From db810ccde4f01a08f82f9732b821d9dc5f36703b Mon Sep 17 00:00:00 2001
From: Sergey Yanovich <ynvich@gmail.com>
Date: Thu, 14 Feb 2008 17:50:20 +0200
Subject: [PATCH] Import 3.0 beta 3 tarball

---
 extensions/cck/browser/install.rdf                 |    4 +-
 .../cck/browser/locales/en-US/chrome/cckWizard.dtd |   34 +-
 .../locales/en-US/chrome/cckwizard.properties      |    8 +-
 .../resources/content/cckwizard/bookmark.xul       |    8 +-
 .../resources/content/cckwizard/cckwizard.js       |  467 ++++--
 .../resources/content/cckwizard/cckwizard.xul      |    9 +-
 .../browser/resources/content/cckwizard/reg.xul    |    2 +-
 .../browser/resources/content/cckwizard/search.js  |  119 +-
 .../resources/content/cckwizard/srcfiles/cck.js.in |   20 +
 .../content/cckwizard/srcfiles/cckService.js.in    |  310 +++-
 .../cckwizard/srcfiles/disableAboutConfig.js.in    |    3 +
 .../content/cckwizard/srcfiles/install.rdf.in      |    6 +-
 .../content/cckwizard/srcfiles/install.rdf.mip.in  |    4 +-
 extensions/irc/Makefile.in                         |   17 +-
 extensions/irc/jar.mn                              |    1 +
 extensions/irc/js/lib/command-manager.js           |    2 +-
 extensions/irc/js/lib/irc.js                       |  145 +-
 extensions/irc/locales/Makefile.in                 |   48 +-
 extensions/irc/locales/all-locales                 |    6 +
 .../irc/locales/en-US/chrome/chatzilla.properties  |   27 +-
 extensions/irc/locales/en-US/defines.inc           |   11 +
 extensions/irc/locales/generic/install.js          |   54 +
 extensions/irc/locales/generic/install.rdf         |   78 +
 extensions/irc/locales/jar.mn                      |    2 +
 extensions/irc/makefiles.sh                        |    1 +
 .../irc/xpi/{makexpi.sh => makelocalexpi.sh}       |  132 +-
 extensions/irc/xpi/makexpi.sh                      |   59 +-
 extensions/irc/xul/content/chatzilla.xul           |   12 +-
 extensions/irc/xul/content/commands.js             |  172 +-
 extensions/irc/xul/content/config.js               |   10 +
 extensions/irc/xul/content/contents.rdf            |    2 +-
 extensions/irc/xul/content/handlers.js             |  113 +-
 extensions/irc/xul/content/menus.js                |   23 +-
 extensions/irc/xul/content/mungers.js              |   50 +-
 extensions/irc/xul/content/output-base.css         |    1 +
 extensions/irc/xul/content/prefs.js                |   53 +-
 extensions/irc/xul/content/static.js               |  567 ++++++-
 extensions/irc/xul/skin/chatzilla.css              |   15 +
 .../irc/xul/skin/images/drop-indicator-bottom.png  |  Bin 0 -> 416 bytes
 .../schema-validation/public/nsISVSchema.idl       |  353 ++++
 .../public/nsISVSchemaErrorHandler.idl}            |   22 +-
 .../schema-validation/public/nsISVSchemaLoader.idl |   85 +
 extensions/schema-validation/src/Makefile.in       |    7 +-
 extensions/schema-validation/src/nsDOMUtils.h      |  162 ++
 extensions/schema-validation/src/nsSchema.cpp      |  542 ++++++
 .../schema-validation/src/nsSchemaAtomList.h       |  119 ++
 .../schema-validation/src/nsSchemaAttributes.cpp   |  744 +++++++++
 .../schema-validation/src/nsSchemaComplexType.cpp  |  631 +++++++
 .../src/nsSchemaComponentBase.cpp}                 |   43 +-
 .../schema-validation/src/nsSchemaDuration.cpp     |    3 +-
 .../src/nsSchemaLoader.cpp                         |    4 +-
 extensions/schema-validation/src/nsSchemaLoader.h  |  235 +++
 .../schema-validation/src/nsSchemaParticles.cpp    |  833 ++++++++++
 extensions/schema-validation/src/nsSchemaPrivate.h |  757 +++++++++
 .../schema-validation/src/nsSchemaSimpleTypes.cpp  |  892 ++++++++++
 .../schema-validation/src/nsSchemaValidator.cpp    |  147 +-
 .../schema-validation/src/nsSchemaValidator.h      |    2 +
 .../src/nsSchemaValidatorUtils.cpp                 |  145 +-
 .../schema-validation/src/nsSchemaValidatorUtils.h |    4 +-
 .../src/nsSpatialNavigationService.cpp             |    8 +-
 extensions/venkman/Makefile.in                     |   18 +-
 extensions/{irc => venkman}/locales/Makefile.in    |   59 +-
 extensions/venkman/locales/all-locales             |    5 +
 .../en-US => locales/en-US/chrome}/profile.csv.tpl |    0
 .../en-US/chrome}/profile.html.tpl                 |    0
 .../en-US => locales/en-US/chrome}/profile.txt.tpl |    0
 .../en-US => locales/en-US/chrome}/profile.xml.tpl |    0
 .../en-US/chrome}/venkman-help.tpl                 |    0
 .../en-US/chrome}/venkman-output-locale.css        |    0
 .../en-US/chrome}/venkman-overlay.dtd              |    0
 .../en-US => locales/en-US/chrome}/venkman.dtd     |    0
 .../en-US/chrome}/venkman.properties               |    2 +
 extensions/venkman/locales/en-US/defines.inc       |   11 +
 .../en-US => locales/generic/chrome}/contents.rdf  |    0
 extensions/venkman/locales/generic/install.js      |   54 +
 extensions/venkman/locales/generic/install.rdf     |   94 ++
 extensions/venkman/locales/jar.mn                  |   15 +
 extensions/venkman/makefiles.sh                    |    1 +
 extensions/venkman/resources/Makefile.in           |    2 -
 .../venkman/resources/content/venkman-commands.js  |   33 +-
 .../venkman/resources/content/venkman-overlay.xul  |    4 +-
 .../venkman/resources/content/venkman-records.js   |    3 +-
 .../venkman/resources/content/venkman-static.js    |   66 +-
 .../venkman/resources/content/venkman-utils.js     |   31 +
 .../venkman/resources/content/venkman-views.js     |    7 +-
 extensions/venkman/resources/jar.mn                |   11 -
 .../venkman/resources/skin/venkman-overlay.css     |    4 +-
 .../makexpi.sh => venkman/xpi/makelocalexpi.sh}    |  152 +-
 extensions/venkman/xpi/makexpi.sh                  |   64 +-
 extensions/webdav/src/Makefile.in                  |    3 +-
 .../webservices/schema/src/nsSchemaLoader.cpp      |    4 +-
 .../security/src/nsWebScriptsAccess.cpp            |    4 +-
 extensions/webservices/soap/src/nsSOAPBlock.cpp    |    4 +-
 extensions/webservices/soap/src/nsSOAPBlock.h      |    4 +-
 extensions/webservices/wsdl/src/nsWSDLLoader.cpp   |    4 +-
 extensions/xforms/Makefile.in                      |   12 +-
 extensions/xforms/nsIXFormsActionModuleElement.idl |    8 +-
 ...ormsXPathXMLUtil.h => nsIXFormsContextInfo.idl} |   72 +-
 ...tionModuleElement.idl => nsIXFormsDOMEvent.idl} |   31 +-
 extensions/xforms/nsIXFormsXPathFunctions.idl      |    5 +-
 extensions/xforms/nsXFormsAccessors.cpp            |    5 +-
 extensions/xforms/nsXFormsActionElement.cpp        |   17 +-
 extensions/xforms/nsXFormsActionElement.h          |   16 +-
 extensions/xforms/nsXFormsActionModuleBase.cpp     |   54 +-
 extensions/xforms/nsXFormsActionModuleBase.h       |   87 +-
 extensions/xforms/nsXFormsAtoms.cpp                |   17 +-
 extensions/xforms/nsXFormsAtoms.h                  |   18 +-
 extensions/xforms/nsXFormsCaseElement.cpp          |    5 +-
 extensions/xforms/nsXFormsChoicesElement.cpp       |    5 +-
 extensions/xforms/nsXFormsContextInfo.cpp          |  227 +++
 extensions/xforms/nsXFormsContextInfo.h            |  126 ++
 extensions/xforms/nsXFormsControlStub.cpp          |   10 +-
 extensions/xforms/nsXFormsControlStub.h            |    8 +-
 extensions/xforms/nsXFormsCopyElement.cpp          |    7 +-
 extensions/xforms/nsXFormsDOMEvent.cpp             |  180 ++
 .../{nsXFormsXPathXMLUtil.h => nsXFormsDOMEvent.h} |   80 +-
 extensions/xforms/nsXFormsDelegateStub.cpp         |    7 +-
 extensions/xforms/nsXFormsDelegateStub.h           |    2 +-
 extensions/xforms/nsXFormsDispatchElement.cpp      |    6 +-
 extensions/xforms/nsXFormsElementFactory.cpp       |    2 +-
 extensions/xforms/nsXFormsGroupElement.cpp         |    2 +-
 extensions/xforms/nsXFormsInsertDeleteElement.cpp  | 1744 ++++++++++----------
 extensions/xforms/nsXFormsInstanceElement.cpp      |    9 +-
 extensions/xforms/nsXFormsInstanceElement.h        |    1 +
 extensions/xforms/nsXFormsItemElement.cpp          |    8 +-
 extensions/xforms/nsXFormsItemSetElement.cpp       |    2 +-
 extensions/xforms/nsXFormsLabelElement.cpp         |   49 +-
 extensions/xforms/nsXFormsLoadElement.cpp          |    8 +-
 extensions/xforms/nsXFormsMessageElement.cpp       |   88 +-
 extensions/xforms/nsXFormsModelElement.cpp         |  127 +-
 extensions/xforms/nsXFormsModelElement.h           |   11 +
 extensions/xforms/nsXFormsModule.cpp               |    3 +-
 extensions/xforms/nsXFormsOutputElement.cpp        |    5 +-
 extensions/xforms/nsXFormsRangeAccessors.cpp       |    5 +-
 extensions/xforms/nsXFormsRebuildElement.cpp       |    8 +-
 extensions/xforms/nsXFormsRecalculateElement.cpp   |    8 +-
 extensions/xforms/nsXFormsRefreshElement.cpp       |    8 +-
 extensions/xforms/nsXFormsRepeatElement.cpp        |    8 +-
 extensions/xforms/nsXFormsResetElement.cpp         |    8 +-
 extensions/xforms/nsXFormsRevalidateElement.cpp    |    8 +-
 extensions/xforms/nsXFormsSchemaValidator.cpp      |    5 +-
 extensions/xforms/nsXFormsSelect1Element.cpp       |    2 +-
 extensions/xforms/nsXFormsSelectElement.cpp        |    2 +-
 extensions/xforms/nsXFormsSendElement.cpp          |   10 +-
 extensions/xforms/nsXFormsSetFocusElement.cpp      |   10 +-
 extensions/xforms/nsXFormsSetIndexElement.cpp      |    8 +-
 extensions/xforms/nsXFormsSetValueElement.cpp      |    8 +-
 extensions/xforms/nsXFormsStubElement.h            |    3 -
 extensions/xforms/nsXFormsSubmissionElement.cpp    |  605 +++++--
 extensions/xforms/nsXFormsSubmissionElement.h      |   51 +-
 extensions/xforms/nsXFormsSwitchElement.cpp        |    2 +-
 extensions/xforms/nsXFormsToggleElement.cpp        |   10 +-
 extensions/xforms/nsXFormsTriggerElement.cpp       |    2 +-
 extensions/xforms/nsXFormsUploadElement.cpp        |   19 +-
 extensions/xforms/nsXFormsUtils.cpp                |  349 +++-
 extensions/xforms/nsXFormsUtils.h                  |   62 +-
 extensions/xforms/nsXFormsValueElement.cpp         |    2 +-
 extensions/xforms/nsXFormsXPathAnalyzer.h          |    2 +-
 extensions/xforms/nsXFormsXPathFunctions.cpp       |  153 +-
 extensions/xforms/nsXFormsXPathParser.cpp          |    1 +
 extensions/xforms/nsXFormsXPathScanner.h           |    2 +-
 extensions/xforms/nsXFormsXPathXMLUtil.h           |    2 +-
 .../xforms/resources/content/widgets-xhtml.xml     |   12 +-
 .../xforms/resources/content/widgets-xul.xml       |   16 +-
 .../xforms/resources/content/xforms-message.xul    |    3 +-
 .../xforms/resources/content/xforms-xhtml.xml      |    9 +-
 extensions/xforms/resources/content/xforms-xul.xml |    4 +-
 167 files changed, 11060 insertions(+), 2403 deletions(-)
 create mode 100644 extensions/irc/locales/en-US/defines.inc
 create mode 100644 extensions/irc/locales/generic/install.js
 create mode 100644 extensions/irc/locales/generic/install.rdf
 copy extensions/irc/xpi/{makexpi.sh => makelocalexpi.sh} (57%)
 mode change 100644 => 100755
 create mode 100644 extensions/irc/xul/skin/images/drop-indicator-bottom.png
 create mode 100644 extensions/schema-validation/public/nsISVSchema.idl
 copy extensions/{xforms/nsIXFormsActionModuleElement.idl => schema-validation/public/nsISVSchemaErrorHandler.idl} (74%)
 create mode 100644 extensions/schema-validation/public/nsISVSchemaLoader.idl
 create mode 100644 extensions/schema-validation/src/nsDOMUtils.h
 create mode 100644 extensions/schema-validation/src/nsSchema.cpp
 create mode 100644 extensions/schema-validation/src/nsSchemaAtomList.h
 create mode 100644 extensions/schema-validation/src/nsSchemaAttributes.cpp
 create mode 100644 extensions/schema-validation/src/nsSchemaComplexType.cpp
 copy extensions/{xforms/nsIXFormsActionModuleElement.idl => schema-validation/src/nsSchemaComponentBase.cpp} (62%)
 copy extensions/{webservices/schema => schema-validation}/src/nsSchemaLoader.cpp (99%)
 create mode 100644 extensions/schema-validation/src/nsSchemaLoader.h
 create mode 100644 extensions/schema-validation/src/nsSchemaParticles.cpp
 create mode 100644 extensions/schema-validation/src/nsSchemaPrivate.h
 create mode 100644 extensions/schema-validation/src/nsSchemaSimpleTypes.cpp
 copy extensions/{irc => venkman}/locales/Makefile.in (51%)
 create mode 100644 extensions/venkman/locales/all-locales
 rename extensions/venkman/{resources/locale/en-US => locales/en-US/chrome}/profile.csv.tpl (100%)
 rename extensions/venkman/{resources/locale/en-US => locales/en-US/chrome}/profile.html.tpl (100%)
 rename extensions/venkman/{resources/locale/en-US => locales/en-US/chrome}/profile.txt.tpl (100%)
 rename extensions/venkman/{resources/locale/en-US => locales/en-US/chrome}/profile.xml.tpl (100%)
 rename extensions/venkman/{resources/locale/en-US => locales/en-US/chrome}/venkman-help.tpl (100%)
 rename extensions/venkman/{resources/locale/en-US => locales/en-US/chrome}/venkman-output-locale.css (100%)
 rename extensions/venkman/{resources/locale/en-US => locales/en-US/chrome}/venkman-overlay.dtd (100%)
 rename extensions/venkman/{resources/locale/en-US => locales/en-US/chrome}/venkman.dtd (100%)
 rename extensions/venkman/{resources/locale/en-US => locales/en-US/chrome}/venkman.properties (99%)
 create mode 100644 extensions/venkman/locales/en-US/defines.inc
 rename extensions/venkman/{resources/locale/en-US => locales/generic/chrome}/contents.rdf (100%)
 create mode 100644 extensions/venkman/locales/generic/install.js
 create mode 100644 extensions/venkman/locales/generic/install.rdf
 create mode 100644 extensions/venkman/locales/jar.mn
 copy extensions/{irc/xpi/makexpi.sh => venkman/xpi/makelocalexpi.sh} (50%)
 mode change 100644 => 100755
 copy extensions/xforms/{nsXFormsXPathXMLUtil.h => nsIXFormsContextInfo.idl} (56%)
 copy extensions/xforms/{nsIXFormsActionModuleElement.idl => nsIXFormsDOMEvent.idl} (69%)
 create mode 100644 extensions/xforms/nsXFormsContextInfo.cpp
 create mode 100644 extensions/xforms/nsXFormsContextInfo.h
 create mode 100644 extensions/xforms/nsXFormsDOMEvent.cpp
 copy extensions/xforms/{nsXFormsXPathXMLUtil.h => nsXFormsDOMEvent.h} (52%)
 rewrite extensions/xforms/nsXFormsInsertDeleteElement.cpp (64%)

diff --git a/extensions/cck/browser/install.rdf b/extensions/cck/browser/install.rdf
index d53c2da..1c3e7b7 100755
--- a/extensions/cck/browser/install.rdf
+++ b/extensions/cck/browser/install.rdf
@@ -5,7 +5,7 @@ xmlns:em="http://www.mozilla.org/2004/em-rdf#">
 
         <em:id>cckwizard@extensions.mozilla.org</em:id>
         <em:name>CCK Wizard</em:name>
-        <em:version>1.0.3</em:version>
+        <em:version>1.1.1</em:version>
         <em:description></em:description>
         <em:creator>Michael Kaply</em:creator>
         <em:homepageURL>http://www.mozilla.org/projects/cck/firefox</em:homepageURL>
@@ -15,7 +15,7 @@ xmlns:em="http://www.mozilla.org/2004/em-rdf#">
             <Description>
                 <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
                 <em:minVersion>1.5</em:minVersion>
-                <em:maxVersion>3.0a1</em:maxVersion>
+                <em:maxVersion>3.0.*</em:maxVersion>
             </Description>
         </em:targetApplication>
 
diff --git a/extensions/cck/browser/locales/en-US/chrome/cckWizard.dtd b/extensions/cck/browser/locales/en-US/chrome/cckWizard.dtd
index 9e58240..b5fd28b 100755
--- a/extensions/cck/browser/locales/en-US/chrome/cckWizard.dtd
+++ b/extensions/cck/browser/locales/en-US/chrome/cckWizard.dtd
@@ -5,7 +5,7 @@
 <!ENTITY  beforeYouBegin.description    "Decide which customizations you want to make and create/collect the customized files, such as:
                                          <html:ul>
                                          <html:li>Custom animation files for browser&apos;s animated logo</html:li>
-                                         <html:li>Search engines (SRC files and the corresponding images)</html:li>
+                                         <html:li>Search engines</html:li>
                                          <html:li>Browser plug-ins</html:li>
                                          <html:li>Extensions/themes</html:li>
                                          </html:ul>">
@@ -24,14 +24,9 @@
 <!ENTITY  configLocation.label          "Location of configuration">
 
 <!ENTITY  saveOnExit.label              "Save configuration automatically on exit">
-<!ENTITY  zipLocation.label             "In order to create the XPI, we need to use ZIP. If ZIP is not in your path, you can specify it here:">
-
-
-
+<!ENTITY  zipLocation.label             "<html:b>Important:</html:b> In order to create the XPI, we need to use ZIP or 7-Zip. Use the 'Choose File' button to locate one of these executables. Note we will also attempt to use ZIP.EXE if it is in the path.">
 
 <!ENTITY  customizeExt.label            "Customize Extension">
-<!ENTITY  customizeExt.description      "">
-
 
 <!ENTITY  id.label                      "Unique ID:">
 <!ENTITY  id.format                     "Format: companyname-cck@extensions.domainname.tld">
@@ -42,8 +37,8 @@
 <!ENTITY  homepageURL.label             "Homepage URL:">
 <!ENTITY  updateURL.label               "Update URL:">
 <!ENTITY  icon.label                    "Icon:">
-<!ENTITY  chooseFile.label              "Choose File…">
-<!ENTITY  chooseDir.label               "Choose Dir…">
+<!ENTITY  chooseFile.label              "Choose File...">
+<!ENTITY  chooseDir.label               "Choose Dir...">
 
 <!ENTITY  filename.label                "Filename:">
 
@@ -62,9 +57,9 @@
 <!ENTITY  homePage.label                "Default Home Page URL:">
 <!ENTITY  homePage.description          "This page is displayed when users first start the Firefox browser, or when they click the Home button.">
 
-<!ENTITY  homePageOverride.label        "Override Home Page URL:">
-<!ENTITY  homePageOverride.description  "This page is displayed  on the very first invocation of Firefox after a new profile is created. It is optional.">
-
+<!ENTITY  homePageOverride.description  "On the very first invocation of Firefox after a new profile is created, a welcome page is displayed. You can choose to replace this page or to not display it at all.">
+<!ENTITY  homePageOverride.label        "Replacement Welcome Page URL:">
+<!ENTITY  noWelcomePage.label           "Do not display the welcome page">
 
 <!ENTITY  titleBar.caption              "Browser Window&apos;s Title Bar Text">
 <!ENTITY  titleBar.label                "Custom Title Bar Text:">
@@ -106,9 +101,9 @@
 <!ENTITY  defaultSearchEngine.label     "Default Search Engine">
 
 <!ENTITY  engines.label                 "Search Engines">
-<!ENTITY  engines.description           "Please select a .src file and the corresponding image.">
+<!ENTITY  engines.description           "Please select a search engine and (if applicable) corresponding image.">
 
-<!ENTITY  engine.label                  "SRC File">
+<!ENTITY  engine.label                  "Search Engine:">
 <!ENTITY  engineIcon.label              "Image File:">
 
 <!ENTITY  file.label                    "File:">
@@ -146,6 +141,8 @@
 <!ENTITY  bookmark.description          "Enter a Bookmark">
 <!ENTITY  bookmarkTitle.label           "Title:">
 <!ENTITY  bookmarkURL.label             "URL:">
+<!ENTITY  liveBookmark.label            "Live Bookmark">
+<!ENTITY  separator.label               "Separator">
 
 
 <!ENTITY  customizePrefs.label          "Customize Preferences">
@@ -173,6 +170,9 @@
 <!ENTITY  registry.label                "Registry">
 <!ENTITY  registry.description          "Use the buttons below to add entries to the Windows registry. Note these items will be added/updated every time the browser starts.">
 
+<!ENTITY  regDescription.label          "Description">
+
+
 <!ENTITY  regRootKey.label              "Root Key">
 <!ENTITY  regKey.label                  "Key">
 <!ENTITY  regName.label                 "Name">
@@ -214,7 +214,9 @@
 <!ENTITY  manualTypeRadio.label         "Manual proxy configuration:">
 <!ENTITY  manualTypeRadio.accesskey     "m">
 <!ENTITY  autoTypeRadio.label           "Automatic proxy configuration URL:">
-<!ENTITY  autoTypeRadio.accesskey       "A">
+<!ENTITY  autoTypeRadio.accesskey       "a">
+<!ENTITY  configAutoconfigText.label    "Configuration location (URL):">
+<!ENTITY  configAutoconfigText.accesskey "u">
 <!ENTITY  autoCCKTypeRadio.label        "Store proxy configuration file in the CCK:">
 <!ENTITY  autoCCKTypeRadio.accesskey    "i">
 
@@ -239,8 +241,6 @@
 <!ENTITY  HTTPport.accesskey            "p">
 <!ENTITY  SSLport.accesskey             "o">
 <!ENTITY  FTPport.accesskey             "r">
-<!-- No accesskey for gopher (':' doesn't go well) - mpt's going to redesign the window -->
-<!ENTITY  gopherPort.accesskey          "">
 <!ENTITY  SOCKSport.accesskey           "t">
 <!ENTITY  noproxy.label                 "No Proxy for:">
 <!ENTITY  noproxy.accesskey             "n">
diff --git a/extensions/cck/browser/locales/en-US/chrome/cckwizard.properties b/extensions/cck/browser/locales/en-US/chrome/cckwizard.properties
index 5f89f01..2137bca 100755
--- a/extensions/cck/browser/locales/en-US/chrome/cckwizard.properties
+++ b/extensions/cck/browser/locales/en-US/chrome/cckwizard.properties
@@ -6,9 +6,9 @@ zipError=Unable to create JAR or XPI file. Please ensure that a command line ver
 intError=The value must be an integer
 lockError=You cannot set this value here, you can only lock it.
 prefExistsError=This preference already exists in the list.
-chooseFile=Choose File…
-chooseDirectory=Choose Directory…
-chooseImage=Choose Image…
+chooseFile=Choose File...
+chooseDirectory=Choose Directory...
+chooseImage=Choose Image...
 createDir=The following directory does not exist: %S\nWould you like to create it?
 createDirError=Could not create folder: %S\nMake sure you have access to create the folder.
 extensions.cckwizard@extensions.mozilla.org.description=XUL Wizard to create CCK Packages
@@ -19,4 +19,4 @@ OrganizationName.error=Company Identifier is required and cannot contain any spa
 BookmarkFolder1.error=You must specify a folder name
 ToolbarFolder1.error=You must specify a folder name
 useBrowserDefault=(use the browser default)
-searchEngine.error=SRC file is invalid
+searchEngine.error=Search engine source file is invalid
diff --git a/extensions/cck/browser/resources/content/cckwizard/bookmark.xul b/extensions/cck/browser/resources/content/cckwizard/bookmark.xul
index b32b9e8..92b9bdc 100644
--- a/extensions/cck/browser/resources/content/cckwizard/bookmark.xul
+++ b/extensions/cck/browser/resources/content/cckwizard/bookmark.xul
@@ -57,6 +57,12 @@
     <textbox flex="1" id="bookmarkname" onchange="bookmarkCheckOKButton();" onkeyup="bookmarkCheckOKButton();"/>
     <label control="bookmarkurl">&bookmarkURL.label;</label>
     <textbox flex="1" id="bookmarkurl" onchange="bookmarkCheckOKButton();" onkeyup="bookmarkCheckOKButton();"/>
-    <checkbox id="liveBookmark" label="Live Bookmark"/>
+    <menulist id="bookmarktype" oncommand="bookmarkCheckOKButton();">
+      <menupopup>
+       <menuitem label="&bookmark.label;" value=""/>
+       <menuitem label="&liveBookmark.label;" value="live"/>
+       <menuitem label="&separator.label;" value="separator"/>
+      </menupopup>
+    </menulist>
   </vbox>
 </dialog>
diff --git a/extensions/cck/browser/resources/content/cckwizard/cckwizard.js b/extensions/cck/browser/resources/content/cckwizard/cckwizard.js
index b0f48e7..554ff18 100755
--- a/extensions/cck/browser/resources/content/cckwizard/cckwizard.js
+++ b/extensions/cck/browser/resources/content/cckwizard/cckwizard.js
@@ -143,7 +143,8 @@ function DeleteConfig()
   var bundle = document.getElementById("bundle_cckwizard");
 
   var button = gPromptService.confirmEx(window, bundle.getString("windowTitle"), bundle.getString("deleteConfirm"),
-                                        gPromptService.STD_YES_NO_BUTTONS,
+                                        gPromptService.BUTTON_TITLE_YES * gPromptService.BUTTON_POS_0 +
+                                        gPromptService.BUTTON_TITLE_NO * gPromptService.BUTTON_POS_1,
                                         null, null, null, null, {});
   if (button == 0) {
     gPrefBranch.deleteBranch("cck.config."+currentconfigname);
@@ -266,7 +267,8 @@ function CloseCCKWizard()
     var bundle = document.getElementById("bundle_cckwizard");
 
     var button = gPromptService.confirmEx(window, bundle.getString("windowTitle"), bundle.getString("cancelConfirm"),
-                                          gPromptService.STD_YES_NO_BUTTONS,
+                                          (gPromptService.BUTTON_TITLE_YES * gPromptService.BUTTON_POS_0) +
+                                          (gPromptService.BUTTON_TITLE_NO * gPromptService.BUTTON_POS_1),
                                           null, null, null, null, {});
   } else {
     button = 0;
@@ -304,6 +306,7 @@ function ClearAll()
         document.getElementById(elements[i].id).clear();
       } else if (elements[i].id == "defaultSearchEngine") {
         document.getElementById(elements[i].id).removeAllItems();
+        document.getElementById(elements[i].id).value = "";
       }
     }
 }
@@ -362,7 +365,7 @@ var prefsLockOnly = ["browser.startup.homepage", "browser.throbber.url",
 
 function OnPrefLoad()
 {
-  listbox = this.opener.document.getElementById('prefList');    
+  var listbox = this.opener.document.getElementById('prefList');    
   if (window.name == 'editpref') {
     window.title = listbox.selectedItem.cck['type'];
     if (listbox.selectedItem.cck['type'] == "integer") {
@@ -443,7 +446,7 @@ function OnPrefOK()
 {
   var bundle = this.opener.document.getElementById("bundle_cckwizard");
   
-  listbox = this.opener.document.getElementById("prefList");
+  var listbox = this.opener.document.getElementById("prefList");
   for (var i=0; i < listbox.getRowCount(); i++) {
     if ((document.getElementById('prefname').value == listbox.getItemAtIndex(i).label) && (window.name == 'newpref')) {
       gPromptService.alert(window, bundle.getString("windowTitle"),
@@ -504,7 +507,7 @@ function OnPrefOK()
 
 function getPageId()
 {
-  temp = document.getElementById('example-window');
+  var temp = document.getElementById('example-window');
   if (!temp)
     temp = this.opener.document.getElementById('example-window');
   return temp.currentPage.id;
@@ -523,49 +526,65 @@ function onEditBookmark()
 
 function OnBookmarkLoad()
 {
-  listbox = this.opener.document.getElementById(getPageId() +'.bookmarkList');    
+  var listbox = this.opener.document.getElementById(getPageId() +'.bookmarkList');    
   if (window.name == 'editbookmark') {
     document.getElementById('bookmarkname').value = listbox.selectedItem.label;
     document.getElementById('bookmarkurl').value = listbox.selectedItem.value;
-    if (listbox.selectedItem.cck['type'] == "live")
-      document.getElementById('liveBookmark').checked = true;
+    document.getElementById('bookmarktype').value = listbox.selectedItem.cck['type'];
   }
   bookmarkCheckOKButton();
 }
 
 function bookmarkCheckOKButton()
 {
-  if ((document.getElementById("bookmarkname").value) && (document.getElementById("bookmarkurl").value)) {
-    document.documentElement.getButton("accept").setAttribute( "disabled", "false" );
+  if (document.getElementById('bookmarktype').value == "separator") {
+    document.getElementById('bookmarkname').disabled = true;
+    document.getElementById('bookmarkurl').disabled = true;
   } else {
-    document.documentElement.getButton("accept").setAttribute( "disabled", "true" );  
+    document.getElementById('bookmarkname').disabled = false;
+    document.getElementById('bookmarkurl').disabled = false;
+  }
+  if ((document.getElementById('bookmarktype').value == "separator") || ((document.getElementById("bookmarkname").value) && (document.getElementById("bookmarkurl").value))) {
+    document.documentElement.getButton("accept").disabled = false;
+  } else {
+    document.documentElement.getButton("accept").disabled = true;  
   }
 }
 
 function OnBookmarkOK()
 {
 
-  listbox = this.opener.document.getElementById(getPageId() +'.bookmarkList');
+  var listbox = this.opener.document.getElementById(getPageId() +'.bookmarkList');
   var listitem;
   if (window.name == 'newbookmark') {
-    listitem = listbox.appendItem(document.getElementById('bookmarkname').value, document.getElementById('bookmarkurl').value);
+    if (document.getElementById('bookmarktype').value == "separator") {
+      listitem = listbox.appendItem("----------", "");
+    } else {
+      listitem = listbox.appendItem(document.getElementById('bookmarkname').value, document.getElementById('bookmarkurl').value);
+    }
     listitem.setAttribute("class", "listitem-iconic");
   } else {
     listitem = listbox.selectedItem;
-    listitem.setAttribute("label", document.getElementById('bookmarkname').value);
-    listitem.setAttribute("value", document.getElementById('bookmarkurl').value);
+    if (document.getElementById('bookmarktype').value == "separator") {
+      listitem.setAttribute("label", "----------");
+      listitem.setAttribute("value", "");
+    } else {
+      listitem.setAttribute("label", document.getElementById('bookmarkname').value);
+      listitem.setAttribute("value", document.getElementById('bookmarkurl').value);
+    }
   }
-  if (document.getElementById('liveBookmark').checked) {
-    listitem.cck['type'] = "live";
+  listitem.cck['type'] = document.getElementById('bookmarktype').value;
+  if (document.getElementById('bookmarktype').value == "live") {
     listitem.setAttribute("image", "chrome://browser/skin/page-livemarks.png");
+  } else if (document.getElementById('bookmarktype').value == "separator") {
+    listitem.setAttribute("image", "");
   } else {
     listitem.setAttribute("image", "chrome://browser/skin/Bookmarks-folder.png");
-    listitem.cck['type'] = "";
   }
 }
 
 function enableBookmarkButtons() {
-  listbox = document.getElementById(getPageId() +'.bookmarkList');
+  var listbox = document.getElementById(getPageId() +'.bookmarkList');
   if (listbox.selectedItem) {
     document.getElementById(getPageId() +'editBookmarkButton').disabled = false;
     document.getElementById(getPageId() +'deleteBookmarkButton').disabled = false;
@@ -587,7 +606,7 @@ function onEditBrowserPlugin()
 
 function OnPluginLoad()
 {
-  listbox = this.opener.document.getElementById('browserPluginList');    
+  var listbox = this.opener.document.getElementById('browserPluginList');    
   if (window.name == 'editplugin') {
     document.getElementById('pluginpath').value = listbox.selectedItem.label;
     document.getElementById('plugintype').value = listbox.selectedItem.value;
@@ -611,9 +630,9 @@ function OnBrowserPluginOK()
     return false;
   }
 
-  listbox = this.opener.document.getElementById('browserPluginList');    
+  var listbox = this.opener.document.getElementById('browserPluginList');    
   if (window.name == 'newplugin') {
-    listitem = listbox.appendItem(document.getElementById('pluginpath').value, document.getElementById('plugintype').value);
+    var listitem = listbox.appendItem(document.getElementById('pluginpath').value, document.getElementById('plugintype').value);
   } else {
     listbox.selectedItem.label = document.getElementById('pluginpath').value;
     listbox.selectedItem.value = document.getElementById('plugintype').selectedItem.value;
@@ -632,7 +651,7 @@ function onEditRegKey()
 
 function OnRegLoad()
 {
-  listbox = this.opener.document.getElementById('regList');
+  var listbox = this.opener.document.getElementById('regList');
   if (window.name == 'editreg') {
     document.getElementById('PrettyName').value = listbox.selectedItem.label;
     document.getElementById('RootKey').value = listbox.selectedItem.cck['rootkey'];
@@ -658,7 +677,7 @@ function regCheckOKButton()
 
 function OnRegOK()
 {
-  listbox = this.opener.document.getElementById('regList');
+  var listbox = this.opener.document.getElementById('regList');
   var listitem;
   if (window.name == 'newreg') {
     listitem = listbox.appendItem(document.getElementById('PrettyName').value, "");
@@ -693,10 +712,10 @@ function RefreshDefaultSearchEngines()
   var setcuritem = false;
   
   var bundle = document.getElementById("bundle_cckwizard");
-  menulistitem = menulist.appendItem(bundle.getString("useBrowserDefault"), "");
+  var menulistitem = menulist.appendItem(bundle.getString("useBrowserDefault"), "");
   menulistitem.minWidth=menulist.width;
   for (var i=0; i < listbox.getRowCount(); i++) {
-    listitem = listbox.getItemAtIndex(i);
+    var listitem = listbox.getItemAtIndex(i);
     name = listitem.getAttribute("label");
     menulistitem = menulist.appendItem(name, name);
     if (name == curitem)
@@ -721,11 +740,15 @@ function onEditSearchEngine()
 
 function OnSearchEngineLoad()
 {
-  listbox = this.opener.document.getElementById('searchEngineList');    
+  var listbox = this.opener.document.getElementById('searchEngineList');    
   if (window.name == 'editsearchengine') {
     document.getElementById('searchengine').value = listbox.selectedItem.cck['engineurl'];
     document.getElementById('searchengineicon').value = listbox.selectedItem.cck['iconurl'];
-    document.getElementById('icon').src = listbox.selectedItem.cck['iconurl'];
+    if (listbox.selectedItem.cck['iconurl'].length > 0) {
+      document.getElementById('icon').src = listbox.selectedItem.cck['iconurl'];
+    } else {
+      document.getElementById('icon').src = getSearchEngineImage(listbox.selectedItem.cck['engineurl']);
+    }
   }
   searchEngineCheckOKButton();
   
@@ -733,11 +756,33 @@ function OnSearchEngineLoad()
 
 function searchEngineCheckOKButton()
 {
-  if ((document.getElementById("searchengine").value) && (document.getElementById("searchengineicon").value)) {
+  if (document.getElementById("searchengine").value) {    
     document.documentElement.getButton("accept").setAttribute( "disabled", "false" );
   } else {
     document.documentElement.getButton("accept").setAttribute( "disabled", "true" );  
   }
+  if (!(document.getElementById("searchengineicon").value)) {
+    var searchengineimage;
+    if (searchengineimage = getSearchEngineImage(document.getElementById("searchengine").value)) {
+      document.getElementById('icon').src = searchengineimage;
+      document.getElementById("searchengineicon").setAttribute( "disabled", "true" );
+    } else {
+      document.getElementById('icon').src = "";
+      document.getElementById("searchengineicon").removeAttribute( "disabled");
+    }
+  } else {
+    try {
+      var sourcefile = Components.classes["@mozilla.org/file/local;1"]
+                                 .createInstance(Components.interfaces.nsILocalFile);
+      sourcefile.initWithPath(document.getElementById('searchengineicon').value);
+      var ioServ = Components.classes["@mozilla.org/network/io-service;1"]
+                             .getService(Components.interfaces.nsIIOService);
+      var imgfile = ioServ.newFileURI(sourcefile);
+      document.getElementById('icon').src = imgfile.spec;
+    } catch (ex) {
+      document.getElementById('icon').src = "";
+    }
+  }
 }
 
 function OnSearchEngineOK()
@@ -746,7 +791,7 @@ function OnSearchEngineOK()
     return false;
   }
 
-  listbox = this.opener.document.getElementById('searchEngineList');
+  var listbox = this.opener.document.getElementById('searchEngineList');
   var listitem;
   var name = getSearchEngineName(document.getElementById('searchengine').value);
   if (!name) {
@@ -762,13 +807,17 @@ function OnSearchEngineOK()
     listitem = listbox.selectedItem;
     listbox.selectedItem.label = name;
   }
-  var sourcefile = Components.classes["@mozilla.org/file/local;1"]
-                             .createInstance(Components.interfaces.nsILocalFile);
-  sourcefile.initWithPath(document.getElementById('searchengineicon').value);
-  var ioServ = Components.classes["@mozilla.org/network/io-service;1"]
-                         .getService(Components.interfaces.nsIIOService);
-  var imgfile = ioServ.newFileURI(sourcefile);
-  listitem.setAttribute("image", imgfile.spec);
+  if (document.getElementById('searchengineicon').value) {
+    var sourcefile = Components.classes["@mozilla.org/file/local;1"]
+                               .createInstance(Components.interfaces.nsILocalFile);
+    sourcefile.initWithPath(document.getElementById('searchengineicon').value);
+    var ioServ = Components.classes["@mozilla.org/network/io-service;1"]
+                           .getService(Components.interfaces.nsIIOService);
+    var imgfile = ioServ.newFileURI(sourcefile);
+    listitem.setAttribute("image", imgfile.spec);
+  } else {
+    listitem.setAttribute("image", getSearchEngineImage(document.getElementById('searchengine').value));
+  }
 
   listitem.cck['name'] = name;
   listitem.cck['engineurl'] = document.getElementById('searchengine').value;
@@ -795,7 +844,7 @@ function onEditCert()
 
 function OnCertLoad()
 {
-  listbox = this.opener.document.getElementById('certList');    
+  var listbox = this.opener.document.getElementById('certList');    
   if (window.name == 'editcert') {
     document.getElementById('certpath').value = listbox.selectedItem.label;
     var trustString = listbox.selectedItem.value;
@@ -844,7 +893,7 @@ function OnCertOK()
     trustString += "c"
   }
 
-  listbox = this.opener.document.getElementById('certList');
+  var listbox = this.opener.document.getElementById('certList');
   var listitem;
   if (window.name == 'newcert') {
     listitem = listbox.appendItem(document.getElementById('certpath').value, trustString);
@@ -863,13 +912,14 @@ function onNewBundle()
   try {
     var nsIFilePicker = Components.interfaces.nsIFilePicker;
     var fp = Components.classes["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
-    fp.init(window, "Choose File...", nsIFilePicker.modeOpen);
+    var bundle = document.getElementById("bundle_cckwizard");
+    fp.init(window, bundle.getString("chooseFile"), nsIFilePicker.modeOpen);
     fp.appendFilters(nsIFilePicker.filterHTML | nsIFilePicker.filterText |
                      nsIFilePicker.filterAll | nsIFilePicker.filterImages | nsIFilePicker.filterXML);
 
     if (fp.show() == nsIFilePicker.returnOK && fp.fileURL.spec && fp.fileURL.spec.length > 0) {
-      listbox = document.getElementById('bundleList');
-      listitem = listbox.appendItem(fp.file.path, "");
+      var listbox = document.getElementById('bundleList');
+      var listitem = listbox.appendItem(fp.file.path, "");
     }
   }
   catch(ex) {
@@ -878,8 +928,8 @@ function onNewBundle()
 
 function onEditBundle()
 {
-  listbox = document.getElementById('bundleList');
-  filename = listbox.selectedItem.label;
+  var listbox = document.getElementById('bundleList');
+  var filename = listbox.selectedItem.label;
   var sourcefile = Components.classes["@mozilla.org/file/local;1"]
                        .createInstance(Components.interfaces.nsILocalFile);
   try {
@@ -938,10 +988,10 @@ function CreateCCK()
   if (document.getElementById("noaboutconfig").checked)
     CCKCopyChromeToFile("cck-config.css", destdir)
 
-  listbox = document.getElementById('certList');
+  var listbox = document.getElementById('certList');
 
   for (var i=0; i < listbox.getRowCount(); i++) {
-    listitem = listbox.getItemAtIndex(i);
+    var listitem = listbox.getItemAtIndex(i);
     CCKCopyFile(listitem.getAttribute("label"), destdir);
   }
 
@@ -986,7 +1036,8 @@ function CreateCCK()
     destdir.create(Components.interfaces.nsIFile.DIRECTORY_TYPE, 0775);
   } catch(ex) {}
 
-  CCKCopyChromeToFile("cckService.js", destdir);
+//  CCKCopyChromeToFile("cckService.js", destdir);
+  CCKWriteCCKServiceJS(destdir);
   if (document.getElementById("noaboutconfig").checked)
     CCKCopyChromeToFile("disableAboutConfig.js", destdir);
   
@@ -1044,7 +1095,8 @@ function CreateCCK()
   for (var i=0; i < listbox.getRowCount(); i++) {
     listitem = listbox.getItemAtIndex(i);
     CCKCopyFile(listitem.cck['engineurl'], destdir);
-    CCKCopyFile(listitem.cck['iconurl'], destdir);
+    if (listitem.cck['iconurl'].length > 0)
+      CCKCopyFile(listitem.cck['iconurl'], destdir);
   }
 
   destdir.initWithPath(currentconfigpath);
@@ -1168,63 +1220,84 @@ function CCKZip(zipfile, location)
     file.remove(false);
   } catch (ex) {}
 
-  if ((document.getElementById("zipLocation").value == "") && (Components.interfaces.IZipWriterComponent)) {
+  if ((document.getElementById("zipLocation").value == "") && Components.interfaces.IZipWriterComponent) {
     var archivefileobj = location.clone();
     archivefileobj.append(zipfile);
-  
-    try {
-      var zipwriterobj = Components.classes["@ottley.org/libzip/zip-writer;1"]
-                                   .createInstance(Components.interfaces.IZipWriterComponent);
-                                
-      zipwriterobj.CURR_COMPRESS_LEVEL = Components.interfaces.IZipWriterComponent.COMPRESS_LEVEL9;
-        
-      var sourcepathobj = Components.classes["@mozilla.org/file/local;1"]
-                                    .createInstance(Components.interfaces.nsILocalFile);
-      sourcepathobj.initWithPath(location.path);
-  
-      zipwriterobj.init(archivefileobj);
-      
-      zipwriterobj.basepath = sourcepathobj;
-      
-      var zipentriestoadd = new Array();
-      
-      for (var i=2; i < arguments.length; i++) {
-        var sourcepathobj = location.clone();
-        sourcepathobj.append(arguments[i]);
-        if (sourcepathobj.exists() && sourcepathobj.isDirectory()) {
-          var entries = sourcepathobj.directoryEntries;
-  
-          while (entries.hasMoreElements()) {
-            zipentriestoadd.push(entries.getNext());
-          }
-        } else if (sourcepathobj.exists()) {
-            zipentriestoadd.push(sourcepathobj);
+    var zipWriter = new Components.Constructor("@mozilla.org/zipwriter;1", "nsIZipWriter");
+    zipWriter.open(archivefileobj, 0x01 | 0x08 | 0x20);
+    for (var i=2; i < arguments.length; i++) {
+      var sourcepathobj = location.clone();
+      sourcepathobj.append(arguments[i]);
+      if (sourcepathobj.exists() && sourcepathobj.isDirectory()) {
+        var entries = sourcepathobj.directoryEntries;
+        while (entries.hasMoreElements()) {
+          zipentriestoadd.push(entries.getNext());
+          var foo = entries.getNext();
+          zipWriter.addEntryFile(foo.path, 9, foo, true);
         }
+      } else if (sourcepathobj.exists()) {
+          zipWriter.addEntryFile(sourcepathobj.path, 9, sourcepathobj, true);
       }
-      
-      // Add files depth first
-      while (zipentriestoadd.length > 0) {
-        var zipentry = zipentriestoadd.pop();
+    }
+
+    
+
+    if (Components.interfaces.nsIZipWriter) {
+    } else if (Components.interfaces.IZipWriterComponent) {
+      try {
+        var zipwriterobj = Components.classes["@ottley.org/libzip/zip-writer;1"]
+                                     .createInstance(Components.interfaces.IZipWriterComponent);
+                                  
+        zipwriterobj.CURR_COMPRESS_LEVEL = Components.interfaces.IZipWriterComponent.COMPRESS_LEVEL9;
+          
+        var sourcepathobj = Components.classes["@mozilla.org/file/local;1"]
+                                      .createInstance(Components.interfaces.nsILocalFile);
+        sourcepathobj.initWithPath(location.path);
+    
+        zipwriterobj.init(archivefileobj);
+        
+        zipwriterobj.basepath = sourcepathobj;
         
-        zipentry.QueryInterface(Components.interfaces.nsILocalFile);
-       
-        if (!zipentry.isDirectory()) {
-          zipwriterobj.add(zipentry);
+        var zipentriestoadd = new Array();
+        
+        for (var i=2; i < arguments.length; i++) {
+          var sourcepathobj = location.clone();
+          sourcepathobj.append(arguments[i]);
+          if (sourcepathobj.exists() && sourcepathobj.isDirectory()) {
+            var entries = sourcepathobj.directoryEntries;
+    
+            while (entries.hasMoreElements()) {
+              zipentriestoadd.push(entries.getNext());
+            }
+          } else if (sourcepathobj.exists()) {
+              zipentriestoadd.push(sourcepathobj);
+          }
         }
         
-        if (zipentry.exists() && zipentry.isDirectory()) {
-          var entries = zipentry.directoryEntries;
-  
-          while (entries.hasMoreElements()) {
-            zipentriestoadd.push(entries.getNext());
+        // Add files depth first
+        while (zipentriestoadd.length > 0) {
+          var zipentry = zipentriestoadd.pop();
+          
+          zipentry.QueryInterface(Components.interfaces.nsILocalFile);
+         
+          if (!zipentry.isDirectory()) {
+            zipwriterobj.add(zipentry);
           }
-        }        
+          
+          if (zipentry.exists() && zipentry.isDirectory()) {
+            var entries = zipentry.directoryEntries;
+    
+            while (entries.hasMoreElements()) {
+              zipentriestoadd.push(entries.getNext());
+            }
+          }        
+        }
+    
+        zipwriterobj.commitUpdates();
+        return;
+      } catch (e) {
+        gPromptService.alert(window, "", "ZIPWriterComponent error - attempting ZIP");
       }
-  
-      zipwriterobj.commitUpdates();
-      return;
-    } catch (e) {
-      gPromptService.alert(window, "", "ZIPWriterComponent error - attempting ZIP");
     }
   }
   
@@ -1233,7 +1306,7 @@ function CCKZip(zipfile, location)
     zipLocation = "zip";
   }
 
-  platform = navigator.platform;
+  var platform = navigator.platform;
   var scriptfile = location.clone();
              
   if ((navigator.platform == "Win32") || (navigator.platform == "OS/2"))
@@ -1250,10 +1323,15 @@ function CCKZip(zipfile, location)
     line += "/d ";
   line += "\"" + location.path + "\"\n";
   fos.write(line, line.length);
+  var zipParams = "-r";
+  /* check for 7zip */
+  if (zipLocation.match("7z")) {
+    zipParams = "a -tZIP";
+  }
   if ((navigator.platform == "Win32") || (navigator.platform == "OS/2"))
-    line =  "\"" + zipLocation + "\" -r \"" + location.path + "\\" + zipfile + "\"";
+    line =  "\"" + zipLocation + "\" " + zipParams + " \"" + location.path + "\\" + zipfile + "\"";
   else
-    line = zipLocation + " -r \"" + location.path + "/" + zipfile + "\"";  
+    line = zipLocation + " " + zipParams + " \"" + location.path + "/" + zipfile + "\"";  
   for (var i=2; i < arguments.length; i++) {
     line += " " + arguments[i];
   }
@@ -1302,8 +1380,7 @@ function CCKZip(zipfile, location)
 
 function CCKWriteXULOverlay(destdir)
 {
-  var tooltipXUL  = '  <button id="navigator-throbber" tooltiptext="&throbber.tooltip;"/>\n';
-
+  var tooltipXUL  = '  <button id="navigator-throbber" oncommand="goClickThrobber(\'browser.throbber.url\', event)" onclick="checkForMiddleClick(this, event);" tooltiptext="&throbber.tooltip;" disabled="false"/>\n';
   var titlebarXUL = '  <window id="main-window" titlemodifier="&mainWindow.titlemodifier;"/>\n';
 
   var helpmenu1   = '  <menupopup id="menu_HelpPopup">\n';
@@ -1336,8 +1413,8 @@ function CCKWriteXULOverlay(destdir)
   scriptableStream.close();
   input.close();
 
-  var tooltip = document.getElementById("AnimatedLogoTooltip").value;
-  if (tooltip && (tooltip.length > 0))
+  var throbberurl = document.getElementById("AnimatedLogoURL").value;
+  if (throbberurl && (throbberurl.length > 0)) 
     str = str.replace(/%button%/g, tooltipXUL);
   else
     str = str.replace(/%button%/g, "");
@@ -1523,7 +1600,7 @@ function CCKWriteProperties(destdir)
     cos.writeString(str);
   }
 
-  radio = document.getElementById('ToolbarLocation');
+  var radio = document.getElementById('ToolbarLocation');
   str = "ToolbarLocation=" + radio.value + "\n";
   cos.writeString(str);
 
@@ -1532,7 +1609,7 @@ function CCKWriteProperties(destdir)
   if (str && str.length) {
     str = "ToolbarFolder1=" + str + "\n";
     cos.writeString(str);
-    listbox = document.getElementById('tbFolder.bookmarkList');    
+    var listbox = document.getElementById('tbFolder.bookmarkList');    
     for (var j=0; j < listbox.getRowCount(); j++) {
       listitem = listbox.getItemAtIndex(j);
       str = "ToolbarFolder1.BookmarkTitle" + (j+1) + "=" + listitem.getAttribute("label") + "\n";
@@ -1548,7 +1625,7 @@ function CCKWriteProperties(destdir)
 
   listbox = document.getElementById('tb.bookmarkList');    
   for (var j=0; j < listbox.getRowCount(); j++) {
-    listitem = listbox.getItemAtIndex(j);
+    var listitem = listbox.getItemAtIndex(j);
     str = "ToolbarBookmarkTitle" + (j+1) + "=" + listitem.getAttribute("label") + "\n";
     cos.writeString(str);
     var str = "ToolbarBookmarkURL" + (j+1) + "=" + listitem.getAttribute("value") + "\n";
@@ -1646,9 +1723,9 @@ function CCKWriteProperties(destdir)
 
 function prefIsLocked(prefname)
 {
-  listbox = document.getElementById("prefList");
+  var listbox = document.getElementById("prefList");
   for (var i=0; i < listbox.getRowCount(); i++) {
-    listitem = listbox.getItemAtIndex(i);
+    var listitem = listbox.getItemAtIndex(i);
     if (prefname == listitem.getAttribute("label"))
       if (listitem.cck['lock'] == "true")
         return true;
@@ -1661,6 +1738,7 @@ function CCKWriteDefaultJS(destdir)
   var throbber1 = 'pref("browser.throbber.url",            "';
   var homepage1 = 'pref("browser.startup.homepage",        "';
   var homepage2 = 'pref("startup.homepage_override_url",   "chrome://cck/content/cck.properties");\n';
+  var override  = 'pref("browser.startup.homepage_override.mstone",   "ignore");\n';
   var chromeurl =   "chrome://cck/content/cck.properties";
   var prefend = '");\n';
   var useragent1begin = 'pref("general.useragent.vendorComment", "CK-';
@@ -1705,6 +1783,12 @@ function CCKWriteDefaultJS(destdir)
   } else if (overrideurl && overrideurl.length) {
     fos.write(homepage2, homepage2.length);
   }
+  
+  if (document.getElementById("noWelcomePage").checked) {
+    fos.write(override, override.length);
+  }
+  
+  
   var bundle = document.getElementById("bundle_cckwizard");
 
   if (document.getElementById("defaultSearchEngine").value != bundle.getString("useBrowserDefault")) {
@@ -1724,9 +1808,9 @@ function CCKWriteDefaultJS(destdir)
   }
 
   // Preferences
-  listbox = document.getElementById("prefList");
+  var listbox = document.getElementById("prefList");
   for (var i=0; i < listbox.getRowCount(); i++) {
-    listitem = listbox.getItemAtIndex(i);
+    var listitem = listbox.getItemAtIndex(i);
     /* allow for locking prefs without setting value */
     if ((listitem.getAttribute("value").length) && (!(prefsLockOnly.exists(listitem.getAttribute("label"))))) {
       var line;
@@ -1818,6 +1902,57 @@ function CCKWriteDefaultJS(destdir)
   fos.close();
 }
 
+function CCKWriteCCKServiceJS(destdir)
+{
+  var idline =          "<em:id>%id%</em:id>";
+
+
+  var file = destdir.clone();
+
+  file.append("cckService.js");
+  try {
+    file.remove(false);                         
+  } catch (ex) {
+  }
+  var fos = Components.classes["@mozilla.org/network/file-output-stream;1"]
+                       .createInstance(Components.interfaces.nsIFileOutputStream);
+  var cos = Components.classes["@mozilla.org/intl/converter-output-stream;1"]
+                      .createInstance(Components.interfaces.nsIConverterOutputStream);
+
+  fos.init(file, -1, -1, false);
+  cos.init(fos, null, 0, null);
+
+  var ioService=Components.classes["@mozilla.org/network/io-service;1"]
+    .getService(Components.interfaces.nsIIOService);
+  var scriptableStream=Components
+    .classes["@mozilla.org/scriptableinputstream;1"]
+    .getService(Components.interfaces.nsIScriptableInputStream);
+
+  var channel=ioService.newChannel("chrome://cckwizard/content/srcfiles/cckService.js.in",null,null);
+  var input=channel.open();
+  scriptableStream.init(input);
+  var str=scriptableStream.read(input.available());
+  scriptableStream.close();
+  input.close();
+
+  var uuidString = "{31aec909-8e86-4397-9380-63a59e0c5ff6}";
+  try {
+    var uuidGenerator = 
+      Components.classes["@mozilla.org/uuid-generator;1"]
+                .getService(Components.interfaces.nsIUUIDGenerator);
+      var uuid = uuidGenerator.generateUUID();
+      uuidString = uuid.toString();
+  } catch (ex) {}
+
+  str = str.replace(/%uuid%/g, uuidString);
+  str = str.replace(/%OrganizationName%/g, document.getElementById("OrganizationName").value);
+
+  cos.writeString(str);
+  cos.close();
+  fos.close();
+}
+
+
 function CCKWriteInstallRDF(destdir)
 {
   var idline =          "<em:id>%id%</em:id>";
@@ -1828,13 +1963,14 @@ function CCKWriteInstallRDF(destdir)
   var homepageURLline = "<em:homepageURL>%homepageURL%</em:homepageURL>";
   var updateURLline =   "<em:updateURL>%updateURL%</em:updateURL>";  
   var iconURLline =     "<em:iconURL>chrome://cck/content/%iconURL%</em:iconURL>";
-
+  var hiddenline =      "<em:hidden>true</em:hidden>";
+  var lockedline =      "<em:locked>true</em:locked>";
 
   var file = destdir.clone();
 
   file.append("install.rdf");
   try {
-    file.remove(false);                         
+    file.remove(false);
   } catch (ex) {
   }
   var fos = Components.classes["@mozilla.org/network/file-output-stream;1"]
@@ -1922,6 +2058,18 @@ function CCKWriteInstallRDF(destdir)
   } else {
     str = str.replace(/%iconURLline%/g, "");
   }
+  
+  if (document.getElementById("hidden").checked) {
+    str = str.replace(/%hiddenline%/g, hiddenline);
+  } else {
+    str = str.replace(/%hiddenline%/g, "");
+  }
+
+  if (document.getElementById("locked").checked) {
+    str = str.replace(/%lockedline%/g, lockedline);
+  } else {
+    str = str.replace(/%lockedline%/g, "");
+  }
 
   cos.writeString(str);
   cos.close();
@@ -2052,14 +2200,15 @@ function CCKWriteConfigFile(destdir)
   if (!file.exists()) {
         var bundle = document.getElementById("bundle_cckwizard");
         var button = gPromptService.confirmEx(window, bundle.getString("windowTitle"), bundle.getString("createDir").replace(/%S/g, file.path),
-                                              gPromptService.STD_YES_NO_BUTTONS,
+                                              gPromptService.BUTTON_TITLE_YES * gPromptService.BUTTON_POS_0 +
+                                              gPromptService.BUTTON_TITLE_NO * gPromptService.BUTTON_POS_1,
                                               null, null, null, null, {});
         if (button == 0) {
           try {
             file.create(Components.interfaces.nsIFile.DIRECTORY_TYPE, 0775);
           } catch (ex) {
             gPromptService.alert(window, bundle.getString("windowTitle"),
-                                 bundle.getString("createDirError").replace(/%S/g, filename));
+                                 bundle.getString("createDirError").replace(/%S/g, file.path));
             return;
           }
         } else {
@@ -2100,9 +2249,9 @@ function CCKWriteConfigFile(destdir)
         }
       }
     } else if (elements[i].id == "prefList") {
-      listbox = document.getElementById('prefList');    
+      var listbox = document.getElementById('prefList');    
       for (var j=0; j < listbox.getRowCount(); j++) {
-        listitem = listbox.getItemAtIndex(j);
+        var listitem = listbox.getItemAtIndex(j);
         var line = "PreferenceName" + (j+1) + "=" + listitem.getAttribute("label") + "\n";
         cos.writeString(line);
         if (listitem.getAttribute("value").length) {
@@ -2235,9 +2384,14 @@ function CCKWriteConfigFile(destdir)
         cos.writeString(line);
       }
     } else if (elements[i].id == "defaultSearchEngine") {
-      if (elements[i].value) {
-        var line = "DefaultSearchEngine=" + elements[i].value + "\n";
-        cos.writeString(line);
+      if (elements[i].selectedItem) {
+        if (elements[i].selectedItem.value) {
+          var line = "DefaultSearchEngine=" + elements[i].selectedItem.value + "\n";
+          cos.writeString(line);
+        }
+      } else {
+          var line = "DefaultSearchEngine=" + elements[i].value + "\n";
+          cos.writeString(line);
       }
     }
   }
@@ -2273,8 +2427,8 @@ function CCKReadConfigFile(srcdir)
     var str = line.value;
     var equals = str.indexOf('=');
     if (equals != -1) {
-      firstpart = str.substring(0,equals);
-      secondpart = str.substring(equals+1);
+      var firstpart = str.substring(0,equals);
+      var secondpart = str.substring(equals+1);
       configarray[firstpart] = secondpart;
       try {
         (document.getElementById(firstpart).value = secondpart)
@@ -2283,15 +2437,16 @@ function CCKReadConfigFile(srcdir)
   } while (more);
   
   // handle prefs
-  listbox = document.getElementById('prefList');
+  var listbox = document.getElementById('prefList');
   listbox.clear();
 
   var i = 1;
+  var prefname;
   while( prefname = configarray['PreferenceName' + i]) {
     /* Old config file - figure out pref type */
     if (!(configarray['PreferenceType' + i])) {
       /* We're going to use this a lot */
-      value = configarray['PreferenceValue' + i];
+      var value = configarray['PreferenceValue' + i];
       if ((value.toLowerCase() == "true") || (value.toLowerCase() == "false")) {
         configarray['PreferenceType' + i] = "boolean";
         value = value.toLowerCase();
@@ -2329,6 +2484,7 @@ function CCKReadConfigFile(srcdir)
   
 
   var i = 1;
+  var pluginname;
   while( pluginname = configarray['BrowserPluginPath' + i]) {
     if (configarray['BrowserPluginType' + i]) {
       listbox.appendItem(pluginname, configarray['BrowserPluginType' + i]);
@@ -2344,11 +2500,18 @@ function CCKReadConfigFile(srcdir)
 
   var i = 1;
   while( name = configarray['ToolbarFolder1.BookmarkTitle' + i]) {
-    listitem = listbox.appendItem(name, configarray['ToolbarFolder1.BookmarkURL' + i]);
+    if (configarray['ToolbarFolder1.BookmarkType' + i] == "separator") {
+      listitem = listbox.appendItem("----------", "");
+    } else {
+      listitem = listbox.appendItem(name, configarray['ToolbarFolder1.BookmarkURL' + i]);
+    }
     listitem.setAttribute("class", "listitem-iconic");
     if (configarray['ToolbarFolder1.BookmarkType' + i] == "live") {
       listitem.cck['type'] = "live";
       listitem.setAttribute("image", "chrome://browser/skin/page-livemarks.png");
+    } else if (configarray['ToolbarFolder1.BookmarkType' + i] == "separator") {
+      listitem.cck['type'] = "separator";
+      listitem.setAttribute("image", "");
     } else {
       listitem.cck['type'] = "";
       listitem.setAttribute("image", "chrome://browser/skin/Bookmarks-folder.png");
@@ -2361,11 +2524,18 @@ function CCKReadConfigFile(srcdir)
 
   var i = 1;
   while( name = configarray['ToolbarBookmarkTitle' + i]) {
-    listitem = listbox.appendItem(name, configarray['ToolbarBookmarkURL' + i]);
+    if (configarray['ToolbarBookmarkType' + i] == "separator") {
+      listitem = listbox.appendItem("----------", "");
+    } else {
+      listitem = listbox.appendItem(name, configarray['ToolbarBookmarkURL' + i]);
+    }
     listitem.setAttribute("class", "listitem-iconic");
     if (configarray['ToolbarBookmarkType' + i] == "live") {
       listitem.cck['type'] = "live";
       listitem.setAttribute("image", "chrome://browser/skin/page-livemarks.png");
+    } else if (configarray['ToolbarBookmarkType' + i] == "separator") {
+      listitem.cck['type'] = "separator";
+      listitem.setAttribute("image", "");
     } else {
       listitem.cck['type'] = "";
       listitem.setAttribute("image", "chrome://browser/skin/Bookmarks-folder.png");
@@ -2379,11 +2549,18 @@ function CCKReadConfigFile(srcdir)
 
   var i = 1;
   while( name = configarray['BookmarkFolder1.BookmarkTitle' + i]) {
-    listitem = listbox.appendItem(name, configarray['BookmarkFolder1.BookmarkURL' + i]);
+    if (configarray['BookmarkFolder1.BookmarkType' + i] == "separator") {
+      listitem = listbox.appendItem("----------", "");
+    } else {
+      listitem = listbox.appendItem(name, configarray['BookmarkFolder1.BookmarkURL' + i]);
+    }
     listitem.setAttribute("class", "listitem-iconic");
     if (configarray['BookmarkFolder1.BookmarkType' + i] == "live") {
       listitem.cck['type'] = "live";
       listitem.setAttribute("image", "chrome://browser/skin/page-livemarks.png");
+    } else if (configarray['BookmarkFolder1.BookmarkType' + i] == "separator") {
+      listitem.cck['type'] = "separator";
+      listitem.setAttribute("image", "");
     } else {
       listitem.cck['type'] = "";
       listitem.setAttribute("image", "chrome://browser/skin/Bookmarks-folder.png");
@@ -2396,11 +2573,18 @@ function CCKReadConfigFile(srcdir)
 
   var i = 1;
   while( name = configarray['BookmarkTitle' + i]) {
-    listitem = listbox.appendItem(name, configarray['BookmarkURL' + i]);
+    if (configarray['BookmarkType' + i] == "separator") {
+      listitem = listbox.appendItem("----------", "");
+    } else {
+      listitem = listbox.appendItem(name, configarray['BookmarkURL' + i]);
+    }
     listitem.setAttribute("class", "listitem-iconic");
     if (configarray['BookmarkType' + i] == "live") {
       listitem.cck['type'] = "live";
       listitem.setAttribute("image", "chrome://browser/skin/page-livemarks.png");
+    } else if (configarray['BookmarkType' + i] == "separator") {
+      listitem.cck['type'] = "separator";
+      listitem.setAttribute("image", "");
     } else {
       listitem.cck['type'] = "";
       listitem.setAttribute("image", "chrome://browser/skin/Bookmarks-folder.png");
@@ -2416,6 +2600,7 @@ function CCKReadConfigFile(srcdir)
   listbox.clear();
 
   var i = 1;
+  var regname;
   while( regname = configarray['RegName' + i]) {
     var listitem = listbox.appendItem(regname, "");
     listitem.cck['rootkey'] = configarray['RootKey' + i];
@@ -2431,6 +2616,7 @@ function CCKReadConfigFile(srcdir)
   listbox.clear();
 
   var i = 1;
+  var certpath;
   while( certpath = configarray['CertPath' + i]) {
     var listitem;
     if (configarray['CertTrust' + i]) {
@@ -2446,6 +2632,7 @@ function CCKReadConfigFile(srcdir)
   listbox.clear();
 
   var i = 1;
+  var bundlepath;
   while( bundlepath = configarray['BundlePath' + i]) {
     var listitem = listbox.appendItem(bundlepath, "");
     i++;
@@ -2470,17 +2657,22 @@ function CCKReadConfigFile(srcdir)
   }
 
   var i = 1;
+  var searchengineurl;
   while(searchengineurl = configarray[searchname + i]) {
     name = getSearchEngineName(searchengineurl);
     listitem = listbox.appendItem(name, "");
     listitem.setAttribute("class", "listitem-iconic");
-    try {
-      sourcefile.initWithPath(configarray[searchname + 'Icon' + i]);
-      var ioServ = Components.classes["@mozilla.org/network/io-service;1"]
-                             .getService(Components.interfaces.nsIIOService);
-      var imgfile = ioServ.newFileURI(sourcefile);
-      listitem.setAttribute("image", imgfile.spec);
-    } catch (e) {
+    if (configarray[searchname + 'Icon' + i].length > 0) {
+      try {
+        sourcefile.initWithPath(configarray[searchname + 'Icon' + i]);
+        var ioServ = Components.classes["@mozilla.org/network/io-service;1"]
+                               .getService(Components.interfaces.nsIIOService);
+        var imgfile = ioServ.newFileURI(sourcefile);
+        listitem.setAttribute("image", imgfile.spec);
+      } catch (e) {
+      }
+    } else {
+      listitem.setAttribute("image", getSearchEngineImage(searchengineurl));
     }
     listitem.cck['name'] = name;
     listitem.cck['engineurl'] = searchengineurl;
@@ -2502,6 +2694,9 @@ function CCKReadConfigFile(srcdir)
   
   var aboutconfig = document.getElementById("noaboutconfig");
   aboutconfig.checked = configarray["noaboutconfig"];
+  
+  var noWelcomePage = document.getElementById("noWelcomePage");
+  noWelcomePage.checked = configarray["noWelcomePage"];
 
 
   var proxyitem = document.getElementById("shareAllProxies");
@@ -2604,7 +2799,8 @@ function ValidateDir()
       if (!file.exists()) {
         var bundle = document.getElementById("bundle_cckwizard");
         var button = gPromptService.confirmEx(window, bundle.getString("windowTitle"), bundle.getString("createDir").replace(/%S/g, filename),
-                                              gPromptService.STD_YES_NO_BUTTONS,
+                                              gPromptService.BUTTON_TITLE_YES * gPromptService.BUTTON_POS_0 +
+                                              gPromptService.BUTTON_TITLE_NO * gPromptService.BUTTON_POS_1,
                                               null, null, null, null, {});
         if (button == 0) {
           try {
@@ -2645,6 +2841,7 @@ function toggleProxySettings()
   var ports = [ftpPort,gopherPort,sslPort];
   var allFields = [ftp,gopher,ssl,ftpPort,gopherPort,sslPort,socks,socksPort,socksVersion,socksVersion4,socksVersion5];
 
+  var i;
   if ((document.getElementById("shareAllProxies").checked) || document.getElementById("ProxyType").value != "1") {
     for (i = 0; i < allFields.length; i++)
       allFields[i].setAttribute("disabled", "true");
diff --git a/extensions/cck/browser/resources/content/cckwizard/cckwizard.xul b/extensions/cck/browser/resources/content/cckwizard/cckwizard.xul
index e98d976..f0a517d 100755
--- a/extensions/cck/browser/resources/content/cckwizard/cckwizard.xul
+++ b/extensions/cck/browser/resources/content/cckwizard/cckwizard.xul
@@ -76,7 +76,7 @@
      </hbox>
      <hbox>
        <button label="&newConfig.label;" id="newconfig" oncommand="CreateConfig();"/>
-       <button label="&copyConfig.label;" id="copyconfig" oncommand="CopyConfig();"/>/>
+       <button label="&copyConfig.label;" id="copyconfig" oncommand="CopyConfig();"/>
        <button label="&deleteConfig.label;" id="deleteconfig" oncommand="DeleteConfig();"/>
      </hbox>
      <checkbox id="saveOnExit" label="&saveOnExit.label;" oncommand="SetSaveOnExitPref();"/>
@@ -92,7 +92,7 @@
   </vbox>
  </wizardpage>
 
- <wizardpage label="&customizeExt.label;" description="&customizeExt.description;"
+ <wizardpage label="&customizeExt.label;"
              onpageshow="initimage('iconURL','icon');"
              onpageadvanced="return (ValidateFile('iconURL') &amp;&amp; Validate('id','name','version'));">
    <grid>
@@ -220,6 +220,9 @@
         <label control="HomePageOverrideURL">&homePageOverride.label;</label>
         <textbox id="HomePageOverrideURL" flex="1"/>
       </hbox>
+       <hbox align="center">
+         <checkbox id="noWelcomePage" label="&noWelcomePage.label;"/>
+       </hbox>
     </groupbox>
     <groupbox>
       <caption label="&titleBar.caption;"/>
@@ -472,7 +475,7 @@
               </hbox>
               <hbox align="center">
                 <textbox id="Gopherproxyname" flex="1" preference="network.proxy.gopher"/>
-                <label value="&port.label;" accesskey="&gopherPort.accesskey;" control="Gopherportno"/>
+                <label value="&port.label;" control="Gopherportno"/>
                 <textbox id="Gopherportno" size="5" preference="network.proxy.gopher_port"/>
               </hbox>
             </row>
diff --git a/extensions/cck/browser/resources/content/cckwizard/reg.xul b/extensions/cck/browser/resources/content/cckwizard/reg.xul
index 5f3bf69..694ffa0 100755
--- a/extensions/cck/browser/resources/content/cckwizard/reg.xul
+++ b/extensions/cck/browser/resources/content/cckwizard/reg.xul
@@ -52,7 +52,7 @@
         >
   <script src="chrome://cckwizard/content/cckwizard.js"/>
   <vbox>
-    <label control="PrettyName">Name:</label>
+    <label control="PrettyName">&regDescription.label;:</label>
     <textbox id="PrettyName" onchange="regCheckOKButton();" onkeyup="regCheckOKButton();"/>
     <label control="RootKey">&regRootKey.label;:</label>
     <menulist id="RootKey">
diff --git a/extensions/cck/browser/resources/content/cckwizard/search.js b/extensions/cck/browser/resources/content/cckwizard/search.js
index 91dc69c..97cf685 100644
--- a/extensions/cck/browser/resources/content/cckwizard/search.js
+++ b/extensions/cck/browser/resources/content/cckwizard/search.js
@@ -46,9 +46,29 @@ const PERMS_FILE                 = 0644;
 const MODE_RDONLY                = 0x01;
 const SEARCH_DATA_XML            = 1;
 const SEARCH_DATA_TEXT           = 2;
+const SEARCH_TYPE_MOZSEARCH      = 1;
 const SEARCH_TYPE_SHERLOCK       = 2;
+const SEARCH_TYPE_OPENSEARCH     = 3;
 const NEW_LINES = /(\r\n|\r|\n)/;
 
+const OPENSEARCH_NS_10  = "http://a9.com/-/spec/opensearch/1.0/";
+const OPENSEARCH_NS_11  = "http://a9.com/-/spec/opensearch/1.1/";
+
+// Although the specification at http://opensearch.a9.com/spec/1.1/description/
+// gives the namespace names defined above, many existing OpenSearch engines
+// are using the following versions.  We therefore allow either.
+const OPENSEARCH_NAMESPACES = [
+  OPENSEARCH_NS_11, OPENSEARCH_NS_10,
+  "http://a9.com/-/spec/opensearchdescription/1.1/",
+  "http://a9.com/-/spec/opensearchdescription/1.0/"
+];
+
+const OPENSEARCH_LOCALNAME = "OpenSearchDescription";
+
+const MOZSEARCH_NS_10     = "http://www.mozilla.org/2006/browser/search/";
+const MOZSEARCH_LOCALNAME = "SearchPlugin";
+
+
 // Returns false for whitespace-only or commented out lines in a
 // Sherlock file, true otherwise.
 function isUsefulLine(aLine) {
@@ -62,6 +82,12 @@ function getSearchEngineName(searchenginepath)
   var dataType = SEARCH_DATA_TEXT;
   var name;
   
+  var ext = searchenginepath.substring(searchenginepath.lastIndexOf('.') + 1,searchenginepath.length);
+
+  if (ext.toLowerCase() == "xml") {
+    dataType = SEARCH_DATA_XML;
+  }
+  
   var sourcefile = Components.classes["@mozilla.org/file/local;1"]
                              .createInstance(Components.interfaces.nsILocalFile);
   sourcefile.initWithPath(searchenginepath);
@@ -80,13 +106,13 @@ function getSearchEngineName(searchenginepath)
                                           "text/xml");
       data = doc.documentElement;
 
-//      if (checkNameSpace(data, [MOZSEARCH_LOCALNAME], [MOZSEARCH_NS_10])) {
-//        type = SEARCH_TYPE_MOZSEARCH;
-//          parseAsMozSearch();
-//      } else if (checkNameSpace(data, [OPENSEARCH_LOCALNAME], OPENSEARCH_NAMESPACES)) {
-//        type = SEARCH_TYPE_OPENSEARCH;
-//          parseAsOpenSearch();
-//      }
+      if (checkNameSpace(data, [MOZSEARCH_LOCALNAME], [MOZSEARCH_NS_10])) {
+        type = SEARCH_TYPE_MOZSEARCH;
+          name = parseAsOpenSearch(data);
+      } else if (checkNameSpace(data, [OPENSEARCH_LOCALNAME], OPENSEARCH_NAMESPACES)) {
+        type = SEARCH_TYPE_OPENSEARCH;
+          name = parseAsOpenSearch(data);
+      }
       break;
     case SEARCH_DATA_TEXT:
       var binaryInStream = Components.classes["@mozilla.org/binaryinputstream;1"]
@@ -292,3 +318,82 @@ function parseAsSherlock(data) {
   return searchSection["name"];
 }
 
+/**
+ * Used to verify a given DOM node's localName and namespaceURI.
+ * @param aElement
+ *        The element to verify.
+ * @param aLocalNameArray
+ *        An array of strings to compare against aElement's localName.
+ * @param aNameSpaceArray
+ *        An array of strings to compare against aElement's namespaceURI.
+ *
+ * @returns false if aElement is null, or if its localName or namespaceURI
+ *          does not match one of the elements in the aLocalNameArray or
+ *          aNameSpaceArray arrays, respectively.
+ * @throws NS_ERROR_INVALID_ARG if aLocalNameArray or aNameSpaceArray are null.
+ */
+function checkNameSpace(aElement, aLocalNameArray, aNameSpaceArray) {
+  return (aElement                                                &&
+          (aLocalNameArray.indexOf(aElement.localName)    != -1)  &&
+          (aNameSpaceArray.indexOf(aElement.namespaceURI) != -1));
+}
+
+/**
+ * Extract search engine information from the collected data to initialize
+ * the engine object.
+ */
+function parseAsOpenSearch(data) {
+  var doc = data;
+
+  for (var i = 0; i < doc.childNodes.length; ++i) {
+    var child = doc.childNodes[i];
+    switch (child.localName) {
+      case "ShortName":
+        return child.textContent;
+        break;
+      case "Image":
+//          this._parseImage(child);
+        break;
+    }
+  }
+}
+  
+function getSearchEngineImage(searchenginepath) {
+  var ext = searchenginepath.substring(searchenginepath.lastIndexOf('.') + 1,searchenginepath.length);
+
+  if (ext.toLowerCase() != "xml") {
+    return;
+  }
+
+  
+// assume we're already open search
+
+  var data;
+  
+  var sourcefile = Components.classes["@mozilla.org/file/local;1"]
+                             .createInstance(Components.interfaces.nsILocalFile);
+  sourcefile.initWithPath(searchenginepath);
+
+  var fileInStream = Components.classes["@mozilla.org/network/file-input-stream;1"]
+                               .createInstance(Components.interfaces.nsIFileInputStream);
+  fileInStream.init(sourcefile, MODE_RDONLY, PERMS_FILE, false);
+
+      var domParser = Components.classes["@mozilla.org/xmlextras/domparser;1"]
+                                .createInstance(Components.interfaces.nsIDOMParser);
+      var doc = domParser.parseFromStream(fileInStream, "UTF-8",
+                                          sourcefile.fileSize,
+                                          "text/xml");
+      data = doc.documentElement;
+
+  for (var i = 0; i < data.childNodes.length; ++i) {
+    var child = data.childNodes[i];
+    switch (child.localName) {
+      case "Image":
+        fileInStream.close();
+        return child.textContent;
+        break;
+    }
+  }
+  fileInStream.close();
+  return;
+}
diff --git a/extensions/cck/browser/resources/content/cckwizard/srcfiles/cck.js.in b/extensions/cck/browser/resources/content/cckwizard/srcfiles/cck.js.in
index e6c82f6..4ab1300 100755
--- a/extensions/cck/browser/resources/content/cckwizard/srcfiles/cck.js.in
+++ b/extensions/cck/browser/resources/content/cckwizard/srcfiles/cck.js.in
@@ -4,3 +4,23 @@ function getCCKLink(item)
 
   return bundle.getString(item);
 }
+
+// urlPref: lets each application have its own throbber URL. example: "messenger.throbber.url"
+// event: lets shift+click open it in a new window, etc.
+function goClickThrobber( urlPref, e )
+{
+  var url;
+  try {
+    var pref = Components.classes["@mozilla.org/preferences-service;1"]
+                         .getService(Components.interfaces.nsIPrefBranch);
+    url = pref.getComplexValue(urlPref, Components.interfaces.nsIPrefLocalizedString).data;
+  }
+
+  catch(e) {
+    url = null;
+  }
+
+  if ( url )
+    openUILink(url, e);
+}
+
diff --git a/extensions/cck/browser/resources/content/cckwizard/srcfiles/cckService.js.in b/extensions/cck/browser/resources/content/cckwizard/srcfiles/cckService.js.in
index c080d28..8cd9af7 100755
--- a/extensions/cck/browser/resources/content/cckwizard/srcfiles/cckService.js.in
+++ b/extensions/cck/browser/resources/content/cckwizard/srcfiles/cckService.js.in
@@ -110,6 +110,7 @@ CCKService.prototype={
     }
     
     var cckinited;
+    var OrgName;
 
     try {
       OrgName = bundle.GetStringFromName("OrganizationName");
@@ -129,6 +130,7 @@ CCKService.prototype={
       const nsIWindowsRegKey = Components.interfaces.nsIWindowsRegKey;
     
       var i = 1;
+      var RegName, RootKey, Key, Name, NameValue, Type;
       do {
         /* This could fail if you don't have the right authority on Windows */
         try {
@@ -187,6 +189,7 @@ CCKService.prototype={
     var certDB = Components.classes[nsX509CertDBContractID].getService(nsIX509CertDB2);
 
     var i = 1;
+    var CertName, CertTrust;
     do {
       try {
         CertName = bundle.GetStringFromName("Cert" + i);
@@ -215,9 +218,9 @@ CCKService.prototype={
         var endCert = "-----END CERTIFICATE-----";
 
         certfile = certfile.replace(/[\r\n]/g, "");
-        begin = certfile.indexOf(beginCert);
-        end = certfile.indexOf(endCert);
-        cert = certfile.substring(begin + beginCert.length, end);
+        var begin = certfile.indexOf(beginCert);
+        var end = certfile.indexOf(endCert);
+        var cert = certfile.substring(begin + beginCert.length, end);
         certDB.addCertFromBase64(cert, CertTrust, "");
       }
       i++;
@@ -253,6 +256,7 @@ CCKService.prototype={
     }
     
     var i = 1;
+    var prefName;
     do {
       try {
         prefName = bundle.GetStringFromName("LockPref" + i);
@@ -265,51 +269,32 @@ CCKService.prototype={
       i++;
     } while (prefName && prefName.length);
   
-    id = bundle.GetStringFromName("id");
-
-    var rdfs = Components.classes["@mozilla.org/rdf/rdf-service;1"]
-                         .getService(Components.interfaces.nsIRDFService);
-    var extensionDS= Components.classes["@mozilla.org/extensions/manager;1"]
-	                             .getService(Components.interfaces.nsIExtensionManager).datasource;
-    var extension = rdfs.GetResource("urn:mozilla:item:" + id);  
-
-    /* if hidden is set, set it */
-    try {
-      hidden = bundle.GetStringFromName("hidden");
-    } catch (ex) {
-      hidden = "";
-    }
-    if (hidden == "true") {
-      var predicate = rdfs.GetResource("http://www.mozilla.org/2004/em-rdf#hidden");
-      var target = rdfs.GetLiteral("true");
-      extensionDS.Assert(extension, predicate, target, true);
-    }
-    /* if locked is set, set it */
-    try {
-      locked = bundle.GetStringFromName("locked");
-    } catch (ex) {
-      locked = "";
-    }
-    if (locked == "true") {
-      var predicate = rdfs.GetResource("http://www.mozilla.org/2004/em-rdf#locked");
-      var target = rdfs.GetLiteral("true");
-      extensionDS.Assert(extension, predicate, target, true);
-    }
-
     /* Only do bookmarks if we haven't been inited to avoid duplicated */
     if (!cckinited)
     {
-      var RDF;
-      var BMSVC;
-      var bmRoot;
-
+      /* First try FUEL. */
       try {
-        RDF = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService)
-        BMSVC  = RDF.GetDataSource("rdf:bookmarks").QueryInterface(Components.interfaces.nsIBookmarksService);;
-	    BMSVC.readBookmarks();
-        bmRoot = RDF.GetResource("NC:BookmarksRoot");
+        var bookmarks = Components.classes["@mozilla.org/browser/nav-bookmarks-service;1"]
+                                  .getService(Components.interfaces.nsINavBookmarksService);
       } catch (ex) {
-        return false;
+      }
+      if (!bookmarks) {
+        var RDF;
+        var BMSVC;
+        var bmRoot;
+  
+        try {
+          RDF = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService)
+          BMSVC = RDF.GetDataSource("rdf:bookmarks").QueryInterface(Components.interfaces.nsIBookmarksService);
+          BMSVC.readBookmarks();
+          bmRoot = RDF.GetResource("NC:BookmarksRoot");
+        } catch (ex) {
+          return false;
+        }
+        
+        try {
+          BMSVC.QueryInterface(Components.interfaces.nsIBookmarksService_MOZILLA_1_8_BRANCH);
+        } catch (ex) {}
       }
 
       var ToolbarLocation;
@@ -320,11 +305,21 @@ CCKService.prototype={
       } catch (ex) {}
       if ((ToolbarLocation) && (ToolbarLocation == "First")) {
         tbIndex = 1;
-        addBookmarks(bundle, BMSVC, "Toolbar", BMSVC.getBookmarksToolbarFolder(), tbIndex);
-        addFolder(bundle, BMSVC, "Toolbar", BMSVC.getBookmarksToolbarFolder(), tbIndex);
+        if (bookmarks) {
+          addBookmarksPlaces(bundle, "Toolbar", bookmarks.toolbarFolder, tbIndex);
+          addFolderPlaces(bundle, "Toolbar", bookmarks.toolbarFolder, tbIndex);
+        } else {
+          addBookmarks(bundle, BMSVC, "Toolbar", BMSVC.getBookmarksToolbarFolder(), tbIndex);
+          addFolder(bundle, BMSVC, "Toolbar", BMSVC.getBookmarksToolbarFolder(), tbIndex);
+        }
       } else {
-        addFolder(bundle, BMSVC, "Toolbar", BMSVC.getBookmarksToolbarFolder(), tbIndex);
-        addBookmarks(bundle, BMSVC, "Toolbar", BMSVC.getBookmarksToolbarFolder(), tbIndex);
+        if (bookmarks) {
+          addFolderPlaces(bundle, "Toolbar", bookmarks.toolbarFolder, tbIndex);
+          addBookmarksPlaces(bundle, "Toolbar", bookmarks.toolbarFolder, tbIndex);
+        } else {
+          addFolder(bundle, BMSVC, "Toolbar", BMSVC.getBookmarksToolbarFolder(), tbIndex);
+          addBookmarks(bundle, BMSVC, "Toolbar", BMSVC.getBookmarksToolbarFolder(), tbIndex);
+        }
       }
 
       var BookmarkLocation;
@@ -335,11 +330,21 @@ CCKService.prototype={
       } catch (ex) {}
       if ((BookmarkLocation) && (BookmarkLocation == "First")) {
         bmIndex = 1;
-        addBookmarks(bundle, BMSVC, "", bmRoot, bmIndex);
-        addFolder(bundle, BMSVC, "Bookmark", bmRoot, bmIndex);
+        if (bookmarks) {
+          addBookmarksPlaces(bundle, "", bookmarks.bookmarksMenuFolder, bmIndex);
+          addFolderPlaces(bundle, "Bookmark", bookmarks.bookmarksMenuFolder, bmIndex);
+        } else {
+          addBookmarks(bundle, BMSVC, "", bmRoot, bmIndex);
+          addFolder(bundle, BMSVC, "Bookmark", bmRoot, bmIndex);
+        }
       } else {
-        addFolder(bundle, BMSVC, "Bookmark", bmRoot, bmIndex);
-        addBookmarks(bundle,  BMSVC, "", bmRoot, bmIndex);
+        if (bookmarks) {
+          addFolderPlaces(bundle, "Bookmark", bookmarks.bookmarksMenuFolder, bmIndex);
+          addBookmarksPlaces(bundle, "", bookmarks.bookmarksMenuFolder, bmIndex);
+        } else {
+          addFolder(bundle, BMSVC, "Bookmark", bmRoot, bmIndex);
+          addBookmarks(bundle,  BMSVC, "", bmRoot, bmIndex);
+        } bookmarks
       }
 
       OrgName = bundle.GetStringFromName("OrganizationName");
@@ -364,7 +369,7 @@ CCKService.prototype={
       return;
     }  
 
-    id = bundle.GetStringFromName("id");
+    var id = bundle.GetStringFromName("id");
 
     var rdfs = Components.classes["@mozilla.org/rdf/rdf-service;1"]
                          .getService(Components.interfaces.nsIRDFService);
@@ -376,8 +381,9 @@ CCKService.prototype={
 
     var opType = extensionDS.GetTarget(extension, opTypeArc, true);
     opType = opType.QueryInterface(Components.interfaces.nsIRDFLiteral).Value;
-    if ((opType == "needs-uninstall") || (opType == "needs-disable") || (opType == "needs-upgrade")) {
+    if (opType && ((opType == "needs-uninstall") || (opType == "needs-disable") || (opType == "needs-upgrade"))) {
       var i = 1;
+      var prefName;
       do {
         try {
           prefName = bundle.GetStringFromName("LockPref" + i);
@@ -390,29 +396,6 @@ CCKService.prototype={
         i++;
       } while (prefName && prefName.length);
     }
-    /* if hidden is set, unset it */
-    try {
-      hidden = bundle.GetStringFromName("hidden");
-    } catch (ex) {
-      hidden = "";
-    }
-    if (hidden == "true") {
-      var predicate = rdfs.GetResource("http://www.mozilla.org/2004/em-rdf#hidden");
-      var target = rdfs.GetLiteral("false");
-      extensionDS.Assert(extension, predicate, target, true);
-    }
-    /* if locked is set, unset it */
-    try {
-      locked = bundle.GetStringFromName("locked");
-    } catch (ex) {
-      locked = "";
-    }
-    if (locked == "true") {
-      var predicate = rdfs.GetResource("http://www.mozilla.org/2004/em-rdf#locked");
-      var target = rdfs.GetLiteral("false");
-      extensionDS.Assert(extension, predicate, target, true);
-    }
-    
   }  
 }
 
@@ -467,6 +450,10 @@ function addBookmarks(bundle, BMSVC, prefix, folder, location)
         }
         if (bmtype == "live") {
             BMSVC.createLivemarkInContainer(BookmarkTitle, "", BookmarkURL, "", folder, location);
+        } else if (bmtype == "separator") {
+          try {
+            BMSVC.createSeparatorInContainer(folder, -1);
+          } catch (ex) {}
         } else {
           if (BMSVC.createBookmarkInContainer.length == 8)
             BMSVC.createBookmarkInContainer(BookmarkTitle, BookmarkURL, "", "", "", "", folder, location);
@@ -478,6 +465,74 @@ function addBookmarks(bundle, BMSVC, prefix, folder, location)
   }
 }
 
+function addBookmarksPlaces(bundle, prefix, container, location)
+{
+  var bookmarks = Components.classes["@mozilla.org/browser/nav-bookmarks-service;1"]
+                            .getService(Components.interfaces.nsINavBookmarksService);
+  var livemarks = Components.classes["@mozilla.org/browser/livemark-service;2"]
+                            .getService(Components.interfaces.nsILivemarkService);
+
+  var BookmarkTitle;
+  var BookmarkURL;
+
+  // items are added in reverse order if we are set to "First"
+  var start, end, increment;
+  
+  var i = 1;
+  var numBookmarks = 0;
+  while (1) {
+    try {
+      var title = bundle.GetStringFromName(prefix + "BookmarkTitle" + i);
+    } catch (ex) {
+      break;
+    }
+    i++;
+    numBookmarks++;
+  }
+  
+  if (location == -1) {
+    start = 1;
+    end = numBookmarks+1;
+    increment = 1;
+  } else {
+    start = numBookmarks;
+    end = 0;
+    increment = -1;
+  }
+
+  for (var i=start; i!=end; i+=increment) {
+    try {
+      BookmarkTitle = bundle.GetStringFromName(prefix + "BookmarkTitle" + i);
+    } catch (ex) {
+      BookmarkTitle = "";
+    }
+    if ((BookmarkTitle) && (BookmarkTitle.length)) {
+      try {
+        BookmarkURL = bundle.GetStringFromName(prefix + "BookmarkURL" + i);
+      } catch (ex) {
+        BookmarkURL = "";          
+      }
+      if ((BookmarkURL) && (BookmarkURL.length)) {
+        var bmtype;
+        try {
+          bmtype = bundle.GetStringFromName(prefix + "BookmarkType" + i);
+        } catch (ex) {
+          bmtype = "";
+        }
+        if (bmtype == "live") {
+          livemarks.createLivemark(container, BookmarkTitle, null, makeURI(BookmarkURL), -1);
+        } else if (bmtype == "separator") {
+          bookmarks.insertSeparator(container, -1);
+        } else {
+          bookmarks.insertBookmark(container, makeURI(BookmarkURL), location, BookmarkTitle);
+        }
+      }
+    }
+  }
+}
+
+
+
 function addFolder(bundle, BMSVC, prefix, folder, location)
 {
   var BookmarkFolder;
@@ -541,6 +596,10 @@ function addFolder(bundle, BMSVC, prefix, folder, location)
             }
             if (bmtype == "live") {
               BMSVC.createLivemarkInContainer(BookmarkTitle, "", BookmarkURL, "", newfolder, -1);
+            } else if (bmtype == "separator") {
+              try {
+                BMSVC.createSeparatorInContainer(newfolder, -1);
+              } catch (ex) {}
             } else {
               if (BMSVC.createBookmarkInContainer.length == 8)
                 BMSVC.createBookmarkInContainer(BookmarkTitle, BookmarkURL, "", "", "", "", newfolder, -1);
@@ -554,13 +613,102 @@ function addFolder(bundle, BMSVC, prefix, folder, location)
   }
 }
 
+function addFolderPlaces(bundle, prefix, container, location)
+{
+  var bookmarks = Components.classes["@mozilla.org/browser/nav-bookmarks-service;1"]
+                            .getService(Components.interfaces.nsINavBookmarksService);
+  var livemarks = Components.classes["@mozilla.org/browser/livemark-service;2"]
+                            .getService(Components.interfaces.nsILivemarkService);
+
+  var BookmarkFolder;
+  var BookmarkTitle;
+  var BookmarkURL;
+  
+  // items are added in reverse order if we are set to "First"
+  var start, end, increment;
+  
+  if (location == -1) {
+    start = 1;
+    end = 6;
+    increment = 1;
+  } else {
+    start = 5;
+    end = 0;
+    increment = -1;
+  }
+      
+  // Bookmarks folder with bookmarks
+  for (var i=start; i!=end; i+=increment) {
+    try {
+      BookmarkFolder = bundle.GetStringFromName(prefix + "Folder" + i);
+    } catch (ex) {
+      BookmarkFolder = "";
+    }
+    if ((BookmarkFolder) && (BookmarkFolder.length)) {
+      var newfolder;
+      newfolder = bookmarks.createFolder(container, BookmarkFolder, location);
+      
+
+      var j = 1;
+      var numBookmarks = 0;
+      while (1) {
+        try {
+          var title = bundle.GetStringFromName(prefix + "Folder" + i + ".BookmarkTitle" + j);
+        } catch (ex) {
+          break;
+        }
+        j++;
+        numBookmarks++;
+      }
+
+      for (var j=1; j<=numBookmarks; j++) {
+        try {
+          BookmarkTitle = bundle.GetStringFromName(prefix + "Folder" + i + ".BookmarkTitle" + j);
+        } catch (ex) {
+          BookmarkTitle = "";
+        }
+        if ((BookmarkTitle) && (BookmarkTitle.length)) {
+          try {
+            BookmarkURL = bundle.GetStringFromName(prefix + "Folder" + i + ".BookmarkURL" + j);
+          } catch (ex) {
+            BookmarkURL = "";
+          }
+          if ((BookmarkURL) && (BookmarkURL.length)) {
+            var bmtype;
+            try {
+              bmtype = bundle.GetStringFromName(prefix + "Folder" + i + ".BookmarkType" + j);
+            } catch (ex) {
+              bmtype = "";
+            }
+            if (bmtype == "live") {
+              livemarks.createLivemark(newfolder, BookmarkTitle, null, makeURI(BookmarkURL), -1);
+            } else if (bmtype == "separator") {
+              try {
+                bookmarks.insertSeparator(newfolder, -1);
+              } catch (ex) {}
+            } else {
+                bookmarks.insertBookmark(newfolder, makeURI(BookmarkURL), location, BookmarkTitle);
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+function makeURI(aURL, aOriginCharset, aBaseURI)
+{
+  var ioService = Components.classes["@mozilla.org/network/io-service;1"]
+                            .getService(Components.interfaces.nsIIOService);
+  return ioService.newURI(aURL, aOriginCharset, aBaseURI);
+}
+
 // XPCOM Scaffolding code
 
 // component defined in this file
-const EXTENSION_ID="{73a6fe31-595d-460b-a920-fcc0f8843233}";
-const SERVICE_NAME="CCK Service";
-const SERVICE_ID="{31aec909-8e86-4397-9380-63a59e0c5ff6}";
-const SERVICE_CTRID = "@mozilla.org/cck-service;1";
+const SERVICE_NAME="CCK Service - %OrganizationName%";
+const SERVICE_ID="%uuid%";
+const SERVICE_CTRID = "@mozilla.org/cck-service-%OrganizationName%;1";
 const SERVICE_CONSTRUCTOR=CCKService;
 
 const SERVICE_CID = Components.ID(SERVICE_ID);
@@ -614,7 +762,7 @@ Module.registerSelf = function (compMgr, fileSpec, location, type) {
     Components.classes['@mozilla.org/categorymanager;1'].getService(
       Components.interfaces.nsICategoryManager
      ).addCategoryEntry("app-startup",
-        SERVICE_NAME, "service," + SERVICE_CTRID, true, true);
+        SERVICE_NAME, "service," + SERVICE_CTRID, true, true, null);
       
     this.firstTime=false;
   } 
diff --git a/extensions/cck/browser/resources/content/cckwizard/srcfiles/disableAboutConfig.js.in b/extensions/cck/browser/resources/content/cckwizard/srcfiles/disableAboutConfig.js.in
index eee953d..27fcf36 100644
--- a/extensions/cck/browser/resources/content/cckwizard/srcfiles/disableAboutConfig.js.in
+++ b/extensions/cck/browser/resources/content/cckwizard/srcfiles/disableAboutConfig.js.in
@@ -60,6 +60,9 @@ AboutHandler.prototype =
     var ext_uri = ioService.newURI(uri_str, null, null);
     var ext_channel = ioService.newChannelFromURI(ext_uri);
     return ext_channel;
+  },
+  getURIFlags : function getURIFlags(aURI) {
+    return Components.interfaces.nsIAboutModule.URI_SAFE_FOR_UNTRUSTED_CONTENT;
   }
 };
 
diff --git a/extensions/cck/browser/resources/content/cckwizard/srcfiles/install.rdf.in b/extensions/cck/browser/resources/content/cckwizard/srcfiles/install.rdf.in
index a8df7dd..8629013 100755
--- a/extensions/cck/browser/resources/content/cckwizard/srcfiles/install.rdf.in
+++ b/extensions/cck/browser/resources/content/cckwizard/srcfiles/install.rdf.in
@@ -11,12 +11,14 @@ xmlns:em="http://www.mozilla.org/2004/em-rdf#">
         %homepageURLline%
         %updateURLline%
         %iconURLline%
+        %hiddenline%
+        %lockedline%
 
         <em:targetApplication>
             <Description>
                 <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-                <em:minVersion>1.5</em:minVersion>
-                <em:maxVersion>1.5.0.*</em:maxVersion>
+                <em:minVersion>2.0</em:minVersion>
+                <em:maxVersion>3.0.*</em:maxVersion>
             </Description>
         </em:targetApplication>
 
diff --git a/extensions/cck/browser/resources/content/cckwizard/srcfiles/install.rdf.mip.in b/extensions/cck/browser/resources/content/cckwizard/srcfiles/install.rdf.mip.in
index 72e14a6..8dee68d 100644
--- a/extensions/cck/browser/resources/content/cckwizard/srcfiles/install.rdf.mip.in
+++ b/extensions/cck/browser/resources/content/cckwizard/srcfiles/install.rdf.mip.in
@@ -7,8 +7,8 @@
     <em:targetApplication>
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-        <em:minVersion>1.5</em:minVersion>
-        <em:maxVersion>1.5.0.*</em:maxVersion>
+        <em:minVersion>2.0</em:minVersion>
+        <em:maxVersion>3.0.*</em:maxVersion>
       </Description>
     </em:targetApplication>
   </Description>
diff --git a/extensions/irc/Makefile.in b/extensions/irc/Makefile.in
index f7142f3..696d9c5 100644
--- a/extensions/irc/Makefile.in
+++ b/extensions/irc/Makefile.in
@@ -57,12 +57,27 @@ NO_JAR_AUTO_REG        = 1
 INSTALL_EXTENSION_ID   = {59c81df5-4b7a-477b-912d-4e0fdf64e5f2}
 XPI_PKGNAME            = chatzilla-$(CHATZILLA_VERSION)
 
-DIRS += locales ff sm
+# include config.mk before using the AB_CD var it sets in an if statement
+include $(topsrcdir)/config/config.mk
+
+# always build en-US locale, add build locale if supported
+BUILD_LOCALES = en-US
+ifneq (,$(filter $(AB_CD),$(shell cat $(srcdir)/locales/all-locales)))
+BUILD_LOCALES += $(AB_CD)
+endif
+
+DIRS += ff sm
 
 DEFINES += -DCHATZILLA_VERSION=$(CHATZILLA_VERSION)
 
 include $(topsrcdir)/config/rules.mk
 
+libs realchrome:: locales/Makefile
+	@$(EXIT_ON_ERROR)                    \
+	for locale in $(BUILD_LOCALES); do   \
+	  $(MAKE) -C locales AB_CD=$$locale; \
+	done
+
 export::
 	$(NSINSTALL) -D $(FINAL_TARGET)/chrome/icons/default
 	$(INSTALL) $(srcdir)/xpi/resources/chatzilla-window* $(FINAL_TARGET)/chrome/icons/default
diff --git a/extensions/irc/jar.mn b/extensions/irc/jar.mn
index 462eb51..8848223 100644
--- a/extensions/irc/jar.mn
+++ b/extensions/irc/jar.mn
@@ -102,3 +102,4 @@ chatzilla.jar:
 	skin/modern/chatzilla/images/secure-broken.png      (xul/skin/images/secure-broken.png)
 	skin/modern/chatzilla/images/online.png             (xul/skin/images/online.png)
 	skin/modern/chatzilla/images/offline.png            (xul/skin/images/offline.png)
+	skin/modern/chatzilla/images/drop-indicator-bottom.png (xul/skin/images/drop-indicator-bottom.png)
diff --git a/extensions/irc/js/lib/command-manager.js b/extensions/irc/js/lib/command-manager.js
index a11761c..27e2163 100644
--- a/extensions/irc/js/lib/command-manager.js
+++ b/extensions/irc/js/lib/command-manager.js
@@ -293,7 +293,7 @@ function cmgr_instkey (parentElem, command)
     var key = document.createElement ("key");
     key.setAttribute ("id", "key:" + command.name);
     key.setAttribute ("oncommand", "dispatch('" + command.name +
-                      "', {isInteractive: true});");
+                      "', {isInteractive: true, source: 'keyboard'});");
 
     if (ary[1])
         key.setAttribute ("modifiers", ary[1]);
diff --git a/extensions/irc/js/lib/irc.js b/extensions/irc/js/lib/irc.js
index 7daa5fa..070d36b 100644
--- a/extensions/irc/js/lib/irc.js
+++ b/extensions/irc/js/lib/irc.js
@@ -136,36 +136,32 @@ CIRCNetwork.prototype.PROXY_TYPE_OVERRIDE = "";
 CIRCNetwork.prototype.TYPE = "IRCNetwork";
 
 CIRCNetwork.prototype.getURL =
-function net_geturl(target)
+function net_geturl(target, flags)
 {
     if (this.temporary)
-        return this.serverList[0].getURL(target);
-
-    if (!target)
-        target = "";
+        return this.serverList[0].getURL(target, flags);
 
     /* Determine whether to use the irc:// or ircs:// scheme */
-    if ("primServ" in this && this.primServ.isConnected)
+    var scheme = "irc";
+    if ((("primServ" in this) && this.primServ.isConnected &&
+         this.primServ.isSecure) ||
+        this.hasOnlySecureServers())
     {
-        if (this.primServ.isSecure)
-            return "ircs://" + ecmaEscape(this.unicodeName) + "/" + target;
+        scheme = "ircs"
     }
-    else
+    
+    var obj = {host: this.unicodeName, scheme: scheme};
+
+    if (target)
+        obj.target = target;
+
+    if (flags)
     {
-        /* No current connections, so let's see if every server has SSL */
-        var isSecure = true;
-        for (var s in this.serverList)
-        {
-            if (!this.serverList[s].isSecure)
-            {
-                isSecure = false;
-                break;
-            }
-        }
-        if (isSecure)
-            return "ircs://" + ecmaEscape(this.unicodeName) + "/" + target;
+        for (var i = 0; i < flags.length; i++)
+            obj[flags[i]] = true;
     }
-    return "irc://" + ecmaEscape(this.unicodeName) + "/" + target;
+
+    return constructIRCURL(obj);
 }
 
 CIRCNetwork.prototype.getUser =
@@ -196,6 +192,18 @@ function net_hasSecure()
     return false;
 }
 
+CIRCNetwork.prototype.hasOnlySecureServers =
+function net_hasOnlySecure()
+{
+    for (var i = 0; i < this.serverList.length; i++)
+    {
+        if (!this.serverList[i].isSecure)
+            return false;
+    }
+
+    return true;
+}
+
 CIRCNetwork.prototype.clearServerList =
 function net_clearserverlist()
 {
@@ -610,21 +618,22 @@ function serv_tolowercase(str)
 }
 
 CIRCServer.prototype.getURL =
-function serv_geturl(target)
+function serv_geturl(target, flags)
 {
-    if (!target)
-        target = "";
+    var scheme = (this.isSecure ? "ircs" : "irc");
+    var obj = {host: this.hostname, scheme: scheme, isserver: true,
+               port: this.port, needpass: Boolean(this.password)};
 
-    var url = (this.isSecure ? "ircs://" : "irc://") + this.hostname;
-    if (this.port != 6667)
-        url += ":" + this.port;
-    url += "/" + target;
-    if (url.indexOf(".") == -1)
-        url += ",isserver";
-    if (this.password)
-        url += ",needpass";
+    if (target)
+        obj.target = target;
+
+    if (flags)
+    {
+        for (var i = 0; i < flags.length; i++)
+            obj[flags[i]] = true;
+    }
 
-    return url;
+    return constructIRCURL(obj);
 }
 
 CIRCServer.prototype.getUser =
@@ -2338,6 +2347,7 @@ function serv_notice (e)
         {
             if (targetName[0] == this.userModes[i].symbol)
             {
+                e.msgPrefix = this.userModes[i];
                 targetName = targetName.substr(1);
                 break;
             }
@@ -2392,6 +2402,7 @@ function serv_privmsg (e)
         {
             if (targetName[0] == this.userModes[i].symbol)
             {
+                e.msgPrefix = this.userModes[i];
                 targetName = targetName.substr(1);
                 break;
             }
@@ -2403,10 +2414,17 @@ function serv_privmsg (e)
     if (arrayIndexOf(this.channelTypes, targetName[0]) != -1)
     {
         e.channel = new CIRCChannel(this, null, targetName);
-        e.user = new CIRCChanUser(e.channel, e.user.unicodeName);
+        if ("user" in e)
+            e.user = new CIRCChanUser(e.channel, e.user.unicodeName);
         e.replyTo = e.channel;
         e.set = "channel";
     }
+    else if (!("user" in e))
+    {
+        e.set = "network";
+        e.destObject = this.parent;
+        return true;
+    }
     else
     {
         e.set = "user";
@@ -2429,6 +2447,26 @@ function serv_privmsg (e)
     return true;
 }
 
+CIRCServer.prototype.onWallops =
+function serv_wallops(e)
+{
+    if (("user" in e) && e.user)
+    {
+        e.msg = e.decodeParam(1, e.user);
+        e.replyTo = e.user;
+    }
+    else
+    {
+        e.msg = e.decodeParam(1);
+        e.replyTo = this;
+    }
+
+    e.destObject = this.parent;
+    e.set = "network";
+
+    return true;
+}
+
 CIRCServer.prototype.onCTCPReply =
 function serv_ctcpr (e)
 {
@@ -2758,25 +2796,18 @@ CIRCChannel.prototype.TYPE = "IRCChannel";
 CIRCChannel.prototype.topic = "";
 
 CIRCChannel.prototype.getURL =
-function chan_geturl ()
+function chan_geturl()
 {
     var target = this.encodedName;
 
     if ((target[0] == "#") &&
         arrayIndexOf(this.parent.channelTypes, target[1]) == -1)
     {
-        /* First character is "#" (which we're allowed to ommit), and the
+        /* First character is "#" (which we're allowed to omit), and the
          * following character is NOT a valid prefix, so it's safe to remove.
          */
-        target = ecmaEscape(target.substr(1));
+        target = target.substr(1);
     }
-    else
-    {
-        target = ecmaEscape(target);
-    }
-
-    target = target.replace(/\//g, "%2f");
-
     return this.parent.parent.getURL(target);
 }
 
@@ -3169,13 +3200,9 @@ function CIRCUser(parent, unicodeName, encodedName, name, host)
 CIRCUser.prototype.TYPE = "IRCUser";
 
 CIRCUser.prototype.getURL =
-function usr_geturl ()
+function usr_geturl()
 {
-    var target = ecmaEscape(this.encodedName);
-    target = target.replace("/", "%2f");
-    //target += "?charset=" + this.prefs["charset"];
-
-    return this.parent.parent.getURL(target) + ",isnick";
+    return this.parent.parent.getURL(this.encodedName, ["isnick"]);
 }
 
 CIRCUser.prototype.rehome =
@@ -3212,12 +3239,7 @@ function usr_banmask()
     if (!this.host)
         return this.unicodeName + "!*@*";
 
-    var hostmask = this.host;
-    if (!/^\d+\.\d+\.\d+\.\d+$/.test(hostmask))
-        hostmask = hostmask.replace(/^[^.]+/, "*");
-    else
-        hostmask = hostmask.replace(/[^.]+$/, "*");
-    return "*!" + this.name + "@" + hostmask;
+    return "*!*@" + this.host;
 }
 
 CIRCUser.prototype.say =
@@ -3382,12 +3404,13 @@ function cusr_updatesortname()
     this.sortName = (9 - modeLevel) + "-" + this.unicodeName;
 }
 
-function cusr_geturl ()
+function cusr_geturl()
 {
-    return this.parent.parent.getURL(ecmaEscape(this.unicodeName)) + ",isnick";
+    // Don't ask.
+    return this.parent.parent.parent.getURL(this.encodedName, ["isnick"]);
 }
 
-function cusr_setop (f)
+function cusr_setop(f)
 {
     var server = this.parent.parent;
     var me = server.me;
@@ -3703,7 +3726,7 @@ function constructIRCURL(obj)
             dd("parseIRCObject: invalid characters in channel/nick name");
             return null;
         }
-        url += ecmaEscape(obj.target);
+        url += ecmaEscape(obj.target.replace(/\//g, "%2f"));
     }
 
     return url + flags + parseFlags(obj) + parseQuery(obj);
diff --git a/extensions/irc/locales/Makefile.in b/extensions/irc/locales/Makefile.in
index 29dc39d..6bd7b46 100644
--- a/extensions/irc/locales/Makefile.in
+++ b/extensions/irc/locales/Makefile.in
@@ -42,16 +42,42 @@ srcdir=@srcdir@
 VPATH=@srcdir@
 relativesrcdir = extensions/irc/locales
 
+CHATZILLA_VERSION=$(shell grep "const __cz_version" "$(srcdir)/../xul/content/static.js" | sed "s|.*\"\([^\"]\{1,\}\)\".*|\1|")
+CHATZILLA_BASE_VERSION=$(shell echo "$(CHATZILLA_VERSION)" | sed "s|\([0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}\).*|\1|")
+
+XPI_NAME               = chatzilla
+USE_EXTENSION_MANIFEST = 1
+NO_JAR_AUTO_REG        = 1
+INSTALL_EXTENSION_ID   = {59c81df5-4b7a-477b-912d-4e0fdf64e5f2}
+XPI_PKGNAME            = chatzilla-$(CHATZILLA_VERSION)
+
 # include config.mk before we override the AB_CD var it sets
 include $(topsrcdir)/config/config.mk
 
 # if the wanted language is not in all-locales, fall back to en-US
 ifeq (,$(filter $(AB_CD),$(shell cat $(srcdir)/all-locales)))
-AB_CD = en-US
+override AB_CD = en-US
 endif
 
 DEFINES += -DAB_CD=$(AB_CD)
 
+ifneq (en-US,$(AB_CD))
+XPI_NAME               = chatzilla-$(AB_CD)
+INSTALL_EXTENSION_ID   = langpack-$(AB_CD)@chatzilla.mozilla.org
+XPI_PKGNAME            = chatzilla-$(CHATZILLA_VERSION).$(AB_CD)
+DIST_FILES             = generic/install.rdf generic/install.js
+XULAPP_DEFINES = \
+    $(DEFINES) \
+    $(ACDEFINES) \
+    -I$(call EXPAND_LOCALE_SRCDIR,toolkit/locales)/defines.inc \
+    -I$(LOCALE_SRCDIR)/defines.inc \
+    $(NULL)
+endif
+
+DEFINES += -DINSTALL_EXTENSION_ID=$(INSTALL_EXTENSION_ID)
+DEFINES += -DCHATZILLA_VERSION=$(CHATZILLA_VERSION)
+DEFINES += -DCHATZILLA_BASE_VERSION=$(CHATZILLA_BASE_VERSION)
+
 include $(topsrcdir)/config/rules.mk
 
 ifneq (en-US,$(AB_CD))
@@ -59,3 +85,23 @@ libs realchrome::
 	@echo "Comparing $(AB_CD) to en-US"
 	@$(PERL) $(topsrcdir)/toolkit/locales/compare-locales.pl $(srcdir)/en-US $(LOCALE_SRCDIR)
 endif
+
+libs-%: AB_CD=$*
+libs-%:
+	# XXX: it would be nice if we could just do nothing if no langpack is being done
+	#  currently, we just go and (re)build en-US if called with a non-supported locale
+	$(MAKE) libs AB_CD=$*
+
+repackage-zip: $(STAGEDIST)
+ifneq (en-US,$(AB_CD))
+	$(RM) -rf $(STAGEDIST)/extensions/$(INSTALL_EXTENSION_ID)
+	mkdir $(STAGEDIST)/extensions/$(INSTALL_EXTENSION_ID)
+	$(RM) -r $(DIST)/xpi-stage/chatzilla-$(AB_CD)/chrome/chatzilla
+	# use tar for copying as cp doesn't portably preserve timestamps
+	cd $(DIST)/xpi-stage/chatzilla-$(AB_CD) && \
+	  tar $(TAR_CREATE_FLAGS) - * | ( cd $(STAGEDIST)/extensions/$(INSTALL_EXTENSION_ID) && tar -xf - )
+	@echo "$(AB_CD)"
+endif
+
+repackage-zip-%: $(STAGEDIST)
+	@$(MAKE) repackage-zip AB_CD=$* STAGEDIST=$(STAGEDIST)
diff --git a/extensions/irc/locales/all-locales b/extensions/irc/locales/all-locales
index 7673daa..9442518 100644
--- a/extensions/irc/locales/all-locales
+++ b/extensions/irc/locales/all-locales
@@ -1 +1,7 @@
+cs
 de
+nb-NO
+fr
+ru
+sk
+sv-SE
diff --git a/extensions/irc/locales/en-US/chrome/chatzilla.properties b/extensions/irc/locales/en-US/chrome/chatzilla.properties
index c89e8e8..b2e6630 100644
--- a/extensions/irc/locales/en-US/chrome/chatzilla.properties
+++ b/extensions/irc/locales/en-US/chrome/chatzilla.properties
@@ -69,7 +69,7 @@
 #
 ### End of notes ###
 
-locale.version = 0.9.79
+locale.version = 0.9.80
 locale.error = You are using ChatZilla %1$S, which requires the locale version %2$S. The currently selected locale, %3$S, is version %4$S, and therefore there may be problems running ChatZilla.\n\nIt is strongly advised that you update or remove the ChatZilla locale in question.
 
 # Misc
@@ -476,6 +476,11 @@ cmd.label-user.label  = <unknown>
 cmd.label-user.params = <unspecified>
 cmd.label-user.help   = 
 
+cmd.label-user-multi.format = «$userCount users»
+cmd.label-user-multi.label  = <unknown>
+cmd.label-user-multi.params = <unspecified>
+cmd.label-user-multi.help   = 
+
 cmd.leave.format = Leave $channelName
 cmd.leave.label  = &Leave
 cmd.leave.params = [<channel-name> [<reason>]]
@@ -743,7 +748,7 @@ msg.err.no.match      = No match for ``%S''.
 msg.err.no.socket     = Error creating socket.
 msg.err.no.secure     = The network ``%S'' has no secure servers defined.
 msg.err.cancelled     = Connection process canceled.
-msg.err.offline       = The host software platform (e.g. Mozilla, Firefox) is in ``offline mode''. No network connections can be made in this mode.
+msg.err.offline       = &brandShortName; is in ``offline mode''. No network connections can be made in this mode.
 msg.err.badalias      = Malformed alias: %S"
 msg.err.no.ctcp.cmd   = %S is not a valid CTCP function for this client
 msg.err.no.ctcp.help  = %S does not have any help information
@@ -753,6 +758,8 @@ msg.err.unsupported.command = The server does not support the ``%S'' command.
 msg.err.invalid.mode  = The mode string you entered (``%S'') is invalid. A valid mode string consists of one or more sequences of a + or - followed by one or more alphabetical characters.
 msg.err.away.save     = Saving the list of away messages failed (%S).
 msg.err.invalid.url   = ``%S'' is not a valid url nor an alias for a url, and therefor could not be loaded.
+msg.err.no.channel    = When running the ``%S'' command, you should either provide a channel name, or run the command in the context of a channel.
+msg.err.no.idleservice = ChatZilla can't determine when you're away in your version of &brandShortName;. The auto-away feature will now be disabled.
 
 # Specific bug messages.
 msg.bug318419.warning = ChatZilla has detected a potential abnormality in its internal data. You will not be able to send any form of communication at this time, although it might appear you can. The most likely cause is Mozilla Bug 318419 <https://bugzilla.mozilla.org/show_bug.cgi?id=318419>. You are strongly advised to restart the host application (&brandShortName;) to prevent further problems.
@@ -1054,7 +1061,7 @@ msg.dcc.accepted.matches = "%S DCC connections matched.
 msg.dcc.matches.help     = You must specify enough of the user's nickname to uniquely identify the request, or include the request type and even the filename if necessary.
 
 msg.dcc.not.enabled      = DCC is disabled. If you need DCC functionality, you may turn it on from the Preferences window.
-msg.dcc.not.possible     = DCC is unavailable in this version of the host software platform (e.g. Mozilla, Firefox) - the feature "scriptable server sockets" is missing. Mozilla builds after 2003-11-15 should contain this feature (e.g. Mozilla 1.6 or later).
+msg.dcc.not.possible     = DCC is unavailable in this version of &brandShortName; - the feature "scriptable server sockets" is missing. Mozilla builds after 2003-11-15 should contain this feature (e.g. Mozilla 1.6 or later).
 msg.dcc.err.nouser       = Must specify |nickname| or run the command from a query view.
 msg.dcc.err.accept.time  = You cannot use the short form of |/dcc-accept| within the first 10 seconds of receiving a DCC request.
 msg.dcc.err.nochat       = Must specify |nickname| or run the command from a DCC Chat view.
@@ -1114,7 +1121,7 @@ msg.si.speed.4 = TiB/s
 msg.si.speed.5 = PiB/s
 msg.si.speed.6 = EiB/s
 
-msg.ident.server.not.possible = Ident Server is unavailable in this version of the host software platform (e.g. Mozilla, Firefox) - the feature "scriptable server sockets" is missing. Mozilla builds after 2003-11-15 should contain this feature (e.g. Mozilla 1.6 or later).
+msg.ident.server.not.possible = Ident Server is unavailable in this version of &brandShortName; - the feature "scriptable server sockets" is missing. Mozilla builds after 2003-11-15 should contain this feature (e.g. Mozilla 1.6 or later).
 
 msg.host.password = Enter a password for the server %S:
 msg.url.key       = Enter key for url %S:
@@ -1232,9 +1239,11 @@ msg.mode.all        = Mode for %S is %S"
 msg.mode.changed    = Mode %S by %S"
 
 msg.away.on      = You are now marked as away (%S). Click the nickname button or use the |/back| command to return from being away.
+msg.idle.away.on = You have automatically been marked as away (%S) after %S minutes of inactivity.
 msg.away.off     = You are no longer marked as away.
 msg.away.prompt  = Enter an away message to use:
-msg.away.default = User is away.
+msg.away.default = I'm not here right now.
+msg.away.idle.default = I'm not here right now.
 
 msg.you.quit     = YOU (%S) have left %S (%S)
 msg.someone.quit = "%S has left %S (%S)
@@ -1384,10 +1393,16 @@ pref.autoRejoin.label           = Rejoin when kicked
 pref.autoRejoin.help            = If this is turned on, ChatZilla will try (only once) to rejoin a channel you got kicked from. Note, some channels dislike auto-rejoin, and will ban you, so be careful.
 pref.away.label                 = Away status
 pref.away.help                  = 
+pref.awayIdleTime.label         = Auto-away timeout
+pref.awayIdleTime.help          = After how many minutes of inactivity ChatZilla will set your status to "away". This only works on newer versions of &brandShortName;. Set to 0 to disable it.
+pref.awayIdleMsg.label          = Auto-away message
+pref.awayIdleMsg.help           = The away message ChatZilla will use when you go away.
 pref.awayNick.label             = Nickname (away)
 pref.awayNick.help              = This nickname will automatically be used when you mark yourself away, if different from 'Nickname'. You may leave this blank to not change nickname when going away.
 pref.bugURL.label               = Bugzilla URL
-pref.bugURL.help                = The URL used for links to bugs, with "%s" replaced with the bug number. The text "bug " followed by a number will get turned into a link using this URL.
+pref.bugURL.help                = The URL used for links to bugs. "%s" is replaced with the bug number or alias. The text "bug " followed by a number or "#" and a 1-20 letter word (bug alias) will get turned into a link using this URL.
+pref.bugURL.comment.label       = Bugzilla URL for Comments
+pref.bugURL.comment.help        = The URL or suffix used for links to specific comments within bugs. With a full URL, "%1$s" is replaced with the bug number or alias and "%2$s" with the comment number, respectively. With a suffix, "%s" is replaced with the comment number. The text "bug " followed by a number or "#" and a 1-20 letter word (bug alias) followed by " comment " followed by another number will get turned into a link using this URL or suffix.
 pref.charset.label              = Character encoding
 pref.charset.help               = For multiple clients to correctly read messages with non-ASCII characters on IRC, they need to use the same character encoding.
 pref.collapseMsgs.label         = Collapse messages
diff --git a/extensions/irc/locales/en-US/defines.inc b/extensions/irc/locales/en-US/defines.inc
new file mode 100644
index 0000000..1c70683
--- /dev/null
+++ b/extensions/irc/locales/en-US/defines.inc
@@ -0,0 +1,11 @@
+#filter emptyLines
+
+#define MOZ_LANGPACK_CREATOR The ChatZilla Team
+
+#define MOZ_LANGPACK_HOMEPAGE http://chatzilla.hacksrus.com/
+
+# If non-English locales wish to credit multiple contributors, uncomment this
+# variable definition and use the format specified.
+# #define MOZ_LANGPACK_CONTRIBUTORS <em:contributor>Joe Solon</em:contributor> <em:contributor>Suzy Solon</em:contributor>
+
+#unfilter emptyLines
diff --git a/extensions/irc/locales/generic/install.js b/extensions/irc/locales/generic/install.js
new file mode 100644
index 0000000..7df4617
--- /dev/null
+++ b/extensions/irc/locales/generic/install.js
@@ -0,0 +1,54 @@
+#filter substitution
+// variables
+var version = "@CHATZILLA_VERSION@";
+var locale = "@AB_CD@";
+var jarFile = "chatzilla.jar";
+var installName = "ChatZilla " + version + " @MOZ_LANG_TITLE@ Language Pack";
+// size of the locale jar file in kibibytes (1024 bytes per KiB)
+// en-US files need about 110 KiB currently, estimate up to 200 KiB for others
+var srDest = 200;
+
+// end variables, start real work
+
+// this function verifies disk space in kilobytes
+function verifyDiskSpace(dirPath, spaceRequired)
+{
+  var spaceAvailable;
+
+  // Get the available disk space on the given path
+  spaceAvailable = fileGetDiskSpaceAvailable(dirPath);
+
+  // Convert the available disk space into kilobytes
+  spaceAvailable = parseInt(spaceAvailable / 1024);
+
+  // do the verification
+  if(spaceAvailable < spaceRequired)
+  {
+    logComment("Insufficient disk space: " + dirPath);
+    logComment("  required : " + spaceRequired + " K");
+    logComment("  available: " + spaceAvailable + " K");
+    return(false);
+  }
+
+  return(true);
+}
+
+var err = initInstall(installName, "ChatZilla " + locale, version); 
+logComment("initInstall: " + err);
+
+if (verifyDiskSpace(getFolder("Program"), srDest))
+{
+    addFile("ChatZilla " + locale,
+            "chrome/" + jarFile,        // jar source folder 
+            getFolder("Chrome"),        // target folder
+            "");                        // target subdir 
+
+    registerChrome(LOCALE | DELAYED_CHROME, getFolder("Chrome", jarFile), "locale/" + locale + "/chatzilla/");
+
+    if (err==SUCCESS)
+        performInstall(); 
+    else
+        cancelInstall(err);
+}
+else
+    cancelInstall(INSUFFICIENT_DISK_SPACE);
diff --git a/extensions/irc/locales/generic/install.rdf b/extensions/irc/locales/generic/install.rdf
new file mode 100644
index 0000000..972159b
--- /dev/null
+++ b/extensions/irc/locales/generic/install.rdf
@@ -0,0 +1,78 @@
+<?xml version="1.0"?>
+#filter substitution
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+  <Description about="urn:mozilla:install-manifest"
+               em:id="@INSTALL_EXTENSION_ID@"
+               em:name="ChatZilla @MOZ_LANG_TITLE@ Language Pack"
+               em:version="@CHATZILLA_VERSION@"
+               em:type="8"
+               em:creator="@MOZ_LANGPACK_CREATOR@"
+               em:homepageURL="@MOZ_LANGPACK_HOMEPAGE@">
+#ifdef MOZ_LANGPACK_CONTRIBUTORS
+    @MOZ_LANGPACK_CONTRIBUTORS@
+#endif
+
+    <em:iconURL>chrome://chatzilla/skin/images/logo.png</em:iconURL>
+
+    <!-- require ChatZilla (ignored on Gecko <= 1.8.*) -->
+    <em:requires>
+      <Description>
+        <em:id>{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}</em:id>
+        <em:minVersion>@CHATZILLA_BASE_VERSION@</em:minVersion>
+        <em:maxVersion>@CHATZILLA_BASE_VERSION@.*</em:maxVersion>
+      </Description>
+    </em:requires>
+
+    <!-- target: Mozilla, version 1.0 to 1.8 -->
+    <em:targetApplication>
+      <Description>
+        <em:id>{86c18b42-e466-45a9-ae7a-9b95ba6f5640}</em:id>
+        <em:minVersion>1.0</em:minVersion>
+        <em:maxVersion>1.8</em:maxVersion>
+      </Description>
+    </em:targetApplication>
+
+    <!-- target: Mozilla Firefox, version 1.0 to 3.0 -->
+    <em:targetApplication>
+      <Description>
+        <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
+        <em:minVersion>1.0</em:minVersion>
+        <em:maxVersion>3.0</em:maxVersion>
+      </Description>
+    </em:targetApplication>
+
+    <!-- target: SeaMonkey, version 1.0 to 2.0 -->
+    <em:targetApplication>
+      <Description>
+        <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
+        <em:minVersion>1.0</em:minVersion>
+        <em:maxVersion>2.0</em:maxVersion>
+      </Description>
+    </em:targetApplication>
+
+    <!-- target: Flock, version 0.4 to 1.0+ -->
+    <em:targetApplication>
+      <Description>
+        <em:id>{a463f10c-3994-11da-9945-000d60ca027b}</em:id>
+        <em:minVersion>0.4</em:minVersion>
+        <em:maxVersion>1.0+</em:maxVersion>
+      </Description>
+    </em:targetApplication>
+
+    <!-- target: Netscape Navigator, version 9.0b1 to 9.0.* -->
+    <em:targetApplication>
+      <Description>
+        <em:id>{3db10fab-e461-4c80-8b97-957ad5f8ea47}</em:id>
+        <em:minVersion>9.0b1</em:minVersion>
+        <em:maxVersion>9.0.*</em:maxVersion>
+      </Description>
+    </em:targetApplication>
+
+    <!-- package files -->
+    <em:file>
+      <Description about="urn:mozilla:extension:file:chatzilla.jar">
+        <em:locale>locale/@AB_CD@/chatzilla/</em:locale>
+      </Description>
+    </em:file>
+  </Description>
+</RDF>
diff --git a/extensions/irc/locales/jar.mn b/extensions/irc/locales/jar.mn
index 55cd569..73fc307 100644
--- a/extensions/irc/locales/jar.mn
+++ b/extensions/irc/locales/jar.mn
@@ -1,6 +1,8 @@
 #filter substitution
 
 chatzilla.jar:
+# the "% locale" line gets put into the .manifest used by toolkit-based apps
+% locale chatzilla @AB_CD@ %locale/@AB_CD@/chatzilla/
 * locale/@AB_CD@/chatzilla/contents.rdf          (generic/chrome/contents.rdf)
   locale/@AB_CD@/chatzilla/chatzillaOverlay.dtd  (%chrome/chatzillaOverlay.dtd)
   locale/@AB_CD@/chatzilla/browserOverlay.dtd    (%chrome/browserOverlay.dtd)
diff --git a/extensions/irc/makefiles.sh b/extensions/irc/makefiles.sh
index fd628b3..a067f82 100755
--- a/extensions/irc/makefiles.sh
+++ b/extensions/irc/makefiles.sh
@@ -38,4 +38,5 @@
 
 add_makefiles "
   extensions/irc/Makefile
+  extensions/irc/locales/Makefile
 "
diff --git a/extensions/irc/xpi/makexpi.sh b/extensions/irc/xpi/makelocalexpi.sh
old mode 100644
new mode 100755
similarity index 57%
copy from extensions/irc/xpi/makexpi.sh
copy to extensions/irc/xpi/makelocalexpi.sh
index 5fa4bd7..92ea2f4
--- a/extensions/irc/xpi/makexpi.sh
+++ b/extensions/irc/xpi/makelocalexpi.sh
@@ -1,27 +1,33 @@
 #!/bin/sh
 
+# Set up locale.
+if [ -z "$AB_CD" ]; then
+  if [ -z "$1" ]; then AB_CD=en-US; else AB_CD=$1; fi
+fi
 # Set up settings and paths for finding files.
 if [ -z "$DEBUG" ]; then DEBUG=0; fi
 if [ -z "$PERL" ]; then PERL=perl; fi
 if [ -z "$FEDIR" ]; then FEDIR=$PWD/..; fi
 if [ -z "$CONFIGDIR" ]; then CONFIGDIR=$FEDIR/../../config; fi
-if [ -z "$XPIFILES" ]; then XPIFILES=$PWD/resources; fi
-if [ -z "$XPIROOT" ]; then XPIROOT=$PWD/xpi-tree; fi
-if [ -z "$JARROOT" ]; then JARROOT=$PWD/jar-tree; fi
+if [ -z "$XPIROOT" ]; then XPIROOT=$PWD/xpi-tree-$AB_CD; fi
+if [ -z "$JARROOT" ]; then JARROOT=$PWD/jar-tree-$AB_CD; fi
 if [ -z "$LOCALEDIR" ]; then LOCALEDIR=$FEDIR/locales; fi
-if [ -z "$AB_CD" ]; then AB_CD=en-US; fi
+# the dir containing the actual localisation files
+# usually this is in l10n/ repository (parallel to mozilla/)
+# note that toolkit/defines.inc is expected in parallel to extensions/irc there
+if [ -z "$L10NDIR" ]; then L10NDIR="$FEDIR/../../../l10n/$AB_CD/extensions/irc"; fi
 
 # Display all the settings and paths if we're in debug mode.
 if [ $DEBUG -ge 1 ]; then
-	echo "\$DEBUG     = $DEBUG"
-	echo "\$PERL      = $PERL"
-	echo "\$CONFIGDIR = $CONFIGDIR"
-	echo "\$XPIFILES  = $XPIFILES"
-	echo "\$XPIROOT   = $XPIROOT"
-	echo "\$JARROOT   = $JARROOT"
-	echo "\$FEDIR     = $FEDIR"
-	echo "\$LOCALEDIR = $LOCALEDIR"
-	echo "\$AB_CD     = $AB_CD"
+  echo "\$DEBUG     = $DEBUG"
+  echo "\$PERL      = $PERL"
+  echo "\$CONFIGDIR = $CONFIGDIR"
+  echo "\$XPIROOT   = $XPIROOT"
+  echo "\$JARROOT   = $JARROOT"
+  echo "\$FEDIR     = $FEDIR"
+  echo "\$LOCALEDIR = $LOCALEDIR"
+  echo "\$AB_CD     = $AB_CD"
+  echo "\$L10NDIR   = $L10NDIR"
 fi
 
 ## Simple function to display all the parameters/arguments to itself.
@@ -70,7 +76,7 @@ function safeCommand()
     LASTP="$P"
   done
   
-  if [ $DEBUG -ge 2 ]; then
+  if [ $DEBUG -gt 0 ]; then
     echo
     showParams "${CMD[@]}"
     echo 'INPUT  :' "$INF"
@@ -89,7 +95,7 @@ function safeCommand()
   fi
   
   EC=$?
-  if [ $DEBUG -ge 2 ]; then
+  if [ $DEBUG -gt 0 ]; then
     echo 'RESULT :' $EC
   fi
   if [ "$EC" != "0" ]; then
@@ -107,7 +113,6 @@ function safeCommand()
 ## Begin real program ##
 
 
-# Clean up XPI and JAR build directories.
 if [ "$1" = "clean" ]; then
   echo -n "Cleaning up files"
   echo -n .
@@ -119,36 +124,26 @@ if [ "$1" = "clean" ]; then
   exit
 fi
 
-
 # Check that requested language is in all-locales file (i.e. exists and it
-# allowed to be used). Fall back to en-US if not.
+# allowed to be used).
 # FIXME: THIS DOES NOT WORK WITH CYGWIN.
 grep -sx "$AB_CD" "$LOCALEDIR/all-locales" > /dev/null
 if [ $? != 0 ]; then
-  AB_CD=en-US
+  echo "ERROR: Language $AB_CD is currently not supported."
+  exit 1
 fi
 if [ $DEBUG -ge 1 ]; then echo "Language   = $AB_CD"; fi
 
 
-# Set up where the actual localisation files are to be found; below $LOCALEDIR
-# for en-US, in l10n/ repository for other languages.
-if [ "$AB_CD" = "en-US" ]; then
-  L10NDIR="$LOCALEDIR/$AB_CD"
-else
-  L10NDIR="$FEDIR/../../../l10n/$AB_CD/extensions/irc"
-fi
-if [ $DEBUG -ge 1 ]; then echo "L10n dir   = $L10NDIR"; fi
-
-
 # Check directory setup.
-if ! [ -d "$CONFIGDIR" ]; then
-  echo "ERROR: mozilla/config directory (CONFIGDIR) not found."
-  exit 1
-fi
 if ! [ -d "$FEDIR" ]; then
   echo "ERROR: Base ChatZilla directory (FEDIR) not found."
   exit 1
 fi
+if ! [ -d "$CONFIGDIR" ]; then
+  echo "ERROR: mozilla/config directory (CONFIGDIR) not found."
+  exit 1
+fi
 if ! [ -d "$L10NDIR" ]; then
   echo "ERROR: Directory with localized files for $AB_CD language (L10NDIR) not found."
   exit 1
@@ -157,23 +152,17 @@ fi
 
 # Extract version number.
 VERSION=`grep "const __cz_version" "$FEDIR/xul/content/static.js" | sed "s|.*\"\([^\"]\{1,\}\)\".*|\1|"`
+BASE_VERSION=`echo "$VERSION" | sed "s|\([0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}\).*|\1|"
+
 if [ -z "$VERSION" ]; then
   echo "ERROR: Unable to get version number."
   exit 1
 fi
 
+echo "Beginning build of $AB_CD language pack for ChatZilla $VERSION..."
 
-echo Beginning build of ChatZilla $VERSION...
-
-
-# Set up XPI name using version and language.
-if [ "$AB_CD" = "en-US" ]; then
-  XPINAME="chatzilla-$VERSION.xpi"
-else
-  XPINAME="chatzilla-$AB_CD-$VERSION.xpi"
-  echo "  NOTE: Building $AB_CD language."
-fi
-
+# Set up LangPack XPI name using version and language.
+XPINAME="chatzilla-$VERSION.$AB_CD.xpi"
 
 # Check for an existing XPI file and print a warning.
 if [ -r "$XPINAME" ]; then
@@ -184,45 +173,35 @@ fi
 # Check for required directory layouts.
 echo -n "  Checking XPI structure"
 echo -n .
-if ! [ -d xpi-tree ]; then mkdir xpi-tree; fi
-echo -n .
-if ! [ -d xpi-tree/chrome ]; then mkdir xpi-tree/chrome; fi
+if ! [ -d "$XPIROOT" ]; then mkdir -p $XPIROOT; fi
 echo -n .
-if ! [ -d xpi-tree/chrome/icons ]; then mkdir xpi-tree/chrome/icons; fi
-echo -n .
-if ! [ -d xpi-tree/chrome/icons/default ]; then mkdir xpi-tree/chrome/icons/default; fi
-echo -n .
-if ! [ -d xpi-tree/components ]; then mkdir xpi-tree/components; fi
-echo   ".           done"
+if ! [ -d "$XPIROOT/chrome" ]; then mkdir $XPIROOT/chrome; fi
+echo   ".                        done"
 
 echo -n "  Checking JAR structure"
 echo -n .
-if ! [ -d jar-tree ]; then mkdir jar-tree; fi
-echo   ".               done"
+if ! [ -d "$JARROOT" ]; then mkdir -p $JARROOT; fi
+echo   ".                         done"
 
 
 # Make Firefox updates.
 echo -n "  Updating Firefox Extension files"
 echo -n .
-safeCommand $PERL $CONFIGDIR/preprocessor.pl -DCHATZILLA_VERSION=$VERSION "$XPIFILES/install.rdf" '>' "$XPIROOT/install.rdf"
-echo -n .
-safeCommand cp "$XPIFILES/chatzilla-window.ico" "$XPIROOT/chrome/icons/default/chatzilla-window.ico"
-echo -n .
-safeCommand cp "$XPIFILES/chatzilla-window.xpm" "$XPIROOT/chrome/icons/default/chatzilla-window.xpm"
+# make sure we have all defines we need when preprocessing the install.rdf file
+# toolkit/defines.inc contains the definition for the locale name we use in the langpack title
+safeCommand $PERL "$CONFIGDIR/preprocessor.pl" -DAB_CD=$AB_CD -DCHATZILLA_VERSION=$VERSION -DCHATZILLA_BASE_VERSION=$BASE_VERSION -DINSTALL_EXTENSION_ID=langpack-$AB_CD@chatzilla.mozilla.org -I$L10NDIR/../../toolkit/defines.inc -I$L10NDIR/defines.inc "$LOCALEDIR/generic/install.rdf" '>' "$XPIROOT/install.rdf"
 echo -n .
-safeCommand cp "$XPIFILES/chatzilla-window16.xpm" "$XPIROOT/chrome/icons/default/chatzilla-window16.xpm"
-echo   ".  done"
+echo   ".              done"
 
 
 # Make Mozilla Suite updates.
 echo -n "  Updating Mozilla Extension files"
 echo -n .
-safeCommand sed "s|@REVISION@|$VERSION|g" '<' "$XPIFILES/install.js" '>' "$XPIROOT/install.js"
+# make sure we have all defines we need when preprocessing the install.js file
+# toolkit/defines.inc contains the definition for the locale name we use in the langpack title
+safeCommand $PERL "$CONFIGDIR/preprocessor.pl" -DAB_CD=$AB_CD -DCHATZILLA_VERSION=$VERSION -DCHATZILLA_BASE_VERSION=$BASE_VERSION -DINSTALL_EXTENSION_ID=langpack-$AB_CD@chatzilla.mozilla.org -I$L10NDIR/../../toolkit/defines.inc -I$L10NDIR/defines.inc "$LOCALEDIR/generic/install.js" '>' "$XPIROOT/install.js"
 echo -n .
-safeCommand mv "$FEDIR/xul/content/contents.rdf" "$FEDIR/xul/content/contents.rdf.in"
-safeCommand sed "s|\(chrome:displayName=\)\"[^\"]\{1,\}\"|\1\"ChatZilla $VERSION\"|g" '<' "$FEDIR/xul/content/contents.rdf.in" '>' "$FEDIR/xul/content/contents.rdf"
-safeCommand rm "$FEDIR/xul/content/contents.rdf.in"
-echo   ".    done"
+echo   ".              done"
 
 
 # Create JAR.
@@ -232,18 +211,13 @@ OLDPWD=`pwd`
 cd "$CONFIGDIR"
 echo -n .
 
-safeCommand $PERL make-jars.pl -v -z zip -p preprocessor.pl -s "$FEDIR" -d "$JARROOT" '<' "$FEDIR/jar.mn"
-echo -n .
-safeCommand $PERL make-jars.pl -v -z zip -p preprocessor.pl -s "$FEDIR/sm" -d "$JARROOT" '<' "$FEDIR/sm/jar.mn"
-echo -n .
-safeCommand $PERL make-jars.pl -v -z zip -p preprocessor.pl -s "$FEDIR/ff" -d "$JARROOT" '<' "$FEDIR/ff/jar.mn"
-echo -n .
 safeCommand $PERL preprocessor.pl -DAB_CD="$AB_CD" "$LOCALEDIR/jar.mn" '>' "$LOCALEDIR/jar.mn.pp"
+echo -n .
 safeCommand $PERL make-jars.pl -v -z zip -p preprocessor.pl -s "$LOCALEDIR" -d "$JARROOT" -c "$L10NDIR" -- "-DAB_CD=\"$AB_CD\" -DMOZILLA_LOCALE_VERSION=\"\"" '<' "$LOCALEDIR/jar.mn.pp"
-safeCommand rm "$LOCALEDIR/jar.mn.pp"
 echo -n .
+safeCommand rm "$LOCALEDIR/jar.mn.pp"
 cd "$OLDPWD"
-echo   ".        done"
+echo   ".                    done"
 
 
 # Make XPI.
@@ -251,17 +225,13 @@ echo -n "  Constructing XPI package"
 echo -n .
 safeCommand cp -v "$JARROOT/chatzilla.jar" "$XPIROOT/chrome/"
 echo -n .
-safeCommand cp -v "$FEDIR/js/lib/chatzilla-service.js" "$XPIROOT/components/"
-echo -n .
 safeCommand chmod 664 "$XPIROOT/chrome/chatzilla.jar"
 echo -n .
-safeCommand chmod 664 "$XPIROOT/components/chatzilla-service.js"
-echo -n .
 OLDPWD=`pwd`
 cd "$XPIROOT"
 safeCommand zip -vr ../$XPINAME . -i "*" -x "log*"
 cd "$OLDPWD"
-echo   ".         done"
+echo   ".                     done"
 
 
-echo "Build of ChatZilla $VERSION...         ALL DONE"
+echo "Build of $AB_CD language pack for ChatZilla $VERSION... ALL DONE"
diff --git a/extensions/irc/xpi/makexpi.sh b/extensions/irc/xpi/makexpi.sh
index 5fa4bd7..8c4c3b8 100644
--- a/extensions/irc/xpi/makexpi.sh
+++ b/extensions/irc/xpi/makexpi.sh
@@ -9,7 +9,6 @@ if [ -z "$XPIFILES" ]; then XPIFILES=$PWD/resources; fi
 if [ -z "$XPIROOT" ]; then XPIROOT=$PWD/xpi-tree; fi
 if [ -z "$JARROOT" ]; then JARROOT=$PWD/jar-tree; fi
 if [ -z "$LOCALEDIR" ]; then LOCALEDIR=$FEDIR/locales; fi
-if [ -z "$AB_CD" ]; then AB_CD=en-US; fi
 
 # Display all the settings and paths if we're in debug mode.
 if [ $DEBUG -ge 1 ]; then
@@ -21,7 +20,6 @@ if [ $DEBUG -ge 1 ]; then
 	echo "\$JARROOT   = $JARROOT"
 	echo "\$FEDIR     = $FEDIR"
 	echo "\$LOCALEDIR = $LOCALEDIR"
-	echo "\$AB_CD     = $AB_CD"
 fi
 
 ## Simple function to display all the parameters/arguments to itself.
@@ -120,37 +118,13 @@ if [ "$1" = "clean" ]; then
 fi
 
 
-# Check that requested language is in all-locales file (i.e. exists and it
-# allowed to be used). Fall back to en-US if not.
-# FIXME: THIS DOES NOT WORK WITH CYGWIN.
-grep -sx "$AB_CD" "$LOCALEDIR/all-locales" > /dev/null
-if [ $? != 0 ]; then
-  AB_CD=en-US
-fi
-if [ $DEBUG -ge 1 ]; then echo "Language   = $AB_CD"; fi
-
-
-# Set up where the actual localisation files are to be found; below $LOCALEDIR
-# for en-US, in l10n/ repository for other languages.
-if [ "$AB_CD" = "en-US" ]; then
-  L10NDIR="$LOCALEDIR/$AB_CD"
-else
-  L10NDIR="$FEDIR/../../../l10n/$AB_CD/extensions/irc"
-fi
-if [ $DEBUG -ge 1 ]; then echo "L10n dir   = $L10NDIR"; fi
-
-
 # Check directory setup.
-if ! [ -d "$CONFIGDIR" ]; then
-  echo "ERROR: mozilla/config directory (CONFIGDIR) not found."
-  exit 1
-fi
 if ! [ -d "$FEDIR" ]; then
   echo "ERROR: Base ChatZilla directory (FEDIR) not found."
   exit 1
 fi
-if ! [ -d "$L10NDIR" ]; then
-  echo "ERROR: Directory with localized files for $AB_CD language (L10NDIR) not found."
+if ! [ -d "$CONFIGDIR" ]; then
+  echo "ERROR: mozilla/config directory (CONFIGDIR) not found."
   exit 1
 fi
 
@@ -166,15 +140,8 @@ fi
 echo Beginning build of ChatZilla $VERSION...
 
 
-# Set up XPI name using version and language.
-if [ "$AB_CD" = "en-US" ]; then
-  XPINAME="chatzilla-$VERSION.xpi"
-else
-  XPINAME="chatzilla-$AB_CD-$VERSION.xpi"
-  echo "  NOTE: Building $AB_CD language."
-fi
-
-
+# Set up XPI name.
+XPINAME="chatzilla-$VERSION.xpi"
 # Check for an existing XPI file and print a warning.
 if [ -r "$XPINAME" ]; then
   echo "  WARNING: output XPI will be overwritten."
@@ -184,27 +151,27 @@ fi
 # Check for required directory layouts.
 echo -n "  Checking XPI structure"
 echo -n .
-if ! [ -d xpi-tree ]; then mkdir xpi-tree; fi
+if ! [ -d "$XPIROOT" ]; then mkdir -p "$XPIROOT"; fi
 echo -n .
-if ! [ -d xpi-tree/chrome ]; then mkdir xpi-tree/chrome; fi
+if ! [ -d "$XPIROOT/chrome" ]; then mkdir "$XPIROOT/chrome"; fi
 echo -n .
-if ! [ -d xpi-tree/chrome/icons ]; then mkdir xpi-tree/chrome/icons; fi
+if ! [ -d "$XPIROOT/chrome/icons" ]; then mkdir "$XPIROOT/chrome/icons"; fi
 echo -n .
-if ! [ -d xpi-tree/chrome/icons/default ]; then mkdir xpi-tree/chrome/icons/default; fi
+if ! [ -d "$XPIROOT/chrome/icons/default" ]; then mkdir "$XPIROOT/chrome/icons/default"; fi
 echo -n .
-if ! [ -d xpi-tree/components ]; then mkdir xpi-tree/components; fi
+if ! [ -d "$XPIROOT/components" ]; then mkdir "$XPIROOT/components"; fi
 echo   ".           done"
 
 echo -n "  Checking JAR structure"
 echo -n .
-if ! [ -d jar-tree ]; then mkdir jar-tree; fi
+if ! [ -d "$JARROOT" ]; then mkdir -p "$JARROOT"; fi
 echo   ".               done"
 
 
 # Make Firefox updates.
 echo -n "  Updating Firefox Extension files"
 echo -n .
-safeCommand $PERL $CONFIGDIR/preprocessor.pl -DCHATZILLA_VERSION=$VERSION "$XPIFILES/install.rdf" '>' "$XPIROOT/install.rdf"
+safeCommand $PERL "$CONFIGDIR/preprocessor.pl" -DCHATZILLA_VERSION=$VERSION "$XPIFILES/install.rdf" '>' "$XPIROOT/install.rdf"
 echo -n .
 safeCommand cp "$XPIFILES/chatzilla-window.ico" "$XPIROOT/chrome/icons/default/chatzilla-window.ico"
 echo -n .
@@ -238,8 +205,8 @@ safeCommand $PERL make-jars.pl -v -z zip -p preprocessor.pl -s "$FEDIR/sm" -d "$
 echo -n .
 safeCommand $PERL make-jars.pl -v -z zip -p preprocessor.pl -s "$FEDIR/ff" -d "$JARROOT" '<' "$FEDIR/ff/jar.mn"
 echo -n .
-safeCommand $PERL preprocessor.pl -DAB_CD="$AB_CD" "$LOCALEDIR/jar.mn" '>' "$LOCALEDIR/jar.mn.pp"
-safeCommand $PERL make-jars.pl -v -z zip -p preprocessor.pl -s "$LOCALEDIR" -d "$JARROOT" -c "$L10NDIR" -- "-DAB_CD=\"$AB_CD\" -DMOZILLA_LOCALE_VERSION=\"\"" '<' "$LOCALEDIR/jar.mn.pp"
+safeCommand $PERL preprocessor.pl -DAB_CD="en-US" "$LOCALEDIR/jar.mn" '>' "$LOCALEDIR/jar.mn.pp"
+safeCommand $PERL make-jars.pl -v -z zip -p preprocessor.pl -s "$LOCALEDIR" -d "$JARROOT" -c "$LOCALEDIR/en-US" -- "-DAB_CD=\"en-US\" -DMOZILLA_LOCALE_VERSION=\"\"" '<' "$LOCALEDIR/jar.mn.pp"
 safeCommand rm "$LOCALEDIR/jar.mn.pp"
 echo -n .
 cd "$OLDPWD"
diff --git a/extensions/irc/xul/content/chatzilla.xul b/extensions/irc/xul/content/chatzilla.xul
index a87e6a1..b05a50b 100644
--- a/extensions/irc/xul/content/chatzilla.xul
+++ b/extensions/irc/xul/content/chatzilla.xul
@@ -89,8 +89,11 @@
   
       </hbox> <!-- tabpanels-contents-box -->
     
-      <hbox id="tabstrip-box" flex="0" crop="right">
-        <hbox id="view-tabs" persist="collapsed" flex="1">
+      <vbox id="tabstrip-box" flex="0" crop="right">
+        <hbox id="view-tabs" persist="collapsed" flex="1"
+            ondragover="nsDragAndDrop.dragOver(event, tabsDropObserver)"
+            ondragexit="nsDragAndDrop.dragExit(event, tabsDropObserver)"
+            ondragdrop="nsDragAndDrop.drop(event, tabsDropObserver)">
           <tabs class="tabs-bottom" id="views-tbar-inner" flex="1"
               onselect="onTabSelect(event)" setfocus="false">
             <tab hidden="true"/> <!-- dummy tab to keep the freaking xbl from
@@ -98,7 +101,10 @@
           </tabs>
           <spacer id="views-tbar-spacer"/>
         </hbox>
-      </hbox>
+        <hbox id="tabs-drop-indicator-bar" collapsed="true">
+          <hbox id="tabs-drop-indicator" mousethrough="always"/>
+        </hbox>
+      </vbox>
   
     </vbox> <!-- upper-box -->
   
diff --git a/extensions/irc/xul/content/commands.js b/extensions/irc/xul/content/commands.js
index e64d6dc..f0e498e 100644
--- a/extensions/irc/xul/content/commands.js
+++ b/extensions/irc/xul/content/commands.js
@@ -119,6 +119,8 @@ function initCommands()
          ["goto-url-external", cmdGotoURL,                                   0],
          ["help",              cmdHelp,                            CMD_CONSOLE],
          ["hide-view",         cmdHideView,                        CMD_CONSOLE],
+         ["idle-away",         cmdAway,                                      0],
+         ["idle-back",         cmdAway,                                      0],
          ["ignore",            cmdIgnore,           CMD_NEED_NET | CMD_CONSOLE],
          ["input-text-direction", cmdInputTextDirection,                     0],
          ["invite",            cmdInvite,           CMD_NEED_SRV | CMD_CONSOLE],
@@ -215,6 +217,7 @@ function initCommands()
          ["homepage",         "goto-url homepage",                           0],
          // Used to display a nickname in the menu only.
          ["label-user",       "echo",                                        0],
+         ["label-user-multi", "echo",                                        0],
          // These are all the font family/size menu commands...
          ["font-family-default",    "font-family default",                   0],
          ["font-family-serif",      "font-family serif",                     0],
@@ -875,6 +878,30 @@ function cmdAblePlugin(e)
 
 function cmdBanOrExcept(e)
 {
+    var modestr;
+    switch (e.command.name)
+    {
+        case "ban":
+            modestr = "+bbbb";
+            break;
+
+        case "unban":
+            modestr = "-bbbb";
+            break;
+
+        case "except":
+            modestr = "+eeee";
+            break;
+
+        case "unexcept":
+            modestr = "-eeee";
+            break;
+
+        default:
+            ASSERT(0, "Dispatch from unknown name " + e.command.name);
+            return;
+    }
+
     /* If we're unbanning, or banning in odd cases, we may actually be talking
      * about a user who is not in the channel, so we need to check the server
      * for information as well.
@@ -884,11 +911,17 @@ function cmdBanOrExcept(e)
     if (!e.user && e.nickname)
         e.user = e.server.getUser(e.nickname);
 
-    var mask = "";
-    if (e.user)
+    var masks = new Array();
+
+    if (e.userList)
+    {
+        for (var i = 0; i < e.userList.length; i++)
+            masks.push(fromUnicode(e.userList[i].getBanMask(), e.server));
+    }
+    else if (e.user)
     {
         // We have a real user object, so get their proper 'ban mask'.
-        mask = fromUnicode(e.user.getBanMask(), e.server);
+        masks = [fromUnicode(e.user.getBanMask(), e.server)];
     }
     else if (e.nickname)
     {
@@ -896,28 +929,25 @@ function cmdBanOrExcept(e)
          * us a complete mask and pass it directly, otherwise assume it is
          * only the nickname and use * for username/host.
          */
-        mask = fromUnicode(e.nickname, e.server);
+        masks = [fromUnicode(e.nickname, e.server)];
         if (!/[!@]/.test(e.nickname))
-            mask = mask + "!*@*";
+            masks[0] = masks[0] + "!*@*";
+    }
+    else
+    {
+        // Nothing specified, so we want to list the bans/excepts.
+        masks = [""];
     }
 
-    var op;
-    switch (e.command.name)
+    // Collapses into groups we can do individually.
+    masks = combineNicks(masks);
+
+    for (var i = 0; i < masks.length; i++)
     {
-        case "ban":
-            op = " +b ";
-            break;
-        case "unban":
-            op = " -b ";
-            break;
-        case "except":
-            op = " +e ";
-            break;
-        case "unexcept":
-            op = " -e ";
-            break;
+        e.server.sendData("MODE " + e.channel.encodedName + " " +
+                          modestr.substr(0, masks[i].count + 1) +
+                          " " + masks[i] + "\n");
     }
-    e.server.sendData("MODE " + e.channel.encodedName + op + mask + "\n");
 }
 
 function cmdCancel(e)
@@ -1633,6 +1663,12 @@ function cmdHideView(e)
         // Detach messages from output window content.
         if (e.view.messages.parentNode)
             e.view.messages.parentNode.removeChild(e.view.messages);
+
+        /* XXX Bug 335998: Adopt the messages into our own internal document
+         * so that when the real one the messages were in gets incorrectly
+         * GC-collected (see bug) the nodes still have an ownerDocument.
+         */
+        client.adoptNode(e.view.messages, client.hiddenDocument);
     }
 
     var tb = getTabForObject(e.view);
@@ -2139,7 +2175,7 @@ function cmdNick(e)
     if (!e.nickname)
     {
         var curNick;
-        if (e.server && e.server.isConnected())
+        if (e.server && e.server.isConnected)
             curNick = e.server.me.unicodeName;
         else if (e.network)
             curNick = e.network.prefs["nickname"];
@@ -2772,15 +2808,25 @@ function cmdAway(e)
     {
         for (var n in client.networks)
         {
-            if (client.networks[n].primServ &&
-                (client.networks[n].state == NET_ONLINE))
+            var net = client.networks[n];
+            if (net.primServ && (net.state == NET_ONLINE))
             {
-                client.networks[n].dispatch(command, { reason: reason });
+                // If we can override the network's away state, or they are
+                // already idly-away, or they're not away to begin with:
+                if (overrideAway || net.isIdleAway || !net.prefs["away"])
+                {
+                    net.dispatch(command, {reason: reason });
+                    net.isIdleAway = (e.command.name == "idle-away");
+                }
             }
         }
     };
 
-    if ((e.command.name == "away") || (e.command.name == "custom-away"))
+    // Idle away shouldn't override away state set by the user.
+    var overrideAway = (e.command.name.indexOf("idle") != 0);
+
+    if ((e.command.name == "away") || (e.command.name == "custom-away") ||
+        (e.command.name == "idle-away"))
     {
         /* going away */
         if (e.command.name == "custom-away")
@@ -2826,6 +2872,7 @@ function cmdAway(e)
             display(getMsg(MSG_ERR_AWAY_SAVE, formatException(ex)), MT_ERROR);
         }
 
+        // Actually do away stuff, is this on a specific network?
         if (e.server)
         {
             var normalNick = e.network.prefs["nickname"];
@@ -2836,7 +2883,8 @@ function cmdAway(e)
                 // user doesn't want to change nicks:
                 if (awayNick && (normalNick != awayNick))
                     e.server.changeNick(awayNick);
-                e.server.sendData("AWAY :" + fromUnicode(e.reason, e.network) + "\n");
+                e.server.sendData("AWAY :" + fromUnicode(e.reason, e.network) +
+                                  "\n");
             }
             if (awayNick && (normalNick != awayNick))
                 e.network.preferredNick = awayNick;
@@ -2844,10 +2892,23 @@ function cmdAway(e)
         }
         else
         {
-            client.prefs["away"] = e.reason;
             // Client view, do command for all networks.
             sendToAllNetworks("away", e.reason);
-            display(getMsg(MSG_AWAY_ON, e.reason));
+            client.prefs["away"] = e.reason;
+
+            // Don't tell people how to get back if they're idle:
+            var idleMsgParams = [e.reason, client.prefs["awayIdleTime"]];
+            if (e.command.name == "idle-away")
+                var msg = getMsg(MSG_IDLE_AWAY_ON, idleMsgParams);
+            else
+                msg = getMsg(MSG_AWAY_ON, e.reason);
+
+            // Display on the *client* tab, or on the current tab iff
+            // there's nowhere else they'll hear about it:
+            if (("frame" in client) && client.frame)
+                client.display(msg);
+            else if (!client.getConnectedNetworks())
+                display(msg);
         }
     }
     else
@@ -2873,7 +2934,10 @@ function cmdAway(e)
             client.prefs["away"] = "";
             // Client view, do command for all networks.
             sendToAllNetworks("back");
-            display(MSG_AWAY_OFF);
+            if (("frame" in client) && client.frame)
+                client.display(MSG_AWAY_OFF);
+            else if (!client.getConnectedNetworks())
+                display(MSG_AWAY_OFF);
         }
     }
 }
@@ -3102,11 +3166,7 @@ function cmdInvite(e)
 {
     var channel;
 
-    if (!e.channelName)
-    {
-        channel = e.channel;
-    }
-    else
+    if (e.channelName)
     {
         channel = e.server.getChannel(e.channelName);
         if (!channel)
@@ -3115,12 +3175,46 @@ function cmdInvite(e)
             return;
         }
     }
+    else if (e.channel)
+    {
+        channel = e.channel;
+    }
+    else
+    {
+        display(getMsg(MSG_ERR_NO_CHANNEL, e.command.name), MT_ERROR);
+        return;
+    }
 
     channel.invite(e.nickname);
 }
 
 function cmdKick(e)
 {
+    if (e.userList)
+    {
+        if (e.command.name == "kick-ban")
+        {
+            e.sourceObject.dispatch("ban", { userList: e.userList,
+                                             canonNickList: e.canonNickList,
+                                             user: e.user,
+                                             nickname: e.user.encodedName });
+        }
+
+        /* Note that we always do /kick below; the /ban is covered above.
+         * Also note that we are required to pass the nickname, to satisfy
+         * the dispatching of the command (which is defined with a required
+         * <nickname> parameter). It's not required for /ban, above, but it
+         * seems prudent to include it anyway.
+         */
+        for (var i = 0; i < e.userList.length; i++)
+        {
+            var e2 = { user: e.userList[i],
+                       nickname: e.userList[i].encodedName };
+            e.sourceObject.dispatch("kick", e2);
+        }
+        return;
+    }
+
     if (!e.user)
         e.user = e.channel.getUser(e.nickname);
 
@@ -3673,6 +3767,16 @@ function cmdDoCommand(e)
         window.openDialog('chrome://chatzilla/content/config.xul', '',
                           'chrome,resizable,dialog=no', window);
     }
+    else if (e.cmdName == "cmd_selectAll")
+    {
+        var userList = document.getElementById("user-list");
+        var elemFocused = document.commandDispatcher.focusedElement;
+
+        if (userList.view && (elemFocused == userList))
+            userList.view.selection.selectAll();
+        else
+            doCommand("cmd_selectAll");
+    }
     else
     {
         doCommand(e.cmdName);
diff --git a/extensions/irc/xul/content/config.js b/extensions/irc/xul/content/config.js
index dda1c02..0f43590 100755
--- a/extensions/irc/xul/content/config.js
+++ b/extensions/irc/xul/content/config.js
@@ -674,6 +674,12 @@ function pdata_loadXUL()
     {
         this.edit.setAttribute("prefobjectindex", this.parent.arrayIndex);
         this.edit.setAttribute("prefname", this.name);
+        // Associate textbox with label for accessibility.
+        if (label)
+        {
+            this.edit.id = this.manager.branchName + this.name;
+            label.setAttribute("control", this.edit.id);
+        }
     }
     
     if (!ASSERT("groups" in this.parent, "Must have called " +
@@ -1051,6 +1057,8 @@ function pwin_onLoad()
             var czWin = window.arguments[0];
             var s;
             var n, c, u;
+            this.ownerClient = czWin.client;
+            this.ownerClient.configWindow = window;
             
             /* Go nick the source window's view list. We can then show items in
              * the tree for the currently connected/shown networks, channels
@@ -1157,6 +1165,8 @@ function pwin_onLoad()
 PrefWindow.prototype.onClose =
 function pwin_onClose()
 {
+    if (this.ownerClient)
+        delete this.ownerClient.configWindow;
     if (this.loaded)
         destroyPrefs();
 }
diff --git a/extensions/irc/xul/content/contents.rdf b/extensions/irc/xul/content/contents.rdf
index 81f4936..663256b 100644
--- a/extensions/irc/xul/content/contents.rdf
+++ b/extensions/irc/xul/content/contents.rdf
@@ -9,7 +9,7 @@
 
   <!-- package information -->
   <RDF:Description about="urn:mozilla:package:chatzilla"
-        chrome:displayName="ChatZilla 0.9.79"
+        chrome:displayName="ChatZilla 0.9.80"
         chrome:author="mozilla.org"
         chrome:authorURL="http://www.mozilla.org/projects/rt-messaging/chatzilla/"
         chrome:description="A simple, straightforward Internet Relay Chat (IRC) client."
diff --git a/extensions/irc/xul/content/handlers.js b/extensions/irc/xul/content/handlers.js
index 722f746..83bff9f 100644
--- a/extensions/irc/xul/content/handlers.js
+++ b/extensions/irc/xul/content/handlers.js
@@ -142,7 +142,20 @@ function onClose()
 function onUnload()
 {
     dd("Shutting down ChatZilla.");
+
+    // Close all dialogs.
+    for (var net in client.networks)
+    {
+        if ("joinDialog" in client.networks[net])
+            client.networks[net].joinDialog.close();
+    }
+    if ("configWindow" in client)
+        client.configWindow.close();
+
+    // We don't trust anybody.
+    client.hiddenDocument = null;
     uninitOfflineIcon();
+    uninitIdleAutoAway(client.prefs["awayIdleTime"]);
     destroy();
 }
 
@@ -332,7 +345,14 @@ function onInputKeyPress (e)
                 onTabCompleteRequest(e);
                 e.preventDefault();
             }
-            break;
+            return;
+
+        case 77: /* Hackaround for carbon on mac sending us this instead of 13
+                  * for ctrl+enter. 77 = "M", and ctrl+M was originally used
+                  * to send a CR in a terminal. */
+            // Fallthrough if ctrl was pressed, otherwise break out to default:
+            if (!e.ctrlKey)
+                break;
 
         case 13: /* CR */
             e.line = e.target.value;
@@ -342,12 +362,12 @@ function onInputKeyPress (e)
             if (e.ctrlKey)
                 e.line = client.COMMAND_CHAR + "say " + e.line;
             onInputCompleteLine (e);
-            break;
+            return;
 
         case 37: /* left */
-             if (e.altKey && e.metaKey)
-                 cycleView(-1);
-             break;
+            if (e.altKey && e.metaKey)
+                cycleView(-1);
+            return;
 
         case 38: /* up */
             if (e.ctrlKey || e.metaKey)
@@ -370,12 +390,12 @@ function onInputKeyPress (e)
                 }
             }
             e.preventDefault();
-            break;
+            return;
 
         case 39: /* right */
-             if (e.altKey && e.metaKey)
-                 cycleView(+1);
-             break;
+            if (e.altKey && e.metaKey)
+                cycleView(+1);
+            return;
 
         case 40: /* down */
             if (client.lastHistoryReferenced > 0)
@@ -392,14 +412,10 @@ function onInputKeyPress (e)
                 e.target.value = client.incompleteLine;
             }
             e.preventDefault();
-            break;
-
-        default:
-            client.lastHistoryReferenced = -1;
-            client.incompleteLine = e.target.value;
-            break;
+            return;
     }
-
+    client.lastHistoryReferenced = -1;
+    client.incompleteLine = e.target.value;
 }
 
 function onTabCompleteRequest (e)
@@ -1081,6 +1097,7 @@ function my_showtonet (e)
                     this.dispatch(cmdary[i]);
             }
 
+            this.isIdleAway = client.isIdleAway;
             if (this.prefs["away"])
                 this.dispatch("away", { reason: this.prefs["away"] });
 
@@ -1098,11 +1115,11 @@ function my_showtonet (e)
 
             if ("pendingURLs" in this)
             {
-                var url = this.pendingURLs.pop();
-                while (url)
+                var target = this.pendingURLs.pop();
+                while (target)
                 {
-                    gotoIRCURL(url);
-                    url = this.pendingURLs.pop();
+                    gotoIRCURL(target.url, target.e);
+                    target = this.pendingURLs.pop();
                 }
                 delete this.pendingURLs;
             }
@@ -1168,13 +1185,21 @@ function my_ctcprunk (e)
 }
 
 CIRCNetwork.prototype.onNotice =
-function my_notice (e)
+function my_notice(e)
 {
     client.munger.getRule(".mailto").enabled = client.prefs["munger.mailto"];
     this.display(e.decodeParam(2), "NOTICE", this, e.server.me);
     client.munger.getRule(".mailto").enabled = false;
 }
 
+CIRCNetwork.prototype.onPrivmsg =
+function my_privmsg(e)
+{
+    client.munger.getRule(".mailto").enabled = client.prefs["munger.mailto"];
+    this.display(e.decodeParam(2), "PRIVMSG", this, e.server.me);
+    client.munger.getRule(".mailto").enabled = false;
+}
+
 /* userhost reply */
 CIRCNetwork.prototype.on302 =
 function my_302(e)
@@ -1282,7 +1307,11 @@ function my_305(e)
 CIRCNetwork.prototype.on306 =
 function my_306(e)
 {
-    this.display(getMsg(MSG_AWAY_ON, this.prefs["away"]));
+    var idleMsgParams = [this.prefs["away"], client.prefs["awayIdleTime"]];
+    if (!this.isIdleAway)
+        this.display(getMsg(MSG_AWAY_ON, this.prefs["away"]));
+    else
+        this.display(getMsg(MSG_IDLE_AWAY_ON, idleMsgParams));
 
     return true;
 }
@@ -1979,9 +2008,11 @@ function my_netdisconnect (e)
                       "reconnect"]);
         msgNetwork = msg;
     }
-    // We won't reconnect if the error was really bad.
-    else if ((typeof e.disconnectStatus != "undefined") &&
-             (e.disconnectStatus == NS_ERROR_ABORT))
+    // We won't reconnect if the error was really bad, or if the user doesn't
+    // want us to do so.
+    else if (((typeof e.disconnectStatus != "undefined") &&
+              (e.disconnectStatus == NS_ERROR_ABORT)) ||
+             !this.stayingPower)
     {
         msgNetwork = msg;
     }
@@ -2135,6 +2166,17 @@ function my_netpong (e)
     this.updateHeader(this);
 }
 
+CIRCNetwork.prototype.onWallops =
+function my_netwallops(e)
+{
+    client.munger.getRule(".mailto").enabled = client.prefs["munger.mailto"];
+    if (e.user)
+        this.display(e.msg, "WALLOPS/WALLOPS", e.user, this);
+    else
+        this.display(e.msg, "WALLOPS/WALLOPS", undefined, this);
+    client.munger.getRule(".mailto").enabled = false;
+}
+
 CIRCNetwork.prototype.reclaimName =
 function my_reclaimname()
 {
@@ -2216,9 +2258,12 @@ CIRCChannel.prototype.onPrivmsg =
 function my_cprivmsg (e)
 {
     var msg = e.decodeParam(2);
+    var msgtype = "PRIVMSG";
+    if ("msgPrefix" in e)
+        msgtype += "/" + e.msgPrefix.symbol;
 
     client.munger.getRule(".mailto").enabled = client.prefs["munger.mailto"];
-    this.display (msg, "PRIVMSG", e.user, this);
+    this.display (msg, msgtype, e.user, this);
     client.munger.getRule(".mailto").enabled = false;
 }
 
@@ -2226,6 +2271,16 @@ function my_cprivmsg (e)
 CIRCChannel.prototype.on366 =
 function my_366 (e)
 {
+    // First clear up old users:
+    var removals = new Array();
+    while (this.userList.childData.childData.length > 0)
+    {
+        var userToRemove = this.userList.childData.childData[0]._userObj;
+        this.removeFromList(userToRemove);
+        removals.push(userToRemove);
+    }
+    this.removeUsers(removals);
+
     var entries = new Array(), updates = new Array();
     for (var u in this.users)
     {
@@ -2354,8 +2409,12 @@ function my_needops(e)
 CIRCChannel.prototype.onNotice =
 function my_notice (e)
 {
+    var msgtype = "NOTICE";
+    if ("msgPrefix" in e)
+        msgtype += "/" + e.msgPrefix.symbol;
+
     client.munger.getRule(".mailto").enabled = client.prefs["munger.mailto"];
-    this.display(e.decodeParam(2), "NOTICE", e.user, this);
+    this.display(e.decodeParam(2), msgtype, e.user, this);
     client.munger.getRule(".mailto").enabled = false;
 }
 
diff --git a/extensions/irc/xul/content/menus.js b/extensions/irc/xul/content/menus.js
index ce5078a..19a92a4 100644
--- a/extensions/irc/xul/content/menus.js
+++ b/extensions/irc/xul/content/menus.js
@@ -70,21 +70,16 @@ function initMenus()
                "Math.abs((cx.fontSizeDefault - cx.fontSize) / 2) != 1";
     };
 
-    function onMenuCommand (event, window)
+    function onMenuCommand(event, window)
     {
-        var params;
         var commandName = event.originalTarget.getAttribute("commandname");
+        var params = new Object();
         if ("cx" in client.menuManager && client.menuManager.cx)
-        {
-            client.menuManager.cx.sourceWindow = window;
             params = client.menuManager.cx;
-        }
-        else
-        {
-            params = { sourceWindow: window };
-        }
+        params.sourceWindow = window;
+        params.source = "menu";
 
-        dispatch (commandName, params);
+        dispatch(commandName, params);
 
         delete client.menuManager.cx;
     };
@@ -357,10 +352,14 @@ function initMenus()
          ["toggle-umode", {type: "checkbox",
                            checkedif: "client.prefs['showModeSymbols']"}],
          ["-", {visibleif: "cx.nickname"}],
-         ["label-user", {visibleif: "cx.nickname", header: true}],
+         ["label-user", {visibleif: "cx.nickname && (cx.userCount == 1)",
+                         header: true}],
+         ["label-user-multi", {visibleif: "cx.nickname && (cx.userCount != 1)",
+                               header: true}],
          [">popup:opcommands", {visibleif: "cx.nickname",
                                 enabledif: isopish + "true"}],
-         [">popup:usercommands", {visibleif: "cx.nickname"}],
+         [">popup:usercommands", {visibleif: "cx.nickname",
+                                  enabledif: "cx.userCount == 1"}],
         ]
     };
 
diff --git a/extensions/irc/xul/content/mungers.js b/extensions/irc/xul/content/mungers.js
index c9643a1..71351c7 100644
--- a/extensions/irc/xul/content/mungers.js
+++ b/extensions/irc/xul/content/mungers.js
@@ -59,6 +59,9 @@ function initMunger()
     client.linkRE =
         /(?:\s|\W|^)((?:(\w[\w-]+):[^\s]+|www(\.[^.\s]+){2,})\b[\/=]?)(?=\s|\W|$)/;
 
+    // Colours: \x03, with optional foreground and background colours
+    client.colorRE = /(\x03((\d{1,2})(,\d{1,2}|)|))/;
+
     const LOW_PRIORITY = 5;
     const NORMAL_PRIORITY = 10;
     const HIGH_PRIORITY = 15;
@@ -79,8 +82,8 @@ function initMunger()
     /* allow () chars inside |code()| blocks */
     munger.addRule("teletype", /(?:\s|^)(\|[^|]*\|)(?:[\s.,]|$)/,
                    "chatzilla-teletype", NORMAL_PRIORITY, NORMAL_PRIORITY);
-    munger.addRule(".mirc-colors", /(\x03((\d{1,2})(,\d{1,2}|)|))/,
-                   mircChangeColor, NORMAL_PRIORITY, NORMAL_PRIORITY);
+    munger.addRule(".mirc-colors", client.colorRE, mircChangeColor,
+                   NORMAL_PRIORITY, NORMAL_PRIORITY);
     munger.addRule(".mirc-bold", /(\x02)/, mircToggleBold,
                    NORMAL_PRIORITY, NORMAL_PRIORITY);
     munger.addRule(".mirc-underline", /(\x1f)/, mircToggleUnder,
@@ -99,7 +102,7 @@ function initMunger()
        /(?:\s|\W|^)((mailto:)?[^:;\\<>\[\]()\'\"\s\u201d]+@[^.<>\[\]()\'\"\s\u201d]+\.[^<>\[\]()\'\"\s\u201d]+)/i,
                    insertMailToLink, NORMAL_PRIORITY, HIGHER_PRIORITY, false);
     munger.addRule("bugzilla-link",
-                   /(?:\s|\W|^)(bug\s+(?:#?\d+|#[^\s,]{1,20}))/i,
+                   /(?:\s|\W|^)(bug\s+(?:#?\d+|#[^\s,]{1,20})(?:\s+comment\s+#?\d+)?)/i,
                    insertBugzillaLink, NORMAL_PRIORITY, NORMAL_PRIORITY);
     munger.addRule("channel-link",
                 /(?:\s|\W|^)[@%+]?(#[^<>,\[\](){}\"\s\u201d]*[^:,.<>\[\](){}\'\"\s\u201d])/i,
@@ -285,11 +288,12 @@ function insertChannelLink(matchText, containerTag, eventData, mungerEntry)
         return;
     }
 
-    var encodedMatchText = fromUnicode(matchText, eventData.sourceObject);
+    var linkText = removeColorCodes(matchText);
+    var encodedLinkText = fromUnicode(linkText, eventData.sourceObject);
     var anchor = document.createElementNS("http://www.w3.org/1999/xhtml",
                                           "html:a");
     anchor.setAttribute("href", eventData.network.getURL() +
-                        ecmaEscape(encodedMatchText));
+                        ecmaEscape(encodedLinkText));
 
     // Carry over formatting.
     var otherFormatting = calcClass(eventData);
@@ -345,21 +349,43 @@ function insertBugzillaLink (matchText, containerTag, eventData, mungerEntry)
         return;
     }
 
-    var bugURL;
+    var prefs = client.prefs;
     if (eventData.channel)
-        bugURL = eventData.channel.prefs["bugURL"];
+        prefs = eventData.channel.prefs;
     else if (eventData.network)
-        bugURL = eventData.network.prefs["bugURL"];
-    else
-        bugURL = client.prefs["bugURL"];
+        prefs = eventData.network.prefs;
+
+    var bugURL = prefs["bugURL"];
+    var bugURLcomment = prefs["bugURL.comment"];
 
     if (bugURL.length > 0)
     {
         var idOrAlias = matchText.match(/bug\s+#?(\d+|[^\s,]{1,20})/i)[1];
+        bugURL = bugURL.replace("%s", idOrAlias);
+
+        if (matchText.indexOf("comment") != -1)
+        {
+            var commentNum = matchText.match(/comment\s+#?(\d+)/i)[1];
+            /* If the comment is a complete URL, use only that, replacing %1$s
+             * and %2$s with the bug number and comment number, respectively.
+             * Otherwise, append the comment preference to the main one,
+             * replacing just %s in each.
+             */
+            if (bugURLcomment.match(/^\w+:/))
+            {
+                bugURL = bugURLcomment;
+                bugURL = bugURL.replace("%1$s", idOrAlias);
+                bugURL = bugURL.replace("%2$s", commentNum);
+            }
+            else
+            {
+                bugURL += bugURLcomment.replace("%s", commentNum);
+            }
+        }
+
         var anchor = document.createElementNS("http://www.w3.org/1999/xhtml",
                                               "html:a");
-
-        anchor.setAttribute("href", bugURL.replace("%s", idOrAlias));
+        anchor.setAttribute("href", bugURL);
         // Carry over formatting.
         var otherFormatting = calcClass(eventData);
         if (otherFormatting)
diff --git a/extensions/irc/xul/content/output-base.css b/extensions/irc/xul/content/output-base.css
index 49077a4..31fab3f 100644
--- a/extensions/irc/xul/content/output-base.css
+++ b/extensions/irc/xul/content/output-base.css
@@ -496,6 +496,7 @@ a.chatzilla-link:hover {
 .msg-user {                                 /* msg-user = nickname portion of */
     text-align: right;                      /* a message (channel and query   */
     vertical-align: top;                    /* views)                         */
+    white-space: nowrap;
 }
 
 .msg-data {                                 /* .msg-data = the text portion   */
diff --git a/extensions/irc/xul/content/prefs.js b/extensions/irc/xul/content/prefs.js
index bcc5891..4af3c7c 100644
--- a/extensions/irc/xul/content/prefs.js
+++ b/extensions/irc/xul/content/prefs.js
@@ -124,15 +124,18 @@ function initPrefs()
 
     var prefs =
         [
-         ["activityFlashDelay", 200,      "global"],
+         ["activityFlashDelay", 200,      "hidden"],
          ["aliases",            [],       "lists.aliases"],
          ["autoAwayCap",        300,      "global"],
          ["autoAwayPeriod",     2,        "appearance.misc"],
          ["autoRejoin",         false,    ".connect"],
          ["away",               "",       "hidden"],
          ["awayNick",           "",       ".ident"],
+         ["awayIdleTime",       0,        ".ident"],
+         ["awayIdleMsg",        "",       ".ident"],
          ["bugURL",           "https://bugzilla.mozilla.org/show_bug.cgi?id=%s",
                                           "appearance.misc"],
+         ["bugURL.comment",     "#c%s",   "appearance.misc"],
          ["channelHeader",      true,     "global.header"],
          ["channelLog",         false,    "global.log"],
          ["channelMaxLines",    500,      "global.maxLines"],
@@ -151,12 +154,12 @@ function initPrefs()
          ["dcc.downloadsFolder", getURLSpecFromFile(downloadsPath.path), "dcc"],
          ["dcc.listenPorts",    [],       "dcc.ports"],
          ["dcc.useServerIP",    true,     "dcc"],
-         ["debugMode",          "",       "global"],
+         ["debugMode",          "",       "hidden"],
          ["defaultQuitMsg",     "",       ".connect"],
          ["desc",               "New Now Know How", ".ident"],
          ["deleteOnPart",       true,     "global"],
          ["displayHeader",      true,     "appearance.misc"],
-         ["guessCommands",      true,     "global"],
+         ["guessCommands",      true,     "hidden"],
          ["hasPrefs",           false,    "hidden"],
          ["font.family",        "default", "appearance.misc"],
          ["font.size",          0,        "appearance.misc"],
@@ -168,13 +171,14 @@ function initPrefs()
          ["instrumentation.inst1", 0,    "hidden"],
          ["link.focus",         true,     "global.links"],
          ["log",                false,                                  ".log"],
-         ["logFileName",        makeLogNameClient,                      ".log"],
-         ["logFile.client",     "client.$y-$m-$d.log",                  ".log"],
-         ["logFile.network",    "$(network)/$(network).$y-$m-$d.log",   ".log"],
+         ["logFileName",        makeLogNameClient,                    "hidden"],
+         ["logFile.client",     "client.$y-$m-$d.log",                "hidden"],
+         ["logFile.network",    "$(network)/$(network).$y-$m-$d.log", "hidden"],
          ["logFile.channel",    "$(network)/channels/$(channel).$y-$m-$d.log",
-                                                                        ".log"],
-         ["logFile.user",       "$(network)/users/$(user).$y-$m-$d.log",".log"],
-         ["logFile.dccuser",    "dcc/$(user)/$(user).$y-$m-$d.log",     ".log"],
+                                                                      "hidden"],
+         ["logFile.user",       "$(network)/users/$(user).$y-$m-$d.log",
+                                                                      "hidden"],
+         ["logFile.dccuser",    "dcc/$(user)/$(user).$y-$m-$d.log",   "hidden"],
          ["logFolder",          getURLSpecFromFile(logPath.path), ".log"],
          ["messages.click",     gotos[0],   "global.links"],
          ["messages.ctrlClick", gotos[1],   "global.links"],
@@ -189,7 +193,7 @@ function initPrefs()
          ["motif.current",      "chrome://chatzilla/skin/output-default.css",
                                           "appearance.motif"],
          //["msgBeep",            "beep beep", "global.sounds"],
-         ["multiline",          false,    "global"],
+         ["multiline",          false,    "hidden"],
          ["munger.bold",        true,     "munger"],
          ["munger.bugzilla-link", true,   "munger"],
          ["munger.channel-link",true,     "munger"],
@@ -215,7 +219,7 @@ function initPrefs()
          ["nicknameList",       [],       "lists.nicknameList"],
          ["outgoing.colorCodes",  false,  "global"],
          ["outputWindowURL",   "chrome://chatzilla/content/output-window.html",
-                                          "appearance.misc"],
+                                          "hidden"],
          ["proxy.typeOverride", "",       ".connect"],
          ["sortUsersByMode",    true,     "appearance.userlist"],
          //["queryBeep",          "beep",   "global.sounds"],
@@ -417,6 +421,7 @@ function getNetworkPrefManager(network)
          ["away",             defer, "hidden"],
          ["awayNick",         defer, ".ident"],
          ["bugURL",           defer, "appearance.misc"],
+         ["bugURL.comment",   defer, "appearance.misc"],
          ["charset",          defer, ".connect"],
          ["collapseActions",  defer, "appearance.misc"],
          ["collapseMsgs",     defer, "appearance.misc"],
@@ -435,12 +440,12 @@ function getNetworkPrefManager(network)
          ["identd.enabled",   defer, client.prefManager.identGroup],
          ["ignoreList",       [],    "hidden"],
          ["log",              client.prefs["networkLog"], ".log"],
-         ["logFileName",      makeLogNameNetwork,         ".log"],
+         ["logFileName",      makeLogNameNetwork, "hidden"],
          ["motif.current",    defer, "appearance.motif"],
          ["nickname",         defer, ".ident"],
          ["nicknameList",     defer, "lists.nicknameList"],
          ["notifyList",       [],    "lists.notifyList"],
-         ["outputWindowURL",  defer, "appearance.misc"],
+         ["outputWindowURL",  defer, "hidden"],
          ["proxy.typeOverride", defer, ".connect"],
          ["reconnect",        defer, ".connect"],
          ["timestamps",         defer, "appearance.timestamps"],
@@ -515,6 +520,7 @@ function getChannelPrefManager(channel)
         [
          ["autoRejoin",       defer, ".connect"],
          ["bugURL",           defer, "appearance.misc"],
+         ["bugURL.comment",   defer, "appearance.misc"],
          ["charset",          defer, ".connect"],
          ["collapseActions",  defer, "appearance.misc"],
          ["collapseMsgs",     defer, "appearance.misc"],
@@ -526,12 +532,12 @@ function getChannelPrefManager(channel)
          ["font.size",        defer, "appearance.misc"],
          ["hasPrefs",         false, "hidden"],
          ["log",              client.prefs["channelLog"], ".log"],
-         ["logFileName",      makeLogNameChannel,         ".log"],
+         ["logFileName",      makeLogNameChannel, "hidden"],
          ["motif.current",    defer, "appearance.motif"],
          ["timestamps",         defer, "appearance.timestamps"],
          ["timestamps.display", defer, "appearance.timestamps"],
          ["timestamps.log",     defer, "hidden"],
-         ["outputWindowURL",  defer, "appearance.misc"]
+         ["outputWindowURL",  defer, "hidden"]
         ];
 
     var branch = "extensions.irc.networks." + pref_mungeName(network.encodedName) +
@@ -580,9 +586,9 @@ function getUserPrefManager(user)
          ["font.size",        defer, "appearance.misc"],
          ["hasPrefs",         false, "hidden"],
          ["motif.current",    defer, "appearance.motif"],
-         ["outputWindowURL",  defer, "appearance.misc"],
+         ["outputWindowURL",  defer, "hidden"],
          ["log",              client.prefs["userLog"], ".log"],
-         ["logFileName",      makeLogNameUser,         ".log"],
+         ["logFileName",      makeLogNameUser, "hidden"],
          ["timestamps",         defer, "appearance.timestamps"],
          ["timestamps.display", defer, "appearance.timestamps"],
          ["timestamps.log",     defer, "hidden"]
@@ -626,9 +632,9 @@ function getDCCUserPrefManager(user)
          ["font.size",        defer, "appearance.misc"],
          ["hasPrefs",         false, "hidden"],
          ["motif.current",    defer, "appearance.motif"],
-         ["outputWindowURL",  defer, "appearance.misc"],
+         ["outputWindowURL",  defer, "hidden"],
          ["log",              client.prefs["dccUserLog"], ".log"],
-         ["logFileName",      makeLogNameUser,            ".log"],
+         ["logFileName",      makeLogNameUser, "hidden"],
          ["timestamps",         defer, "appearance.timestamps"],
          ["timestamps.display", defer, "appearance.timestamps"],
          ["timestamps.log",     defer, "hidden"]
@@ -660,6 +666,11 @@ function onPrefChanged(prefName, newValue, oldValue)
 {
     switch (prefName)
     {
+        case "awayIdleTime":
+            uninitIdleAutoAway(oldValue);
+            initIdleAutoAway(newValue);
+            break;
+
         case "channelMaxLines":
             CIRCChannel.prototype.MAX_MESSAGES = newValue;
             break;
@@ -701,6 +712,10 @@ function onPrefChanged(prefName, newValue, oldValue)
             CIRCNetwork.prototype.PROXY_TYPE_OVERRIDE = newValue;
             break;
 
+        case "reconnect":
+            CIRCNetwork.prototype.stayingPower = newValue;
+            break;
+
         case "showModeSymbols":
             if (newValue)
                 setListMode("symbol");
diff --git a/extensions/irc/xul/content/static.js b/extensions/irc/xul/content/static.js
index 1fbfa81..42630dd 100644
--- a/extensions/irc/xul/content/static.js
+++ b/extensions/irc/xul/content/static.js
@@ -39,11 +39,11 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-const __cz_version   = "0.9.79";
+const __cz_version   = "0.9.80";
 const __cz_condition = "green";
 const __cz_suffix    = "";
 const __cz_guid      = "59c81df5-4b7a-477b-912d-4e0fdf64e5f2";
-const __cz_locale    = "0.9.79";
+const __cz_locale    = "0.9.80";
 
 var warn;
 var ASSERT;
@@ -205,6 +205,8 @@ function init()
     client.busy = false;
     updateProgress();
     initOfflineIcon();
+    client.isIdleAway = false;
+    initIdleAutoAway(client.prefs["awayIdleTime"]);
 
     client.initialized = true;
 
@@ -282,6 +284,9 @@ function initStatic()
         dd("Locale-correct date formatting failed to initialize: " + ex);
     }
 
+    // XXX Bug 335998: See cmdHideView for usage of this.
+    client.hiddenDocument = document.implementation.createDocument(null, null, null);
+
     multilineInputMode(client.prefs["multiline"]);
     updateSpellcheck(client.prefs["inputSpellcheck"]);
     if (client.prefs["showModeSymbols"])
@@ -352,6 +357,10 @@ function initStatic()
 
     client.statusBar["server-nick"] = document.getElementById("server-nick");
 
+    client.tabs = document.getElementById("views-tbar-inner");
+    client.tabDragBar = document.getElementById("tabs-drop-indicator-bar");
+    client.tabDragMarker = document.getElementById("tabs-drop-indicator");
+
     client.statusElement = document.getElementById("status-text");
     client.defaultStatus = MSG_DEFAULT_STATUS;
 
@@ -856,8 +865,15 @@ function processStartupURLs()
     }
 
     if (client.viewsArray.length > 1 && !isStartupURL("irc://"))
+        dispatch("delete-view", { view: client });
+
+    /* XXX: If we have the "stop XBL breaking" hidden tab, remove it, to
+     * stop XBL breaking later. Oh, the irony.
+     */
+    if (client.tabs.firstChild.hidden)
     {
-        dispatch("delete-view", {view: client});
+        client.tabs.removeChild(client.tabs.firstChild);
+        updateTabAttributes();
     }
 }
 
@@ -1108,6 +1124,7 @@ function getUserlistContext(cx)
             cx.canonNick = user.canonicalName;
         }
     }
+    cx.userCount = cx.userList.length;
 
     return cx;
 }
@@ -1164,25 +1181,9 @@ function getFontContext(cx)
     return cx;
 }
 
-function msgIsImportant (msg, sourceNick, network)
+function msgIsImportant(msg, sourceNick, network)
 {
-    /* This is a huge hack, but it works. What we want is to match against the
-     * plain text of a message, ignoring color codes, bold, etc. so we put it
-     * through the munger. This produces a tree of HTML elements, which we use
-     * |.innerHTML| to convert to a textual representation.
-     *
-     * Then we remove all the HTML tags, using a RegExp.
-     *
-     * It certainly isn't ideal, and there has to be a better way, but it:
-     *   a) works, and
-     *   b) is fast enough to not cause problems,
-     * so it will do for now.
-     *
-     * Note also that we don't want to log URLs munged here, or generally do
-     * any state-changing stuff.
-     */
-    var plainMsg = client.munger.munge(msg, null, { noStateChange: true });
-    plainMsg = plainMsg.innerHTML.replace(/<[^>]+>/g, "");
+    var plainMsg = removeColorCodes(msg);
 
     var re = network.stalkExpression;
     if (plainMsg.search(re) != -1 || sourceNick && sourceNick.search(re) == 0)
@@ -1652,7 +1653,7 @@ function doObjectURLtest()
 }
 
 
-function gotoIRCURL (url)
+function gotoIRCURL(url, e)
 {
     var urlspec = url;
     if (typeof url == "string")
@@ -1660,7 +1661,7 @@ function gotoIRCURL (url)
 
     if (!url)
     {
-        window.alert (getMsg(MSG_ERR_BAD_IRCURL, urlspec));
+        window.alert(getMsg(MSG_ERR_BAD_IRCURL, urlspec));
         return;
     }
 
@@ -1670,7 +1671,9 @@ function gotoIRCURL (url)
          * urls that don't have a host.  (irc:/// implies a connect to the
          * default network.)
          */
+        client.pendingViewContext = e;
         dispatch("client");
+        delete client.pendingViewContext;
         return;
     }
 
@@ -1719,11 +1722,12 @@ function gotoIRCURL (url)
                     }
                 }
 
-                
+                client.pendingViewContext = e;
                 var params = {hostname: url.host, port: url.port,
                               password: pass};
                 var cmd = (url.scheme == "ircs" ? "sslserver" : "server");
                 network = dispatch(cmd, params);
+                delete client.pendingViewContext;
             }
 
             if (!url.target)
@@ -1731,7 +1735,7 @@ function gotoIRCURL (url)
 
             if (!("pendingURLs" in network))
                 network.pendingURLs = new Array();
-            network.pendingURLs.unshift(url);
+            network.pendingURLs.unshift({ url: url, e: e });
             return;
         }
     }
@@ -1753,14 +1757,18 @@ function gotoIRCURL (url)
             */
             var secure = (url.scheme == "ircs" ? true : false);
             if (!network.isConnected())
+            {
+                client.pendingViewContext = e;
                 client.connectToNetwork(network, secure);
+                delete client.pendingViewContext;
+            }
 
             if (!url.target)
                 return;
 
             if (!("pendingURLs" in network))
                 network.pendingURLs = new Array();
-            network.pendingURLs.unshift(url);
+            network.pendingURLs.unshift({ url: url, e: e });
             return;
         }
     }
@@ -1779,7 +1787,9 @@ function gotoIRCURL (url)
             if (ary)
                 nick = ary[0];
 
+            client.pendingViewContext = e;
             targetObject = network.dispatch("query", {nickname: nick});
+            delete client.pendingViewContext;
         }
         else
         {
@@ -1795,9 +1805,11 @@ function gotoIRCURL (url)
 
             if (url.charset)
             {
+                client.pendingViewContext = e;
                 var d = { channelName: url.target, key: key,
                           charset: url.charset };
                 targetObject = network.dispatch("join", d);
+                delete client.pendingViewContext;
             }
             else
             {
@@ -1819,9 +1831,11 @@ function gotoIRCURL (url)
 
                 var chan = new CIRCChannel(serv, null, target);
 
+                client.pendingViewContext = e;
                 d = { channelName: chan.unicodeName, key: key,
                       charset: url.charset };
                 targetObject = network.dispatch("join", d);
+                delete client.pendingViewContext;
             }
 
             if (!targetObject)
@@ -1830,6 +1844,7 @@ function gotoIRCURL (url)
 
         if (url.msg)
         {
+            client.pendingViewContext = e;
             var msg;
             if (url.msg.indexOf("\01ACTION") == 0)
             {
@@ -1845,13 +1860,16 @@ function gotoIRCURL (url)
             }
             targetObject.say(msg);
             dispatch("set-current-view", { view: targetObject });
+            delete client.pendingViewContext;
         }
     }
     else
     {
+        client.pendingViewContext = e;
         if (!network.messages)
-            network.displayHere (getMsg(MSG_NETWORK_OPENED, network.unicodeName));
+            network.displayHere(getMsg(MSG_NETWORK_OPENED, network.unicodeName));
         dispatch("set-current-view", { view: network });
+        delete client.pendingViewContext;
     }
 }
 
@@ -2090,6 +2108,77 @@ function uninitOfflineIcon()
     }
 }
 
+client.idleObserver = {
+    QueryInterface: function io_qi(iid)
+    {
+        if (!iid || (!iid.equals(Components.interfaces.nsIObserver) &&
+                     !iid.equals(Components.interfaces.nsISupports)))
+        {
+            throw Components.results.NS_ERROR_NO_INTERFACE;
+        }
+        return this;
+    },
+    observe: function io_observe(subject, topic, data)
+    {
+        if ((topic == "idle") && !client.prefs["away"])
+        {
+            if (!client.prefs["awayIdleMsg"])
+                client.prefs["awayIdleMsg"] = MSG_AWAY_IDLE_DEFAULT;
+            client.dispatch("idle-away", {reason: client.prefs["awayIdleMsg"]});
+            client.isIdleAway = true;
+        }
+        else if ((topic == "back") && client.isIdleAway)
+        {
+            client.dispatch("idle-back");
+            client.isIdleAway = false;
+        }
+    }
+};
+
+function initIdleAutoAway(timeout)
+{
+    // Don't try to do anything if we are disabled
+    if (!timeout)
+        return;
+
+    var is = getService("@mozilla.org/widget/idleservice;1", "nsIIdleService");
+    if (!is)
+    {
+        display(MSG_ERR_NO_IDLESERVICE, MT_WARN);
+        client.prefs["autoIdleTime"] = 0;
+        return;
+    }
+
+    try
+    {
+        is.addIdleObserver(client.idleObserver, timeout * 60);
+    }
+    catch (ex)
+    {
+        display(formatException(ex), MT_ERROR);
+    }
+}
+
+function uninitIdleAutoAway(timeout)
+{
+    // Don't try to do anything if we were disabled before
+    if (!timeout)
+        return;
+
+    var is = getService("@mozilla.org/widget/idleservice;1", "nsIIdleService");
+    if (!is)
+        return;
+
+    try
+    {
+        is.removeIdleObserver(client.idleObserver, timeout * 60);
+    }
+    catch (ex)
+    {
+        display(formatException(ex), MT_ERROR);
+    }
+}
+
 function updateAppMotif(motifURL)
 {
     var node = document.firstChild;
@@ -2429,7 +2518,11 @@ function setCurrentObject (obj)
         return;
 
     if ("currentObject" in client && client.currentObject == obj)
+    {
+        if (typeof client.pendingViewContext == "object")
+            dispatch("create-tab-for-view", { view: obj });
         return;
+    }
 
     // Set window.content to make screenreader apps find the chat content.
     if (obj.frame && getContentWindow(obj.frame))
@@ -2445,17 +2538,12 @@ function setCurrentObject (obj)
 
     client.currentObject = obj;
 
-    /* If the splitter's collapsed, the userlist *isn't* visible, but we'll not
-     * get told when it becomes visible, so update it even if it's only the
-     * splitter visible. */
-    if (isVisible("user-list-box") || isVisible("main-splitter"))
+    // Update userlist:
+    userList.view = null;
+    if (obj.TYPE == "IRCChannel")
     {
-        userList.view = null;
-        if (obj.TYPE == "IRCChannel")
-        {
-            userList.view = obj.userList;
-            updateUserList();
-        }
+        userList.view = obj.userList;
+        updateUserList();
     }
 
     tb = dispatch("create-tab-for-view", { view: obj });
@@ -2467,7 +2555,7 @@ function setCurrentObject (obj)
 
     var vk = Number(tb.getAttribute("viewKey"));
     delete client.activityList[vk];
-    client.deck.selectedIndex = vk;
+    client.deck.selectedPanel = obj.frame;
 
     // Style userlist and the like:
     updateAppMotif(obj.prefs["motif.current"]);
@@ -2744,13 +2832,15 @@ function getFrameForDOMWindow(window)
 
 function replaceColorCodes(msg)
 {
-    // find things that look like URLs and escape the color code inside of those to
-    // prevent munging the URLs resulting in broken links
+    // Find things that look like URLs and escape the color code inside of those
+    // to prevent munging the URLs resulting in broken links. Leave codes at
+    // the start of the URL alone.
     msg = msg.replace(new RegExp(client.linkRE.source, "g"), function(url) {
         return url.replace(/%[BC][0-9A-Fa-f]/g, function(hex, index) {
             // as JS does not support lookbehind and we don't want to consume the
             // preceding character, we test for an existing %% manually
-            return (("%" == url.substr(index - 1, 1)) ? "" : "%") + hex;
+            var needPercent = ("%" == url.substr(index - 1, 1)) || (index == 0);
+            return (needPercent ? "" : "%") + hex;
         });
     });
     
@@ -2780,6 +2870,14 @@ function decodeColorCodes(msg)
     return msg;
 }
 
+function removeColorCodes(msg)
+{
+    msg = msg.replace(/[\x1f\x02\x0f\x16]/g, "");
+    // We need this to be global:
+    msg = msg.replace(new RegExp(client.colorRE.source, "g"), "");
+    return msg;
+}
+
 client.progressListener = new Object();
 
 client.progressListener.QueryInterface =
@@ -2947,24 +3045,20 @@ function createMessages(source)
     source.messageCount = 0;
 }
 
-/* gets the toolbutton associated with an object
- * if |create| is present, and true, create if not found */
-function getTabForObject (source, create)
+/* Gets the <tab> element associated with a view object.
+ * If |create| is present, and true, tab is created if not found.
+ */
+function getTabForObject(source, create)
 {
     var name;
 
     if (!ASSERT(source, "UNDEFINED passed to getTabForObject"))
         return null;
 
-    if ("viewName" in source)
-    {
-        name = source.viewName;
-    }
-    else
-    {
-        ASSERT(0, "INVALID OBJECT passed to getTabForObject");
+    if (!ASSERT("viewName" in source, "INVALID OBJECT in getTabForObject"))
         return null;
-    }
+
+    name = source.viewName;
 
     var tb, id = "tb[" + name + "]";
     var matches = 1;
@@ -2981,12 +3075,47 @@ function getTabForObject (source, create)
                 id = "tb[" + name + "<" + (++matches) + ">]";
     }
 
-    if (!tb && create) /* not found, create one */
+    /* If we found a <tab>, are allowed to create it, and have a pending view
+     * context, then we're expected to move the existing tab according to said
+     * context. We do that by removing the tab here, and below the creation
+     * code (which is not run) we readd it in the correct location.
+     */
+    if (tb && create && (typeof client.pendingViewContext == "object"))
+    {
+        /* If we're supposed to insert before ourselves, or the next <tab>,
+         * then bail out (since it's a no-op).
+         */
+        var tabBefore = client.pendingViewContext.tabInsertBefore;
+        if (tabBefore)
+        {
+            var tbAfter = tb.nextSibling;
+            while (tbAfter && tbAfter.collapsed && tbAfter.hidden)
+                tbAfter = tbAfter.nextSibling;
+            if ((tabBefore == tb) || (tabBefore == tbAfter))
+                return tb;
+        }
+
+        var viewKey = Number(tb.getAttribute("viewKey"));
+        arrayRemoveAt(client.viewsArray, viewKey);
+        for (i = viewKey; i < client.viewsArray.length; i++)
+            client.viewsArray[i].tb.setAttribute("viewKey", i);
+        client.tabs.removeChild(tb);
+    }
+    else if (tb || (!tb && !create))
+    {
+        /* Either: we have a tab and don't want it moved, or didn't find one
+         * and don't wish to create one.
+         */
+        return tb;
+    }
+
+    // Didn't found a <tab>, but we're allowed to create one.
+    if (!tb && create)
     {
         if (!("messages" in source) || source.messages == null)
             createMessages(source);
-        var views = document.getElementById ("views-tbar-inner");
-        tb = document.createElement ("tab");
+
+        tb = document.createElement("tab");
         tb.setAttribute("ondraggesture",
                         "nsDragAndDrop.startDrag(event, tabDNDObserver);");
         tb.setAttribute("href", source.getURL());
@@ -2999,25 +3128,16 @@ function getTabForObject (source, create)
         tb.setAttribute("class", "tab-bottom view-button");
         tb.setAttribute("id", id);
         tb.setAttribute("state", "normal");
-
-        client.viewsArray.push ({source: source, tb: tb});
-        tb.setAttribute ("viewKey", client.viewsArray.length - 1);
+        tb.setAttribute("label", name + (matches > 1 ? "<" + matches + ">" : ""));
         tb.view = source;
 
-        if (matches > 1)
-            tb.setAttribute("label", name + "<" + matches + ">");
-        else
-            tb.setAttribute("label", name);
-
-        views.appendChild(tb);
-
-        var browser = document.createElement ("browser");
+        var browser = document.createElement("browser");
         browser.setAttribute("class", "output-container");
         browser.setAttribute("type", "content");
         browser.setAttribute("flex", "1");
         browser.setAttribute("tooltip", "html-tooltip-node");
         browser.setAttribute("context", "context:messages");
-        //browser.setAttribute ("onload", "scrollDown(true);");
+        //browser.setAttribute("onload", "scrollDown(true);");
         browser.setAttribute("onclick",
                              "return onMessageViewClick(event)");
         browser.setAttribute("onmousedown",
@@ -3033,8 +3153,8 @@ function getTabForObject (source, create)
         browser.source = source;
         source.frame = browser;
         ASSERT(client.deck, "no deck?");
-        client.deck.appendChild (browser);
-        syncOutputFrame (source);
+        client.deck.appendChild(browser);
+        syncOutputFrame(source);
 
         if (!("userList" in source) && (source.TYPE == "IRCChannel"))
         {
@@ -3045,8 +3165,94 @@ function getTabForObject (source, create)
         }
     }
 
+    var beforeTab = null;
+    if (typeof client.pendingViewContext == "object")
+    {
+        var c = client.pendingViewContext;
+        /* If we have a <tab> to insert before, and it is still in the tabs,
+         * move the newly-created <tab> into the right place.
+         */
+        if (c.tabInsertBefore && (c.tabInsertBefore.parentNode == client.tabs))
+            beforeTab = c.tabInsertBefore;
+    }
+
+    if (beforeTab)
+    {
+        var viewKey = beforeTab.getAttribute("viewKey");
+        arrayInsertAt(client.viewsArray, viewKey, {source: source, tb: tb});
+        for (i = viewKey; i < client.viewsArray.length; i++)
+            client.viewsArray[i].tb.setAttribute("viewKey", i);
+        client.tabs.insertBefore(tb, beforeTab);
+    }
+    else
+    {
+        client.viewsArray.push({source: source, tb: tb});
+        tb.setAttribute("viewKey", client.viewsArray.length - 1);
+        client.tabs.appendChild(tb);
+    }
+
+    updateTabAttributes();
+
     return tb;
+}
+
+function updateTabAttributes()
+{
+    /* XXX: Workaround for Gecko bugs 272646 and 261826. Note that this breaks
+     * the location of the spacers before and after the tabs but, due to our
+     * own <spacer>, their flex was not being utilised anyway.
+     */
+    var tabOrdinal = 0;
+    for (var tab = client.tabs.firstChild; tab; tab = tab.nextSibling)
+        tab.ordinal = tabOrdinal++;
+
+    /* XXX: Workaround for tabbox.xml not coping with updating attributes when
+     * tabs are moved. We correct the "first-tab", "last-tab", "beforeselected"
+     * and "afterselected" attributes.
+     *
+     * "last-tab" and "beforeselected" are updated on each valid (non-collapsed
+     * and non-hidden) tab found, to avoid having to work backwards as well as
+     * forwards. "first-tab" and "afterselected" are just set the once each.
+     * |foundSelected| tracks where we are in relation to the selected tab.
+     */
+    var tabAttrs = {
+        "first-tab": null,
+        "last-tab": null,
+        "beforeselected": null,
+        "afterselected": null
+    };
+    var foundSelected = "before";
+    for (tab = client.tabs.firstChild; tab; tab = tab.nextSibling)
+    {
+        if (tab.collapsed || tab.hidden)
+            continue;
+
+        if (!tabAttrs["first-tab"])
+            tabAttrs["first-tab"] = tab;
+        tabAttrs["last-tab"] = tab;
+
+        if ((foundSelected == "before") && tab.selected)
+            foundSelected = "on";
+        else if (foundSelected == "on")
+            foundSelected = "after";
+
+        if (foundSelected == "before")
+            tabAttrs["beforeselected"] = tab;
+        if ((foundSelected == "after") && !tabAttrs["afterselected"])
+            tabAttrs["afterselected"] = tab;
+    }
 
+    // After picking a tab for each attribute, apply them to the tabs.
+    for (tab = client.tabs.firstChild; tab; tab = tab.nextSibling)
+    {
+        for (var attr in tabAttrs)
+        {
+            if (tabAttrs[attr] == tab)
+                tab.setAttribute(attr, "true");
+            else
+                tab.removeAttribute(attr);
+        }
+    }
 }
 
 // Properties getter for user list tree view
@@ -3071,7 +3277,7 @@ function ul_getcellprops(index, column, properties)
 var contentDropObserver = new Object();
 
 contentDropObserver.onDragOver =
-function tabdnd_dover (aEvent, aFlavour, aDragSession)
+function cdnd_dover(aEvent, aFlavour, aDragSession)
 {
     if (aEvent.getPreventDefault())
         return;
@@ -3084,21 +3290,21 @@ function tabdnd_dover (aEvent, aFlavour, aDragSession)
 }
 
 contentDropObserver.onDrop =
-function tabdnd_drop (aEvent, aXferData, aDragSession)
+function cdnd_drop(aEvent, aXferData, aDragSession)
 {
     var url = transferUtils.retrieveURLFromData(aXferData.data,
                                                 aXferData.flavour.contentType);
     if (!url || url.search(client.linkRE) == -1)
         return;
 
-    if (url.search(/\.css$/i) != -1  && confirm (getMsg(MSG_TABDND_DROP, url)))
+    if (url.search(/\.css$/i) != -1  && confirm(getMsg(MSG_TABDND_DROP, url)))
         dispatch("motif", {"motif": url});
     else if (url.search(/^ircs?:\/\//i) != -1)
         dispatch("goto-url", {"url": url});
 }
 
 contentDropObserver.getSupportedFlavours =
-function tabdnd_gsf ()
+function cdnd_gsf()
 {
     var flavourSet = new FlavourSet();
     flavourSet.appendFlavour("text/x-moz-url");
@@ -3107,6 +3313,153 @@ function tabdnd_gsf ()
     return flavourSet;
 }
 
+/* Drag and Drop handler for the <tabs> element.
+ *
+ * XXX: Some of the code below has to work around specific limitations in how
+ * the nsDragAndDrop.js wrapper works. The wrapper greatly simplifies the DnD
+ * code, though, so it's still worth using.
+ * 
+ * XXX: canDrop checks if there is a supported flavour of data because
+ * nsDragAndDrop does not. This will prevent the drag service from thinking
+ * we accept any old data when we don't.
+ * 
+ * XXX: nsDragAndDrop.checkCanDrop does this:
+ *     mDragSession.canDrop = mDragSession.sourceNode != aEvent.target;
+ *     mDragSession.canDrop &= aDragDropObserver.canDrop(...);
+ * As a result, canDrop cannot override the false canDrop value when the source
+ * and target are the same (i.e. the same <tab>). Thus, we override this check
+ * inside onDragOver instead, which is called after canDrop (even if that says
+ * it can't be dropped, luckily). As a result, after nsDragAndDrop has called
+ * canDrop and onDragOver, the drag service's canDrop value is true iff there
+ * is a supported flavour.
+ * 
+ * XXX: onDrop is the only place which checks we're getting an IRC URL, as
+ * accessing the drag data at any other time is both tedious and could
+ * significantly impact the performance of the drag (getting the data can be
+ * very slow).
+ */
+var tabsDropObserver = new Object();
+
+tabsDropObserver.canDrop =
+function tabdnd_candrop(aEvent, aDragSession)
+{
+    if (aEvent.getPreventDefault())
+        return false;
+
+    // See comment above |var tabsDropObserver|.
+    var flavourSet = this.getSupportedFlavours();
+    for (var flavour in flavourSet.flavourTable)
+    {
+        if (aDragSession.isDataFlavorSupported(flavour))
+            return true;
+    }
+    return false;
+}
+
+tabsDropObserver.onDragOver =
+function tabdnd_dover(aEvent, aFlavour, aDragSession)
+{
+    if (aEvent.getPreventDefault())
+        return;
+
+    // See comment above |var tabsDropObserver|.
+    if (aDragSession.sourceNode == aEvent.target)
+        aDragSession.canDrop = true;
+
+    // If we're not accepting the drag, don't show the marker either.
+    if (!aDragSession.canDrop)
+    {
+        client.tabDragBar.collapsed = true;
+        return;
+    }
+
+    /* Locate the tab we're about to drop onto. We split tabs in half, dropping
+     * on the side closest to the mouse, or after the last tab if the mouse is
+     * somewhere beyond all the tabs.
+     */
+    var ltr = (window.getComputedStyle(client.tabs, null).direction == "ltr");
+    var newPosition = client.tabs.firstChild.boxObject.x;
+    for (var dropTab = client.tabs.firstChild; dropTab;
+         dropTab = dropTab.nextSibling)
+    {
+        if (dropTab.collapsed || dropTab.hidden)
+            continue;
+        var bo = dropTab.boxObject;
+        if ((ltr && (aEvent.screenX < bo.screenX + bo.width / 2)) ||
+            (!ltr && (aEvent.screenX > bo.screenX + bo.width / 2)))
+        {
+            break;
+        }
+        newPosition = bo.x + bo.width;
+    }
+
+    // Reposition the drop marker and show it. In that order.
+    client.tabDragMarker.style.MozMarginStart = newPosition + "px";
+    client.tabDragBar.collapsed = false;
+}
+
+tabsDropObserver.onDragExit =
+function tabdnd_dexit(aEvent, aDragSession)
+{
+    if (aEvent.getPreventDefault())
+        return;
+
+    /* We've either stopped being part of a drag operation, or the dragging is
+     * somewhere away from us.
+     */
+    client.tabDragBar.collapsed = true;
+}
+
+tabsDropObserver.onDrop =
+function tabdnd_drop(aEvent, aXferData, aDragSession)
+{
+    // See comment above |var tabsDropObserver|.
+    var url = transferUtils.retrieveURLFromData(aXferData.data,
+                                                aXferData.flavour.contentType);
+    if (!url || !url.match(/^ircs?:/))
+        return;
+
+    // Find the tab to insertBefore() the new one.
+    var ltr = (window.getComputedStyle(client.tabs, null).direction == "ltr");
+    for (var dropTab = client.tabs.firstChild; dropTab;
+         dropTab = dropTab.nextSibling)
+    {
+        if (dropTab.collapsed || dropTab.hidden)
+            continue;
+        var bo = dropTab.boxObject;
+        if ((ltr && (aEvent.screenX < bo.screenX + bo.width / 2)) ||
+            (!ltr && (aEvent.screenX > bo.screenX + bo.width / 2)))
+        {
+            break;
+        }
+    }
+
+    // Check if the URL is already in the views.
+    for (var i = 0; i < client.viewsArray.length; i++)
+    {
+        var view = client.viewsArray[i].source;
+        if (view.getURL() == url)
+        {
+            client.pendingViewContext = { tabInsertBefore: dropTab };
+            dispatch("create-tab-for-view", { view: view });
+            delete client.pendingViewContext;
+            return;
+        }
+    }
+
+    // URL not found in tabs, so force it into life - this may connect/rejoin.
+    gotoIRCURL(url, { tabInsertBefore: dropTab });
+}
+
+tabsDropObserver.getSupportedFlavours =
+function tabdnd_gsf()
+{
+    var flavourSet = new FlavourSet();
+    flavourSet.appendFlavour("text/x-moz-url");
+    flavourSet.appendFlavour("text/unicode");
+    return flavourSet;
+}
+
 var tabDNDObserver = new Object();
 
 tabDNDObserver.onDragStart =
@@ -3141,7 +3494,7 @@ function userlistdnd_dstart(event, transferData, dragAction)
     transferData.data.addDataForFlavour("text/unicode", nickname);
 }
 
-function deleteTab (tb)
+function deleteTab(tb)
 {
     if (!ASSERT(tb.hasAttribute("viewKey"),
                 "INVALID OBJECT passed to deleteTab (" + tb + ")"))
@@ -3149,17 +3502,14 @@ function deleteTab (tb)
         return null;
     }
 
-    var i;
     var key = Number(tb.getAttribute("viewKey"));
 
-    /* re-index higher toolbuttons */
-    for (i = key + 1; i < client.viewsArray.length; i++)
-    {
-        client.viewsArray[i].tb.setAttribute ("viewKey", i - 1);
-    }
+    // Re-index higher tabs.
+    for (var i = key + 1; i < client.viewsArray.length; i++)
+        client.viewsArray[i].tb.setAttribute("viewKey", i - 1);
     arrayRemoveAt(client.viewsArray, key);
-    var tbinner = document.getElementById("views-tbar-inner");
-    tbinner.removeChild(tb);
+    client.tabs.removeChild(tb);
+    updateTabAttributes();
 
     return key;
 }
@@ -3623,6 +3973,14 @@ function __display(message, msgtype, sourceObj, destObj)
     if (!msgtype)
         msgtype = MT_INFO;
 
+    var msgprefix = "";
+    if (msgtype.indexOf("/") != -1)
+    {
+        var ary = msgtype.match(/^(.*)\/(.*)$/);
+        msgtype = ary[1];
+        msgprefix = ary[2];
+    }
+
     var blockLevel = false; /* true if this row should be rendered at block
                              * level, (like, if it has a really long nickname
                              * that might disturb the rest of the layout)     */
@@ -3716,6 +4074,7 @@ function __display(message, msgtype, sourceObj, destObj)
     var msgRow = document.createElementNS(XHTML_NS, "html:tr");
     msgRow.setAttribute("class", "msg");
     msgRow.setAttribute("msg-type", msgtype);
+    msgRow.setAttribute("msg-prefix", msgprefix);
     msgRow.setAttribute("msg-dest", toAttr);
     msgRow.setAttribute("dest-type", toType);
     msgRow.setAttribute("view-type", viewType);
@@ -3735,7 +4094,7 @@ function __display(message, msgtype, sourceObj, destObj)
 
     var canMergeData;
     var msgRowSource, msgRowType, msgRowData;
-    if (fromUser && msgtype.match(/^(PRIVMSG|ACTION|NOTICE)$/))
+    if (fromUser && msgtype.match(/^(PRIVMSG|ACTION|NOTICE|WALLOPS)$/))
     {
         var nick = sourceObj.unicodeName;
         var decorSt = "";
@@ -3799,12 +4158,13 @@ function __display(message, msgtype, sourceObj, destObj)
                 decorEn = "<";
             }
         }
-        // Log the nickname in the same format as we'll let the user copy.
-        logStringPfx += decorSt + nick + decorEn + " ";
 
-        // Mark makes alternate "talkers" show up in different shades.
-        //if (!("mark" in this))
-        //    this.mark = "odd";
+        // Log the nickname in the same format as we'll let the user copy.
+        // If the message has a prefix, show it after a "/".
+        if (msgprefix)
+            logStringPfx += decorSt + nick + "/" + msgprefix + decorEn + " ";
+        else
+            logStringPfx += decorSt + nick + decorEn + " ";
 
         if (!("lastNickDisplayed" in this) || this.lastNickDisplayed != nick)
         {
@@ -3833,10 +4193,35 @@ function __display(message, msgtype, sourceObj, destObj)
         {
             msgRowSource.appendChild(newInlineText(nick));
         }
+        if (msgprefix)
+        {
+            /* We don't style the "/" with chatzilla-decor because the one
+             * thing we don't want is it disappearing!
+             */
+            msgRowSource.appendChild(newInlineText("/", ""));
+            msgRowSource.appendChild(newInlineText(msgprefix,
+                                                   "chatzilla-prefix"));
+        }
         if (decorEn)
             msgRowSource.appendChild(newInlineText(decorEn, "chatzilla-decor"));
         canMergeData = this.prefs["collapseMsgs"];
     }
+    else if (msgprefix)
+    {
+        decorSt = "<";
+        decorEn = ">";
+
+        logStringPfx += decorSt + "/" + msgprefix + decorEn + " ";
+
+        msgRowSource = document.createElementNS(XHTML_NS, "html:td");
+        msgRowSource.setAttribute("class", "msg-user");
+
+        msgRowSource.appendChild(newInlineText(decorSt, "chatzilla-decor"));
+        msgRowSource.appendChild(newInlineText("/", ""));
+        msgRowSource.appendChild(newInlineText(msgprefix, "chatzilla-prefix"));
+        msgRowSource.appendChild(newInlineText(decorEn, "chatzilla-decor"));
+        canMergeData = this.prefs["collapseMsgs"];
+    }
     else
     {
         isSuperfluous = true;
@@ -4020,6 +4405,9 @@ function addHistory (source, obj, mergeData)
             // Are we the same user as last time?
             sameNick = (lastRow.getAttribute("msg-user") ==
                         inobj.getAttribute("msg-user"));
+            // Do we have the same prefix as last time?
+            samePrefix = (lastRow.getAttribute("msg-prefix") ==
+                          inobj.getAttribute("msg-prefix"));
             // Do we have the same destination as last time?
             sameDest = (lastRow.getAttribute("msg-dest") ==
                         inobj.getAttribute("msg-dest"));
@@ -4040,7 +4428,8 @@ function addHistory (source, obj, mergeData)
                              ("collapsemore" in source.motifSettings));
         }
 
-        if (sameNick && sameDest && (haveSameType || !needSameType) &&
+        if (sameNick && samePrefix && sameDest &&
+            (haveSameType || !needSameType) &&
             (!isAction || collapseActions))
         {
             obj = inobj;
diff --git a/extensions/irc/xul/skin/chatzilla.css b/extensions/irc/xul/skin/chatzilla.css
index ce7cf5b..4a1c7f9 100644
--- a/extensions/irc/xul/skin/chatzilla.css
+++ b/extensions/irc/xul/skin/chatzilla.css
@@ -92,6 +92,21 @@ window {
     -moz-box-flex: 10000;
 }
 
+#tabs-drop-indicator-bar {
+    position: relative;
+    margin-top: -3px;
+    -moz-margin-start: -5px;
+    height: 3px;
+}
+
+#tabs-drop-indicator {
+    position: relative;
+    margin-bottom: -8px;
+    width: 11px;
+    height: 11px;
+    background: url(images/drop-indicator-bottom.png) 50% 50% no-repeat;
+}
+
 .view-button {
     /* do NOT set colour, at least not without background. :) */
     text-align: center;
diff --git a/extensions/irc/xul/skin/images/drop-indicator-bottom.png b/extensions/irc/xul/skin/images/drop-indicator-bottom.png
new file mode 100644
index 0000000000000000000000000000000000000000..4196235cd34520f859c05611a6cc2d50f3a46e58
GIT binary patch
literal 416
zcwPaZ0bl-!P)<h;3K|Lk000e1NJLTq000XB000XJ1^@s6sjPP<00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10Ub$1K~xx(eb7H^!e9^v@aIBWGQ1#y_RnTJi3+-#rBf+RQo*t4
z_wb`Q6x_QMA{kuj;NZ}$TakjGxRxe)-`sm0f)GpSZO8rYI35xa<ZC=$`b2n667w{h
z-7WJorvL`ETIrTZg5faq3-J-QT2+-K4jPRs1xV2EzxpTm2%F8SIvfn**kZRcsMoI*
zfS}iV@d1EFqc@)jLA!mSm<d{2Y_~DW<uix~h*GTApWnuq2bTzwBr$5W`hx2^akqQp
zZ8krsRL-$je8f?tJ!@GJVd74w{{8W%!5|Q33#~2ER1ihlo6jGqFb!q~v%nY&W`VVQ
z66+tFUDR5TrUK@Fadx@WDS=tQY)`P8Z$z*U!}rT<$wEZ-`S~xS)|`=F8ZjRL0000<
KMNUMnLSTaW@2mm<

literal 0
HcwPel00001

diff --git a/extensions/schema-validation/public/nsISVSchema.idl b/extensions/schema-validation/public/nsISVSchema.idl
new file mode 100644
index 0000000..09021aa
--- /dev/null
+++ b/extensions/schema-validation/public/nsISVSchema.idl
@@ -0,0 +1,353 @@
+/* -*- 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 Mozilla.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Vidur Apparao <vidur@netscape.com> (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 "nsISupports.idl"
+#include "nsIWebServiceErrorHandler.idl"
+
+interface nsISchema;
+interface nsISchemaType;
+interface nsISchemaSimpleType;
+interface nsISchemaBuiltinType;
+interface nsISchemaListType;
+interface nsISchemaUnionType;
+interface nsISchemaRestrictionType;
+interface nsISchemaComplexType;
+interface nsISchemaParticle;
+interface nsISchemaModelGroup;
+interface nsISchemaAnyParticle;
+interface nsISchemaElement;
+interface nsISchemaAttributeComponent;
+interface nsISchemaAttribute;
+interface nsISchemaAttributeGroup;
+interface nsISchemaAnyAttribute;
+interface nsISchemaFacet;
+
+/**
+ * The collection of loaded schemas. If a schema references other 
+ * schemas (generally through an import), these will be included
+ * in the corresponding collection. 
+ */
+[scriptable, uuid(427c5511-941b-48c0-9abc-8ec9ea5d964b)]
+interface nsISchemaCollection : nsISupports {
+  nsISchema getSchema(in AString targetNamespace);
+  nsISchemaElement getElement(in AString name, in AString aNamespace);
+  nsISchemaAttribute getAttribute(in AString name, in AString aNamespace);
+  nsISchemaType getType(in AString name, in AString aNamespace);
+};
+
+[scriptable, uuid(5caaa64e-e191-11d8-842a-000393b6661a)]
+interface nsISchemaComponent : nsISupports {
+  readonly attribute AString targetNamespace;
+  void resolve(in nsIWebServiceErrorHandler aErrorHandler);
+  void clear();
+};
+
+[scriptable, uuid(236ce1d7-213e-42e7-96ad-79f4cb3282a9)]
+interface nsISchema : nsISchemaComponent {
+  /* Is this necessary? */
+  readonly attribute AString schemaNamespace;
+
+  readonly attribute PRUint32 typeCount;
+  nsISchemaType getTypeByIndex(in PRUint32 index);
+  nsISchemaType getTypeByName(in AString name);
+
+  readonly attribute PRUint32 attributeCount;
+  nsISchemaAttribute getAttributeByIndex(in PRUint32 index);
+  nsISchemaAttribute getAttributeByName(in AString name);
+
+  readonly attribute PRUint32 elementCount;
+  nsISchemaElement getElementByIndex(in PRUint32 index);
+  nsISchemaElement getElementByName(in AString name);
+  
+  readonly attribute PRUint32 attributeGroupCount;
+  nsISchemaAttributeGroup getAttributeGroupByIndex(in PRUint32 index);
+  nsISchemaAttributeGroup getAttributeGroupByName(in AString name);
+
+  readonly attribute PRUint32 modelGroupCount;
+  nsISchemaModelGroup getModelGroupByIndex(in PRUint32 index);
+  nsISchemaModelGroup getModelGroupByName(in AString name);
+
+  readonly attribute nsISchemaCollection collection;
+};
+
+[scriptable, uuid(3c14a022-6f4e-11d5-9b46-000064657374)]
+interface nsISchemaType : nsISchemaComponent {
+  const unsigned short SCHEMA_TYPE_SIMPLE = 1;
+  const unsigned short SCHEMA_TYPE_COMPLEX = 2;
+  const unsigned short SCHEMA_TYPE_PLACEHOLDER = 3;
+
+  readonly attribute AString name;
+  readonly attribute unsigned short schemaType;
+};
+
+[scriptable, uuid(3c14a023-6f4e-11d5-9b46-000064657374)]
+interface nsISchemaSimpleType : nsISchemaType {
+  const unsigned short SIMPLE_TYPE_BUILTIN = 1;
+  const unsigned short SIMPLE_TYPE_LIST = 2;
+  const unsigned short SIMPLE_TYPE_UNION = 3;
+  const unsigned short SIMPLE_TYPE_RESTRICTION = 4;
+
+  readonly attribute unsigned short simpleType;
+};
+
+[scriptable, uuid(3c14a024-6f4e-11d5-9b46-000064657374)]
+interface nsISchemaBuiltinType : nsISchemaSimpleType {
+  const unsigned short BUILTIN_TYPE_ANYTYPE = 1;
+  const unsigned short BUILTIN_TYPE_STRING = 2;
+  const unsigned short BUILTIN_TYPE_NORMALIZED_STRING = 3;
+  const unsigned short BUILTIN_TYPE_TOKEN = 4;
+  const unsigned short BUILTIN_TYPE_BYTE = 5;
+  const unsigned short BUILTIN_TYPE_UNSIGNEDBYTE = 6;
+  const unsigned short BUILTIN_TYPE_BASE64BINARY = 7;
+  const unsigned short BUILTIN_TYPE_HEXBINARY = 8;
+  const unsigned short BUILTIN_TYPE_INTEGER = 9;
+  const unsigned short BUILTIN_TYPE_POSITIVEINTEGER = 10;
+  const unsigned short BUILTIN_TYPE_NEGATIVEINTEGER = 11;
+  const unsigned short BUILTIN_TYPE_NONNEGATIVEINTEGER = 12;
+  const unsigned short BUILTIN_TYPE_NONPOSITIVEINTEGER = 13;
+  const unsigned short BUILTIN_TYPE_INT = 14;
+  const unsigned short BUILTIN_TYPE_UNSIGNEDINT = 15;
+  const unsigned short BUILTIN_TYPE_LONG = 16;
+  const unsigned short BUILTIN_TYPE_UNSIGNEDLONG = 17;
+  const unsigned short BUILTIN_TYPE_SHORT = 18;
+  const unsigned short BUILTIN_TYPE_UNSIGNEDSHORT = 19;
+  const unsigned short BUILTIN_TYPE_DECIMAL = 20;
+  const unsigned short BUILTIN_TYPE_FLOAT = 21;
+  const unsigned short BUILTIN_TYPE_DOUBLE = 22;
+  const unsigned short BUILTIN_TYPE_BOOLEAN = 23;
+  const unsigned short BUILTIN_TYPE_TIME = 24;
+  const unsigned short BUILTIN_TYPE_DATETIME = 25;
+  const unsigned short BUILTIN_TYPE_DURATION = 26;
+  const unsigned short BUILTIN_TYPE_DATE = 27;
+  const unsigned short BUILTIN_TYPE_GMONTH = 28;
+  const unsigned short BUILTIN_TYPE_GYEAR = 29;
+  const unsigned short BUILTIN_TYPE_GYEARMONTH = 30;
+  const unsigned short BUILTIN_TYPE_GDAY = 31;
+  const unsigned short BUILTIN_TYPE_GMONTHDAY = 32;
+  const unsigned short BUILTIN_TYPE_NAME = 33;
+  const unsigned short BUILTIN_TYPE_QNAME = 34;
+  const unsigned short BUILTIN_TYPE_NCNAME = 35;
+  const unsigned short BUILTIN_TYPE_ANYURI = 36;
+  const unsigned short BUILTIN_TYPE_LANGUAGE = 37;
+  const unsigned short BUILTIN_TYPE_ID = 38;
+  const unsigned short BUILTIN_TYPE_IDREF = 39;
+  const unsigned short BUILTIN_TYPE_IDREFS = 40;
+  const unsigned short BUILTIN_TYPE_ENTITY = 41;
+  const unsigned short BUILTIN_TYPE_ENTITIES = 42;
+  const unsigned short BUILTIN_TYPE_NOTATION = 43;
+  const unsigned short BUILTIN_TYPE_NMTOKEN = 44;
+  const unsigned short BUILTIN_TYPE_NMTOKENS = 45;
+
+  readonly attribute unsigned short builtinType;
+};
+
+[scriptable, uuid(3c14a025-6f4e-11d5-9b46-000064657374)]
+interface nsISchemaListType : nsISchemaSimpleType {
+  readonly attribute nsISchemaSimpleType listType;
+};
+
+[scriptable, uuid(3c14a026-6f4e-11d5-9b46-000064657374)]
+interface nsISchemaUnionType : nsISchemaSimpleType {
+  readonly attribute PRUint32 unionTypeCount;
+  nsISchemaSimpleType getUnionType(in PRUint32 index);
+};
+
+[scriptable, uuid(3c14a027-6f4e-11d5-9b46-000064657374)]
+interface nsISchemaRestrictionType : nsISchemaSimpleType {
+  readonly attribute nsISchemaSimpleType baseType;
+  readonly attribute PRUint32 facetCount;
+  nsISchemaFacet getFacet(in PRUint32 index);
+};
+
+[scriptable, uuid(3c14a028-6f4e-11d5-9b46-000064657374)]
+interface nsISchemaComplexType : nsISchemaType {
+  const unsigned short CONTENT_MODEL_EMPTY = 1;
+  const unsigned short CONTENT_MODEL_SIMPLE = 2;
+  const unsigned short CONTENT_MODEL_ELEMENT_ONLY = 3;
+  const unsigned short CONTENT_MODEL_MIXED = 4;
+
+  const unsigned short DERIVATION_EXTENSION_SIMPLE = 1;
+  const unsigned short DERIVATION_RESTRICTION_SIMPLE = 2;
+  const unsigned short DERIVATION_EXTENSION_COMPLEX = 3;
+  const unsigned short DERIVATION_RESTRICTION_COMPLEX = 4;  
+  const unsigned short DERIVATION_SELF_CONTAINED = 5; // Restriction of ur-type
+
+  readonly attribute unsigned short contentModel;
+  readonly attribute unsigned short derivation;
+  readonly attribute nsISchemaType baseType;
+
+  // For complex types that are derivations of simple types or of
+  // complex types that are themselves derivations of simple types
+  // i.e. derivation is either DERIVATION_RESTRICTION_SIMPLE or
+  // DERIVATION_EXTENSION_SIMPLE.
+  readonly attribute nsISchemaSimpleType simpleBaseType; 
+
+  readonly attribute nsISchemaModelGroup modelGroup;
+  
+  readonly attribute PRUint32 attributeCount;
+  nsISchemaAttributeComponent getAttributeByIndex(in PRUint32 index);
+  nsISchemaAttributeComponent getAttributeByName(in AString name);
+
+  readonly attribute boolean abstract;
+  
+  readonly attribute boolean isArray;
+  readonly attribute nsISchemaType arrayType;
+  readonly attribute PRUint32 arrayDimension;
+};
+
+[scriptable, uuid(3c14a029-6f4e-11d5-9b46-000064657374)]
+interface nsISchemaParticle : nsISchemaComponent {
+  const unsigned short PARTICLE_TYPE_ELEMENT = 1;
+  const unsigned short PARTICLE_TYPE_MODEL_GROUP = 2;
+  const unsigned short PARTICLE_TYPE_ANY = 3;
+
+  const PRUint32 OCCURRENCE_UNBOUNDED = 0xFFFFFFFF;
+
+  readonly attribute AString name;
+  readonly attribute unsigned short particleType;
+
+  readonly attribute PRUint32 minOccurs;
+  readonly attribute PRUint32 maxOccurs;  
+};
+
+[scriptable, uuid(3c14a02a-6f4e-11d5-9b46-000064657374)]
+interface nsISchemaModelGroup : nsISchemaParticle {
+  const unsigned short COMPOSITOR_ALL = 1;
+  const unsigned short COMPOSITOR_SEQUENCE = 2;
+  const unsigned short COMPOSITOR_CHOICE = 3;
+
+  readonly attribute unsigned short compositor;
+
+  readonly attribute PRUint32 particleCount;
+  nsISchemaParticle getParticle(in PRUint32 index);
+
+  // Get named element definition for a named element that is
+  // part of this model group or part of a nested model group.
+  nsISchemaElement getElementByName(in AString name);
+};
+
+[scriptable, uuid(3c14a02b-6f4e-11d5-9b46-000064657374)]
+interface nsISchemaAnyParticle : nsISchemaParticle {
+  const unsigned short PROCESS_STRICT = 1;
+  const unsigned short PROCESS_SKIP = 2;
+  const unsigned short PROCESS_LAX = 3;
+
+  readonly attribute unsigned short process;
+  readonly attribute AString namespace;
+};
+
+[scriptable, uuid(3c14a02c-6f4e-11d5-9b46-000064657374)]
+interface nsISchemaElement : nsISchemaParticle {
+  readonly attribute nsISchemaType type;
+
+  readonly attribute AString defaultValue;
+  readonly attribute AString fixedValue;
+
+  readonly attribute boolean nillable;
+  readonly attribute boolean abstract; 
+};
+
+[scriptable, uuid(3c14a02d-6f4e-11d5-9b46-000064657374)]
+interface nsISchemaAttributeComponent : nsISchemaComponent {
+  const unsigned short COMPONENT_TYPE_ATTRIBUTE = 1;
+  const unsigned short COMPONENT_TYPE_GROUP = 2;
+  const unsigned short COMPONENT_TYPE_ANY = 3;
+  
+  readonly attribute AString name;
+  readonly attribute unsigned short componentType;
+};
+
+[scriptable, uuid(47241e70-ca2c-4372-a6b2-5c84d32cc739)]
+interface nsISchemaAttribute : nsISchemaAttributeComponent {
+  const unsigned short USE_OPTIONAL = 1;
+  const unsigned short USE_PROHIBITED = 2;
+  const unsigned short USE_REQUIRED = 3;
+
+  readonly attribute nsISchemaSimpleType type;
+ 
+  readonly attribute AString defaultValue;
+  readonly attribute AString fixedValue;
+  readonly attribute unsigned short use;
+
+  readonly attribute AString qualifiedNamespace;
+};
+
+[scriptable, uuid(3c14a02f-6f4e-11d5-9b46-000064657374)]
+interface nsISchemaAttributeGroup : nsISchemaAttributeComponent {
+  readonly attribute PRUint32 attributeCount;
+  nsISchemaAttributeComponent getAttributeByIndex(in PRUint32 index);
+  nsISchemaAttributeComponent getAttributeByName(in AString name);
+};
+
+[scriptable, uuid(3c14a030-6f4e-11d5-9b46-000064657374)]
+interface nsISchemaAnyAttribute : nsISchemaAttributeComponent {
+  const unsigned short PROCESS_STRICT = 1;
+  const unsigned short PROCESS_SKIP = 2;
+  const unsigned short PROCESS_LAX = 3;
+
+  readonly attribute unsigned short process;
+  readonly attribute AString namespace;
+};
+
+[scriptable, uuid(3c14a031-6f4e-11d5-9b46-000064657374)]
+interface nsISchemaFacet : nsISchemaComponent {
+  const unsigned short FACET_TYPE_LENGTH = 1;
+  const unsigned short FACET_TYPE_MINLENGTH = 2;
+  const unsigned short FACET_TYPE_MAXLENGTH = 3;
+  const unsigned short FACET_TYPE_PATTERN = 4;
+  const unsigned short FACET_TYPE_ENUMERATION = 5;
+  const unsigned short FACET_TYPE_WHITESPACE = 6;
+  const unsigned short FACET_TYPE_MAXINCLUSIVE = 7;
+  const unsigned short FACET_TYPE_MININCLUSIVE = 8;
+  const unsigned short FACET_TYPE_MAXEXCLUSIVE = 9;
+  const unsigned short FACET_TYPE_MINEXCLUSIVE = 10;
+  const unsigned short FACET_TYPE_TOTALDIGITS = 11;
+  const unsigned short FACET_TYPE_FRACTIONDIGITS = 12;
+  
+  const unsigned short WHITESPACE_PRESERVE = 1;
+  const unsigned short WHITESPACE_REPLACE = 1;
+  const unsigned short WHITESPACE_COLLAPSE = 1;
+  
+
+  readonly attribute unsigned short facetType;
+  readonly attribute AString value;
+  readonly attribute PRUint32 lengthValue; // For length, minLength & maxLength
+  readonly attribute PRUint32 digitsValue; // For totalDigits & fractionDigits
+  readonly attribute unsigned short whitespaceValue; // For whitespace only
+  readonly attribute boolean isfixed;
+};
diff --git a/extensions/xforms/nsIXFormsActionModuleElement.idl b/extensions/schema-validation/public/nsISVSchemaErrorHandler.idl
similarity index 74%
copy from extensions/xforms/nsIXFormsActionModuleElement.idl
copy to extensions/schema-validation/public/nsISVSchemaErrorHandler.idl
index 414cb8d..53b32b1 100644
--- a/extensions/xforms/nsIXFormsActionModuleElement.idl
+++ b/extensions/schema-validation/public/nsISVSchemaErrorHandler.idl
@@ -12,19 +12,18 @@
  * for the specific language governing rights and limitations under the
  * License.
  *
- * The Original Code is Mozilla XForms support.
+ * The Original Code is the web services error handling.
  *
  * The Initial Developer of the Original Code is
- * Olli Pettay.
+ * Cedric Chantepie (chantepie@altern.org).
  * Portions created by the Initial Developer are Copyright (C) 2004
  * the Initial Developer. All Rights Reserved.
  *
- * Contributor(s):
- *   Olli Pettay <Olli.Pettay@helsinki.fi> (original author)
+ * Contributor(s): 
  *
  * Alternatively, the contents of this file may be used under the terms of
- * either of 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"),
+ * 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
@@ -38,12 +37,7 @@
 
 #include "nsISupports.idl"
 
-interface nsIDOMEvent;
-interface nsIXFormsActionElement;
-
-[uuid(b19c47e4-2478-4a73-91a3-d86f91d91ffd)]
-interface nsIXFormsActionModuleElement : nsISupports
-{
-  void handleAction(in nsIDOMEvent aEvent, in nsIXFormsActionElement aParentAction);
+[scriptable,uuid(068e20e0-df59-11d8-869f-000393b6661a)]
+interface nsIWebServiceErrorHandler : nsISupports {
+  void onError(in nsresult status, in AString statusMessage);
 };
-
diff --git a/extensions/schema-validation/public/nsISVSchemaLoader.idl b/extensions/schema-validation/public/nsISVSchemaLoader.idl
new file mode 100644
index 0000000..956f127
--- /dev/null
+++ b/extensions/schema-validation/public/nsISVSchemaLoader.idl
@@ -0,0 +1,85 @@
+/* -*- 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 Mozilla.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Vidur Apparao <vidur@netscape.com> (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 "nsISupports.idl"
+#include "nsIWebServiceErrorHandler.idl"
+
+interface nsISchema;
+interface nsISchemaType;
+interface nsIDOMElement;
+interface nsISchemaLoadListener;
+
+[scriptable, uuid(9B2F0B4A-8F00-4a78-961A-7E84ED49B0B6)]
+interface nsISchemaLoader : nsISupports {
+  nsISchema load(in AString schemaURI);
+  void loadAsync(in AString schemaURI, 
+                 in nsISchemaLoadListener listener);
+  nsISchema processSchemaElement(in nsIDOMElement element,
+                                 in nsIWebServiceErrorHandler aErrorHandler);
+};
+
+[scriptable, function, uuid(8d9aa9ce-e191-11d8-9f31-000393b6661a)]
+interface nsISchemaLoadListener : nsIWebServiceErrorHandler {
+  void onLoad(in nsISchema schema);
+};
+
+%{ C++
+#define NS_SCHEMALOADER_CID                           \
+{ /* 5adc10f0-74e1-11d5-9b49-00104bdf5339 */          \
+ 0x5adc10f0, 0x74e1, 0x11d5,                          \
+{0x9b, 0x49, 0x00, 0x10, 0x4b, 0xdf, 0x53, 0x39}}     
+
+#define NS_SCHEMALOADER_CONTRACTID "@mozilla.org/xmlextras/schemas/schemaloader;1"
+
+#define NS_BUILTINSCHEMACOLLECTION_CID                \
+{ /* a83b0823-f10e-4235-9859-88a5abd2ed54 */          \
+ 0xa83b0823, 0xf10e, 0x4235,                          \
+{0x98, 0x59, 0x88, 0xa5, 0xab, 0xd2, 0xed, 0x54}}
+
+#define NS_BUILTINSCHEMACOLLECTION_CONTRACTID "@mozilla.org/xmlextras/schemas/builtinschemacollection;1"
+
+#define NS_ERROR_SCHEMA_NOT_SCHEMA_ELEMENT NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GENERAL, 1)
+#define NS_ERROR_SCHEMA_UNKNOWN_TARGET_NAMESPACE NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GENERAL, 2)
+#define NS_ERROR_SCHEMA_UNKNOWN_TYPE NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GENERAL, 3)
+#define NS_ERROR_SCHEMA_UNKNOWN_PREFIX NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GENERAL, 4)
+#define NS_ERROR_SCHEMA_INVALID_STRUCTURE NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GENERAL, 5)
+#define NS_ERROR_SCHEMA_INVALID_TYPE_USAGE NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GENERAL, 6)
+#define NS_ERROR_SCHEMA_MISSING_TYPE NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GENERAL, 7)
+#define NS_ERROR_SCHEMA_FACET_VALUE_ERROR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GENERAL, 8)
+#define NS_ERROR_SCHEMA_LOADING_ERROR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GENERAL, 9)
+%}
diff --git a/extensions/schema-validation/src/Makefile.in b/extensions/schema-validation/src/Makefile.in
index e77f67c..f59630a 100644
--- a/extensions/schema-validation/src/Makefile.in
+++ b/extensions/schema-validation/src/Makefile.in
@@ -55,7 +55,6 @@ EXPORT_LIBRARY	= 1
 MODULE_NAME	= schemavalidation
 endif
 GRE_MODULE      = 1
-MOZILLA_INTERNAL_API = 1
 
 REQUIRES	= xpcom \
 		  string \
@@ -80,12 +79,14 @@ CPPSRCS		= \
 		nsSchemaValidatorUtils.cpp \
 		$(NULL)
 
+
 EXTRA_DSO_LDOPTS = \
 		$(LIBS_DIR) \
-		$(MOZ_COMPONENT_LIBS) \
+		$(MOZ_COMPONENT_NSPR_LIBS) \
 		$(ZLIB_LIBS) \
 		$(MOZ_JS_LIBS) \
-		$(MOZ_UNICHARUTIL_LIBS) \
+		$(LIBXUL_DIST)/lib/$(LIB_PREFIX)unicharutil_external_s.$(LIB_SUFFIX) \
+		$(XPCOM_GLUE_LDOPTS) \
 		$(NULL)
 EXTRA_COMPONENTS = nsSchemaValidatorRegexp.js
 
diff --git a/extensions/schema-validation/src/nsDOMUtils.h b/extensions/schema-validation/src/nsDOMUtils.h
new file mode 100644
index 0000000..9adc0be
--- /dev/null
+++ b/extensions/schema-validation/src/nsDOMUtils.h
@@ -0,0 +1,162 @@
+/* -*- 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 Mozilla.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Vidur Apparao <vidur@netscape.com> (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 ***** */
+
+#ifndef _nsDOMUtils_h__
+#define _nsDOMUtils_h__
+
+// content includes
+#include "nsIContent.h"
+#include "nsIDOMElement.h"
+#include "nsIDOMNode.h"
+#include "nsIDOMNodeList.h"
+
+// string includes
+#include "nsString.h"
+#include "nsReadableUtils.h"
+
+// collection includes
+#include "nsVoidArray.h"
+
+////////////////////////////////////////////////////////////
+//
+// nsChildElementIterator 
+//
+////////////////////////////////////////////////////////////
+
+class nsChildElementIterator {
+private:
+  nsCOMPtr<nsIDOMNodeList> mNodeList;
+  PRUint32 mIndex;
+  PRUint32 mLength;
+  nsString mNamespace;
+  const char** mNamespaceArray;
+  PRUint32 mNumNamespaces;
+
+public:
+  nsChildElementIterator(nsIDOMElement* aParent) :
+    mIndex(0), mLength(0), mNumNamespaces(0)
+  {
+    SetElement(aParent);
+  }    
+  
+  nsChildElementIterator(nsIDOMElement* aParent,
+                         const nsAString& aNamespace) :
+    mIndex(0), mLength(0), mNamespace(aNamespace), mNumNamespaces(0)
+  {
+    SetElement(aParent);
+  }
+
+  nsChildElementIterator(nsIDOMElement* aParent,
+                         const char** aNamespaceArray,
+                         PRUint32 aNumNamespaces) :
+    mIndex(0), mLength(0), mNamespaceArray(aNamespaceArray), 
+    mNumNamespaces(aNumNamespaces)
+  {
+    SetElement(aParent);    
+  }
+
+  ~nsChildElementIterator() {}
+
+  void SetElement(nsIDOMElement* aParent) 
+  {
+    aParent->GetChildNodes(getter_AddRefs(mNodeList));
+    if (mNodeList) {
+      mNodeList->GetLength(&mLength);
+      // if we change the element, reset the index
+      mIndex = 0;
+    }    
+  }
+
+  PRUint32 GetCurrentIndex() { return mIndex; }
+
+  void Reset(PRUint32 aIndex=0) { mIndex = aIndex; }
+
+  PRBool HasChildNodes() { return mLength; }
+
+  nsresult GetNextChild(nsIDOMElement** aChildElement,
+                        nsIAtom** aElementName)
+  {
+    *aChildElement = nsnull;
+    
+    if (!mNodeList) {
+      return NS_ERROR_FAILURE;
+    }
+
+    nsCOMPtr<nsIDOMNode> child; 
+    while (mIndex < mLength) {
+      mNodeList->Item(mIndex++, getter_AddRefs(child));
+      nsCOMPtr<nsIDOMElement> childElement(do_QueryInterface(child));
+      if (!childElement) {
+        continue;
+      }
+      
+      // Confirm that the element is an element of the specified namespace
+      nsAutoString namespaceURI;           
+      childElement->GetNamespaceURI(namespaceURI);  
+      if (!mNamespace.IsEmpty()) {
+        if (!namespaceURI.Equals(mNamespace)) {
+          continue;
+        }
+      }
+      else if (mNumNamespaces) {
+        PRUint32 i;
+        for (i = 0; i < mNumNamespaces; i++) {
+          if (!namespaceURI.Equals(NS_ConvertASCIItoUTF16(mNamespaceArray[i]))) {
+            continue;
+          }
+        }
+      }
+      
+      nsCOMPtr<nsIContent> content(do_QueryInterface(childElement));
+      NS_ASSERTION(content, "Element is not content");
+      if (!content) {
+        return NS_ERROR_FAILURE;
+      }
+      
+      NS_ADDREF(*aElementName = content->Tag());
+
+      *aChildElement = childElement;
+      NS_ADDREF(*aChildElement);
+      break;
+    }
+    
+    return NS_OK;
+  }
+};
+
+#endif // _nsDOMUtils_h__
diff --git a/extensions/schema-validation/src/nsSchema.cpp b/extensions/schema-validation/src/nsSchema.cpp
new file mode 100644
index 0000000..8eaca20
--- /dev/null
+++ b/extensions/schema-validation/src/nsSchema.cpp
@@ -0,0 +1,542 @@
+/* -*- 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 Mozilla.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Vidur Apparao <vidur@netscape.com> (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 "nsSchemaPrivate.h"
+#include "nsReadableUtils.h"
+
+////////////////////////////////////////////////////////////
+//
+// nsSchema implementation
+//
+////////////////////////////////////////////////////////////
+nsSchema::nsSchema(nsISchemaCollection* aCollection,
+                   nsIDOMElement* aSchemaElement) 
+{
+  mCollection = aCollection;  // Weak reference
+  
+  if (aSchemaElement) {
+    const nsAFlatString& empty = EmptyString();
+
+    aSchemaElement->GetAttributeNS(empty, 
+                                   NS_LITERAL_STRING("targetNamespace"), 
+                                   mTargetNamespace);
+    mTargetNamespace.Trim(" \r\n\t");
+    aSchemaElement->GetNamespaceURI(mSchemaNamespace);
+
+    nsAutoString elementFormDefault;
+    aSchemaElement->GetAttributeNS(empty, 
+                                   NS_LITERAL_STRING("elementFormDefault"), 
+                                   elementFormDefault);
+    elementFormDefault.Trim(" \r\n\t");
+    mElementFormQualified = 
+      elementFormDefault.EqualsLiteral("qualified");
+
+    // get the attribute qualification form
+    nsAutoString attributeFormDefault;
+    aSchemaElement->GetAttributeNS(empty,
+                                   NS_LITERAL_STRING("attributeFormDefault"),
+                                   attributeFormDefault);
+
+    // default is unqualified
+    mAttributeFormDefaultQualified =
+      attributeFormDefault.EqualsLiteral("qualified");
+  }
+}
+
+nsSchema::~nsSchema()
+{
+  Clear();
+}
+
+NS_IMPL_ISUPPORTS2_CI(nsSchema, nsISchema, nsISchemaComponent)
+
+nsresult
+nsSchema::Init()
+{
+  PRBool ok = mTypesHash.Init();
+  NS_ENSURE_TRUE(ok, NS_ERROR_FAILURE);
+
+  ok = mAttributesHash.Init();
+  NS_ENSURE_TRUE(ok, NS_ERROR_FAILURE);
+
+  ok = mElementsHash.Init();
+  NS_ENSURE_TRUE(ok, NS_ERROR_FAILURE);
+
+  ok = mAttributeGroupsHash.Init();
+  NS_ENSURE_TRUE(ok, NS_ERROR_FAILURE);
+
+  return mModelGroupsHash.Init() ? NS_OK : NS_ERROR_FAILURE;
+}
+
+/* readonly attribute wstring targetNamespace; */
+NS_IMETHODIMP
+nsSchema::GetTargetNamespace(nsAString& aTargetNamespace)
+{
+  aTargetNamespace.Assign(mTargetNamespace);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchema::GetSchemaNamespace(nsAString& aSchemaNamespace)
+{
+  aSchemaNamespace.Assign(mSchemaNamespace);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchema::Resolve(nsIWebServiceErrorHandler* aErrorHandler)
+{
+  nsresult rv;
+  PRUint32 i, count;
+
+  count = mTypes.Count();
+  for (i = 0; i < count; ++i) {
+    rv = mTypes.ObjectAt(i)->Resolve(aErrorHandler);
+    if (NS_FAILED(rv)) {
+      nsAutoString name;
+      nsresult rc = mTypes.ObjectAt(i)->GetName(name);
+      NS_ENSURE_SUCCESS(rc, rc);
+      
+      nsAutoString errorMsg;
+      errorMsg.AppendLiteral("Failure resolving schema, cannot resolve schema type \"");
+      errorMsg.Append(name);
+      errorMsg.AppendLiteral("\"");
+      
+      NS_SCHEMALOADER_FIRE_ERROR(rv, errorMsg);
+    }
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
+
+  count = mAttributes.Count();
+  for (i = 0; i < count; ++i) {
+    rv = mAttributes.ObjectAt(i)->Resolve(aErrorHandler);
+    if (NS_FAILED(rv)) {
+      nsAutoString name;
+      nsresult rc = mAttributes.ObjectAt(i)->GetName(name);
+      NS_ENSURE_SUCCESS(rc, rc);
+      
+      nsAutoString errorMsg;
+      errorMsg.AppendLiteral("Failure resolving schema, cannot resolve attribute \"");
+      errorMsg.Append(name);
+      errorMsg.AppendLiteral("\"");
+      
+      NS_SCHEMALOADER_FIRE_ERROR(rv, errorMsg);
+    }
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
+
+  count = mElements.Count();
+  for (i = 0; i < count; ++i) {
+    rv = mElements.ObjectAt(i)->Resolve(aErrorHandler);
+    if (NS_FAILED(rv)) {
+      nsAutoString name;
+      nsresult rc = mElements.ObjectAt(i)->GetName(name);
+      NS_ENSURE_SUCCESS(rc, rc);
+      
+      nsAutoString errorMsg;
+      errorMsg.AppendLiteral("Failure resolving schema, cannot resolve element \"");
+      errorMsg.Append(name);
+      errorMsg.AppendLiteral("\"");
+      
+      NS_SCHEMALOADER_FIRE_ERROR(rv, errorMsg);
+    }
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
+
+  count = mAttributeGroups.Count();
+  for (i = 0; i < count; ++i) {
+    rv = mAttributeGroups.ObjectAt(i)->Resolve(aErrorHandler);
+    if (NS_FAILED(rv)) {
+      nsAutoString errorMsg(NS_LITERAL_STRING("Failure resolving schema, "));
+      errorMsg.AppendLiteral("cannot resolve attribute groups");
+      NS_SCHEMALOADER_FIRE_ERROR(rv, errorMsg);
+
+      return rv;
+    }
+  }
+
+  count = mModelGroups.Count();
+  for (i = 0; i < count; ++i) {
+    rv = mModelGroups.ObjectAt(i)->Resolve(aErrorHandler);
+    if (NS_FAILED(rv)) {
+      nsAutoString errorMsg(NS_LITERAL_STRING("Failure resolving schema, "));
+      errorMsg.AppendLiteral("cannot resolve model group");
+      NS_SCHEMALOADER_FIRE_ERROR(rv, errorMsg);
+      
+      return rv;
+    }
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchema::Clear()
+{
+  PRUint32 i, count;
+
+  count = mTypes.Count();
+  for (i = 0; i < count; ++i) {
+    mTypes.ObjectAt(i)->Clear();
+  }
+  mTypes.Clear();
+  mTypesHash.Clear();
+
+  count = mAttributes.Count();
+  for (i = 0; i < count; ++i) {
+    mAttributes.ObjectAt(i)->Clear();
+  }
+  mAttributes.Clear();
+  mAttributesHash.Clear();
+
+  count = mElements.Count();
+  for (i = 0; i < count; ++i) {
+    mElements.ObjectAt(i)->Clear();
+  }
+  mElements.Clear();
+  mElementsHash.Clear();
+
+  count = mAttributeGroups.Count();
+  for (i = 0; i < count; ++i) {
+    mAttributeGroups.ObjectAt(i)->Clear();
+  }
+  mAttributeGroups.Clear();
+  mAttributeGroupsHash.Clear();
+
+  count = mModelGroups.Count();
+  for (i = 0; i < count; ++i) {
+    mModelGroups.ObjectAt(i)->Clear();
+  }
+  mModelGroups.Clear();
+  mModelGroupsHash.Clear();
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchema::GetTypeCount(PRUint32 *aTypeCount)
+{
+  NS_ENSURE_ARG_POINTER(aTypeCount);
+
+  *aTypeCount = mTypes.Count();
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchema::GetTypeByIndex(PRUint32 aIndex, nsISchemaType** aResult)
+{
+  NS_ENSURE_ARG_POINTER(aResult);
+
+  if (aIndex >= (PRUint32)mTypes.Count()) {
+    return NS_ERROR_FAILURE;
+  }
+
+  NS_ADDREF(*aResult = mTypes.ObjectAt(aIndex));
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchema::GetTypeByName(const nsAString& aName, nsISchemaType** aResult)
+{
+  NS_ENSURE_ARG_POINTER(aResult);
+
+  mTypesHash.Get(aName, aResult);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchema::GetAttributeCount(PRUint32 *aAttributeCount)
+{
+  NS_ENSURE_ARG_POINTER(aAttributeCount);
+
+  *aAttributeCount = mAttributes.Count();
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchema::GetAttributeByIndex(PRUint32 aIndex, nsISchemaAttribute** aResult)
+{
+  NS_ENSURE_ARG_POINTER(aResult);
+
+  if (aIndex >= (PRUint32)mAttributes.Count()) {
+    return NS_ERROR_FAILURE;
+  }
+
+  NS_ADDREF(*aResult = mAttributes.ObjectAt(aIndex));
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchema::GetAttributeByName(const nsAString& aName,
+                             nsISchemaAttribute** aResult)
+{
+  NS_ENSURE_ARG_POINTER(aResult);
+
+  mAttributesHash.Get(aName, aResult);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchema::GetElementCount(PRUint32 *aElementCount)
+{
+  NS_ENSURE_ARG_POINTER(aElementCount);
+
+  *aElementCount = mElements.Count();
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchema::GetElementByIndex(PRUint32 aIndex, nsISchemaElement** aResult)
+{
+  NS_ENSURE_ARG_POINTER(aResult);
+
+  if (aIndex >= (PRUint32)mElements.Count()) {
+    return NS_ERROR_FAILURE;
+  }
+
+  NS_ADDREF(*aResult = mElements.ObjectAt(aIndex));
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchema::GetElementByName(const nsAString& aName, nsISchemaElement** aResult)
+{
+  NS_ENSURE_ARG_POINTER(aResult);
+
+  mElementsHash.Get(aName, aResult);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchema::GetAttributeGroupCount(PRUint32 *aAttributeGroupCount)
+{
+  NS_ENSURE_ARG_POINTER(aAttributeGroupCount);
+
+  *aAttributeGroupCount = mAttributeGroups.Count();
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchema::GetAttributeGroupByIndex(PRUint32 aIndex,
+                                   nsISchemaAttributeGroup** aResult)
+{
+  NS_ENSURE_ARG_POINTER(aResult);
+
+  if (aIndex >= (PRUint32)mAttributeGroups.Count()) {
+    return NS_ERROR_FAILURE;
+  }
+
+  NS_ADDREF(*aResult = mAttributeGroups.ObjectAt(aIndex));
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchema::GetAttributeGroupByName(const nsAString& aName,
+                                  nsISchemaAttributeGroup** aResult)
+{
+  NS_ENSURE_ARG_POINTER(aResult);
+
+  mAttributeGroupsHash.Get(aName, aResult);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchema::GetModelGroupCount(PRUint32 *aModelGroupCount)
+{
+  NS_ENSURE_ARG_POINTER(aModelGroupCount);
+
+  *aModelGroupCount = mModelGroups.Count();
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchema::GetModelGroupByIndex(PRUint32 aIndex, nsISchemaModelGroup** aResult)
+{
+  NS_ENSURE_ARG_POINTER(aResult);
+
+  if (aIndex >= (PRUint32)mModelGroups.Count()) {
+    return NS_ERROR_FAILURE;
+  }
+
+  NS_ADDREF(*aResult = mModelGroups.ObjectAt(aIndex));
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchema::GetModelGroupByName(const nsAString& aName,
+                              nsISchemaModelGroup** aResult)
+{
+  NS_ENSURE_ARG_POINTER(aResult);
+
+  mModelGroupsHash.Get(aName, aResult);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchema::GetCollection(nsISchemaCollection** aResult)
+{
+  NS_ENSURE_ARG_POINTER(aResult);
+
+  NS_IF_ADDREF(*aResult = mCollection);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchema::AddType(nsISchemaType* aType)
+{
+  NS_ENSURE_ARG_POINTER(aType);
+
+  nsAutoString name;
+  aType->GetName(name);
+
+  mTypes.AppendObject(aType);
+  mTypesHash.Put(name, aType);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchema::AddAttribute(nsISchemaAttribute* aAttribute)
+{
+  NS_ENSURE_ARG_POINTER(aAttribute);
+
+  nsAutoString name;
+  aAttribute->GetName(name);
+
+  mAttributes.AppendObject(aAttribute);
+  mAttributesHash.Put(name, aAttribute);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchema::AddElement(nsISchemaElement* aElement)
+{
+  NS_ENSURE_ARG_POINTER(aElement);
+
+  nsAutoString name;
+  aElement->GetName(name);
+
+  mElements.AppendObject(aElement);
+  mElementsHash.Put(name, aElement);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchema::AddAttributeGroup(nsISchemaAttributeGroup* aAttributeGroup)
+{
+  NS_ENSURE_ARG_POINTER(aAttributeGroup);
+
+  nsAutoString name;
+  aAttributeGroup->GetName(name);
+
+  mAttributeGroups.AppendObject(aAttributeGroup);
+  mAttributeGroupsHash.Put(name, aAttributeGroup);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchema::AddModelGroup(nsISchemaModelGroup* aModelGroup)
+{
+  NS_ENSURE_ARG_POINTER(aModelGroup);
+
+  nsAutoString name;
+  aModelGroup->GetName(name);
+
+  mModelGroups.AppendObject(aModelGroup);
+  mModelGroupsHash.Put(name, aModelGroup);
+
+  return NS_OK;
+}
+
+void 
+nsSchema::DropCollectionReference()
+{
+  mCollection = nsnull;
+}
+
+nsresult
+nsSchema::ResolveTypePlaceholder(nsIWebServiceErrorHandler* aErrorHandler, 
+                                 nsISchemaType* aPlaceholder,
+                                 nsISchemaType** aType)
+{
+  PRUint16 schemaType;
+
+  aPlaceholder->GetSchemaType(&schemaType);
+  if (schemaType == nsISchemaType::SCHEMA_TYPE_PLACEHOLDER) {
+    nsAutoString name;
+    aPlaceholder->GetName(name);
+    
+    nsresult rv = GetTypeByName(name, aType);
+    if (NS_FAILED(rv) || !*aType) {
+      *aType = nsnull;
+      nsAutoString errorMsg;
+      errorMsg.AppendLiteral("Failure resolving schema type, ");
+      errorMsg.AppendLiteral("cannot resolve schema type place holder for \"");
+      errorMsg.Append(name);
+      errorMsg.AppendLiteral("\"");
+
+      NS_SCHEMALOADER_FIRE_ERROR(rv, errorMsg);
+
+      return NS_ERROR_FAILURE;
+    }
+  }
+  else {
+    NS_ADDREF(*aType = aPlaceholder);
+  }
+
+  return NS_OK;
+}
diff --git a/extensions/schema-validation/src/nsSchemaAtomList.h b/extensions/schema-validation/src/nsSchemaAtomList.h
new file mode 100644
index 0000000..b05abe7
--- /dev/null
+++ b/extensions/schema-validation/src/nsSchemaAtomList.h
@@ -0,0 +1,119 @@
+/* -*- 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 Mozilla.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Vidur Apparao <vidur@netscape.com> (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 ***** */
+
+SCHEMA_ATOM(sAnyType_atom, "anyType")
+SCHEMA_ATOM(sString_atom, "string")
+SCHEMA_ATOM(sNormalizedString_atom, "normalizedString")
+SCHEMA_ATOM(sToken_atom, "token")
+SCHEMA_ATOM(sByte_atom, "byte")
+SCHEMA_ATOM(sUnsignedByte_atom, "unsignedByte")
+SCHEMA_ATOM(sBase64Binary_atom, "base64Binary")
+SCHEMA_ATOM(sHexBinary_atom, "hexBinary")
+SCHEMA_ATOM(sInteger_atom, "integer")
+SCHEMA_ATOM(sPositiveInteger_atom, "positiveInteger")
+SCHEMA_ATOM(sNegativeInteger_atom, "negativeInteger")
+SCHEMA_ATOM(sNonnegativeInteger_atom, "nonNegativeInteger")
+SCHEMA_ATOM(sNonpositiveInteger_atom, "nonPositiveInteger")
+SCHEMA_ATOM(sInt_atom, "int")
+SCHEMA_ATOM(sUnsignedInt_atom, "unsignedInt")
+SCHEMA_ATOM(sLong_atom, "long")
+SCHEMA_ATOM(sUnsignedLong_atom, "unsignedLong")
+SCHEMA_ATOM(sShort_atom, "short")
+SCHEMA_ATOM(sUnsignedShort_atom, "unsignedShort")
+SCHEMA_ATOM(sDecimal_atom, "decimal")
+SCHEMA_ATOM(sFloat_atom, "float")
+SCHEMA_ATOM(sDouble_atom, "double")
+SCHEMA_ATOM(sBoolean_atom, "boolean")
+SCHEMA_ATOM(sTime_atom, "time")
+SCHEMA_ATOM(sDateTime_atom, "dateTime")
+SCHEMA_ATOM(sDuration_atom, "duration")
+SCHEMA_ATOM(sDate_atom, "date")
+SCHEMA_ATOM(sGMonth_atom, "gMonth")
+SCHEMA_ATOM(sGYear_atom, "gYear")
+SCHEMA_ATOM(sGYearMonth_atom, "gYearMonth")
+SCHEMA_ATOM(sGDay_atom, "gDay")
+SCHEMA_ATOM(sGMonthDay_atom, "gMonthDay")
+SCHEMA_ATOM(sName_atom, "Name")
+SCHEMA_ATOM(sQName_atom, "QName")
+SCHEMA_ATOM(sNCName_atom, "NCName")
+SCHEMA_ATOM(sAnyURI_atom, "anyURI")
+SCHEMA_ATOM(sLanguage_atom, "language")
+SCHEMA_ATOM(sID_atom, "ID")
+SCHEMA_ATOM(sIDREF_atom, "IDREF")
+SCHEMA_ATOM(sIDREFS_atom, "IDREFS")
+SCHEMA_ATOM(sENTITY_atom, "ENTITY")
+SCHEMA_ATOM(sENTITIES_atom, "ENTITIES")
+SCHEMA_ATOM(sNOTATION_atom, "NOTATION")
+SCHEMA_ATOM(sNMTOKEN_atom, "NMTOKEN")
+SCHEMA_ATOM(sNMTOKENS_atom, "NMTOKENS")
+
+SCHEMA_ATOM(sElement_atom, "element")
+SCHEMA_ATOM(sModelGroup_atom, "group")
+SCHEMA_ATOM(sAny_atom, "any")
+SCHEMA_ATOM(sAttribute_atom, "attribute")
+SCHEMA_ATOM(sAttributeGroup_atom, "attributeGroup")
+SCHEMA_ATOM(sSimpleType_atom, "simpleType")
+SCHEMA_ATOM(sComplexType_atom, "complexType")
+SCHEMA_ATOM(sSimpleContent_atom, "simpleContent")
+SCHEMA_ATOM(sComplexContent_atom, "complexContent")
+SCHEMA_ATOM(sAll_atom, "all")
+SCHEMA_ATOM(sChoice_atom, "choice")
+SCHEMA_ATOM(sSequence_atom, "sequence")
+SCHEMA_ATOM(sAnyAttribute_atom, "anyAttribute")
+SCHEMA_ATOM(sRestriction_atom, "restriction")
+SCHEMA_ATOM(sExtension_atom, "extension")
+SCHEMA_ATOM(sAnnotation_atom, "annotation")
+SCHEMA_ATOM(sNotation_atom, "notation")
+SCHEMA_ATOM(sInclude_atom, "include")
+SCHEMA_ATOM(sImport_atom, "import")
+SCHEMA_ATOM(sRedefine_atom, "redefine")
+SCHEMA_ATOM(sList_atom, "list")
+SCHEMA_ATOM(sUnion_atom, "union")
+
+SCHEMA_ATOM(sMinExclusive_atom, "minExclusive")
+SCHEMA_ATOM(sMinInclusive_atom, "minInclusive")
+SCHEMA_ATOM(sMaxExclusive_atom, "maxExclusive")
+SCHEMA_ATOM(sMaxInclusive_atom, "maxInclusive")
+SCHEMA_ATOM(sTotalDigits_atom, "totalDigits")
+SCHEMA_ATOM(sFractionDigits_atom, "fractionDigits")
+SCHEMA_ATOM(sLength_atom, "length")
+SCHEMA_ATOM(sMinLength_atom, "minLength")
+SCHEMA_ATOM(sMaxLength_atom, "maxLength")
+SCHEMA_ATOM(sEnumeration_atom, "enumeration")
+SCHEMA_ATOM(sWhiteSpace_atom, "whiteSpace")
+SCHEMA_ATOM(sPattern_atom, "pattern")
diff --git a/extensions/schema-validation/src/nsSchemaAttributes.cpp b/extensions/schema-validation/src/nsSchemaAttributes.cpp
new file mode 100644
index 0000000..caf9fb3
--- /dev/null
+++ b/extensions/schema-validation/src/nsSchemaAttributes.cpp
@@ -0,0 +1,744 @@
+/* -*- 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 Mozilla.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Vidur Apparao <vidur@netscape.com> (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 "nsSchemaPrivate.h"
+
+////////////////////////////////////////////////////////////
+//
+// nsSchemaAttribute implementation
+//
+////////////////////////////////////////////////////////////
+nsSchemaAttribute::nsSchemaAttribute(nsSchema* aSchema, 
+                                     const nsAString& aName)
+  : nsSchemaComponentBase(aSchema), mName(aName)
+{
+}
+
+nsSchemaAttribute::~nsSchemaAttribute()
+{
+}
+
+NS_IMPL_ISUPPORTS3_CI(nsSchemaAttribute,
+                      nsISchemaComponent,
+                      nsISchemaAttributeComponent,
+                      nsISchemaAttribute)
+
+
+/* void resolve (in nsIWebServiceErrorHandler aErrorHandler); */
+NS_IMETHODIMP
+nsSchemaAttribute::Resolve(nsIWebServiceErrorHandler* aErrorHandler)
+{
+  if (mIsResolved) {
+    return NS_OK;
+  }
+
+  mIsResolved = PR_TRUE;
+  nsresult rv = NS_OK;
+  if (mType && mSchema) {
+    nsCOMPtr<nsISchemaType> type;
+    rv = mSchema->ResolveTypePlaceholder(aErrorHandler, mType, getter_AddRefs(type));
+    if (NS_FAILED(rv)) {
+      return NS_ERROR_FAILURE;
+    }
+    mType = do_QueryInterface(type);
+    if (!mType) {
+      return NS_ERROR_FAILURE;
+    }
+    rv = mType->Resolve(aErrorHandler);
+  }
+
+  return rv;
+}
+
+/* void clear (); */
+NS_IMETHODIMP
+nsSchemaAttribute::Clear()
+{
+  if (mIsCleared) {
+    return NS_OK;
+  }
+
+  mIsCleared = PR_TRUE;
+  if (mType) {
+    mType->Clear();
+    mType = nsnull;
+  }
+
+  return NS_OK;
+}
+
+/* readonly attribute AString name; */
+NS_IMETHODIMP
+nsSchemaAttribute::GetName(nsAString & aName)
+{
+  aName.Assign(mName);
+
+  return NS_OK;
+}
+
+/* readonly attribute unsigned short componentType; */
+NS_IMETHODIMP
+nsSchemaAttribute::GetComponentType(PRUint16 *aComponentType)
+{
+  NS_ENSURE_ARG_POINTER(aComponentType);
+
+  *aComponentType = nsISchemaAttributeComponent::COMPONENT_TYPE_ATTRIBUTE;
+
+  return NS_OK;
+}
+
+/* readonly attribute nsISchemaSimpleType type; */
+NS_IMETHODIMP
+nsSchemaAttribute::GetType(nsISchemaSimpleType** aType)
+{
+  NS_ENSURE_ARG_POINTER(aType);
+
+  NS_IF_ADDREF(*aType = mType);
+
+  return NS_OK;
+}
+
+/* readonly attribute AString defaultValue; */
+NS_IMETHODIMP
+nsSchemaAttribute::GetDefaultValue(nsAString & aDefaultValue)
+{
+  aDefaultValue.Assign(mDefaultValue);
+  
+  return NS_OK;
+}
+
+/* readonly attribute AString fixedValue; */
+NS_IMETHODIMP
+nsSchemaAttribute::GetFixedValue(nsAString & aFixedValue)
+{
+  aFixedValue.Assign(mFixedValue);
+  
+  return NS_OK;
+}
+
+/* readonly attribute unsigned short use; */
+NS_IMETHODIMP
+nsSchemaAttribute::GetUse(PRUint16 *aUse)
+{
+  NS_ENSURE_ARG_POINTER(aUse);
+
+  *aUse = mUse;
+
+  return NS_OK;
+}
+
+/* readonly attribute AString targetNamespace */
+NS_IMETHODIMP
+nsSchemaAttribute::GetQualifiedNamespace(nsAString & aNamespace)
+{
+  if (mSchema && mAttributeFormQualified)
+    mSchema->GetTargetNamespace(aNamespace);
+  else
+    aNamespace.Truncate();
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchemaAttribute::SetType(nsISchemaSimpleType* aType)
+{
+  NS_ENSURE_ARG(aType);
+  
+  mType = aType;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchemaAttribute::SetConstraints(const nsAString& aDefaultValue,
+                                  const nsAString& aFixedValue)
+{
+  mDefaultValue.Assign(aDefaultValue);
+  mFixedValue.Assign(aFixedValue);
+
+  return NS_OK;
+}
+ 
+NS_IMETHODIMP
+nsSchemaAttribute::SetUse(PRUint16 aUse)
+{
+  mUse = aUse;
+
+  return NS_OK;
+}
+
+nsresult
+nsSchemaAttribute::SetAttributeFormQualified(PRBool aAttributeFormQualified)
+{
+  mAttributeFormQualified = aAttributeFormQualified;
+
+  return NS_OK;
+}
+
+////////////////////////////////////////////////////////////
+//
+// nsSchemaAttributeRef implementation
+//
+////////////////////////////////////////////////////////////
+nsSchemaAttributeRef::nsSchemaAttributeRef(nsSchema* aSchema, 
+                                           const nsAString& aRef,
+                                           const nsAString& aRefNS)
+  : nsSchemaComponentBase(aSchema), mRef(aRef), mRefNS(aRefNS)
+{
+}
+
+nsSchemaAttributeRef::~nsSchemaAttributeRef()
+{
+}
+
+NS_IMPL_ISUPPORTS3_CI(nsSchemaAttributeRef,
+                      nsISchemaComponent,
+                      nsISchemaAttributeComponent,
+                      nsISchemaAttribute)
+
+
+/* void resolve (in nsIWebServiceErrorHandler aErrorHandler); */
+NS_IMETHODIMP
+nsSchemaAttributeRef::Resolve(nsIWebServiceErrorHandler* aErrorHandler)
+{
+  nsresult rv = NS_OK;
+  if (mIsResolved) {
+    return NS_OK;
+  }
+  
+  mIsResolved = PR_TRUE;
+  if (!mAttribute && mSchema) {
+    if (mRefNS.IsEmpty()) {
+    mSchema->GetAttributeByName(mRef, getter_AddRefs(mAttribute));
+    } else {
+      // use the namespace and type
+      nsCOMPtr<nsISchemaCollection> schemaColl;
+      mSchema->GetCollection(getter_AddRefs(schemaColl));
+      NS_ENSURE_STATE(schemaColl);
+
+      schemaColl->GetAttribute(mRef, mRefNS, getter_AddRefs(mAttribute));
+    }
+  }
+
+  if (mAttribute) {
+    rv = mAttribute->Resolve(aErrorHandler);
+  }
+
+  return rv;
+}
+
+/* void clear (); */
+NS_IMETHODIMP
+nsSchemaAttributeRef::Clear()
+{
+  if (mIsCleared) {
+    return NS_OK;
+  }
+
+  mIsCleared = PR_TRUE;
+  if (mAttribute) {
+    mAttribute->Clear();
+    mAttribute = nsnull;
+  }
+
+  return NS_OK;
+}
+
+/* readonly attribute AString name; */
+NS_IMETHODIMP
+nsSchemaAttributeRef::GetName(nsAString & aName)
+{
+  if (!mAttribute) {
+    return NS_ERROR_NOT_INITIALIZED;
+  }
+
+  return mAttribute->GetName(aName);
+}
+
+/* readonly attribute unsigned short componentType; */
+NS_IMETHODIMP
+nsSchemaAttributeRef::GetComponentType(PRUint16 *aComponentType)
+{
+  NS_ENSURE_ARG_POINTER(aComponentType);
+
+  *aComponentType = nsISchemaAttributeComponent::COMPONENT_TYPE_ATTRIBUTE;
+
+  return NS_OK;
+}
+
+/* readonly attribute nsISchemaSimpleType type; */
+NS_IMETHODIMP
+nsSchemaAttributeRef::GetType(nsISchemaSimpleType * *aType)
+{
+  NS_ENSURE_ARG_POINTER(aType);
+
+  if (!mAttribute) {
+    return NS_ERROR_NOT_INITIALIZED;
+  }
+
+  return mAttribute->GetType(aType);
+}
+
+/* readonly attribute AString defaultValue; */
+NS_IMETHODIMP
+nsSchemaAttributeRef::GetDefaultValue(nsAString & aDefaultValue)
+{
+  aDefaultValue.Assign(mDefaultValue);
+  
+  return NS_OK;
+}
+
+/* readonly attribute AString fixedValue; */
+NS_IMETHODIMP
+nsSchemaAttributeRef::GetFixedValue(nsAString & aFixedValue)
+{
+  aFixedValue.Assign(mFixedValue);
+  
+  return NS_OK;
+}
+
+/* readonly attribute unsigned short use; */
+NS_IMETHODIMP
+nsSchemaAttributeRef::GetUse(PRUint16 *aUse)
+{
+  NS_ENSURE_ARG_POINTER(aUse);
+
+  *aUse = mUse;
+
+  return NS_OK;
+}
+
+/* readonly attribute AString targetNamespace */
+NS_IMETHODIMP
+nsSchemaAttributeRef::GetQualifiedNamespace(nsAString & aNamespace)
+{
+  if (mSchema && mAttributeFormQualified)
+    mSchema->GetTargetNamespace(aNamespace);
+  else
+    aNamespace.Truncate();
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchemaAttributeRef::SetConstraints(const nsAString& aDefaultValue,
+                                     const nsAString& aFixedValue)
+{
+  mDefaultValue.Assign(aDefaultValue);
+  mFixedValue.Assign(aFixedValue);
+
+  return NS_OK;
+}
+ 
+NS_IMETHODIMP
+nsSchemaAttributeRef::SetUse(PRUint16 aUse)
+{
+  mUse = aUse;
+
+  return NS_OK;
+}
+
+nsresult
+nsSchemaAttributeRef::SetAttributeFormQualified(PRBool aAttributeFormQualified)
+{
+  mAttributeFormQualified = aAttributeFormQualified;
+
+  return NS_OK;
+}
+
+////////////////////////////////////////////////////////////
+//
+// nsSchemaAttributeGroup implementation
+//
+////////////////////////////////////////////////////////////
+nsSchemaAttributeGroup::nsSchemaAttributeGroup(nsSchema* aSchema,
+                                               const nsAString& aName)
+  : nsSchemaComponentBase(aSchema), mName(aName)
+{
+}
+
+nsSchemaAttributeGroup::~nsSchemaAttributeGroup()
+{
+}
+
+NS_IMPL_ISUPPORTS3_CI(nsSchemaAttributeGroup,
+                      nsISchemaComponent,
+                      nsISchemaAttributeComponent,
+                      nsISchemaAttributeGroup)
+
+/* void resolve (in nsIWebServiceErrorHandler aErrorHandler); */
+NS_IMETHODIMP
+nsSchemaAttributeGroup::Resolve(nsIWebServiceErrorHandler* aErrorHandler)
+{
+  if (mIsResolved) {
+    return NS_OK;
+  }
+
+  mIsResolved = PR_TRUE;
+  nsresult rv;
+  PRUint32 i, count;
+
+  count = mAttributes.Count();
+  for (i = 0; i < count; ++i) {
+    rv = mAttributes.ObjectAt(i)->Resolve(aErrorHandler);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+  }
+  
+  return NS_OK;
+}
+
+/* void clear (); */
+NS_IMETHODIMP
+nsSchemaAttributeGroup::Clear()
+{
+  if (mIsCleared) {
+    return NS_OK;
+  }
+
+  mIsCleared = PR_TRUE;
+
+  PRUint32 i, count;
+  count = mAttributes.Count();
+  for (i = 0; i < count; ++i) {
+    mAttributes.ObjectAt(i)->Clear();
+  }
+  mAttributes.Clear();
+  mAttributesHash.Clear();
+
+  return NS_OK;
+}
+
+/* readonly attribute AString name; */
+NS_IMETHODIMP
+nsSchemaAttributeGroup::GetName(nsAString & aName)
+{
+  aName.Assign(mName);
+
+  return NS_OK;
+}
+
+/* readonly attribute unsigned short componentType; */
+NS_IMETHODIMP
+nsSchemaAttributeGroup::GetComponentType(PRUint16 *aComponentType)
+{
+  NS_ENSURE_ARG_POINTER(aComponentType);
+
+  *aComponentType = nsISchemaAttributeComponent::COMPONENT_TYPE_GROUP;
+
+  return NS_OK;
+}
+
+/* readonly attribute PRUint32 attributeCount; */
+NS_IMETHODIMP
+nsSchemaAttributeGroup::GetAttributeCount(PRUint32* aAttributeCount)
+{
+  NS_ENSURE_ARG_POINTER(aAttributeCount);
+
+  *aAttributeCount = mAttributes.Count();
+
+  return NS_OK;
+}
+
+/* nsISchemaAttributeComponent getAttributeByIndex (in PRUint32 index); */
+NS_IMETHODIMP
+nsSchemaAttributeGroup::GetAttributeByIndex(PRUint32 aIndex, 
+                                            nsISchemaAttributeComponent** aResult)
+{
+  NS_ENSURE_ARG_POINTER(aResult);
+
+  if (aIndex >= (PRUint32)mAttributes.Count()) {
+    return NS_ERROR_FAILURE;
+  }
+
+  NS_ADDREF(*aResult = mAttributes.ObjectAt(aIndex));
+
+  return NS_OK;
+}
+
+/* nsISchemaAttributeComponent getAttributeByName (in AString name); */
+NS_IMETHODIMP
+nsSchemaAttributeGroup::GetAttributeByName(const nsAString& aName, 
+                                           nsISchemaAttributeComponent** aResult)
+{
+  NS_ENSURE_ARG_POINTER(aResult);
+
+  mAttributesHash.Get(aName, aResult);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchemaAttributeGroup::AddAttribute(nsISchemaAttributeComponent* aAttribute)
+{
+  NS_ENSURE_ARG_POINTER(aAttribute);
+
+  nsAutoString name;
+  aAttribute->GetName(name);
+
+  mAttributes.AppendObject(aAttribute);
+  mAttributesHash.Put(name, aAttribute);
+
+  return NS_OK;    
+}
+
+////////////////////////////////////////////////////////////
+//
+// nsSchemaAttributeGroupRef implementation
+//
+////////////////////////////////////////////////////////////
+nsSchemaAttributeGroupRef::nsSchemaAttributeGroupRef(nsSchema* aSchema,
+                                                     const nsAString& aRef,
+                                                     const nsAString& aRefNS)
+  : nsSchemaComponentBase(aSchema), mRef(aRef), mRefNS(aRefNS)
+{
+}
+
+nsSchemaAttributeGroupRef::~nsSchemaAttributeGroupRef()
+{
+}
+
+NS_IMPL_ISUPPORTS3_CI(nsSchemaAttributeGroupRef,
+                      nsISchemaComponent,
+                      nsISchemaAttributeComponent,
+                      nsISchemaAttributeGroup)
+
+/* void resolve (in nsIWebServiceErrorHandler aErrorHandler); */
+NS_IMETHODIMP
+nsSchemaAttributeGroupRef::Resolve(nsIWebServiceErrorHandler* aErrorHandler)
+{
+  nsresult rv = NS_OK;
+  if (mIsResolved) {
+    return NS_OK;
+  }
+
+  mIsResolved = PR_TRUE;
+  if (!mAttributeGroup && mSchema) {
+    if (mRefNS.IsEmpty()) {
+    mSchema->GetAttributeGroupByName(mRef, getter_AddRefs(mAttributeGroup));
+    } else {
+      // use the namespace and type
+      nsCOMPtr<nsISchemaCollection> schemaColl;
+      mSchema->GetCollection(getter_AddRefs(schemaColl));
+      NS_ENSURE_STATE(schemaColl);
+
+      // get the right schema
+      nsCOMPtr<nsISchema> schema;
+      schemaColl->GetSchema(mRefNS, getter_AddRefs(schema));
+      NS_ENSURE_STATE(schema);
+
+      schema->GetAttributeGroupByName(mRef, getter_AddRefs(mAttributeGroup));
+    }
+  }
+
+  if (mAttributeGroup) {
+    rv = mAttributeGroup->Resolve(aErrorHandler);
+  }
+  
+  return rv;
+}
+
+/* void clear (); */
+NS_IMETHODIMP
+nsSchemaAttributeGroupRef::Clear()
+{
+  if (mIsCleared) {
+    return NS_OK;
+  }
+
+  mIsCleared = PR_TRUE;
+  if (mAttributeGroup) {
+    mAttributeGroup->Clear();
+    mAttributeGroup = nsnull;
+  }
+
+  return NS_OK;
+}
+
+/* readonly attribute AString name; */
+NS_IMETHODIMP
+nsSchemaAttributeGroupRef::GetName(nsAString & aName)
+{
+  if (!mAttributeGroup) {
+    return NS_ERROR_NOT_INITIALIZED;
+  }
+
+  return mAttributeGroup->GetName(aName);
+}
+
+/* readonly attribute unsigned short componentType; */
+NS_IMETHODIMP
+nsSchemaAttributeGroupRef::GetComponentType(PRUint16 *aComponentType)
+{
+  NS_ENSURE_ARG_POINTER(aComponentType);
+
+  *aComponentType = nsISchemaAttributeComponent::COMPONENT_TYPE_GROUP;
+
+  return NS_OK;
+}
+
+/* readonly attribute PRUint32 attributeCount; */
+NS_IMETHODIMP
+nsSchemaAttributeGroupRef::GetAttributeCount(PRUint32 *aAttributeCount)
+{
+  NS_ENSURE_ARG_POINTER(aAttributeCount);
+
+  if (!mAttributeGroup) {
+    return NS_ERROR_NOT_INITIALIZED;
+  }
+  
+  return mAttributeGroup->GetAttributeCount(aAttributeCount);
+}
+
+/* nsISchemaAttributeComponent getAttributeByIndex (in PRUint32 index); */
+NS_IMETHODIMP
+nsSchemaAttributeGroupRef::GetAttributeByIndex(PRUint32 index, 
+                                               nsISchemaAttributeComponent **_retval)
+{
+  NS_ENSURE_ARG_POINTER(_retval);
+
+  if (!mAttributeGroup) {
+    return NS_ERROR_NOT_INITIALIZED;
+  }
+  
+  return mAttributeGroup->GetAttributeByIndex(index, _retval);
+}
+
+/* nsISchemaAttributeComponent getAttributeByName (in AString name); */
+NS_IMETHODIMP
+nsSchemaAttributeGroupRef::GetAttributeByName(const nsAString & name, 
+                                              nsISchemaAttributeComponent **_retval)
+{
+  NS_ENSURE_ARG_POINTER(_retval);
+
+  if (!mAttributeGroup) {
+    return NS_ERROR_NOT_INITIALIZED;
+  }
+
+  return mAttributeGroup->GetAttributeByName(name, _retval);
+}
+
+////////////////////////////////////////////////////////////
+//
+// nsSchemaAnyAttribute implementation
+//
+////////////////////////////////////////////////////////////
+nsSchemaAnyAttribute::nsSchemaAnyAttribute(nsSchema* aSchema)
+  : nsSchemaComponentBase(aSchema), mProcess(PROCESS_STRICT)
+{
+}
+
+nsSchemaAnyAttribute::~nsSchemaAnyAttribute()
+{
+}
+
+NS_IMPL_ISUPPORTS3_CI(nsSchemaAnyAttribute,
+                      nsISchemaComponent,
+                      nsISchemaAttributeComponent,
+                      nsISchemaAnyAttribute)
+
+/* void resolve (in nsIWebServiceErrorHandler aErrorHandler); */
+NS_IMETHODIMP
+nsSchemaAnyAttribute::Resolve(nsIWebServiceErrorHandler* aErrorHandler)
+{
+  return NS_OK;
+}
+
+/* void clear (); */
+NS_IMETHODIMP
+nsSchemaAnyAttribute::Clear()
+{
+  return NS_OK;
+}
+
+/* readonly attribute unsigned short componentType; */
+NS_IMETHODIMP
+nsSchemaAnyAttribute::GetComponentType(PRUint16 *aComponentType)
+{
+  NS_ENSURE_ARG_POINTER(aComponentType);
+
+  *aComponentType = nsISchemaAttributeComponent::COMPONENT_TYPE_ANY;
+
+  return NS_OK;
+}
+
+/* readonly attribute AString name; */
+NS_IMETHODIMP
+nsSchemaAnyAttribute::GetName(nsAString & aName)
+{
+  aName.AssignLiteral("anyAttribute");
+
+  return NS_OK;
+}
+
+/* readonly attribute unsigned short process; */
+NS_IMETHODIMP
+nsSchemaAnyAttribute::GetProcess(PRUint16 *aProcess)
+{
+  NS_ENSURE_ARG_POINTER(aProcess);
+
+  *aProcess = mProcess;
+
+  return NS_OK;
+}
+
+/* readonly attribute AString namespace; */
+NS_IMETHODIMP
+nsSchemaAnyAttribute::GetNamespace(nsAString & aNamespace)
+{
+  aNamespace.Assign(mNamespace);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchemaAnyAttribute::SetProcess(PRUint16 aProcess)
+{
+  mProcess = aProcess;
+  
+  return NS_OK;
+}
+ 
+NS_IMETHODIMP
+nsSchemaAnyAttribute::SetNamespace(const nsAString& aNamespace)
+{
+  mNamespace.Assign(aNamespace);
+
+  return NS_OK;
+}
diff --git a/extensions/schema-validation/src/nsSchemaComplexType.cpp b/extensions/schema-validation/src/nsSchemaComplexType.cpp
new file mode 100644
index 0000000..e126fc2
--- /dev/null
+++ b/extensions/schema-validation/src/nsSchemaComplexType.cpp
@@ -0,0 +1,631 @@
+/* -*- 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 Mozilla.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Vidur Apparao <vidur@netscape.com> (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 "nsSchemaPrivate.h"
+
+////////////////////////////////////////////////////////////
+//
+// nsSchemaComplexType implementation
+//
+////////////////////////////////////////////////////////////
+nsSchemaComplexType::nsSchemaComplexType(nsSchema* aSchema,
+                                         const nsAString& aName,
+                                         PRBool aAbstract)
+  : nsSchemaComponentBase(aSchema), mName(aName), mAbstract(aAbstract),
+    mContentModel(CONTENT_MODEL_ELEMENT_ONLY), 
+    mDerivation(DERIVATION_SELF_CONTAINED)
+{
+}
+
+nsSchemaComplexType::~nsSchemaComplexType()
+{
+}
+
+NS_IMPL_ISUPPORTS3_CI(nsSchemaComplexType, 
+                      nsISchemaComponent,
+                      nsISchemaType,
+                      nsISchemaComplexType)
+
+
+nsresult
+nsSchemaComplexType::ProcessExtension(nsIWebServiceErrorHandler* aErrorHandler)
+{
+  nsresult rv = NS_OK;
+
+  nsAutoString baseStr;
+  mBaseType->GetName(baseStr);
+
+  nsCOMPtr<nsISchemaComplexType> complexBaseType(do_QueryInterface(mBaseType));
+
+  nsCOMPtr<nsISchemaModelGroup> sequence;
+  nsSchemaModelGroup* sequenceInst = nsnull;
+  if (complexBaseType) {
+    // XXX Should really be cloning
+    nsCOMPtr<nsISchemaModelGroup> baseGroup;
+    rv = complexBaseType->GetModelGroup(getter_AddRefs(baseGroup));
+    if (NS_FAILED(rv)) {
+      nsAutoString errorMsg;
+      errorMsg.AppendLiteral("Failure processing schema, ");
+      errorMsg.AppendLiteral("extension for type \"");
+      errorMsg.Append(baseStr);
+      errorMsg.AppendLiteral("\" does not contains any model group");
+      errorMsg.AppendLiteral("such as <all>, <choice>, <sequence>, or <group>");
+
+      NS_SCHEMALOADER_FIRE_ERROR(rv, errorMsg);
+
+      return rv;
+    }
+          
+    if (baseGroup) {
+      // Create a new model group that's going to be the a sequence
+      // of the base model group and the content below
+      sequenceInst = new nsSchemaModelGroup(mSchema, EmptyString());
+      if (!sequenceInst) {
+        return NS_ERROR_OUT_OF_MEMORY;
+      }
+      sequence = sequenceInst;
+
+      PRUint16 compositor;
+      baseGroup->GetCompositor(&compositor);
+
+      PRUint32 minOccurs, maxOccurs;
+      baseGroup->GetMinOccurs(&minOccurs);
+      baseGroup->GetMaxOccurs(&maxOccurs);
+
+      // If the base group also a sequence, we can collapse the
+      // two sequences.
+      if ((compositor == nsISchemaModelGroup::COMPOSITOR_SEQUENCE) &&
+          (minOccurs == 1) && (maxOccurs == 1)) {
+        PRUint32 pIndex, pCount;
+        baseGroup->GetParticleCount(&pCount);
+        for (pIndex = 0; pIndex < pCount; pIndex++) {
+          nsCOMPtr<nsISchemaParticle> particle;
+                
+          rv = baseGroup->GetParticle(pIndex, getter_AddRefs(particle));
+          if (NS_FAILED(rv)) {
+            nsAutoString errorMsg;
+            errorMsg.AppendLiteral("Failure processing schema, failure ");
+            errorMsg.AppendLiteral("processing model group for extension ");
+            errorMsg.AppendLiteral("of type \"");
+            errorMsg.Append(baseStr);
+            errorMsg.AppendLiteral("\"");
+
+            NS_SCHEMALOADER_FIRE_ERROR(rv, errorMsg);
+
+            return rv;
+          }
+                
+          rv = sequenceInst->AddParticle(particle);
+          if (NS_FAILED(rv)) {
+            nsAutoString errorMsg;
+            errorMsg.AppendLiteral("Failure processing schema, failure ");
+            errorMsg.AppendLiteral("processing model group for extension ");
+            errorMsg.AppendLiteral("of type \"");
+            errorMsg.Append(baseStr);
+            errorMsg.AppendLiteral("\"");
+
+            NS_SCHEMALOADER_FIRE_ERROR(rv, errorMsg);
+
+            return rv;
+          }
+        }
+      }
+      else {
+        sequenceInst->AddParticle(baseGroup);
+      }
+            
+      // Need to append original contents.
+      if (mModelGroup) {
+        PRUint32 pIndex, pCount;
+        mModelGroup->GetParticleCount(&pCount);
+        for (pIndex = 0; pIndex < pCount; pIndex++) {
+          nsCOMPtr<nsISchemaParticle> particle;
+          rv = mModelGroup->GetParticle(pIndex, getter_AddRefs(particle));
+          rv = sequenceInst->AddParticle(particle);
+        }
+      }
+      this->SetModelGroup(sequence);
+    }
+  }
+        
+  if (complexBaseType) {
+    // Inherit content model from base if currently empty
+    if (mContentModel == nsISchemaComplexType::CONTENT_MODEL_EMPTY) {
+      PRUint16 baseContentModel;
+      complexBaseType->GetContentModel(&baseContentModel);
+      mContentModel = baseContentModel;
+    }
+
+    // Copy over the attributes from the base type
+    // XXX Should really be cloning
+    PRUint32 attrIndex, attrCount;
+    complexBaseType->GetAttributeCount(&attrCount);
+
+    for (attrIndex = 0; attrIndex < attrCount; attrIndex++) {
+      nsCOMPtr<nsISchemaAttributeComponent> attribute;
+
+      rv = complexBaseType->GetAttributeByIndex(attrIndex,
+                                                getter_AddRefs(attribute));
+      if (NS_FAILED(rv)) {
+        nsAutoString errorMsg;
+        errorMsg.AppendLiteral("Failure processing schema, cannot clone ");
+        errorMsg.AppendLiteral("attributes from base type \"");
+        errorMsg.Append(baseStr);
+        errorMsg.AppendLiteral("\"");
+
+        NS_SCHEMALOADER_FIRE_ERROR(rv, errorMsg);
+
+        return rv;
+      }
+
+      rv = this->AddAttribute(attribute);
+      if (NS_FAILED(rv)) {
+        nsAutoString errorMsg;
+        errorMsg.AppendLiteral("Failure processing schema, cannot clone ");
+        errorMsg.AppendLiteral("attributes from base type \"");
+        errorMsg.Append(baseStr);
+        errorMsg.AppendLiteral("\"");
+
+        NS_SCHEMALOADER_FIRE_ERROR(rv, errorMsg);
+
+        return rv;
+      }
+    }
+  }
+  return NS_OK;
+}
+
+
+/* void resolve (in nsIWebServiceErrorHandler* aErrorHandler); */
+NS_IMETHODIMP
+nsSchemaComplexType::Resolve(nsIWebServiceErrorHandler* aErrorHandler)
+{
+  if (mIsResolved) {
+    return NS_OK;
+  }
+
+  mIsResolved = PR_TRUE;
+  nsresult rv;
+  PRUint32 i, count;
+
+  count = mAttributes.Count();
+  for (i = 0; i < count; ++i) {
+    rv = mAttributes.ObjectAt(i)->Resolve(aErrorHandler);
+    if (NS_FAILED(rv)) {
+      nsAutoString attrName;
+      nsresult rv1 = mAttributes.ObjectAt(i)->GetName(attrName);
+      NS_ENSURE_SUCCESS(rv1, rv1);
+
+      nsAutoString errorMsg;
+      errorMsg.AppendLiteral("Failure resolving schema complex type, ");
+      errorMsg.AppendLiteral("cannot resolve attribute \"");
+      errorMsg.Append(attrName);
+      errorMsg.AppendLiteral("\"");
+      
+      NS_SCHEMALOADER_FIRE_ERROR(rv, errorMsg);
+
+      return rv;
+    }
+  }
+
+  if (!mSchema) {
+    return NS_ERROR_FAILURE;
+  }
+
+  nsCOMPtr<nsISchemaType> type;
+  if (mBaseType) {
+    rv = mSchema->ResolveTypePlaceholder(aErrorHandler, mBaseType, getter_AddRefs(type));
+    if (NS_FAILED(rv)) {
+      return NS_ERROR_FAILURE;
+    }
+    // Only process unresolved base types, as resolved base types are
+    // processed when they are encountered during main parsing phase.
+    if (mBaseType != type) {
+      mBaseType = type;
+      rv = mBaseType->Resolve(aErrorHandler);
+      if (NS_FAILED(rv)) {
+        nsAutoString baseStr;
+        nsresult rv1 = type->GetName(baseStr);
+        NS_ENSURE_SUCCESS(rv1, rv1);
+
+        nsAutoString errorMsg;
+        errorMsg.AppendLiteral("Failure resolving schema complex type, ");
+        errorMsg.AppendLiteral("cannot resolve base type \"");
+        errorMsg.Append(baseStr);
+        errorMsg.AppendLiteral("\"");
+
+        NS_SCHEMALOADER_FIRE_ERROR(rv, errorMsg);
+        return NS_ERROR_FAILURE;
+      }
+
+      // Only extensions need to be applied
+      if (mDerivation == nsISchemaComplexType::DERIVATION_EXTENSION_COMPLEX) {
+        rv = ProcessExtension(aErrorHandler);
+        if (NS_FAILED(rv)) {
+          return NS_ERROR_FAILURE;
+        }
+      }
+    }
+  }
+    
+  if (mSimpleBaseType) {
+    rv = mSchema->ResolveTypePlaceholder(aErrorHandler, mSimpleBaseType, 
+                                         getter_AddRefs(type));
+    if (NS_FAILED(rv)) {
+      return NS_ERROR_FAILURE;
+    }
+
+    mSimpleBaseType = do_QueryInterface(type);
+
+    // mSimpleBaseType could become a complex type under certain conditions
+    // (simple content that restricts a complex type, which itself is a
+    // simple content).  So if we can't QI to a simple type, get the simple
+    // base type if it is a complex type.
+    if (!mSimpleBaseType) {
+      nsCOMPtr<nsISchemaComplexType> complexType = do_QueryInterface(type);
+      if (complexType) {
+        complexType->GetSimpleBaseType(getter_AddRefs(mSimpleBaseType));
+      }
+    }
+
+    if (!mSimpleBaseType) {
+      return NS_ERROR_FAILURE;
+    }
+    rv = mSimpleBaseType->Resolve(aErrorHandler);
+    if (NS_FAILED(rv)) {
+      return NS_ERROR_FAILURE;
+    }
+  }
+
+  if (mModelGroup) {
+    rv = mModelGroup->Resolve(aErrorHandler);
+    if (NS_FAILED(rv)) {
+      nsAutoString modelName;
+      nsresult rv1 = mModelGroup->GetName(modelName);
+      NS_ENSURE_SUCCESS(rv1, rv1);
+
+      nsAutoString errorMsg;
+      errorMsg.AppendLiteral("Failure resolving schema complex type, ");
+      errorMsg.AppendLiteral("cannot resolve model group \"");
+      errorMsg.Append(modelName);
+      errorMsg.AppendLiteral("\"");
+
+      NS_SCHEMALOADER_FIRE_ERROR(rv, errorMsg);
+
+      return NS_ERROR_FAILURE;
+    }
+  }
+
+  if (mArrayInfo) {
+    nsCOMPtr<nsISchemaType> placeHolder;
+    mArrayInfo->GetType(getter_AddRefs(placeHolder));
+    if (placeHolder) {
+      PRUint16 schemaType;
+      placeHolder->GetSchemaType(&schemaType);
+      if (schemaType == nsISchemaType::SCHEMA_TYPE_PLACEHOLDER) {
+        rv = mSchema->ResolveTypePlaceholder(aErrorHandler, placeHolder, getter_AddRefs(type));
+        if (NS_FAILED(rv)) {
+          return NS_ERROR_FAILURE;
+        }
+        rv = type->Resolve(aErrorHandler);
+        if (NS_FAILED(rv)) {
+          return NS_ERROR_FAILURE;
+        }
+        SetArrayInfo(type, mArrayInfo->GetDimension());
+      }
+      else {
+         rv = placeHolder->Resolve(aErrorHandler);
+        if (NS_FAILED(rv)) {
+          return NS_ERROR_FAILURE;
+        }
+      }
+    } 
+  }
+
+  return NS_OK;
+}
+
+/* void clear (); */
+NS_IMETHODIMP
+nsSchemaComplexType::Clear()
+{
+  if (mIsCleared) {
+    return NS_OK;
+  }
+
+  mIsCleared = PR_TRUE;
+  if (mBaseType) {
+    mBaseType->Clear();
+    mBaseType = nsnull;
+  }
+  if (mSimpleBaseType) {
+    mSimpleBaseType->Clear();
+    mSimpleBaseType = nsnull;
+  }
+  if (mModelGroup) {
+    mModelGroup->Clear();
+    mModelGroup = nsnull;
+  }
+
+  PRUint32 i, count;
+  count = mAttributes.Count();
+  for (i = 0; i < count; ++i) {
+    mAttributes.ObjectAt(i)->Clear();
+  }
+  mAttributes.Clear();
+  mAttributesHash.Clear();
+
+  return NS_OK;
+}
+
+/* readonly attribute wstring name; */
+NS_IMETHODIMP
+nsSchemaComplexType::GetName(nsAString& aName)
+{
+  aName.Assign(mName);
+  
+  return NS_OK;
+}
+
+/* readonly attribute unsigned short schemaType; */
+NS_IMETHODIMP
+nsSchemaComplexType::GetSchemaType(PRUint16 *aSchemaType)
+{
+  NS_ENSURE_ARG_POINTER(aSchemaType);
+
+  *aSchemaType = nsISchemaType::SCHEMA_TYPE_COMPLEX;
+
+  return NS_OK;
+}
+
+/* readonly attribute unsigned short contentModel; */
+NS_IMETHODIMP
+nsSchemaComplexType::GetContentModel(PRUint16 *aContentModel)
+{
+  NS_ENSURE_ARG_POINTER(aContentModel);
+  
+  *aContentModel = mContentModel;
+  
+  return NS_OK;
+}
+
+/* readonly attribute unsigned short derivation; */
+NS_IMETHODIMP
+nsSchemaComplexType::GetDerivation(PRUint16 *aDerivation)
+{
+  NS_ENSURE_ARG_POINTER(aDerivation);
+
+  *aDerivation = mDerivation;
+
+  return NS_OK;
+}
+
+/* readonly attribute nsISchemaType baseType; */
+NS_IMETHODIMP
+nsSchemaComplexType::GetBaseType(nsISchemaType * *aBaseType)
+{
+  NS_ENSURE_ARG_POINTER(aBaseType);
+
+  NS_IF_ADDREF(*aBaseType = mBaseType);
+
+  return NS_OK;
+}
+
+/* readonly attribute nsISchemaSimpleType simplBaseType; */
+NS_IMETHODIMP
+nsSchemaComplexType::GetSimpleBaseType(nsISchemaSimpleType * *aSimpleBaseType)
+{
+  NS_ENSURE_ARG_POINTER(aSimpleBaseType);
+
+  NS_IF_ADDREF(*aSimpleBaseType = mSimpleBaseType);
+
+  return NS_OK;
+}
+
+/* readonly attribute nsISchemaModelGroup modelGroup; */
+NS_IMETHODIMP
+nsSchemaComplexType::GetModelGroup(nsISchemaModelGroup * *aModelGroup)
+{
+  NS_ENSURE_ARG_POINTER(aModelGroup);
+
+  NS_IF_ADDREF(*aModelGroup = mModelGroup);
+
+  return NS_OK;
+}
+
+/* readonly attribute PRUint32 attributeCount; */
+NS_IMETHODIMP
+nsSchemaComplexType::GetAttributeCount(PRUint32 *aAttributeCount)
+{
+  NS_ENSURE_ARG_POINTER(aAttributeCount);
+
+  *aAttributeCount = mAttributes.Count();
+
+  return NS_OK;
+}
+
+/* nsISchemaAttributeComponent getAttributeByIndex (in PRUint32 index); */
+NS_IMETHODIMP
+nsSchemaComplexType::GetAttributeByIndex(PRUint32 aIndex, 
+                                         nsISchemaAttributeComponent** aResult)
+{
+  NS_ENSURE_ARG_POINTER(aResult);
+
+  if (aIndex >= (PRUint32)mAttributes.Count()) {
+    return NS_ERROR_FAILURE;
+  }
+
+  NS_ADDREF(*aResult = mAttributes.ObjectAt(aIndex));
+
+  return NS_OK;
+}
+
+/* nsISchemaAttributeComponent getAttributeByName (in AString name); */
+NS_IMETHODIMP
+nsSchemaComplexType::GetAttributeByName(const nsAString& aName, 
+                                        nsISchemaAttributeComponent** aResult)
+{
+  NS_ENSURE_ARG_POINTER(aResult);
+
+  mAttributesHash.Get(aName, aResult);
+
+  return NS_OK;
+}
+
+/* readonly attribute boolean abstract; */
+NS_IMETHODIMP
+nsSchemaComplexType::GetAbstract(PRBool *aAbstract)
+{
+  NS_ENSURE_ARG_POINTER(aAbstract);
+
+  *aAbstract = mAbstract;
+  
+  return NS_OK;
+}
+
+/* readonly attribute boolean isArray; */
+NS_IMETHODIMP
+nsSchemaComplexType::GetIsArray(PRBool* aIsArray) 
+{
+  NS_ENSURE_ARG_POINTER(aIsArray);
+
+  nsCOMPtr<nsISchemaComplexType> complexBase = do_QueryInterface(mBaseType);
+  if (complexBase) {
+    return complexBase->GetIsArray(aIsArray);
+  }
+
+  *aIsArray = PR_FALSE;
+
+  return NS_OK;
+}
+
+/* readonly attribute nsISchemaType arrayType; */
+NS_IMETHODIMP
+nsSchemaComplexType::GetArrayType(nsISchemaType** aArrayType)
+{
+  NS_ENSURE_ARG_POINTER(aArrayType);
+
+  *aArrayType = nsnull;
+  if (mArrayInfo) {
+    mArrayInfo->GetType(aArrayType);
+  }
+  else {
+    nsCOMPtr<nsISchemaComplexType> complexBase = do_QueryInterface(mBaseType);
+    if (complexBase) {
+      return complexBase->GetArrayType(aArrayType);
+    }
+  }
+
+  return NS_OK;
+}
+
+/* readonly attribute PRUint32 arrayDimension; */
+NS_IMETHODIMP
+nsSchemaComplexType::GetArrayDimension(PRUint32* aDimension)
+{
+  NS_ENSURE_ARG_POINTER(aDimension);
+
+  *aDimension = 0;
+  if (mArrayInfo) {
+    *aDimension = mArrayInfo->GetDimension();
+  }
+  else {
+    nsCOMPtr<nsISchemaComplexType> complexBase = do_QueryInterface(mBaseType);
+    if (complexBase) {
+      return complexBase->GetArrayDimension(aDimension);
+    }
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchemaComplexType::SetContentModel(PRUint16 aContentModel)
+{
+  mContentModel = aContentModel;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchemaComplexType::SetDerivation(PRUint16 aDerivation, 
+                                   nsISchemaType* aBaseType)
+{
+  mDerivation = aDerivation;
+  mBaseType = aBaseType;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchemaComplexType::SetSimpleBaseType(nsISchemaSimpleType* aSimpleBaseType)
+{
+  mSimpleBaseType = aSimpleBaseType;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchemaComplexType::SetModelGroup(nsISchemaModelGroup* aModelGroup)
+{
+  mModelGroup = aModelGroup;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchemaComplexType::AddAttribute(nsISchemaAttributeComponent* aAttribute)
+{
+  NS_ENSURE_ARG_POINTER(aAttribute);
+
+  nsAutoString name;
+  aAttribute->GetName(name);
+
+  mAttributes.AppendObject(aAttribute);
+  mAttributesHash.Put(name, aAttribute);
+
+  return NS_OK;  
+}
+
+NS_IMETHODIMP
+nsSchemaComplexType::SetArrayInfo(nsISchemaType* aType, PRUint32 aDimension)
+{
+  mArrayInfo = new nsComplexTypeArrayInfo(aType, aDimension);
+
+  return mArrayInfo ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
+}
diff --git a/extensions/xforms/nsIXFormsActionModuleElement.idl b/extensions/schema-validation/src/nsSchemaComponentBase.cpp
similarity index 62%
copy from extensions/xforms/nsIXFormsActionModuleElement.idl
copy to extensions/schema-validation/src/nsSchemaComponentBase.cpp
index 414cb8d..a3f791d 100644
--- a/extensions/xforms/nsIXFormsActionModuleElement.idl
+++ b/extensions/schema-validation/src/nsSchemaComponentBase.cpp
@@ -12,19 +12,19 @@
  * for the specific language governing rights and limitations under the
  * License.
  *
- * The Original Code is Mozilla XForms support.
+ * The Original Code is Mozilla.
  *
  * The Initial Developer of the Original Code is
- * Olli Pettay.
- * Portions created by the Initial Developer are Copyright (C) 2004
+ * Netscape Communications.
+ * Portions created by the Initial Developer are Copyright (C) 2001
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
- *   Olli Pettay <Olli.Pettay@helsinki.fi> (original author)
+ *   Vidur Apparao <vidur@netscape.com> (original author)
  *
  * Alternatively, the contents of this file may be used under the terms of
- * either of 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"),
+ * 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
@@ -36,14 +36,31 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsISupports.idl"
+#include "nsSchemaPrivate.h"
 
-interface nsIDOMEvent;
-interface nsIXFormsActionElement;
+////////////////////////////////////////////////////////////
+//
+// nsSchemaComponentBase implementation
+//
+////////////////////////////////////////////////////////////
+nsSchemaComponentBase::nsSchemaComponentBase(nsSchema* aSchema) 
+  : mSchema(aSchema), mIsResolved(PR_FALSE), mIsCleared(PR_FALSE)
+{
+}
+
+nsSchemaComponentBase::~nsSchemaComponentBase()
+{
+  mSchema = nsnull;
+}
 
-[uuid(b19c47e4-2478-4a73-91a3-d86f91d91ffd)]
-interface nsIXFormsActionModuleElement : nsISupports
+/* readonly attribute wstring targetNamespace; */
+NS_IMETHODIMP 
+nsSchemaComponentBase::GetTargetNamespace(nsAString& aTargetNamespace)
 {
-  void handleAction(in nsIDOMEvent aEvent, in nsIXFormsActionElement aParentAction);
-};
+  if (mSchema) {
+    return mSchema->GetTargetNamespace(aTargetNamespace);
+  }
 
+  aTargetNamespace.Truncate();
+  return NS_OK;
+}
diff --git a/extensions/schema-validation/src/nsSchemaDuration.cpp b/extensions/schema-validation/src/nsSchemaDuration.cpp
index f452d11..7da6761 100644
--- a/extensions/schema-validation/src/nsSchemaDuration.cpp
+++ b/extensions/schema-validation/src/nsSchemaDuration.cpp
@@ -39,8 +39,7 @@
 #include "nsSchemaDuration.h"
 
 // string includes
-#include "nsReadableUtils.h"
-#include "nsString.h"
+#include "nsStringAPI.h"
 #include "nsUnicharUtils.h"
 
 // XPCOM includes
diff --git a/extensions/webservices/schema/src/nsSchemaLoader.cpp b/extensions/schema-validation/src/nsSchemaLoader.cpp
similarity index 99%
copy from extensions/webservices/schema/src/nsSchemaLoader.cpp
copy to extensions/schema-validation/src/nsSchemaLoader.cpp
index 0005bc0..5277aab 100644
--- a/extensions/webservices/schema/src/nsSchemaLoader.cpp
+++ b/extensions/schema-validation/src/nsSchemaLoader.cpp
@@ -618,10 +618,10 @@ nsSchemaLoader::GetResolvedURI(const nsAString& aSchemaURI,
                                nsIURI** aURI)
 {
   nsresult rv;
-  nsCOMPtr<nsIXPCNativeCallContext> cc;
+  nsAXPCNativeCallContext *cc = nsnull;
   nsCOMPtr<nsIXPConnect> xpc(do_GetService(nsIXPConnect::GetCID(), &rv));
   if(NS_SUCCEEDED(rv)) {
-    rv = xpc->GetCurrentNativeCallContext(getter_AddRefs(cc));
+    rv = xpc->GetCurrentNativeCallContext(&cc);
   }
 
   if (NS_SUCCEEDED(rv) && cc) {
diff --git a/extensions/schema-validation/src/nsSchemaLoader.h b/extensions/schema-validation/src/nsSchemaLoader.h
new file mode 100644
index 0000000..981b94f
--- /dev/null
+++ b/extensions/schema-validation/src/nsSchemaLoader.h
@@ -0,0 +1,235 @@
+/* -*- 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 Mozilla.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Vidur Apparao <vidur@netscape.com> (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 ***** */
+
+#ifndef __nsSchemaLoader_h__
+#define __nsSchemaLoader_h__
+
+#include "nsIWebServiceErrorHandler.h"
+#include "nsISchemaLoader.h"
+#include "nsSchemaPrivate.h"
+#include "nsDOMUtils.h"
+
+// DOM includes
+#include "nsIDOMElement.h"
+#include "nsIDOMNodeList.h"
+#include "nsIDOMNode.h"
+
+// XPCOM Includes
+#include "nsCOMPtr.h"
+#include "nsVoidArray.h"
+#include "nsString.h"
+#include "nsIAtom.h"
+#include "nsInterfaceHashtable.h"
+
+// Loading includes
+#include "nsIURI.h"
+
+class nsSchemaAtoms 
+{
+public:
+  static nsresult AddRefAtoms();
+
+#define SCHEMA_ATOM(_name, _value) static nsIAtom* _name;
+#include "nsSchemaAtomList.h"
+#undef SCHEMA_ATOM
+};
+
+class nsBuiltinSchemaCollection : public nsISchemaCollection
+{
+public:
+  nsBuiltinSchemaCollection();
+  nsresult Init();
+
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSISCHEMACOLLECTION
+
+protected:
+  nsresult GetBuiltinType(const nsAString& aName,
+                          const nsAString& aNamespace,
+                          nsISchemaType** aType);
+  nsresult GetSOAPType(const nsAString& aName,
+                       const nsAString& aNamespace,
+                       nsISchemaType** aType);
+
+protected:
+  nsInterfaceHashtable<nsStringHashKey, nsISchemaType> mBuiltinTypesHash;
+  nsInterfaceHashtable<nsStringHashKey, nsISchemaType> mSOAPTypeHash;
+};
+
+class nsSchemaLoader : public nsISchemaLoader,
+                       public nsISchemaCollection
+{
+public:
+  nsSchemaLoader();
+  nsresult Init();
+
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSISCHEMALOADER
+  NS_DECL_NSISCHEMACOLLECTION
+
+protected:
+  nsresult ProcessElement(nsIWebServiceErrorHandler* aErrorHandler,
+                          nsSchema* aSchema, 
+                          nsIDOMElement* aElement,
+                          nsISchemaElement** aSchemaElement);
+  nsresult ProcessComplexType(nsIWebServiceErrorHandler* aErrorHandler,
+                              nsSchema* aSchema, 
+                              nsIDOMElement* aElement,
+                              nsISchemaComplexType** aComplexType);
+  nsresult ProcessComplexTypeBody(nsIWebServiceErrorHandler* aErrorHandler,
+                                  nsSchema* aSchema, 
+                                  nsIDOMElement* aElement,
+                                  nsSchemaComplexType* aComplexType,
+                                  nsSchemaModelGroup* aSequence,
+                                  PRUint16* aContentModel);
+  nsresult ProcessSimpleContent(nsIWebServiceErrorHandler* aErrorHandler,
+                                nsSchema* aSchema, 
+                                nsIDOMElement* aElement,
+                                nsSchemaComplexType* aComplexType,
+                                PRUint16* aDerivation,
+                                nsISchemaType** aBaseType);
+  nsresult ProcessSimpleContentRestriction(nsIWebServiceErrorHandler* aErrorHandler,
+                                           nsSchema* aSchema, 
+                                           nsIDOMElement* aElement,
+                                           nsSchemaComplexType* aComplexType, 
+                                           nsISchemaType* aBaseType,
+                                           nsISchemaSimpleType** aSimpleBaseType);
+  nsresult ProcessSimpleContentExtension(nsIWebServiceErrorHandler* aErrorHandler,
+                                         nsSchema* aSchema, 
+                                         nsIDOMElement* aElement,
+                                         nsSchemaComplexType* aComplexType,
+                                         nsISchemaType* aBaseType,
+                                         nsISchemaSimpleType** aSimpleBaseType);
+  nsresult ProcessComplexContent(nsIWebServiceErrorHandler* aErrorHandler,
+                                 nsSchema* aSchema, 
+                                 nsIDOMElement* aElement,
+                                 nsSchemaComplexType* aComplexType,
+                                 PRUint16* aContentModel,
+                                 PRUint16* aDerivation,
+                                 nsISchemaType** aBaseType);
+  nsresult ProcessSimpleType(nsIWebServiceErrorHandler* aErrorHandler,
+                             nsSchema* aSchema, 
+                             nsIDOMElement* aElement,
+                             nsISchemaSimpleType** aSimpleType);
+  nsresult ProcessSimpleTypeRestriction(nsIWebServiceErrorHandler* aErrorHandler,
+                                        nsSchema* aSchema, 
+                                        nsIDOMElement* aElement,
+                                        const nsAString& aName,
+                                        nsISchemaSimpleType** aSimpleType);
+  nsresult ProcessSimpleTypeList(nsIWebServiceErrorHandler* aErrorHandler,
+                                 nsSchema* aSchema, 
+                                 nsIDOMElement* aElement,
+                                 const nsAString& aName,
+                                 nsISchemaSimpleType** aSimpleType);
+  nsresult ProcessSimpleTypeUnion(nsIWebServiceErrorHandler* aErrorHandler,
+                                  nsSchema* aSchema, 
+                                  nsIDOMElement* aElement,
+                                  const nsAString& aName,
+                                  nsISchemaSimpleType** aSimpleType);
+  nsresult ProcessAttribute(nsIWebServiceErrorHandler* aErrorHandler,
+                            nsSchema* aSchema, 
+                            nsIDOMElement* aElement,
+                            nsISchemaAttribute** aAttribute);
+  nsresult ProcessAttributeGroup(nsIWebServiceErrorHandler* aErrorHandler,
+                                 nsSchema* aSchema, 
+                                 nsIDOMElement* aElement,
+                                 nsISchemaAttributeGroup** aAttributeGroup);
+  nsresult ProcessAttributeComponent(nsIWebServiceErrorHandler* aErrorHandler,
+                                     nsSchema* aSchema, 
+                                     nsIDOMElement* aElement,
+                                     nsIAtom* aTagName,
+                                     nsISchemaAttributeComponent** aAttribute);
+  nsresult ProcessModelGroup(nsIWebServiceErrorHandler* aErrorHandler,
+                             nsSchema* aSchema, 
+                             nsIDOMElement* aElement,
+                             nsIAtom* aTagName,
+                             nsSchemaModelGroup* aParentSequence,
+                             nsISchemaModelGroup** aModelGroup);
+  nsresult ProcessParticle(nsIWebServiceErrorHandler* aErrorHandler,
+                           nsSchema* aSchema, 
+                           nsIDOMElement* aElement,
+                           nsIAtom* aTagName,
+                           nsISchemaParticle** aModelGroup);
+  nsresult ProcessFacet(nsIWebServiceErrorHandler* aErrorHandler,
+                        nsSchema* aSchema, 
+                        nsIDOMElement* aElement,
+                        nsIAtom* aTagName,
+                        nsISchemaFacet** aFacet);
+
+  nsresult GetNewOrUsedType(nsSchema* aSchema,
+                            nsIDOMElement* aContext,
+                            const nsAString& aTypeName,
+                            nsISchemaType** aType);
+
+  void GetUse(nsIDOMElement* aElement, 
+              PRUint16* aUse);
+  void GetProcess(nsIDOMElement* aElement, 
+                  PRUint16* aProcess);
+  void GetMinAndMax(nsIDOMElement* aElement,
+                    PRUint32* aMinOccurs,
+                    PRUint32* aMaxOccurs);
+
+  nsresult GetResolvedURI(const nsAString& aSchemaURI,
+                          const char* aMethod, nsIURI** aURI);
+
+  nsresult ParseArrayType(nsSchema* aSchema,
+                          nsIDOMElement* aAttrElement,
+                          const nsAString& aStr,
+                          nsISchemaType** aType,
+                          PRUint32* aDimension);
+  nsresult ParseDimensions(nsSchema* aSchema,
+                           nsIDOMElement* aAttrElement,
+                           const nsAString& aStr,
+                           nsISchemaType* aBaseType,
+                           nsISchemaType** aArrayType,
+                           PRUint32* aDimension);
+  void ConstructArrayName(nsISchemaType* aType,
+                          nsAString& aName);
+
+  nsresult ParseNameAndNS(const nsAString& aName, nsIDOMElement* aElement,
+                          nsAString& aTypeName, nsAString& aTypeNS);
+
+  nsresult GetDocumentFromURI(const nsAString& aUri,
+                              nsIDOMDocument** aDocument);
+
+protected:
+  nsInterfaceHashtable<nsStringHashKey, nsISchema> mSchemas;
+  nsCOMPtr<nsISchemaCollection> mBuiltinCollection;
+};
+
+#endif // __nsSchemaLoader_h__
diff --git a/extensions/schema-validation/src/nsSchemaParticles.cpp b/extensions/schema-validation/src/nsSchemaParticles.cpp
new file mode 100644
index 0000000..d2fcfc3
--- /dev/null
+++ b/extensions/schema-validation/src/nsSchemaParticles.cpp
@@ -0,0 +1,833 @@
+/* -*- 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 Mozilla.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Vidur Apparao <vidur@netscape.com> (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 "nsSchemaPrivate.h"
+
+////////////////////////////////////////////////////////////
+//
+// nsSchemaParticleBase implementation
+//
+////////////////////////////////////////////////////////////
+nsSchemaParticleBase::nsSchemaParticleBase(nsSchema* aSchema)
+  : nsSchemaComponentBase(aSchema), mMinOccurs(1), mMaxOccurs(1)
+{
+}
+
+nsSchemaParticleBase::~nsSchemaParticleBase()
+{
+}
+
+NS_IMETHODIMP
+nsSchemaParticleBase::GetMinOccurs(PRUint32 *aMinOccurs)
+{
+  NS_ENSURE_ARG_POINTER(aMinOccurs);
+
+  *aMinOccurs = mMinOccurs;
+
+  return NS_OK;
+}
+ 
+NS_IMETHODIMP
+nsSchemaParticleBase::GetMaxOccurs(PRUint32 *aMaxOccurs)
+{
+  NS_ENSURE_ARG_POINTER(aMaxOccurs);
+
+  *aMaxOccurs = mMaxOccurs;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchemaParticleBase::SetMinOccurs(PRUint32 aMinOccurs)
+{
+  mMinOccurs = aMinOccurs;
+
+  if (mMaxOccurs < mMinOccurs) {
+    mMaxOccurs = mMinOccurs;
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchemaParticleBase::SetMaxOccurs(PRUint32 aMaxOccurs)
+{
+  mMaxOccurs = aMaxOccurs;
+
+  if (mMinOccurs > mMaxOccurs) {
+    mMinOccurs = mMaxOccurs;
+  }
+
+  return NS_OK;
+}
+
+////////////////////////////////////////////////////////////
+//
+// nsSchemaModelGroup implementation
+//
+////////////////////////////////////////////////////////////
+nsSchemaModelGroup::nsSchemaModelGroup(nsSchema* aSchema, 
+                                       const nsAString& aName)
+  : nsSchemaParticleBase(aSchema), mName(aName), mCompositor(COMPOSITOR_SEQUENCE)
+{
+}
+
+nsSchemaModelGroup::~nsSchemaModelGroup()
+{
+}
+
+NS_IMPL_ISUPPORTS3_CI(nsSchemaModelGroup, 
+                      nsISchemaComponent,
+                      nsISchemaParticle,
+                      nsISchemaModelGroup)
+
+
+/* void resolve (in nsIWebServiceErrorHandler aErrorHandler); */
+NS_IMETHODIMP
+nsSchemaModelGroup::Resolve(nsIWebServiceErrorHandler* aErrorHandler)
+{
+  if (mIsResolved) {
+    return NS_OK;
+  }
+
+  mIsResolved = PR_TRUE;
+  nsresult rv;
+  PRUint32 i, count;
+
+  count = mParticles.Count();
+  for (i = 0; i < count; ++i) {
+    rv = mParticles.ObjectAt(i)->Resolve(aErrorHandler);
+    if (NS_FAILED(rv)) {
+      nsAutoString name;
+      nsresult rc = mParticles.ObjectAt(i)->GetName(name);
+      NS_ENSURE_SUCCESS(rc, rc);
+      
+      nsAutoString errorMsg;
+      errorMsg.AppendLiteral("Failure resolving schema particle, cannot ");
+      errorMsg.AppendLiteral("resolve particle \"");
+      errorMsg.Append(name);
+      errorMsg.AppendLiteral("\"");
+      
+      NS_SCHEMALOADER_FIRE_ERROR(rv, errorMsg);
+      
+      return rv;
+    }
+  }
+
+  return NS_OK;
+}
+
+/* void clear (); */
+NS_IMETHODIMP
+nsSchemaModelGroup::Clear()
+{
+  if (mIsCleared) {
+    return NS_OK;
+  }
+
+  mIsCleared = PR_TRUE;
+
+  PRUint32 i, count;
+  count = mParticles.Count();
+  for (i = 0; i < count; ++i) {
+    mParticles.ObjectAt(i)->Clear();
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchemaModelGroup::GetParticleType(PRUint16 *aParticleType)
+{
+  NS_ENSURE_ARG_POINTER(aParticleType);
+
+  *aParticleType = nsISchemaParticle::PARTICLE_TYPE_MODEL_GROUP;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchemaModelGroup::GetName(nsAString& aName)
+{
+  aName.Assign(mName);
+
+  return NS_OK;
+}
+
+/* readonly attribute unsigned short compositor; */
+NS_IMETHODIMP
+nsSchemaModelGroup::GetCompositor(PRUint16 *aCompositor)
+{
+  NS_ENSURE_ARG_POINTER(aCompositor);
+
+  *aCompositor = mCompositor;
+
+  return NS_OK;
+}
+
+/* readonly attribute PRUint32 particleCount; */
+NS_IMETHODIMP
+nsSchemaModelGroup::GetParticleCount(PRUint32 *aParticleCount)
+{
+  NS_ENSURE_ARG_POINTER(aParticleCount);
+
+  *aParticleCount = mParticles.Count();
+
+  return NS_OK;
+}
+
+/* nsISchemaParticle getParticle (in PRUint32 index); */
+NS_IMETHODIMP
+nsSchemaModelGroup::GetParticle(PRUint32 aIndex, nsISchemaParticle** aResult)
+{
+  NS_ENSURE_ARG_POINTER(aResult);
+
+  if (aIndex >= (PRUint32)mParticles.Count()) {
+    return NS_ERROR_FAILURE;
+  }
+
+  NS_ADDREF(*aResult = mParticles.ObjectAt(aIndex));
+
+  return NS_OK;
+}
+
+/* nsISchemaElement getElementByName(in AString name); */
+NS_IMETHODIMP
+nsSchemaModelGroup::GetElementByName(const nsAString& aName,
+                                     nsISchemaElement** aResult)
+{
+  NS_ENSURE_ARG_POINTER(aResult);
+
+  PRUint32 i, count;
+  count = mParticles.Count();
+
+  for (i = 0; i < count; ++i) {
+    nsISchemaParticle* particle = mParticles.ObjectAt(i);
+
+    nsCOMPtr<nsISchemaElement> element = do_QueryInterface(particle);
+    if (element) {
+      nsAutoString name;
+      element->GetName(name);
+
+      if (name.Equals(aName)) {
+        NS_ADDREF(*aResult = element);
+
+        return NS_OK;
+      }
+    }
+    else {
+      nsCOMPtr<nsISchemaModelGroup> group = do_QueryInterface(particle);
+      if (group) {
+        nsresult rv = group->GetElementByName(aName, aResult);
+        if (NS_SUCCEEDED(rv)) {
+          return NS_OK;
+        }
+      }
+    }
+  }
+
+  return NS_ERROR_FAILURE; // No element of that name found
+}
+
+NS_IMETHODIMP
+nsSchemaModelGroup::SetCompositor(PRUint16 aCompositor)
+{
+  mCompositor = aCompositor;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchemaModelGroup::AddParticle(nsISchemaParticle* aParticle)
+{
+  NS_ENSURE_ARG_POINTER(aParticle);
+
+  return mParticles.AppendObject(aParticle) ? NS_OK : NS_ERROR_FAILURE;
+}
+
+////////////////////////////////////////////////////////////
+//
+// nsSchemaModelGroupRef implementation
+//
+////////////////////////////////////////////////////////////
+nsSchemaModelGroupRef::nsSchemaModelGroupRef(nsSchema* aSchema,
+                                             const nsAString& aRef,
+                                             const nsAString& aRefNS)
+  : nsSchemaParticleBase(aSchema), mRef(aRef), mRefNS(aRefNS)
+{
+}
+
+nsSchemaModelGroupRef::~nsSchemaModelGroupRef()
+{
+}
+
+NS_IMPL_ISUPPORTS3_CI(nsSchemaModelGroupRef, 
+                      nsISchemaComponent,
+                      nsISchemaParticle,
+                      nsISchemaModelGroup)
+
+/* void resolve (in nsIWebServiceErrorHandler aErrorHandler); */
+NS_IMETHODIMP
+nsSchemaModelGroupRef::Resolve(nsIWebServiceErrorHandler* aErrorHandler)
+{
+  nsresult rv = NS_OK;
+
+  if (mIsResolved) {
+    return NS_OK;
+  }
+
+  mIsResolved = PR_TRUE;
+  if (!mModelGroup && mSchema) {
+    if (mRefNS.IsEmpty()) {
+      mSchema->GetModelGroupByName(mRef, getter_AddRefs(mModelGroup));
+    } else {
+      // use the namespace and type
+      nsCOMPtr<nsISchemaCollection> schemaColl;
+      mSchema->GetCollection(getter_AddRefs(schemaColl));
+      NS_ENSURE_STATE(schemaColl);
+
+      // get the right schema
+      nsCOMPtr<nsISchema> schema;
+      schemaColl->GetSchema(mRefNS, getter_AddRefs(schema));
+      NS_ENSURE_STATE(schema);
+
+      schema->GetModelGroupByName(mRef, getter_AddRefs(mModelGroup));
+    }
+  }
+
+  if (mModelGroup) {
+    rv = mModelGroup->Resolve(aErrorHandler);
+  }
+
+  return rv;
+}
+
+/* void clear (); */
+NS_IMETHODIMP
+nsSchemaModelGroupRef::Clear()
+{
+  if (mIsCleared) {
+    return NS_OK;
+  }
+
+  mIsCleared = PR_TRUE;
+  if (mModelGroup) {
+    mModelGroup->Clear();
+    mModelGroup = nsnull;
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchemaModelGroupRef::GetParticleType(PRUint16 *aParticleType)
+{
+  NS_ENSURE_ARG_POINTER(aParticleType);
+
+  *aParticleType = nsISchemaParticle::PARTICLE_TYPE_MODEL_GROUP;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchemaModelGroupRef::GetName(nsAString& aName)
+{
+  if (!mModelGroup) {
+    return NS_ERROR_NOT_INITIALIZED;
+  }
+
+  return mModelGroup->GetName(aName);
+}
+
+
+/* readonly attribute unsigned short compositor; */
+NS_IMETHODIMP
+nsSchemaModelGroupRef::GetCompositor(PRUint16 *aCompositor)
+{
+  NS_ENSURE_ARG_POINTER(aCompositor);
+
+  if (!mModelGroup) {
+    return NS_ERROR_NOT_INITIALIZED;
+  }
+
+  return mModelGroup->GetCompositor(aCompositor);
+}
+
+/* readonly attribute PRUint32 particleCount; */
+NS_IMETHODIMP
+nsSchemaModelGroupRef::GetParticleCount(PRUint32 *aParticleCount)
+{
+  NS_ENSURE_ARG_POINTER(aParticleCount);
+  
+  if (!mModelGroup) {
+    return NS_ERROR_NOT_INITIALIZED;
+  }
+
+  return mModelGroup->GetParticleCount(aParticleCount);  
+}
+
+/* nsISchemaParticle getParticle (in PRUint32 index); */
+NS_IMETHODIMP
+nsSchemaModelGroupRef::GetParticle(PRUint32 index, nsISchemaParticle **_retval)
+{
+  NS_ENSURE_ARG_POINTER(_retval);
+  
+  if (!mModelGroup) {
+    return NS_ERROR_NOT_INITIALIZED;
+  }
+
+  return mModelGroup->GetParticle(index, _retval);
+}
+
+NS_IMETHODIMP
+nsSchemaModelGroupRef::GetElementByName(const nsAString& aName,
+                                        nsISchemaElement** _retval)
+{
+  NS_ENSURE_ARG_POINTER(_retval);
+  
+  if (!mModelGroup) {
+    return NS_ERROR_NOT_INITIALIZED;
+  }
+
+  return mModelGroup->GetElementByName(aName, _retval);
+}
+
+////////////////////////////////////////////////////////////
+//
+// nsSchemaAnyParticle implementation
+//
+////////////////////////////////////////////////////////////
+nsSchemaAnyParticle::nsSchemaAnyParticle(nsSchema* aSchema)
+  : nsSchemaParticleBase(aSchema), mProcess(PROCESS_STRICT)
+{
+}
+
+nsSchemaAnyParticle::~nsSchemaAnyParticle()
+{
+}
+
+NS_IMPL_ISUPPORTS3_CI(nsSchemaAnyParticle, 
+                      nsISchemaComponent,
+                      nsISchemaParticle,
+                      nsISchemaAnyParticle)
+
+
+/* void resolve (in nsIWebServiceErrorHandler aErrorHandler); */
+NS_IMETHODIMP
+nsSchemaAnyParticle::Resolve(nsIWebServiceErrorHandler* aErrorHandler)
+{
+  return NS_OK;
+}
+
+/* void clear (); */
+NS_IMETHODIMP
+nsSchemaAnyParticle::Clear()
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchemaAnyParticle::GetParticleType(PRUint16 *aParticleType)
+{
+  NS_ENSURE_ARG_POINTER(aParticleType);
+
+  *aParticleType = nsISchemaParticle::PARTICLE_TYPE_ANY;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchemaAnyParticle::GetName(nsAString& aName)
+{
+  aName.AssignLiteral("any");
+
+  return NS_OK;
+}
+
+/* readonly attribute unsigned short process; */
+NS_IMETHODIMP
+nsSchemaAnyParticle::GetProcess(PRUint16 *aProcess)
+{
+  NS_ENSURE_ARG_POINTER(aProcess);
+  
+  *aProcess = mProcess;
+
+  return NS_OK;
+}
+
+/* readonly attribute AString namespace; */
+NS_IMETHODIMP
+nsSchemaAnyParticle::GetNamespace(nsAString & aNamespace)
+{
+  aNamespace.Assign(mNamespace);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchemaAnyParticle::SetProcess(PRUint16 aProcess)
+{
+  mProcess = aProcess;
+  
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchemaAnyParticle::SetNamespace(const nsAString& aNamespace)
+{
+  mNamespace.Assign(aNamespace);
+
+  return NS_OK;
+}
+
+////////////////////////////////////////////////////////////
+//
+// nsSchemaElement implementation
+//
+////////////////////////////////////////////////////////////
+nsSchemaElement::nsSchemaElement(nsSchema* aSchema, 
+                                 const nsAString& aName)
+  : nsSchemaParticleBase(aSchema), mName(aName), mFlags(0)
+{
+}
+
+nsSchemaElement::~nsSchemaElement()
+{
+}
+
+NS_IMPL_ISUPPORTS3_CI(nsSchemaElement, 
+                      nsISchemaComponent,
+                      nsISchemaParticle,
+                      nsISchemaElement)
+
+/* void resolve (in nsIWebServiceErrorHandler aErrorHandler); */
+NS_IMETHODIMP
+nsSchemaElement::Resolve(nsIWebServiceErrorHandler* aErrorHandler)
+{
+  if (mIsResolved) {
+    return NS_OK;
+  }
+
+  mIsResolved = PR_TRUE;
+  nsresult rv = NS_OK;
+  if (mType && mSchema) {
+    nsCOMPtr<nsISchemaType> type;
+    rv = mSchema->ResolveTypePlaceholder(aErrorHandler, mType, getter_AddRefs(type));
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    
+    mType = type;
+    rv = mType->Resolve(aErrorHandler);
+  }
+
+  return rv;
+}
+
+/* void clear (); */
+NS_IMETHODIMP
+nsSchemaElement::Clear()
+{
+  if (mIsCleared) {
+    return NS_OK;
+  }
+
+  mIsCleared = PR_TRUE;
+  if (mType) {
+    mType->Clear();
+    mType = nsnull;
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchemaElement::GetParticleType(PRUint16 *aParticleType)
+{
+  NS_ENSURE_ARG_POINTER(aParticleType);
+
+  *aParticleType = nsISchemaParticle::PARTICLE_TYPE_ELEMENT;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchemaElement::GetName(nsAString& aName)
+{
+  aName.Assign(mName);
+
+  return NS_OK;
+}
+
+/* readonly attribute nsISchemaType type; */
+NS_IMETHODIMP
+nsSchemaElement::GetType(nsISchemaType * *aType)
+{
+  NS_ENSURE_ARG_POINTER(aType);
+  
+  NS_IF_ADDREF(*aType = mType);
+
+  return NS_OK;
+}
+
+/* readonly attribute AString defaultValue; */
+NS_IMETHODIMP
+nsSchemaElement::GetDefaultValue(nsAString & aDefaultValue)
+{
+  aDefaultValue.Assign(mDefaultValue);
+  
+  return NS_OK;
+}
+
+/* readonly attribute AString fixedValue; */
+NS_IMETHODIMP
+nsSchemaElement::GetFixedValue(nsAString & aFixedValue)
+{
+  aFixedValue.Assign(mFixedValue);
+  
+  return NS_OK;
+}
+
+/* readonly attribute boolean nillable; */
+NS_IMETHODIMP
+nsSchemaElement::GetNillable(PRBool *aNillable)
+{
+  NS_ENSURE_ARG_POINTER(aNillable);
+
+  *aNillable = mFlags & nsSchemaElement::NILLABLE;
+
+  return NS_OK;
+}
+
+/* readonly attribute boolean abstract; */
+NS_IMETHODIMP
+nsSchemaElement::GetAbstract(PRBool *aAbstract)
+{
+  NS_ENSURE_ARG_POINTER(aAbstract);
+
+  *aAbstract = mFlags & nsSchemaElement::ABSTRACT;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchemaElement::SetType(nsISchemaType* aType)
+{
+  NS_ENSURE_ARG_POINTER(aType);
+
+  mType = aType;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchemaElement::SetConstraints(const nsAString& aDefaultValue,
+                                const nsAString& aFixedValue)
+{
+  mDefaultValue.Assign(aDefaultValue);
+  mFixedValue.Assign(aFixedValue);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchemaElement::SetFlags(PRInt32 aFlags)
+{
+  mFlags = aFlags;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchemaElement::GetTargetNamespace(nsAString& aTargetNamespace)
+{
+  if ((mFlags & nsSchemaElement::FORM_QUALIFIED) && mSchema) {
+    return mSchema->GetTargetNamespace(aTargetNamespace);
+  }
+  aTargetNamespace.Truncate();
+  return NS_OK;
+}
+
+////////////////////////////////////////////////////////////
+//
+// nsSchemaElementRef implementation
+//
+////////////////////////////////////////////////////////////
+nsSchemaElementRef::nsSchemaElementRef(nsSchema* aSchema, 
+                                       const nsAString& aRef,
+                                       const nsAString& aRefNS)
+  : nsSchemaParticleBase(aSchema), mRef(aRef), mRefNS(aRefNS)
+{
+}
+
+nsSchemaElementRef::~nsSchemaElementRef()
+{
+}
+
+NS_IMPL_ISUPPORTS3_CI(nsSchemaElementRef,
+                      nsISchemaComponent,
+                      nsISchemaParticle,
+                      nsISchemaElement)
+
+/* void resolve (in nsIWebServiceErrorHandler aErrorHandler); */
+NS_IMETHODIMP
+nsSchemaElementRef::Resolve(nsIWebServiceErrorHandler* aErrorHandler)
+{
+  nsresult rv = NS_OK;
+  if (mIsResolved) {
+    return NS_OK;
+  }
+
+  mIsResolved = PR_TRUE;
+  if (!mElement && mSchema) {
+    if (mRefNS.IsEmpty()) {
+      mSchema->GetElementByName(mRef, getter_AddRefs(mElement));
+    } else {
+      // use the namespace and type
+      nsCOMPtr<nsISchemaCollection> schemaColl;
+      mSchema->GetCollection(getter_AddRefs(schemaColl));
+      NS_ENSURE_STATE(schemaColl);
+
+      schemaColl->GetElement(mRef, mRefNS, getter_AddRefs(mElement));
+    }
+  }
+
+  if (mElement) {
+    rv = mElement->Resolve(aErrorHandler);
+  }
+
+  return rv;
+}
+
+/* void clear (); */
+NS_IMETHODIMP
+nsSchemaElementRef::Clear()
+{
+  if (mIsCleared) {
+    return NS_OK;
+  }
+
+  mIsCleared = PR_TRUE;
+  if (mElement) {
+    mElement->Clear();
+    mElement = nsnull;
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchemaElementRef::GetParticleType(PRUint16 *aParticleType)
+{
+  NS_ENSURE_ARG_POINTER(aParticleType);
+
+  *aParticleType = nsISchemaParticle::PARTICLE_TYPE_ELEMENT;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchemaElementRef::GetName(nsAString& aName)
+{
+  if (!mElement) {
+    return NS_ERROR_NOT_INITIALIZED;
+  }
+
+  return mElement->GetName(aName);
+}
+
+/* readonly attribute nsISchemaType type; */
+NS_IMETHODIMP
+nsSchemaElementRef::GetType(nsISchemaType * *aType)
+{
+  NS_ENSURE_ARG_POINTER(aType);
+  
+  if (!mElement) {
+    return NS_ERROR_NOT_INITIALIZED;
+  }
+
+  return mElement->GetType(aType);
+}
+
+/* readonly attribute AString defaultValue; */
+NS_IMETHODIMP
+nsSchemaElementRef::GetDefaultValue(nsAString & aDefaultValue)
+{
+  if (!mElement) {
+    return NS_ERROR_NOT_INITIALIZED;
+  }
+
+  return mElement->GetDefaultValue(aDefaultValue);
+}
+
+/* readonly attribute AString fixedValue; */
+NS_IMETHODIMP
+nsSchemaElementRef::GetFixedValue(nsAString & aFixedValue)
+{
+  if (!mElement) {
+    return NS_ERROR_NOT_INITIALIZED;
+  }
+
+  return mElement->GetFixedValue(aFixedValue);
+}
+
+/* readonly attribute boolean nillable; */
+NS_IMETHODIMP
+nsSchemaElementRef::GetNillable(PRBool *aNillable)
+{
+  NS_ENSURE_ARG_POINTER(aNillable);
+
+  if (!mElement) {
+    return NS_ERROR_NOT_INITIALIZED;
+  }
+
+  return mElement->GetNillable(aNillable);
+}
+
+/* readonly attribute boolean abstract; */
+NS_IMETHODIMP
+nsSchemaElementRef::GetAbstract(PRBool *aAbstract)
+{
+  NS_ENSURE_ARG_POINTER(aAbstract);
+
+  if (!mElement) {
+    return NS_ERROR_NOT_INITIALIZED;
+  }
+
+  return mElement->GetAbstract(aAbstract);
+}
+
diff --git a/extensions/schema-validation/src/nsSchemaPrivate.h b/extensions/schema-validation/src/nsSchemaPrivate.h
new file mode 100644
index 0000000..f2a93c5
--- /dev/null
+++ b/extensions/schema-validation/src/nsSchemaPrivate.h
@@ -0,0 +1,757 @@
+/* -*- 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 Mozilla.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Vidur Apparao <vidur@netscape.com> (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 ***** */
+
+#ifndef __nsSchemaPrivate_h__
+#define __nsSchemaPrivate_h__
+
+#include "nsIWebServiceErrorHandler.h"
+#include "nsISchema.h"
+
+// XPCOM Includes
+#include "nsAutoPtr.h"
+#include "nsCOMPtr.h"
+#include "nsCOMArray.h"
+#include "nsHashKeys.h"
+#include "nsInterfaceHashtable.h"
+#include "nsString.h"
+#include "nsIDOMElement.h"
+#include "nsIClassInfoImpl.h"
+
+#define NS_SCHEMA_2001_NAMESPACE "http://www.w3.org/2001/XMLSchema"
+#define NS_SCHEMA_1999_NAMESPACE "http://www.w3.org/1999/XMLSchema"
+#define NS_SOAP_1_1_ENCODING_NAMESPACE \
+   "http://schemas.xmlsoap.org/soap/encoding/"
+#define NS_SOAP_1_2_ENCODING_NAMESPACE \
+   "http://www.w3.org/2001/09/soap-encoding"
+
+/**
+ * Fire error on error handler passed as argument, only to be used
+ * in ProcessXXX or Resolve methods.
+ */
+#define NS_SCHEMALOADER_FIRE_ERROR(status,statusMessage)   \
+  PR_BEGIN_MACRO                                           \
+  if (aErrorHandler) {                                     \
+    aErrorHandler->OnError(status, statusMessage);         \
+  }                                                        \
+  PR_END_MACRO
+
+class nsSchema : public nsISchema 
+{
+public:
+  nsSchema(nsISchemaCollection* aCollection, nsIDOMElement* aElement);
+  virtual ~nsSchema();
+
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSISCHEMACOMPONENT
+  NS_DECL_NSISCHEMA
+
+  nsresult Init();
+
+  NS_IMETHOD AddType(nsISchemaType* aType);
+  NS_IMETHOD AddAttribute(nsISchemaAttribute* aAttribute);
+  NS_IMETHOD AddElement(nsISchemaElement* aElement);
+  NS_IMETHOD AddAttributeGroup(nsISchemaAttributeGroup* aAttributeGroup);
+  NS_IMETHOD AddModelGroup(nsISchemaModelGroup* aModelGroup);
+  void DropCollectionReference();
+  nsresult ResolveTypePlaceholder(nsIWebServiceErrorHandler* aErrorHandler,
+                                  nsISchemaType* aPlaceholder,
+                                  nsISchemaType** aType);
+  PRBool IsElementFormQualified() { return mElementFormQualified; }
+  PRBool IsAttributeFormDefaultQualified() { return mAttributeFormDefaultQualified; }
+
+protected:
+  nsString mTargetNamespace;
+  nsString mSchemaNamespace;
+  nsCOMArray<nsISchemaType> mTypes;
+  nsInterfaceHashtable<nsStringHashKey, nsISchemaType> mTypesHash;
+  nsCOMArray<nsISchemaAttribute> mAttributes;
+  nsInterfaceHashtable<nsStringHashKey, nsISchemaAttribute> mAttributesHash;
+  nsCOMArray<nsISchemaElement> mElements;
+  nsInterfaceHashtable<nsStringHashKey, nsISchemaElement> mElementsHash;
+  nsCOMArray<nsISchemaAttributeGroup> mAttributeGroups;
+  nsInterfaceHashtable<nsStringHashKey, nsISchemaAttributeGroup> mAttributeGroupsHash;
+  nsCOMArray<nsISchemaModelGroup> mModelGroups;
+  nsInterfaceHashtable<nsStringHashKey, nsISchemaModelGroup> mModelGroupsHash;
+  nsISchemaCollection* mCollection;  // [WEAK] it owns me
+  PRPackedBool mElementFormQualified;
+  PRBool mAttributeFormDefaultQualified;
+};
+
+class nsSchemaComponentBase {
+public:
+  nsSchemaComponentBase(nsSchema* aSchema);
+  virtual ~nsSchemaComponentBase();
+
+  NS_IMETHOD GetTargetNamespace(nsAString& aTargetNamespace);
+
+protected:
+  nsSchema* mSchema;  // [WEAK] It owns me
+  // Used to prevent infinite recursion for cycles in the object graph
+  PRPackedBool mIsResolved;
+  PRPackedBool mIsCleared;
+};
+
+#define NS_IMPL_NSISCHEMACOMPONENT_USING_BASE                           \
+  NS_IMETHOD GetTargetNamespace(nsAString& aTargetNamespace) {          \
+    return nsSchemaComponentBase::GetTargetNamespace(aTargetNamespace); \
+  }                                                                     \
+  NS_IMETHOD Resolve(nsIWebServiceErrorHandler* aErrorHandler);                                                 \
+  NS_IMETHOD Clear();
+
+class nsSchemaBuiltinType : public nsISchemaBuiltinType
+{
+public:
+  nsSchemaBuiltinType(PRUint16 aBuiltinType);
+  virtual ~nsSchemaBuiltinType();
+
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSISCHEMACOMPONENT
+  NS_DECL_NSISCHEMATYPE
+  NS_DECL_NSISCHEMASIMPLETYPE
+  NS_DECL_NSISCHEMABUILTINTYPE
+
+protected:
+  PRUint16 mBuiltinType;
+};
+
+class nsSchemaListType : public nsSchemaComponentBase,
+                         public nsISchemaListType
+{
+public:
+  nsSchemaListType(nsSchema* aSchema, const nsAString& aName);
+  virtual ~nsSchemaListType();
+
+  NS_DECL_ISUPPORTS
+  NS_IMPL_NSISCHEMACOMPONENT_USING_BASE
+  NS_DECL_NSISCHEMATYPE
+  NS_DECL_NSISCHEMASIMPLETYPE
+  NS_DECL_NSISCHEMALISTTYPE
+  
+  NS_IMETHOD SetListType(nsISchemaSimpleType* aListType);
+
+protected:
+  nsString mName;
+  nsCOMPtr<nsISchemaSimpleType> mListType;
+};
+
+class nsSchemaUnionType : public nsSchemaComponentBase,
+                          public nsISchemaUnionType
+{
+public:
+  nsSchemaUnionType(nsSchema* aSchema, const nsAString& aName);
+  virtual ~nsSchemaUnionType();
+  
+  NS_DECL_ISUPPORTS
+  NS_IMPL_NSISCHEMACOMPONENT_USING_BASE
+  NS_DECL_NSISCHEMATYPE
+  NS_DECL_NSISCHEMASIMPLETYPE
+  NS_DECL_NSISCHEMAUNIONTYPE
+
+  NS_IMETHOD AddUnionType(nsISchemaSimpleType* aUnionType);
+
+protected:
+  nsString mName;
+  nsCOMArray<nsISchemaSimpleType> mUnionTypes;
+};
+
+class nsSchemaRestrictionType : public nsSchemaComponentBase,
+                                public nsISchemaRestrictionType
+{
+public:
+  nsSchemaRestrictionType(nsSchema* aSchema, const nsAString& aName);
+  virtual ~nsSchemaRestrictionType();
+
+  NS_DECL_ISUPPORTS
+  NS_IMPL_NSISCHEMACOMPONENT_USING_BASE
+  NS_DECL_NSISCHEMATYPE
+  NS_DECL_NSISCHEMASIMPLETYPE
+  NS_DECL_NSISCHEMARESTRICTIONTYPE
+
+  NS_IMETHOD SetBaseType(nsISchemaSimpleType* aBaseType);
+  NS_IMETHOD AddFacet(nsISchemaFacet* aFacet);
+
+protected:
+  nsString mName;
+  nsCOMPtr<nsISchemaSimpleType> mBaseType;
+  nsCOMArray<nsISchemaFacet> mFacets;
+};
+
+class nsComplexTypeArrayInfo {
+public:
+  nsComplexTypeArrayInfo(nsISchemaType* aType, PRUint32 aDimension) :
+    mType(aType), mDimension(aDimension) {}
+  ~nsComplexTypeArrayInfo() {}
+
+  void GetType(nsISchemaType** aType) { *aType = mType; NS_ADDREF(*aType); }
+  PRUint32 GetDimension() { return mDimension; }
+
+private:
+  nsCOMPtr<nsISchemaType> mType;
+  PRUint32 mDimension;
+};
+
+class nsSchemaComplexType : public nsSchemaComponentBase,
+                            public nsISchemaComplexType
+{
+public:
+  nsSchemaComplexType(nsSchema* aSchema, const nsAString& aName,
+                      PRBool aAbstract);
+  virtual ~nsSchemaComplexType();
+
+  NS_DECL_ISUPPORTS
+  NS_IMPL_NSISCHEMACOMPONENT_USING_BASE
+  NS_DECL_NSISCHEMATYPE
+  NS_DECL_NSISCHEMACOMPLEXTYPE
+
+  nsresult Init()
+  {
+    return mAttributesHash.Init() ? NS_OK : NS_ERROR_FAILURE;
+  }
+
+  nsresult ProcessExtension(nsIWebServiceErrorHandler* aErrorHandler);
+
+  NS_IMETHOD SetContentModel(PRUint16 aContentModel);
+  NS_IMETHOD SetDerivation(PRUint16 aDerivation, nsISchemaType* aBaseType);
+  NS_IMETHOD SetSimpleBaseType(nsISchemaSimpleType* aSimpleBaseType);
+  NS_IMETHOD SetModelGroup(nsISchemaModelGroup* aModelGroup);
+  NS_IMETHOD AddAttribute(nsISchemaAttributeComponent* aAttribute);
+  NS_IMETHOD SetArrayInfo(nsISchemaType* aType, PRUint32 aDimension);
+  
+protected:
+  nsString mName;
+  PRPackedBool mAbstract;
+  PRUint16 mContentModel;
+  PRUint16 mDerivation;
+  nsCOMPtr<nsISchemaType> mBaseType;
+  nsCOMPtr<nsISchemaSimpleType> mSimpleBaseType;
+  nsCOMPtr<nsISchemaModelGroup> mModelGroup;
+  nsCOMArray<nsISchemaAttributeComponent> mAttributes;
+  nsInterfaceHashtable<nsStringHashKey, nsISchemaAttributeComponent> mAttributesHash;
+  nsAutoPtr<nsComplexTypeArrayInfo> mArrayInfo;
+};
+
+class nsSchemaTypePlaceholder : public nsSchemaComponentBase,
+                                public nsISchemaSimpleType
+{
+public:
+  nsSchemaTypePlaceholder(nsSchema* aSchema, const nsAString& aName);
+  virtual ~nsSchemaTypePlaceholder();
+
+  NS_DECL_ISUPPORTS
+  NS_IMPL_NSISCHEMACOMPONENT_USING_BASE
+  NS_DECL_NSISCHEMATYPE
+  NS_DECL_NSISCHEMASIMPLETYPE
+
+protected:
+  nsString mName;
+};
+
+class nsSchemaParticleBase : public nsSchemaComponentBase
+{
+public:  
+  nsSchemaParticleBase(nsSchema* aSchema);
+  virtual ~nsSchemaParticleBase();
+
+  NS_IMETHOD GetMinOccurs(PRUint32 *aMinOccurs);
+  NS_IMETHOD GetMaxOccurs(PRUint32 *aMaxOccurs);
+
+  NS_IMETHOD SetMinOccurs(PRUint32 aMinOccurs);
+  NS_IMETHOD SetMaxOccurs(PRUint32 aMaxOccurs);
+
+protected:
+  PRUint32 mMinOccurs;
+  PRUint32 mMaxOccurs;
+};
+
+#define NS_IMPL_NSISCHEMAPARTICLE_USING_BASE                           \
+  NS_IMETHOD GetMinOccurs(PRUint32 *aMinOccurs) {                      \
+    return nsSchemaParticleBase::GetMinOccurs(aMinOccurs);             \
+  }                                                                    \
+  NS_IMETHOD GetMaxOccurs(PRUint32 *aMaxOccurs) {                      \
+    return nsSchemaParticleBase::GetMaxOccurs(aMaxOccurs);             \
+  }                                                                    \
+  NS_IMETHOD SetMinOccurs(PRUint32 aMinOccurs) {                       \
+    return nsSchemaParticleBase::SetMinOccurs(aMinOccurs);             \
+  }                                                                    \
+  NS_IMETHOD SetMaxOccurs(PRUint32 aMaxOccurs) {                       \
+    return nsSchemaParticleBase::SetMaxOccurs(aMaxOccurs);             \
+  }                                                                    \
+  NS_IMETHOD GetParticleType(PRUint16 *aParticleType);                 \
+  NS_IMETHOD GetName(nsAString& aName);                        
+
+class nsSchemaModelGroup : public nsSchemaParticleBase,
+                           public nsISchemaModelGroup
+{
+public:
+  nsSchemaModelGroup(nsSchema* aSchema, 
+                     const nsAString& aName);
+  virtual ~nsSchemaModelGroup();
+
+  NS_DECL_ISUPPORTS
+  NS_IMPL_NSISCHEMACOMPONENT_USING_BASE
+  NS_IMPL_NSISCHEMAPARTICLE_USING_BASE
+  NS_DECL_NSISCHEMAMODELGROUP
+
+  NS_IMETHOD SetCompositor(PRUint16 aCompositor);
+  NS_IMETHOD AddParticle(nsISchemaParticle* aParticle);
+
+protected:
+  nsString mName;
+  PRUint16 mCompositor;
+  nsCOMArray<nsISchemaParticle> mParticles;
+};
+
+class nsSchemaModelGroupRef : public nsSchemaParticleBase,
+                              public nsISchemaModelGroup
+{
+public:
+  nsSchemaModelGroupRef(nsSchema* aSchema, 
+                        const nsAString& aRef,
+                        const nsAString& aRefNS);
+  virtual ~nsSchemaModelGroupRef();
+
+  NS_DECL_ISUPPORTS
+  NS_IMPL_NSISCHEMACOMPONENT_USING_BASE
+  NS_IMPL_NSISCHEMAPARTICLE_USING_BASE
+  NS_DECL_NSISCHEMAMODELGROUP
+
+protected:
+  nsString mRef, mRefNS;
+  nsCOMPtr<nsISchemaModelGroup> mModelGroup;
+};
+
+class nsSchemaAnyParticle : public nsSchemaParticleBase,
+                            public nsISchemaAnyParticle
+{
+public:
+  nsSchemaAnyParticle(nsSchema* aSchema);
+  virtual ~nsSchemaAnyParticle();
+
+  NS_DECL_ISUPPORTS
+  NS_IMPL_NSISCHEMACOMPONENT_USING_BASE
+  NS_IMPL_NSISCHEMAPARTICLE_USING_BASE
+  NS_DECL_NSISCHEMAANYPARTICLE
+
+  NS_IMETHOD SetProcess(PRUint16 aProcess);
+  NS_IMETHOD SetNamespace(const nsAString& aNamespace);
+
+protected:
+  PRUint16 mProcess;
+  nsString mNamespace;
+};
+
+class nsSchemaElement : public nsSchemaParticleBase,
+                        public nsISchemaElement
+{
+public:
+  enum { NILLABLE       = 1 << 1 };
+  enum { ABSTRACT       = 1 << 2 };
+  enum { FORM_QUALIFIED = 1 << 3 };
+
+  nsSchemaElement(nsSchema* aSchema, const nsAString& aName);
+  virtual ~nsSchemaElement();
+
+  NS_DECL_ISUPPORTS
+  NS_IMPL_NSISCHEMAPARTICLE_USING_BASE
+  NS_DECL_NSISCHEMAELEMENT
+
+  NS_IMETHOD GetTargetNamespace(nsAString& aTargetNamespace);
+  NS_IMETHOD Resolve(nsIWebServiceErrorHandler* aErrorHandler);
+  NS_IMETHOD Clear();
+  NS_IMETHOD SetType(nsISchemaType* aType);
+  NS_IMETHOD SetConstraints(const nsAString& aDefaultValue,
+                            const nsAString& aFixedValue);
+  NS_IMETHOD SetFlags(PRInt32 aFlags);
+
+protected:
+  nsString mName;
+  nsCOMPtr<nsISchemaType> mType;
+  nsString mDefaultValue;
+  nsString mFixedValue;
+  PRUint8 mFlags;
+};
+
+class nsSchemaElementRef : public nsSchemaParticleBase,
+                           public nsISchemaElement
+{
+public:
+  nsSchemaElementRef(nsSchema* aSchema, const nsAString& aRef, const nsAString& aRefNS);
+  virtual ~nsSchemaElementRef();
+
+  NS_DECL_ISUPPORTS
+  NS_IMPL_NSISCHEMACOMPONENT_USING_BASE
+  NS_IMPL_NSISCHEMAPARTICLE_USING_BASE
+  NS_DECL_NSISCHEMAELEMENT
+
+protected:
+  nsString mRef;
+  nsString mRefNS;
+  nsCOMPtr<nsISchemaElement> mElement;
+};
+
+class nsSchemaAttribute : public nsSchemaComponentBase,
+                          public nsISchemaAttribute 
+{
+public:
+  nsSchemaAttribute(nsSchema* aSchema, const nsAString& aName);
+  virtual ~nsSchemaAttribute();
+
+  NS_DECL_ISUPPORTS
+  NS_IMPL_NSISCHEMACOMPONENT_USING_BASE
+  NS_DECL_NSISCHEMAATTRIBUTECOMPONENT
+  NS_DECL_NSISCHEMAATTRIBUTE
+
+  NS_IMETHOD SetType(nsISchemaSimpleType* aType);
+  NS_IMETHOD SetConstraints(const nsAString& aDefaultValue,
+                            const nsAString& aFixedValue);
+  NS_IMETHOD SetUse(PRUint16 aUse);
+  nsresult SetAttributeFormQualified(PRBool aAttributeFormQualified);
+
+protected:
+  nsString mName;
+  nsCOMPtr<nsISchemaSimpleType> mType;
+  nsString mDefaultValue;
+  nsString mFixedValue;
+  PRUint16 mUse;
+  PRBool mAttributeFormQualified;
+};
+
+class nsSchemaAttributeRef : public nsSchemaComponentBase,
+                             public nsISchemaAttribute 
+{
+public:
+  nsSchemaAttributeRef(nsSchema* aSchema, const nsAString& aRef,
+                       const nsAString& aRefNS);
+  virtual ~nsSchemaAttributeRef();
+  
+  NS_DECL_ISUPPORTS
+  NS_IMPL_NSISCHEMACOMPONENT_USING_BASE
+  NS_DECL_NSISCHEMAATTRIBUTECOMPONENT
+  NS_DECL_NSISCHEMAATTRIBUTE
+
+  NS_IMETHOD SetConstraints(const nsAString& aDefaultValue,
+                            const nsAString& aFixedValue);
+  NS_IMETHOD SetUse(PRUint16 aUse);
+  nsresult SetAttributeFormQualified(PRBool aAttributeFormQualified);
+
+protected:
+  nsString mRef, mRefNS;
+  nsCOMPtr<nsISchemaAttribute> mAttribute;
+  nsString mDefaultValue;
+  nsString mFixedValue;
+  PRUint16 mUse;
+  PRBool mAttributeFormQualified;
+};
+
+class nsSchemaAttributeGroup : public nsSchemaComponentBase,
+                               public nsISchemaAttributeGroup
+{
+public:
+  nsSchemaAttributeGroup(nsSchema* aSchema, const nsAString& aName);
+  virtual ~nsSchemaAttributeGroup();
+  
+  NS_DECL_ISUPPORTS
+  NS_IMPL_NSISCHEMACOMPONENT_USING_BASE
+  NS_DECL_NSISCHEMAATTRIBUTECOMPONENT
+  NS_DECL_NSISCHEMAATTRIBUTEGROUP
+
+  nsresult Init()
+  {
+    return mAttributesHash.Init() ? NS_OK : NS_ERROR_FAILURE;
+  }
+
+  NS_IMETHOD AddAttribute(nsISchemaAttributeComponent* aAttribute);
+
+protected:
+  nsString mName;
+  nsCOMArray<nsISchemaAttributeComponent> mAttributes;
+  nsInterfaceHashtable<nsStringHashKey, nsISchemaAttributeComponent> mAttributesHash;
+};
+
+class nsSchemaAttributeGroupRef : public nsSchemaComponentBase,
+                                  public nsISchemaAttributeGroup
+{
+public:
+  nsSchemaAttributeGroupRef(nsSchema* aSchema, const nsAString& aRef, 
+                            const nsAString& aRefNS);
+  virtual ~nsSchemaAttributeGroupRef();
+  
+  NS_DECL_ISUPPORTS
+  NS_IMPL_NSISCHEMACOMPONENT_USING_BASE
+  NS_DECL_NSISCHEMAATTRIBUTECOMPONENT
+  NS_DECL_NSISCHEMAATTRIBUTEGROUP
+
+protected:
+  nsString mRef, mRefNS;
+  nsCOMPtr<nsISchemaAttributeGroup> mAttributeGroup;
+};
+
+class nsSchemaAnyAttribute : public nsSchemaComponentBase,
+                             public nsISchemaAnyAttribute
+{
+public:
+  nsSchemaAnyAttribute(nsSchema* aSchema);
+  virtual ~nsSchemaAnyAttribute();
+
+  NS_DECL_ISUPPORTS
+  NS_IMPL_NSISCHEMACOMPONENT_USING_BASE
+  NS_DECL_NSISCHEMAATTRIBUTECOMPONENT
+  NS_DECL_NSISCHEMAANYATTRIBUTE
+  
+  NS_IMETHOD SetProcess(PRUint16 aProcess);
+  NS_IMETHOD SetNamespace(const nsAString& aNamespace);
+
+protected:
+  PRUint16 mProcess;
+  nsString mNamespace;
+};
+
+class nsSchemaFacet : public nsSchemaComponentBase,
+                      public nsISchemaFacet
+{
+public:
+  nsSchemaFacet(nsSchema* aSchema);
+  virtual ~nsSchemaFacet();
+
+  NS_DECL_ISUPPORTS
+  NS_IMPL_NSISCHEMACOMPONENT_USING_BASE
+  NS_DECL_NSISCHEMAFACET
+
+  NS_IMETHOD SetFacetType(PRUint16 aFacetType);
+  NS_IMETHOD SetIsFixed(PRBool aIsFixed);
+  NS_IMETHOD SetValue(const nsAString& aStrValue);
+  NS_IMETHOD SetUintValue(PRUint32 aUintValue);
+  NS_IMETHOD SetWhitespaceValue(PRUint16 aWhitespaceValue);
+
+protected:
+  PRUint16 mFacetType;
+  PRPackedBool mIsFixed;
+  nsString mStrValue;
+  PRUint32 mUintValue;
+  PRUint16 mWhitespaceValue;
+};
+
+class nsSOAPArray : public nsISchemaComplexType
+{
+public:
+  nsSOAPArray(nsISchemaType* aAnyType);
+  virtual ~nsSOAPArray();
+
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSISCHEMACOMPONENT
+  NS_DECL_NSISCHEMATYPE
+  NS_DECL_NSISCHEMACOMPLEXTYPE
+
+protected:
+  nsCOMPtr<nsISchemaType> mAnyType;
+};
+
+class nsSOAPArrayType : public nsISchemaRestrictionType
+{
+public:
+  nsSOAPArrayType();
+  virtual ~nsSOAPArrayType();
+
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSISCHEMACOMPONENT
+  NS_DECL_NSISCHEMATYPE
+  NS_DECL_NSISCHEMASIMPLETYPE
+  NS_DECL_NSISCHEMARESTRICTIONTYPE
+};
+
+#define NS_SCHEMA_CID                              \
+{ /* 58870ef5-cb65-4220-8317-dbe236059c58 */       \
+ 0x58870ef5, 0xcb65, 0x4220,                       \
+ {0x83, 0x17, 0xdb, 0xe2, 0x36, 0x05, 0x9c, 0x58}}
+
+#define NS_SCHEMA_CONTRACTID    \
+"@mozilla.org/xmlextras/schemas/schema;1"
+
+#define NS_SCHEMABUILTINTYPE_CID                   \
+{ /* c1db07bc-1095-4a44-9ed6-f4a00a116b4a */       \
+ 0xc1db07bc, 0x1095, 0x4a44,                       \
+ {0x9e, 0xd6, 0xf4, 0xa0, 0x0a, 0x11, 0x6b, 0x4a}}
+
+#define NS_SCHEMABUILTINTYPE_CONTRACTID    \
+"@mozilla.org/xmlextras/schemas/schemabuiltintype;1"
+
+#define NS_SCHEMALISTTYPE_CID                      \
+{ /* 2053b685-e541-45f9-bb00-9d8897b8887d */       \
+ 0x2053b685, 0xe541, 0x45f9,                       \
+ {0xbb, 0x00, 0x9d, 0x88, 0x97, 0xb8, 0x88, 0x7d}}
+
+#define NS_SCHEMALISTTYPE_CONTRACTID    \
+"@mozilla.org/xmlextras/schemas/schemalisttype;1"
+
+#define NS_SCHEMAUNIONTYPE_CID                     \
+{ /* ef8b74ae-da9a-4fa2-b6f1-b587b02b2262 */       \
+ 0xef8b74ae, 0xda9a, 0x4fa2,                       \
+ {0xb6, 0xf1, 0xb5, 0x87, 0xb0, 0x2b, 0x22, 0x62}}
+
+#define NS_SCHEMAUNIONTYPE_CONTRACTID    \
+"@mozilla.org/xmlextras/schemas/schemauniontype;1"
+
+#define NS_SCHEMARESTRICTIONTYPE_CID               \
+{ /* 38622f82-c10e-48cc-aea9-1a6ed31078e5 */       \
+ 0x38622f82, 0xc10e, 0x48cc,                       \
+ {0xae, 0xa9, 0x1a, 0x6e, 0xd3, 0x10, 0x78, 0xe5}}
+
+#define NS_SCHEMARESTRICTIONTYPE_CONTRACTID    \
+"@mozilla.org/xmlextras/schemas/schemarestrictiontype;1"
+
+#define NS_SCHEMACOMPLEXTYPE_CID                   \
+{ /* e8266b17-b5ed-4228-be18-473dbfe68f67 */       \
+ 0xe8266b17, 0xb5ed, 0x4228,                       \
+ {0xbe, 0x18, 0x47, 0x3d, 0xbf, 0xe6, 0x8f, 0x67}}
+
+#define NS_SCHEMACOMPLEXTYPE_CONTRACTID    \
+"@mozilla.org/xmlextras/schemas/schemacomplextype;1"
+
+#define NS_SCHEMATYPEPLACEHOLDER_CID               \
+{ /* 50e026ef-e0ef-408c-a5ed-8492d7f3604e */       \
+ 0x50e026ef, 0xe0ef, 0x408c,                       \
+ {0xa5, 0xed, 0x84, 0x92, 0xd7, 0xf3, 0x60, 0x4e}}
+
+#define NS_SCHEMATYPEPLACEHOLDER_CONTRACTID    \
+"@mozilla.org/xmlextras/schemas/schematypeplaceholder;1"
+
+#define NS_SCHEMAMODELGROUP_CID                    \
+{ /* 8f75863d-a724-40d5-a271-72bb67ef2105 */       \
+ 0x8f75863d, 0xa724, 0x40d5,                       \
+ {0xa2, 0x71, 0x72, 0xbb, 0x67, 0xef, 0x21, 0x05}}
+
+#define NS_SCHEMAMODELGROUP_CONTRACTID    \
+"@mozilla.org/xmlextras/schemas/schemamodelgroup;1"
+
+#define NS_SCHEMAMODELGROUPREF_CID                 \
+{ /* 2e9dca3a-5684-44a1-99cb-94f8aef95c03 */       \
+ 0x2e9dca3a, 0x5684, 0x44a1,                       \
+ {0x99, 0xcb, 0x94, 0xf8, 0xae, 0xf9, 0x5c, 0x03}}
+
+#define NS_SCHEMAMODELGROUPREF_CONTRACTID    \
+"@mozilla.org/xmlextras/schemas/schemamodelgroupref;1"
+
+#define NS_SCHEMAANYPARTICLE_CID                   \
+{ /* ab78c787-a356-483a-9153-92c50ba8a80d */       \
+ 0xab78c787, 0xa356, 0x483a,                       \
+ {0x91, 0x53, 0x92, 0xc5, 0x0b, 0xa8, 0xa8, 0x0d}}
+
+#define NS_SCHEMAANYPARTICLE_CONTRACTID    \
+"@mozilla.org/xmlextras/schemas/schemaanyparticle;1"
+
+#define NS_SCHEMAELEMENT_CID                       \
+{ /* 9c3e5c69-2d47-475d-9cc8-1d6905d0f7dc */       \
+ 0x9c3e5c69, 0x2d47, 0x475d,                       \
+ {0x9c, 0xc8, 0x1d, 0x69, 0x05, 0xd0, 0xf7, 0xdc}}
+
+#define NS_SCHEMAELEMENT_CONTRACTID    \
+"@mozilla.org/xmlextras/schemas/schemaelement;1"
+
+#define NS_SCHEMAELEMENTREF_CID                    \
+{ /* a62b4292-5d30-4085-9dbb-3f478d639188 */       \
+ 0xa62b4292, 0x5d30, 0x4085,                       \
+ {0x9d, 0xbb, 0x3f, 0x47, 0x8d, 0x63, 0x91, 0x88}}
+
+#define NS_SCHEMAELEMENTREF_CONTRACTID    \
+"@mozilla.org/xmlextras/schemas/schemaelementref;1"
+
+#define NS_SCHEMAATTRIBUTE_CID                     \
+{ /* 7b3820e6-0fd9-4025-9ba8-73f3a1ab1ba6 */       \
+ 0x7b3820e6, 0x0fd9, 0x4025,                       \
+ {0x9b, 0xa8, 0x73, 0xf3, 0xa1, 0xab, 0x1b, 0xa6}}
+
+#define NS_SCHEMAATTRIBUTE_CONTRACTID    \
+"@mozilla.org/xmlextras/schemas/schemaattribute;1"
+
+#define NS_SCHEMAATTRIBUTEREF_CID                  \
+{ /* 53fe1960-e0df-487f-a26c-a3073a8e863a */       \
+ 0x53fe1960, 0xe0df, 0x487f,                       \
+ {0xa2, 0x6c, 0xa3, 0x07, 0x3a, 0x8e, 0x86, 0x3a}}
+
+#define NS_SCHEMAATTRIBUTEREF_CONTRACTID    \
+"@mozilla.org/xmlextras/schemas/schemaattributeref;1"
+
+#define NS_SCHEMAATTRIBUTEGROUP_CID                \
+{ /* 1f3d1ad4-2501-4097-9293-6e40890cf72a */       \
+ 0x1f3d1ad4, 0x2501, 0x4097,                       \
+ {0x92, 0x93, 0x6e, 0x40, 0x89, 0x0c, 0xf7, 0x2a}}
+
+#define NS_SCHEMAATTRIBUTEGROUP_CONTRACTID    \
+"@mozilla.org/xmlextras/schemas/schemaattributegroup;1"
+
+#define NS_SCHEMAATTRIBUTEGROUPREF_CID             \
+{ /* 99596213-d550-4b46-ae04-7dd38dd7abff */       \
+ 0x99596213, 0xd550, 0x4b46,                       \
+ {0xae, 0x04, 0x7d, 0xd3, 0x8d, 0xd7, 0xab, 0xff}}
+
+#define NS_SCHEMAATTRIBUTEGROUPREF_CONTRACTID    \
+"@mozilla.org/xmlextras/schemas/schemaattributegroupref;1"
+
+#define NS_SCHEMAANYATTRIBUTE_CID                  \
+{ /* 4e248fa3-79d7-4821-bc69-63e5275e879c */       \
+ 0x4e248fa3, 0x79d7, 0x4821,                       \
+ {0xbc, 0x69, 0x63, 0xe5, 0x27, 0x5e, 0x87, 0x9c}}
+
+#define NS_SCHEMAANYATTRIBUTE_CONTRACTID    \
+"@mozilla.org/xmlextras/schemas/schemaanyattribute;1"
+
+#define NS_SCHEMAFACET_CID                         \
+{ /* fbaa0537-f931-4160-86a0-de849de08635 */       \
+ 0xfbaa0537, 0xf931, 0x4160,                       \
+ {0x86, 0xa0, 0xde, 0x84, 0x9d, 0xe0, 0x86, 0x35}}
+
+#define NS_SCHEMAFACET_CONTRACTID    \
+"@mozilla.org/xmlextras/schemas/schemafacet;1"
+
+#define NS_SOAPARRAY_CID                         \
+{ /* 0df92b09-36d6-4bed-ac6f-dbc195e35218 */       \
+ 0x0df92b09, 0x36d6, 0x4bed,                       \
+ {0xac, 0x6f, 0xdb, 0xc1, 0x95, 0xe3, 0x52, 0x18}}
+
+#define NS_SOAPARRAY_CONTRACTID    \
+"@mozilla.org/xmlextras/schemas/soaparray;1"
+
+#define NS_SOAPARRAYTYPE_CID                       \
+{ /* 9df7bcdb-3676-49dd-b5b9-4257dc326231 */       \
+ 0x9df7bcdb, 0x3676, 0x49dd,                       \
+ {0xb5, 0xb9, 0x42, 0x57, 0xdc, 0x32, 0x62, 0x31}}
+
+#define NS_SOAPARRAYTYPE_CONTRACTID    \
+"@mozilla.org/xmlextras/schemas/soaparraytype;1"
+
+#endif // __nsSchemaPrivate_h__
diff --git a/extensions/schema-validation/src/nsSchemaSimpleTypes.cpp b/extensions/schema-validation/src/nsSchemaSimpleTypes.cpp
new file mode 100644
index 0000000..47a7392
--- /dev/null
+++ b/extensions/schema-validation/src/nsSchemaSimpleTypes.cpp
@@ -0,0 +1,892 @@
+/* -*- 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 Mozilla.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Vidur Apparao <vidur@netscape.com> (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 "nsSchemaPrivate.h"
+
+////////////////////////////////////////////////////////////
+//
+// nsSchemaBuiltinType implementation
+//
+////////////////////////////////////////////////////////////
+nsSchemaBuiltinType::nsSchemaBuiltinType(PRUint16 aBuiltinType)
+  : mBuiltinType(aBuiltinType)
+{
+}
+
+nsSchemaBuiltinType::~nsSchemaBuiltinType()
+{
+}
+
+NS_IMPL_ISUPPORTS4_CI(nsSchemaBuiltinType, 
+                      nsISchemaComponent,
+                      nsISchemaType,
+                      nsISchemaSimpleType,
+                      nsISchemaBuiltinType)
+
+/* readonly attribute wstring targetNamespace; */
+NS_IMETHODIMP
+nsSchemaBuiltinType::GetTargetNamespace(nsAString& aTargetNamespace)
+{
+  aTargetNamespace.AssignLiteral(NS_SCHEMA_2001_NAMESPACE);
+  
+  return NS_OK;
+}
+
+/* void resolve (in nsIWebServiceErrorHandler aErrorHandler); */
+NS_IMETHODIMP
+nsSchemaBuiltinType::Resolve(nsIWebServiceErrorHandler* aErrorHandler)
+{
+  return NS_OK;
+}
+
+/* void clear (); */
+NS_IMETHODIMP nsSchemaBuiltinType::Clear()
+{
+  return NS_OK;
+}
+
+/* readonly attribute wstring name; */
+NS_IMETHODIMP
+nsSchemaBuiltinType::GetName(nsAString& aName)
+{
+  switch(mBuiltinType) {
+    case BUILTIN_TYPE_ANYTYPE:
+      aName.AssignLiteral("anyType");
+      break;
+    case BUILTIN_TYPE_STRING:
+      aName.AssignLiteral("string");
+      break;
+    case BUILTIN_TYPE_NORMALIZED_STRING:
+      aName.AssignLiteral("normalizedString");
+      break;
+    case BUILTIN_TYPE_TOKEN:
+      aName.AssignLiteral("token");
+      break;
+    case BUILTIN_TYPE_BYTE:
+      aName.AssignLiteral("byte");
+      break;
+    case BUILTIN_TYPE_UNSIGNEDBYTE:
+      aName.AssignLiteral("unsignedByte");
+      break;
+    case BUILTIN_TYPE_BASE64BINARY:
+      aName.AssignLiteral("base64Binary");
+      break;
+    case BUILTIN_TYPE_HEXBINARY:
+      aName.AssignLiteral("hexBinary");
+      break;
+    case BUILTIN_TYPE_INTEGER:
+      aName.AssignLiteral("integer");
+      break;
+    case BUILTIN_TYPE_POSITIVEINTEGER:
+      aName.AssignLiteral("positiveInteger");
+      break;
+    case BUILTIN_TYPE_NEGATIVEINTEGER:
+      aName.AssignLiteral("negativeInteger");
+      break;
+    case BUILTIN_TYPE_NONNEGATIVEINTEGER:
+      aName.AssignLiteral("nonNegativeInteger");
+      break;
+    case BUILTIN_TYPE_NONPOSITIVEINTEGER:
+      aName.AssignLiteral("nonPositiveInteger");
+      break;
+    case BUILTIN_TYPE_INT:
+      aName.AssignLiteral("int");
+      break;
+    case BUILTIN_TYPE_UNSIGNEDINT:
+      aName.AssignLiteral("unsignedInt");
+      break;
+    case BUILTIN_TYPE_LONG:
+      aName.AssignLiteral("long");
+      break;
+    case BUILTIN_TYPE_UNSIGNEDLONG:
+      aName.AssignLiteral("unsignedLong");
+      break;
+    case BUILTIN_TYPE_SHORT:
+      aName.AssignLiteral("short");
+      break;
+    case BUILTIN_TYPE_UNSIGNEDSHORT:
+      aName.AssignLiteral("unsignedShort");
+      break;
+    case BUILTIN_TYPE_DECIMAL:
+      aName.AssignLiteral("decimal");
+      break;
+    case BUILTIN_TYPE_FLOAT:
+      aName.AssignLiteral("float");
+      break;
+    case BUILTIN_TYPE_DOUBLE:
+      aName.AssignLiteral("double");
+      break;
+    case BUILTIN_TYPE_BOOLEAN:
+      aName.AssignLiteral("boolean");
+      break;
+    case BUILTIN_TYPE_TIME:
+      aName.AssignLiteral("time");
+      break;
+    case BUILTIN_TYPE_DATETIME:
+      aName.AssignLiteral("dateTime");
+      break;
+    case BUILTIN_TYPE_DURATION:
+      aName.AssignLiteral("duration");
+      break;
+    case BUILTIN_TYPE_DATE:
+      aName.AssignLiteral("date");
+      break;
+    case BUILTIN_TYPE_GMONTH:
+      aName.AssignLiteral("gMonth");
+      break;
+    case BUILTIN_TYPE_GYEAR:
+      aName.AssignLiteral("gYear");
+      break;
+    case BUILTIN_TYPE_GYEARMONTH:
+      aName.AssignLiteral("gYearMonth");
+      break;
+    case BUILTIN_TYPE_GDAY:
+      aName.AssignLiteral("gDay");
+      break;
+    case BUILTIN_TYPE_GMONTHDAY:
+      aName.AssignLiteral("gMonthDay");
+      break;
+    case BUILTIN_TYPE_NAME:
+      aName.AssignLiteral("Name");
+      break;
+    case BUILTIN_TYPE_QNAME:
+      aName.AssignLiteral("QName");
+      break;
+    case BUILTIN_TYPE_NCNAME:
+      aName.AssignLiteral("NCName");
+      break;
+    case BUILTIN_TYPE_ANYURI:
+      aName.AssignLiteral("anyURI");
+      break;
+    case BUILTIN_TYPE_LANGUAGE:
+      aName.AssignLiteral("language");
+      break;
+    case BUILTIN_TYPE_ID:
+      aName.AssignLiteral("ID");
+      break;
+    case BUILTIN_TYPE_IDREF:
+      aName.AssignLiteral("IDREF");
+      break;
+    case BUILTIN_TYPE_IDREFS:
+      aName.AssignLiteral("IDREFS");
+      break;
+    case BUILTIN_TYPE_ENTITY:
+      aName.AssignLiteral("ENTITY");
+      break;
+    case BUILTIN_TYPE_ENTITIES:
+      aName.AssignLiteral("ENTITIES");
+      break;
+    case BUILTIN_TYPE_NOTATION:
+      aName.AssignLiteral("NOTATION");
+      break;
+    case BUILTIN_TYPE_NMTOKEN:
+      aName.AssignLiteral("NMTOKEN");
+      break;
+    case BUILTIN_TYPE_NMTOKENS:
+      aName.AssignLiteral("NMTOKENS");
+      break;
+    default:
+      NS_ERROR("Unknown builtin type!");
+      aName.Truncate();
+  }
+
+  return NS_OK;
+}
+
+/* readonly attribute unsigned short schemaType; */
+NS_IMETHODIMP
+nsSchemaBuiltinType::GetSchemaType(PRUint16 *aSchemaType)
+{
+  NS_ENSURE_ARG_POINTER(aSchemaType);
+
+  *aSchemaType = nsISchemaType::SCHEMA_TYPE_SIMPLE;
+
+  return NS_OK;
+}
+
+/* readonly attribute unsigned short simpleType; */
+NS_IMETHODIMP
+nsSchemaBuiltinType::GetSimpleType(PRUint16 *aSimpleType)
+{
+  NS_ENSURE_ARG_POINTER(aSimpleType);
+
+  *aSimpleType = nsISchemaSimpleType::SIMPLE_TYPE_BUILTIN;
+
+  return NS_OK;
+}
+
+/* readonly attribute unsigned short builtinType; */
+NS_IMETHODIMP
+nsSchemaBuiltinType::GetBuiltinType(PRUint16 *aBuiltinType)
+{
+  NS_ENSURE_ARG_POINTER(aBuiltinType);
+  
+  *aBuiltinType = mBuiltinType;
+
+  return NS_OK;
+}
+
+////////////////////////////////////////////////////////////
+//
+// nsSchemaListType implementation
+//
+////////////////////////////////////////////////////////////
+nsSchemaListType::nsSchemaListType(nsSchema* aSchema, 
+                                   const nsAString& aName)
+  : nsSchemaComponentBase(aSchema), mName(aName)
+{
+}
+
+nsSchemaListType::~nsSchemaListType()
+{
+}
+
+NS_IMPL_ISUPPORTS4_CI(nsSchemaListType, 
+                      nsISchemaComponent,
+                      nsISchemaType,
+                      nsISchemaSimpleType,
+                      nsISchemaListType)
+
+/* void resolve (in nsIWebServiceErrorHandler aErrorHandler); */
+NS_IMETHODIMP
+nsSchemaListType::Resolve(nsIWebServiceErrorHandler* aErrorHandler)
+{
+  if (mIsResolved) {
+    return NS_OK;
+  }
+
+  nsresult rv = NS_OK;
+  mIsResolved = PR_TRUE;
+  if (mListType && mSchema) {
+    nsCOMPtr<nsISchemaType> type;
+    rv = mSchema->ResolveTypePlaceholder(aErrorHandler, mListType, getter_AddRefs(type));
+    if (NS_FAILED(rv)) {
+      return NS_ERROR_FAILURE;
+    }
+    mListType = do_QueryInterface(type);
+    if (!mListType) {
+      return NS_ERROR_FAILURE;
+    }
+  }
+  rv = mListType->Resolve(aErrorHandler);
+
+  return rv;
+}
+
+/* void clear (); */
+NS_IMETHODIMP
+nsSchemaListType::Clear()
+{
+  if (mIsCleared) {
+    return NS_OK;
+  }
+
+  mIsCleared = PR_TRUE;
+  if (mListType) {
+    mListType->Clear();
+    mListType = nsnull;
+  }
+
+  return NS_OK;
+}
+
+/* readonly attribute wstring name; */
+NS_IMETHODIMP
+nsSchemaListType::GetName(nsAString& aName)
+{
+  aName.Assign(mName);
+  
+  return NS_OK;
+}
+
+/* readonly attribute unsigned short schemaType; */
+NS_IMETHODIMP
+nsSchemaListType::GetSchemaType(PRUint16 *aSchemaType)
+{
+  NS_ENSURE_ARG_POINTER(aSchemaType);
+
+  *aSchemaType = nsISchemaType::SCHEMA_TYPE_SIMPLE;
+
+  return NS_OK;
+}
+
+/* readonly attribute unsigned short simpleType; */
+NS_IMETHODIMP
+nsSchemaListType::GetSimpleType(PRUint16 *aSimpleType)
+{
+  NS_ENSURE_ARG_POINTER(aSimpleType);
+
+  *aSimpleType = nsISchemaSimpleType::SIMPLE_TYPE_LIST;
+
+  return NS_OK;
+}
+
+/* readonly attribute nsISchemaSimpleType listType; */
+NS_IMETHODIMP
+nsSchemaListType::GetListType(nsISchemaSimpleType * *aListType)
+{
+  NS_ENSURE_ARG_POINTER(aListType);
+
+  NS_IF_ADDREF(*aListType = mListType);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchemaListType::SetListType(nsISchemaSimpleType* aListType)
+{
+  mListType = aListType;
+
+  return NS_OK;
+}
+
+////////////////////////////////////////////////////////////
+//
+// nsSchemaUnionType implementation
+//
+////////////////////////////////////////////////////////////
+nsSchemaUnionType::nsSchemaUnionType(nsSchema* aSchema, 
+                                     const nsAString& aName)
+  : nsSchemaComponentBase(aSchema), mName(aName)
+{
+}
+
+nsSchemaUnionType::~nsSchemaUnionType()
+{
+}
+
+NS_IMPL_ISUPPORTS4_CI(nsSchemaUnionType, 
+                      nsISchemaComponent,
+                      nsISchemaType,
+                      nsISchemaSimpleType,
+                      nsISchemaUnionType)
+
+/* void resolve (in nsIWebServiceErrorHandler aErrorHandler); */
+NS_IMETHODIMP
+nsSchemaUnionType::Resolve(nsIWebServiceErrorHandler* aErrorHandler)
+{
+  if (mIsResolved) {
+    return NS_OK;
+  }
+
+  mIsResolved = PR_TRUE;
+  if (mSchema) {
+    PRUint32 i, count;
+    count = mUnionTypes.Count();
+    for (i = 0; i < count; ++i) {
+      nsCOMPtr<nsISchemaType> type;
+      nsresult rv = mSchema->ResolveTypePlaceholder(aErrorHandler, mUnionTypes.ObjectAt(i),
+                                                    getter_AddRefs(type));
+      if (NS_FAILED(rv)) {
+        return NS_ERROR_FAILURE;
+      }
+      nsCOMPtr<nsISchemaSimpleType> simpleType = do_QueryInterface(type);
+      mUnionTypes.ReplaceObjectAt(simpleType, i);
+      rv = type->Resolve(aErrorHandler);
+      if (NS_FAILED(rv)) {
+        return rv;
+      }
+    }
+  }
+
+  return NS_OK;
+}
+
+/* void clear (); */
+NS_IMETHODIMP
+nsSchemaUnionType::Clear()
+{
+  if (mIsCleared) {
+    return NS_OK;
+  }
+
+  mIsCleared = PR_TRUE;
+  PRUint32 i, count;
+  count = mUnionTypes.Count();
+  for (i = 0; i < count; ++i) {
+    mUnionTypes.ObjectAt(i)->Clear();
+  }
+  mUnionTypes.Clear();
+
+  return NS_OK;
+}
+
+/* readonly attribute wstring name; */
+NS_IMETHODIMP
+nsSchemaUnionType::GetName(nsAString& aName)
+{
+  aName.Assign(mName);
+  
+  return NS_OK;
+}
+
+/* readonly attribute unsigned short schemaType; */
+NS_IMETHODIMP
+nsSchemaUnionType::GetSchemaType(PRUint16 *aSchemaType)
+{
+  NS_ENSURE_ARG_POINTER(aSchemaType);
+
+  *aSchemaType = nsISchemaType::SCHEMA_TYPE_SIMPLE;
+
+  return NS_OK;
+}
+
+/* readonly attribute unsigned short simpleType; */
+NS_IMETHODIMP
+nsSchemaUnionType::GetSimpleType(PRUint16 *aSimpleType)
+{
+  NS_ENSURE_ARG_POINTER(aSimpleType);
+
+  *aSimpleType = nsISchemaSimpleType::SIMPLE_TYPE_UNION;
+
+  return NS_OK;
+}
+
+/* readonly attribute PRUint32 unionTypeCount; */
+NS_IMETHODIMP
+nsSchemaUnionType::GetUnionTypeCount(PRUint32 *aUnionTypeCount)
+{
+  NS_ENSURE_ARG_POINTER(aUnionTypeCount);
+
+  *aUnionTypeCount = mUnionTypes.Count();
+
+  return NS_OK;
+}
+
+/* nsISchemaSimpleType getUnionType (in PRUint32 index); */
+NS_IMETHODIMP
+nsSchemaUnionType::GetUnionType(PRUint32 aIndex, nsISchemaSimpleType** aResult)
+{
+  NS_ENSURE_ARG_POINTER(aResult);
+
+  if (aIndex >= (PRUint32)mUnionTypes.Count()) {
+    return NS_ERROR_FAILURE;
+  }
+
+  NS_ADDREF(*aResult = mUnionTypes.ObjectAt(aIndex));
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchemaUnionType::AddUnionType(nsISchemaSimpleType* aType)
+{
+  NS_ENSURE_ARG(aType);
+
+  return mUnionTypes.AppendObject(aType) ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
+}
+
+////////////////////////////////////////////////////////////
+//
+// nsSchemaRestrictionType implementation
+//
+////////////////////////////////////////////////////////////
+nsSchemaRestrictionType::nsSchemaRestrictionType(nsSchema* aSchema, 
+                                                 const nsAString& aName)
+  : nsSchemaComponentBase(aSchema), mName(aName)
+{
+}
+
+nsSchemaRestrictionType::~nsSchemaRestrictionType()
+{
+}
+
+NS_IMPL_ISUPPORTS4_CI(nsSchemaRestrictionType, 
+                      nsISchemaComponent,
+                      nsISchemaType,
+                      nsISchemaSimpleType,
+                      nsISchemaRestrictionType)
+
+/* void resolve (in nsIWebServiceErrorHandler aErrorHandler); */
+NS_IMETHODIMP
+nsSchemaRestrictionType::Resolve(nsIWebServiceErrorHandler* aErrorHandler)
+{
+  if (mIsResolved) {
+    return NS_OK;
+  }
+
+  nsresult rv = NS_OK;
+  mIsResolved = PR_TRUE;
+  if (mBaseType && mSchema) {
+    nsCOMPtr<nsISchemaType> type;
+    rv = mSchema->ResolveTypePlaceholder(aErrorHandler, mBaseType, getter_AddRefs(type));
+    if (NS_FAILED(rv)) {
+      return NS_ERROR_FAILURE;
+    }
+    mBaseType = do_QueryInterface(type);
+    if (!mBaseType) {
+      return NS_ERROR_FAILURE;
+    }
+    rv = mBaseType->Resolve(aErrorHandler);
+  }
+
+  return rv;
+}
+
+/* void clear (); */
+NS_IMETHODIMP
+nsSchemaRestrictionType::Clear()
+{
+  if (mIsCleared) {
+    return NS_OK;
+  }
+
+  mIsCleared = PR_TRUE;
+  if (mBaseType) {
+    mBaseType->Clear();
+    mBaseType = nsnull;
+  }
+
+  PRUint32 i, count;
+  count = mFacets.Count();
+  for (i = 0; i < count; ++i) {
+    mFacets.ObjectAt(i)->Clear();
+  }
+  mFacets.Clear();
+
+  return NS_OK;
+}
+
+/* readonly attribute wstring name; */
+NS_IMETHODIMP
+nsSchemaRestrictionType::GetName(nsAString& aName)
+{
+  aName.Assign(mName);
+  
+  return NS_OK;
+}
+
+/* readonly attribute unsigned short schemaType; */
+NS_IMETHODIMP
+nsSchemaRestrictionType::GetSchemaType(PRUint16 *aSchemaType)
+{
+  NS_ENSURE_ARG_POINTER(aSchemaType);
+
+  *aSchemaType = nsISchemaType::SCHEMA_TYPE_SIMPLE;
+
+  return NS_OK;
+}
+
+/* readonly attribute unsigned short simpleType; */
+NS_IMETHODIMP
+nsSchemaRestrictionType::GetSimpleType(PRUint16 *aSimpleType)
+{
+  NS_ENSURE_ARG_POINTER(aSimpleType);
+
+  *aSimpleType = nsISchemaSimpleType::SIMPLE_TYPE_RESTRICTION;
+
+  return NS_OK;
+}
+
+/* readonly attribute nsISchemaSimpleType baseType; */
+NS_IMETHODIMP
+nsSchemaRestrictionType::GetBaseType(nsISchemaSimpleType * *aBaseType)
+{
+  NS_ENSURE_ARG_POINTER(aBaseType);
+
+  NS_IF_ADDREF(*aBaseType = mBaseType);
+
+  return NS_OK;
+}
+
+/* readonly attribute PRUint32 facetCount; */
+NS_IMETHODIMP
+nsSchemaRestrictionType::GetFacetCount(PRUint32 *aFacetCount)
+{
+  NS_ENSURE_ARG_POINTER(aFacetCount);
+
+  *aFacetCount = mFacets.Count();
+
+  return NS_OK;
+}
+
+/* nsISchemaFacet getFacet(in PRUint32 index); */
+NS_IMETHODIMP
+nsSchemaRestrictionType::GetFacet(PRUint32 aIndex, nsISchemaFacet** aResult)
+{
+  NS_ENSURE_ARG_POINTER(aResult);
+
+  if (aIndex >= (PRUint32)mFacets.Count()) {
+    return NS_ERROR_FAILURE;
+  }
+
+  NS_ADDREF(*aResult = mFacets.ObjectAt(aIndex));
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchemaRestrictionType::SetBaseType(nsISchemaSimpleType* aBaseType)
+{
+  NS_ENSURE_ARG(aBaseType);
+
+  mBaseType = aBaseType;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchemaRestrictionType::AddFacet(nsISchemaFacet* aFacet)
+{
+  NS_ENSURE_ARG(aFacet);
+
+  return mFacets.AppendObject(aFacet) ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
+}
+
+////////////////////////////////////////////////////////////
+//
+// nsSchemaTypePlaceholder implementation
+//
+////////////////////////////////////////////////////////////
+nsSchemaTypePlaceholder::nsSchemaTypePlaceholder(nsSchema* aSchema,
+                                                 const nsAString& aName)
+  : nsSchemaComponentBase(aSchema), mName(aName)
+{
+}
+
+nsSchemaTypePlaceholder::~nsSchemaTypePlaceholder()
+{
+}
+
+NS_IMPL_ISUPPORTS3_CI(nsSchemaTypePlaceholder, 
+                      nsISchemaComponent,
+                      nsISchemaType,
+                      nsISchemaSimpleType)
+
+
+/* void resolve (in nsIWebServiceErrorHandler aErrorHandler); */
+NS_IMETHODIMP
+nsSchemaTypePlaceholder::Resolve(nsIWebServiceErrorHandler* aErrorHandler)
+{
+  return NS_OK;
+}
+
+/* void clear (); */
+NS_IMETHODIMP
+nsSchemaTypePlaceholder::Clear()
+{
+  return NS_OK;
+}
+
+/* readonly attribute wstring name; */
+NS_IMETHODIMP
+nsSchemaTypePlaceholder::GetName(nsAString& aName)
+{
+  aName.Assign(mName);
+  
+  return NS_OK;
+}
+
+/* readonly attribute unsigned short schemaType; */
+NS_IMETHODIMP
+nsSchemaTypePlaceholder::GetSchemaType(PRUint16 *aSchemaType)
+{
+  NS_ENSURE_ARG_POINTER(aSchemaType);
+
+  *aSchemaType = nsISchemaType::SCHEMA_TYPE_PLACEHOLDER;
+
+  return NS_OK;
+}
+
+/* readonly attribute unsigned short simpleType; */
+NS_IMETHODIMP
+nsSchemaTypePlaceholder::GetSimpleType(PRUint16 *aSimpleType)
+{
+  return NS_ERROR_FAILURE;
+}
+
+
+////////////////////////////////////////////////////////////
+//
+// nsSchemaFacet implementation
+//
+////////////////////////////////////////////////////////////
+nsSchemaFacet::nsSchemaFacet(nsSchema* aSchema)
+  : nsSchemaComponentBase(aSchema), mIsFixed(PR_FALSE)
+{
+}
+
+nsSchemaFacet::~nsSchemaFacet()
+{
+}
+
+NS_IMPL_ISUPPORTS2_CI(nsSchemaFacet,
+                      nsISchemaComponent,
+                      nsISchemaFacet)
+
+/* void resolve (in nsIWebServiceErrorHandler aErrorHandler); */
+NS_IMETHODIMP
+nsSchemaFacet::Resolve(nsIWebServiceErrorHandler* aErrorHandler)
+{
+  return NS_OK;
+}
+
+/* void clear (); */
+NS_IMETHODIMP
+nsSchemaFacet::Clear()
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchemaFacet::SetFacetType(PRUint16 aFacetType)
+{
+  mFacetType = aFacetType;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchemaFacet::SetIsFixed(PRBool aIsFixed) 
+{
+  mIsFixed = aIsFixed;
+
+  return NS_OK;
+}
+
+/* readonly attribute unsigned short facetType; */
+NS_IMETHODIMP
+nsSchemaFacet::GetFacetType(PRUint16 *aFacetType)
+{
+  NS_ENSURE_ARG_POINTER(aFacetType);
+
+  *aFacetType = mFacetType;
+  
+  return NS_OK;
+}
+
+/* readonly attribute AString value; */
+NS_IMETHODIMP
+nsSchemaFacet::GetValue(nsAString & aValue)
+{
+  if ((mFacetType == FACET_TYPE_TOTALDIGITS) ||
+      (mFacetType == FACET_TYPE_FRACTIONDIGITS) ||
+      (mFacetType == FACET_TYPE_WHITESPACE) ||
+      (mFacetType == FACET_TYPE_LENGTH) ||
+      (mFacetType == FACET_TYPE_MINLENGTH) ||
+      (mFacetType == FACET_TYPE_MAXLENGTH)) {
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+
+  aValue.Assign(mStrValue);
+
+  return NS_OK;
+}
+
+/* readonly attribute PRUint32 lengthValue; */
+NS_IMETHODIMP
+nsSchemaFacet::GetLengthValue(PRUint32 *aLengthValue)
+{
+  NS_ENSURE_ARG_POINTER(aLengthValue);
+
+  if ((mFacetType != FACET_TYPE_LENGTH) &&
+      (mFacetType != FACET_TYPE_MINLENGTH) &&
+      (mFacetType != FACET_TYPE_MAXLENGTH)) {
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+
+  *aLengthValue = mUintValue;
+
+  return NS_OK;
+}
+
+/* readonly attribute PRUint32 digitsValue; */
+NS_IMETHODIMP
+nsSchemaFacet::GetDigitsValue(PRUint32 *aDigitsValue)
+{
+  NS_ENSURE_ARG_POINTER(aDigitsValue);
+
+  if ((mFacetType != FACET_TYPE_TOTALDIGITS) &&
+      (mFacetType != FACET_TYPE_FRACTIONDIGITS)) {
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+
+  *aDigitsValue = mUintValue;
+
+  return NS_OK;
+}
+
+/* readonly attribute unsigned short whitespaceValue; */
+NS_IMETHODIMP
+nsSchemaFacet::GetWhitespaceValue(PRUint16 *aWhitespaceValue)
+{
+  NS_ENSURE_ARG_POINTER(aWhitespaceValue);
+
+  if (mFacetType != FACET_TYPE_WHITESPACE) {
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+
+  *aWhitespaceValue = mWhitespaceValue;
+
+  return NS_OK;
+}
+
+/* readonly attribute boolean isfixed; */
+NS_IMETHODIMP
+nsSchemaFacet::GetIsfixed(PRBool *aIsFixed)
+{
+  NS_ENSURE_ARG_POINTER(aIsFixed);
+  
+  *aIsFixed = mIsFixed;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchemaFacet::SetValue(const nsAString& aStrValue)
+{
+  mStrValue.Assign(aStrValue);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchemaFacet::SetUintValue(PRUint32 aUintValue)
+{
+  mUintValue = aUintValue;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSchemaFacet::SetWhitespaceValue(PRUint16 aWhitespaceValue)
+{
+  mWhitespaceValue = aWhitespaceValue;
+
+  return NS_OK;
+}
diff --git a/extensions/schema-validation/src/nsSchemaValidator.cpp b/extensions/schema-validation/src/nsSchemaValidator.cpp
index ab8d7ef..3d0299f 100644
--- a/extensions/schema-validation/src/nsSchemaValidator.cpp
+++ b/extensions/schema-validation/src/nsSchemaValidator.cpp
@@ -53,8 +53,7 @@
 #include "nsIAttribute.h"
 
 // string includes
-#include "nsReadableUtils.h"
-#include "nsString.h"
+#include "nsStringAPI.h"
 #include "nsUnicharUtils.h"
 
 // XPCOM includes
@@ -78,6 +77,7 @@
 #include "prtime.h"
 #include "plbase64.h"
 #include <ctype.h>
+#include "nsIAtomService.h"
 
 #define NS_SCHEMA_1999_NAMESPACE "http://www.w3.org/1999/XMLSchema"
 #define NS_SCHEMA_2001_NAMESPACE "http://www.w3.org/2001/XMLSchema"
@@ -298,10 +298,15 @@ nsSchemaValidator::ValidateAgainstType(nsIDOMNode* aElement,
       nsCOMPtr<nsIContent> content = do_QueryInterface(domNode3);
       NS_ENSURE_STATE(content);
 
-      // we have to be really carefull to set the destructor function correctly.
+      // we have to be really careful to set the destructor function correctly.
       // this also has to be a pointer to a variant
-      nsCOMPtr<nsIAtom> key = do_GetAtom("xsdtype");
-      NS_ENSURE_TRUE(key, NS_ERROR_OUT_OF_MEMORY);
+      nsCOMPtr<nsIAtomService> atomServ =
+        do_GetService(NS_ATOMSERVICE_CONTRACTID, &rv);
+      NS_ENSURE_SUCCESS(rv, rv);
+
+      nsCOMPtr<nsIAtom> key;
+      rv = atomServ->GetAtomUTF8("xsdtype", getter_AddRefs(key));
+      NS_ENSURE_SUCCESS(rv, rv);
 
       nsIVariant *pVariant = holder;
       NS_IF_ADDREF(pVariant);
@@ -1508,7 +1513,7 @@ nsSchemaValidator::ValidateListSimpletype(const nsAString & aNodeValue,
     if (facetsValid) {
       nsAutoString tmp;
       for (PRUint32 i=0; i < count; ++i) {
-        CopyUTF8toUTF16(stringArray[i]->get(), tmp);
+        CopyUTF8toUTF16(*stringArray[i], tmp);
         LOG(("  Validating List Item (%d): %s", i, NS_ConvertUTF16toUTF8(tmp).get()));
         rv = ValidateSimpletype(tmp, listSimpleType, &isValid);
 
@@ -1755,21 +1760,20 @@ nsSchemaValidator::IsValidSchemaGDay(const nsAString & aNodeValue,
   int dayInt;
 
   // iterate over the string and parse/validate
-  nsAString::const_iterator start, end;
-  aNodeValue.BeginReading(start);
-  aNodeValue.EndReading(end);
+  const PRUnichar *start, *end;
+  aNodeValue.BeginReading(&start, &end);
   nsAutoString nodeValue(aNodeValue);
 
   // validate the ---DD part
-  PRBool isValid = Substring(start.get(), start.get()+3).EqualsLiteral("---") &&
-                   IsValidSchemaGType(Substring(start.get()+3, start.get()+5),
+  PRBool isValid = Substring(start, start + 3).EqualsLiteral("---") &&
+                   IsValidSchemaGType(Substring(start + 3, start + 5),
                                       1, 31, &dayInt);
   if (isValid) {
     tzSign = nodeValue.CharAt(5);
     if (strLength == 6) {
       isValid &= (tzSign == 'Z');
     } else if (strLength == 11) {
-      const nsAString &tz = Substring(start.get()+6, end.get());
+      const nsAString &tz = Substring(start + 6, end);
 
       isValid &= ((tzSign == '+' || tzSign == '-') &&
                   nsSchemaValidatorUtils::ParseSchemaTimeZone(tz, timezoneHour,
@@ -1878,21 +1882,20 @@ nsSchemaValidator::IsValidSchemaGMonth(const nsAString & aNodeValue,
   PRUnichar tzSign = 0;
   int monthInt;
 
-  nsAString::const_iterator start, end;
-  aNodeValue.BeginReading(start);
-  aNodeValue.EndReading(end);
+  const PRUnichar *start, *end;
+  aNodeValue.BeginReading(&start, &end);
   nsAutoString nodeValue(aNodeValue);
 
   // validate the --MM part
-  PRBool isValid = Substring(start.get(), start.get()+2).EqualsLiteral("--") &&
-                   IsValidSchemaGType(Substring(start.get()+2, start.get()+4),
+  PRBool isValid = Substring(start, start + 2).EqualsLiteral("--") &&
+                   IsValidSchemaGType(Substring(start + 2, start + 4),
                                       1, 12, &monthInt);
   if (isValid) {
     tzSign = nodeValue.CharAt(4);
     if (strLength == 5) {
       isValid &= (tzSign == 'Z');
     } else if (strLength == 10) {
-      const nsAString &tz = Substring(start.get()+5, end.get());
+      const nsAString &tz = Substring(start + 5, end);
 
       isValid &= ((tzSign == '+' || tzSign == '-') &&
                   nsSchemaValidatorUtils::ParseSchemaTimeZone(tz, timezoneHour,
@@ -1983,10 +1986,9 @@ nsSchemaValidator::IsValidSchemaGYear(const nsAString & aNodeValue,
   char timezoneMinute[3] = "";
   PRUnichar tzSign = 0;
 
-  nsAString::const_iterator start, end, buffStart;
-  aNodeValue.BeginReading(start);
-  aNodeValue.BeginReading(buffStart);
-  aNodeValue.EndReading(end);
+  const PRUnichar *start, *end, *buffStart;
+  aNodeValue.BeginReading(&start, &end);
+  aNodeValue.BeginReading(&buffStart);
   PRUint32 state = 0;
   PRUint32 buffLength = 0, yearLength = 0;
   PRBool done = PR_FALSE;
@@ -2142,10 +2144,9 @@ nsSchemaValidator::IsValidSchemaGYearMonth(const nsAString & aNodeValue,
   // GYearMonth looks like this: (-)CCYY-MM(Z|(+|-)hh:mm)
   PRBool isValid = PR_FALSE;
 
-  nsAString::const_iterator start, end, buffStart;
-  aNodeValue.BeginReading(start);
-  aNodeValue.BeginReading(buffStart);
-  aNodeValue.EndReading(end);
+  const PRUnichar *start, *end, *buffStart;
+  aNodeValue.BeginReading(&start, &end);
+  aNodeValue.BeginReading(&buffStart);
   PRUint32 buffLength = 0;
   PRBool done = PR_FALSE;
 
@@ -2265,10 +2266,9 @@ nsSchemaValidator::IsValidSchemaGMonthDay(const nsAString & aNodeValue,
   // GMonthDay looks like this: --MM-DD(Z|(+|-)hh:mm)
   PRBool isValid = PR_FALSE;
 
-  nsAString::const_iterator start, end, buffStart;
-  aNodeValue.BeginReading(start);
-  aNodeValue.BeginReading(buffStart);
-  aNodeValue.EndReading(end);
+  const PRUnichar *start, *end, *buffStart;
+  aNodeValue.BeginReading(&start, &end);
+  aNodeValue.BeginReading(&buffStart);
   PRUint32 buffLength = 0;
   PRUint32 state = 0;
   PRBool done = PR_FALSE;
@@ -2296,7 +2296,8 @@ nsSchemaValidator::IsValidSchemaGMonthDay(const nsAString & aNodeValue,
 
       nsAutoString month;
       month.AppendLiteral("--");
-      month.Append(Substring(buffStart, start.advance(2)));
+      start += 2;
+      month.Append(Substring(buffStart, start));
       isValid = IsValidSchemaGMonth(month,
                                     aMonthDay ? &aMonthDay->gMonth : nsnull);
 
@@ -2425,12 +2426,18 @@ nsSchemaValidator::IsValidSchemaTime(const nsAString & aNodeValue,
   PRBool isValid = PR_FALSE;
 
   nsAutoString timeString(aNodeValue);
+  PRUint32 len = timeString.Length();
+  PRUnichar end = 0;
+  if (len > 0) {
+    // length counts null terminator
+    end = timeString.CharAt(len - 1);
+  }
 
   // if no timezone ([+/-]hh:ss) or no timezone Z, add a Z to the end so that
   // nsSchemaValidatorUtils::ParseSchemaTime can parse it
   if ((timeString.FindChar('-') == kNotFound) &&
       (timeString.FindChar('+') == kNotFound) &&
-       timeString.Last() != 'Z'){
+      end != 'Z') {
     timeString.Append('Z');
   }
 
@@ -3031,11 +3038,28 @@ nsSchemaValidator::IsValidSchemaFloat(const nsAString & aNodeValue,
                                       float *aResult)
 {
   PRBool isValid = PR_TRUE;
-  nsAutoString temp(aNodeValue);
+  nsresult rv = NS_ERROR_ILLEGAL_VALUE;
+  float floatValue = 0.0f;
+
+  // took most of this float conversion code from nsCString::ToFloat
+  // which isn't frozen so we can't use it directly
+  NS_LossyConvertUTF16toASCII convertedValue(aNodeValue);
+  const char *value = convertedValue.get();
+  PRUint32 length = strlen(value);
+  if (length > 0) {
+    char *conv_stopped;
+
+    floatValue = (float)PR_strtod(value, &conv_stopped);
+    if (conv_stopped == value+length) {
+      rv = NS_OK;
+    } else {
+      // the scan failed somewhere before completion
+      rv = NS_ERROR_ILLEGAL_VALUE;
+      floatValue = 0.0f;
+    }
+  }
 
-  PRInt32 errorCode;
-  float floatValue = temp.ToFloat(&errorCode);
-  if (NS_FAILED(errorCode)) {
+  if (NS_FAILED(rv)) {
     // floats may be INF, -INF and NaN
     if (aNodeValue.EqualsLiteral("INF")) {
       floatValue = FLT_MAX;
@@ -3046,9 +3070,7 @@ nsSchemaValidator::IsValidSchemaFloat(const nsAString & aNodeValue,
     }
   }
 
-  if (aResult)
-    *aResult = floatValue;
-
+  *aResult = floatValue;
   return isValid;
 }
 
@@ -3344,12 +3366,10 @@ nsSchemaValidator::CompareFractionStrings(const nsAString & aString1,
     compareString2.Assign(aString1);
   }
 
-  nsAString::const_iterator start1, end1, start2, end2;
-  compareString1.BeginReading(start1);
-  compareString1.EndReading(end1);
+  const PRUnichar *start1, *end1, *start2, *end2;
+  compareString1.BeginReading(&start1, &end1);
 
-  compareString2.BeginReading(start2);
-  compareString2.EndReading(end2);
+  compareString2.BeginReading(&start2, &end2);
 
   PRBool done = PR_FALSE;
 
@@ -3545,7 +3565,7 @@ nsSchemaValidator::IsValidSchemaQName(const nsAString & aString)
   NS_ENSURE_SUCCESS(rv, PR_FALSE);
 
   const PRUnichar *colon;
-  const nsAFlatString& qName = PromiseFlatString(aString);
+  const nsString& qName = PromiseFlatString(aString);
   rv = parserService->CheckQName(qName, PR_TRUE, &colon);
   if (NS_SUCCEEDED(rv)) {
     isValid = PR_TRUE;
@@ -3611,9 +3631,8 @@ nsSchemaValidator::IsValidSchemaHexBinary(const nsAString & aString)
   if (length % 2 != 0)
     return PR_FALSE;
 
-  nsAString::const_iterator start, end;
-  aString.BeginReading(start);
-  aString.EndReading(end);
+  const PRUnichar *start, *end;
+  aString.BeginReading(&start, &end);
 
   PRBool isValid = PR_TRUE;
 
@@ -4290,13 +4309,12 @@ nsSchemaValidator::GetElementXsiType(nsIDOMNode*     aNode,
       do_GetService("@mozilla.org/parser/parser-service;1", &rv);
     NS_ENSURE_SUCCESS(rv, rv);
 
-    const nsAFlatString& qName = PromiseFlatString(typeAttribute);
+    const nsString& qName = PromiseFlatString(typeAttribute);
     const PRUnichar *colon;
     rv = parserService->CheckQName(qName, PR_TRUE, &colon);
     NS_ENSURE_SUCCESS(rv, rv);
 
-    const PRUnichar* end;
-    qName.EndReading(end);
+    const PRUnichar* end = qName.EndReading();
 
     nsAutoString schemaTypePrefix, schemaType, schemaTypeNamespace;
     if (!colon) {
@@ -4736,12 +4754,22 @@ nsSchemaValidator::ValidateSchemaAttribute(nsIDOMNode* aNode,
   PRBool hasAttr = PR_FALSE;
   PRBool isValid = PR_FALSE;
 
-  rv = elm->HasAttribute(aAttrName, &hasAttr);
-  NS_ENSURE_SUCCESS(rv, rv);
+  if (!qualifiedNamespace.IsEmpty()) {
+    rv = elm->HasAttributeNS(qualifiedNamespace, aAttrName, &hasAttr);
+    NS_ENSURE_SUCCESS(rv, rv);
 
-  if (hasAttr) {
-    rv = elm->GetAttribute(aAttrName, attrValue);
+    if (hasAttr) {
+      rv = elm->GetAttributeNS(qualifiedNamespace, aAttrName, attrValue);
+      NS_ENSURE_SUCCESS(rv, rv);
+    }
+  } else {
+    rv = elm->HasAttribute(aAttrName, &hasAttr);
     NS_ENSURE_SUCCESS(rv, rv);
+
+    if (hasAttr) {
+      rv = elm->GetAttribute(aAttrName, attrValue);
+      NS_ENSURE_SUCCESS(rv, rv);
+    }
   }
 
   if (!hasAttr) {
@@ -4793,8 +4821,13 @@ nsSchemaValidator::ValidateSchemaAttribute(nsIDOMNode* aNode,
           if (pAttribute) {
             // we have to be really careful to set the destructor function
             // correctly. this also has to be a pointer to a variant
-            nsCOMPtr<nsIAtom> key = do_GetAtom("xsdtype");
-            NS_ENSURE_TRUE(key, NS_ERROR_OUT_OF_MEMORY);
+            nsCOMPtr<nsIAtomService> atomServ =
+              do_GetService(NS_ATOMSERVICE_CONTRACTID, &rv);
+            NS_ENSURE_SUCCESS(rv, rv);
+      
+            nsCOMPtr<nsIAtom> key;
+            rv = atomServ->GetAtomUTF8("xsdtype", getter_AddRefs(key));
+            NS_ENSURE_SUCCESS(rv, rv);
 
             nsIVariant *pVariant = holder;
             NS_IF_ADDREF(pVariant);
diff --git a/extensions/schema-validation/src/nsSchemaValidator.h b/extensions/schema-validation/src/nsSchemaValidator.h
index 9206bae..66e48e9 100644
--- a/extensions/schema-validation/src/nsSchemaValidator.h
+++ b/extensions/schema-validation/src/nsSchemaValidator.h
@@ -58,6 +58,8 @@
 #define NS_ERROR_SCHEMAVALIDATOR_NO_TYPE_FOUND         NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SCHEMA, 3)
 #define NS_ERROR_SCHEMAVALIDATOR_TYPE_NOT_FOUND        NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SCHEMA, 4)
 
+#define kNotFound -1
+
 class nsSchemaValidator : public nsISchemaValidator
 {
 public:
diff --git a/extensions/schema-validation/src/nsSchemaValidatorUtils.cpp b/extensions/schema-validation/src/nsSchemaValidatorUtils.cpp
index 31f3449..14ad2cd 100644
--- a/extensions/schema-validation/src/nsSchemaValidatorUtils.cpp
+++ b/extensions/schema-validation/src/nsSchemaValidatorUtils.cpp
@@ -38,8 +38,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 // string includes
-#include "nsReadableUtils.h"
-#include "nsString.h"
+#include "nsStringAPI.h"
 #include "nsUnicharUtils.h"
 
 #include "nsISchema.h"
@@ -47,6 +46,7 @@
 #include "nsSchemaValidatorUtils.h"
 #include "nsISchemaValidatorRegexp.h"
 #include "nsSchemaDuration.h"
+#include "nsServiceManagerUtils.h"
 
 #include <stdlib.h>
 #include <math.h>
@@ -193,10 +193,9 @@ nsSchemaValidatorUtils::ParseSchemaDate(const nsAString & aStrValue,
     (-)CCYY-MM-DDT
   */
 
-  nsAString::const_iterator start, end, buffStart;
-  aStrValue.BeginReading(start);
-  aStrValue.BeginReading(buffStart);
-  aStrValue.EndReading(end);
+  const PRUnichar *start, *end, *buffStart;
+  aStrValue.BeginReading(&start, &end);
+  aStrValue.BeginReading(&buffStart);
   PRUint32 state = 0;
   PRUint32 buffLength = 0;
   PRBool done = PR_FALSE;
@@ -289,18 +288,25 @@ nsSchemaValidatorUtils::ParseSchemaDate(const nsAString & aStrValue,
       isValid = PR_FALSE;
     } else {
       PRUint8 monthval = strtol(month, &pEnd, 10);
-      PRUint8 dayval = strtol(day, &pEnd, 10);
-
-      // check for leap years
-      PRUint8 maxDay = GetMaximumDayInMonthFor(yearval, monthval);
-      if (maxDay >= dayval) {
-        aDate->year = yearval;
-
-        // month/day are validated in the parsing code above
-        aDate->month = monthval;
-        aDate->day = dayval;
-      } else {
+      if (monthval < 1 || monthval > 12) {
         isValid = PR_FALSE;
+      } else {
+        PRUint8 dayval = strtol(day, &pEnd, 10);
+        if (dayval < 1) {
+          isValid = PR_FALSE;
+        } else {
+          // check for leap years
+          PRUint8 maxDay = GetMaximumDayInMonthFor(yearval, monthval);
+          if (maxDay >= dayval) {
+            aDate->year = yearval;
+
+            // month/day are validated in the parsing code above
+            aDate->month = monthval;
+            aDate->day = dayval;
+          } else {
+            isValid = PR_FALSE;
+          }
+        }
       }
     }
   }
@@ -330,10 +336,9 @@ nsSchemaValidatorUtils::ParseSchemaTime(const nsAString & aStrValue,
   // we store the fraction seconds because PR_ExplodeTime seems to skip them.
   nsAutoString usec;
 
-  nsAString::const_iterator start, end, buffStart;
-  aStrValue.BeginReading(start);
-  aStrValue.BeginReading(buffStart);
-  aStrValue.EndReading(end);
+  const PRUnichar *start, *end, *buffStart;
+  aStrValue.BeginReading(&start, &end);
+  aStrValue.BeginReading(&buffStart);
   PRUint32 state = 0;
   PRUint32 buffLength = 0;
   PRBool done = PR_FALSE;
@@ -426,8 +431,13 @@ nsSchemaValidatorUtils::ParseSchemaTime(const nsAString & aStrValue,
           // has to be a numerical character or else abort
           if ((currentChar > '9') || (currentChar < '0'))
             done = PR_TRUE;
-          else
+          else {
             second[buffLength] = currentChar;
+            if (start == end) {
+              isValid = PR_TRUE;
+              done = PR_TRUE;
+            }
+          }
           buffLength++;
         }
 
@@ -444,10 +454,10 @@ nsSchemaValidatorUtils::ParseSchemaTime(const nsAString & aStrValue,
           else
             done = PR_TRUE;
           tzSign = currentChar;
-          usec.Assign(Substring(buffStart.get(), start.get()-1));
+          usec.Assign(Substring(buffStart, start - 1));
         } else if ((currentChar == '+') || (currentChar == '-')) {
           // timezone exists
-          usec.Assign(Substring(buffStart.get(), start.get()-1));
+          usec.Assign(Substring(buffStart, start - 1));
           state = 4;
           buffLength = 0;
           buffStart = start;
@@ -463,7 +473,7 @@ nsSchemaValidatorUtils::ParseSchemaTime(const nsAString & aStrValue,
 
       case 4: {
         // timezone hh:mm
-       if (buffStart.size_forward() == 5)
+       if (end-buffStart == 5)
          isValid = ParseSchemaTimeZone(Substring(buffStart, end), timezoneHour,
                                        timezoneMinute);
 
@@ -509,10 +519,9 @@ nsSchemaValidatorUtils::ParseSchemaTimeZone(const nsAString & aStrValue,
   char timezoneHour[3] = "";
   char timezoneMinute[3] = "";
 
-  nsAString::const_iterator start, end, buffStart;
-  aStrValue.BeginReading(start);
-  aStrValue.BeginReading(buffStart);
-  aStrValue.EndReading(end);
+  const PRUnichar *start, *end, *buffStart;
+  aStrValue.BeginReading(&start, &end);
+  aStrValue.BeginReading(&buffStart);
   PRUint32 state = 0;
   PRUint32 buffLength = 0;
   PRBool done = PR_FALSE;
@@ -792,7 +801,7 @@ nsSchemaValidatorUtils::AddTimeZoneToDateTime(nsSchemaDateTime aDateTime,
 void
 nsSchemaValidatorUtils::GetMonthShorthand(PRUint8 aMonth, nsACString & aReturn)
 {
-  aReturn.AssignASCII(monthShortHand[aMonth - 1].shortHand);
+  aReturn.Assign(monthShortHand[aMonth - 1].shortHand);
 }
 
 /*
@@ -857,10 +866,9 @@ nsSchemaValidatorUtils::ParseSchemaDuration(const nsAString & aStrValue,
 {
   PRBool isValid = PR_FALSE;
 
-  nsAString::const_iterator start, end, buffStart;
-  aStrValue.BeginReading(start);
-  aStrValue.BeginReading(buffStart);
-  aStrValue.EndReading(end);
+  const PRUnichar *start, *end, *buffStart;
+  aStrValue.BeginReading(&start, &end);
+  aStrValue.BeginReading(&buffStart);
   PRUint32 state = 0;
   PRUint32 buffLength = 0;
   PRBool done = PR_FALSE;
@@ -870,7 +878,7 @@ nsSchemaValidatorUtils::ParseSchemaDuration(const nsAString & aStrValue,
 
   // make sure leading P is present.  Take negative durations into consideration.
   if (*start == '-') {
-    start.advance(1);
+    ++start;
     if (*start != 'P') {
       return PR_FALSE;
     } else {
@@ -1133,11 +1141,9 @@ nsSchemaValidatorUtils::CompareStrings(const nsAString & aString1,
     return 1;
   }
 
-  nsAString::const_iterator start1, start2, end1, end2;
-  aString1.BeginReading(start1);
-  aString1.EndReading(end1);
-  aString2.BeginReading(start2);
-  aString2.EndReading(end2);
+  const PRUnichar *start1, *start2, *end1, *end2;
+  aString1.BeginReading(&start1, &end1);
+  aString2.BeginReading(&start2, &end2);
 
   // skip negative sign
   if (isNegative1)
@@ -1371,9 +1377,8 @@ nsSchemaValidatorUtils::IsValidSchemaNormalizedString(const nsAString &aStrValue
   nsAutoString string(aStrValue);
 
   // may not contain carriage return, line feed nor tab characters
-  if (string.FindCharInSet("\t\r\n") == kNotFound)
+  if (FindCharInSet(string, "\t\r\n") == kNotFound)
     isValid = PR_TRUE;
-
   return isValid;
 }
 
@@ -1387,10 +1392,10 @@ nsSchemaValidatorUtils::IsValidSchemaToken(const nsAString &aStrValue)
   // may not contain carriage return, line feed, tab characters.  Also can
   // not contain leading/trailing whitespace and no internal sequences of
   // two or more spaces.
-  if ((string.FindCharInSet("\t\r\n") == kNotFound) &&
+  if ((FindCharInSet(string, "\t\r\n") == kNotFound) &&
       (string.Find(NS_LITERAL_STRING("  ")) == kNotFound) &&
       (string.First() != ' ') &&
-      (string.Last() != ' '))
+      (string.CharAt(string.Length() - 1) != ' '))
     isValid = PR_TRUE;
 
   return isValid;
@@ -1502,11 +1507,10 @@ nsSchemaValidatorUtils::IsValidSchemaIDRefs(const nsAString &aStrValue)
   PRBool isValid = PR_FALSE;
 
   // Need to validate each IDREF
-  nsAString::const_iterator iter, end, tokenStart;
+  const PRUnichar *iter, *end, *tokenStart;
   nsAutoString idref;
-  aStrValue.BeginReading(iter);
-  aStrValue.BeginReading(tokenStart);
-  aStrValue.EndReading(end);
+  aStrValue.BeginReading(&iter, &end);
+  aStrValue.BeginReading(&tokenStart);
   while (iter != end) {
     for (;IsWhitespace(*iter) && iter != end; ++iter);
     tokenStart = iter;
@@ -1563,11 +1567,10 @@ nsSchemaValidatorUtils::IsValidSchemaNMTokens(const nsAString &aStrValue)
   PRBool isValid = PR_FALSE;
 
   // Need to validate each NNTOKEN
-  nsAString::const_iterator iter, end, tokenStart;
+  const PRUnichar *iter, *end, *tokenStart;
   nsAutoString idref;
-  aStrValue.BeginReading(iter);
-  aStrValue.BeginReading(tokenStart);
-  aStrValue.EndReading(end);
+  aStrValue.BeginReading(&iter, &end);
+  aStrValue.BeginReading(&tokenStart);
   while (iter != end) {
     for (;IsWhitespace(*iter) && iter != end; ++iter);
     tokenStart = iter;
@@ -1612,9 +1615,8 @@ nsSchemaValidatorUtils::HandleEnumeration(const nsAString &aStrValue,
 void
 nsSchemaValidatorUtils::RemoveLeadingZeros(nsAString & aString)
 {
-  nsAString::const_iterator start, end;
-  aString.BeginReading(start);
-  aString.EndReading(end);
+  const PRUnichar *start, *end;
+  aString.BeginReading(&start, &end);
 
   PRBool done = PR_FALSE;
   PRUint32 count = 0, indexstart = 0;
@@ -1647,9 +1649,8 @@ nsSchemaValidatorUtils::RemoveLeadingZeros(nsAString & aString)
 void
 nsSchemaValidatorUtils::RemoveTrailingZeros(nsAString & aString)
 {
-  nsAString::const_iterator start, end;
-  aString.BeginReading(start);
-  aString.EndReading(end);
+  const PRUnichar *start, *end;
+  aString.BeginReading(&start, &end);
 
   PRUint32 length = aString.Length();
 
@@ -1941,3 +1942,31 @@ nsSchemaValidatorUtils::SetToNullOrElement(nsIDOMNode *aNode,
   }
 }
 
+PRInt32
+nsSchemaValidatorUtils::FindCharInSet(const nsAString & aString,
+                                      const char *aSet, PRInt32 aOffset)
+{
+  if (aString.IsEmpty()) {
+    return kNotFound;
+  }
+
+  if (aOffset < 0) {
+    aOffset = 0;
+  } else if (aOffset > (PRInt32)aString.Length()) {
+    return kNotFound;
+  }
+
+  const PRUnichar *start, *end;
+  aString.BeginReading(&start, &end);
+
+  for (; start != end; ++start) {
+    for (const char *temp = aSet; *temp; ++temp) {
+      if (*start == PRUnichar(*temp)) {
+        return (temp - aSet + aOffset) ;
+      }
+    }
+  }
+
+  return kNotFound;
+}
+
diff --git a/extensions/schema-validation/src/nsSchemaValidatorUtils.h b/extensions/schema-validation/src/nsSchemaValidatorUtils.h
index 0cfbf10..7c25404 100644
--- a/extensions/schema-validation/src/nsSchemaValidatorUtils.h
+++ b/extensions/schema-validation/src/nsSchemaValidatorUtils.h
@@ -40,7 +40,7 @@
 #define __nsSchemaValidatorUtils_h__
 
 #include "nsCOMPtr.h"
-#include "nsString.h"
+#include "nsStringAPI.h"
 #include "nsISchema.h"
 #include "nsIDOMNode.h"
 #include "nsCOMArray.h"
@@ -239,6 +239,8 @@ public:
                                     nsSchemaDerivedSimpleType *aDerivedSrc);
 
   static void SetToNullOrElement(nsIDOMNode *aNode, nsIDOMNode **aResultNode);
+  static PRInt32 FindCharInSet(const nsAString & aString, const char *aSet,
+                               PRInt32 aOffset = 0);
 private:
   nsSchemaValidatorUtils();
   ~nsSchemaValidatorUtils();
diff --git a/extensions/spatialnavigation/src/nsSpatialNavigationService.cpp b/extensions/spatialnavigation/src/nsSpatialNavigationService.cpp
index 0997ae3..df7715e 100755
--- a/extensions/spatialnavigation/src/nsSpatialNavigationService.cpp
+++ b/extensions/spatialnavigation/src/nsSpatialNavigationService.cpp
@@ -232,12 +232,6 @@ nsSpatialNavigationService::Observe(nsISupports *aSubject, const char *aTopic, c
 //  XPCOM REGISTRATION BELOW
 //------------------------------------------------------------------------------
 
-#define SpatialNavigation_CID \
-{ 0xd1b91385, 0xe1c1, 0x46ec, \
-{0x8d, 0x15, 0x88, 0x0c, 0x45, 0xbe, 0x8e, 0x0e} }
-
-#define SpatialNavigation_ContractID "@mozilla.org/spatialNavigation/service;1"
-
 #define SpatialNavigationService_CID \
 { 0x4125624b, 0xaf22, 0x4d50, \
 { 0x87, 0xf6, 0x40, 0x19, 0xc9, 0x85, 0x7b, 0x58} }
@@ -268,7 +262,7 @@ static NS_METHOD SpatialNavigationServiceRegistration(nsIComponentManager *aComp
   char* previous = nsnull;
   rv = catman->AddCategoryEntry("app-startup",
                                 "SpatialNavigationService", 
-                                SpatialNavigationService_ContractID,
+                                "service," SpatialNavigationService_ContractID,
                                 PR_TRUE, 
                                 PR_TRUE, 
                                 &previous);
diff --git a/extensions/venkman/Makefile.in b/extensions/venkman/Makefile.in
index 74d1b80..c36ea94 100644
--- a/extensions/venkman/Makefile.in
+++ b/extensions/venkman/Makefile.in
@@ -46,22 +46,34 @@ include $(DEPTH)/config/autoconf.mk
 MODULE       = venkman
 PACKAGE_FILE = venkman.pkg
 
-DIRS        = resources
-
 EXTRA_COMPONENTS = js/venkman-service.js
 DIST_FILES = xpi/resources/install.rdf
 
 VENKMAN_VERSION=$(shell cat $(srcdir)/version.txt)
 
-ifdef MOZ_XUL_APP
 XPI_NAME = venkman
 NO_JAR_AUTO_REG = 1
 INSTALL_EXTENSION_ID = {f13b157f-b174-47e7-a34d-4815ddfdfeb8}
 XPI_PKGNAME = venkman-$(VENKMAN_VERSION)
+
+# include config.mk before using the AB_CD var it sets in an if statement
+include $(topsrcdir)/config/config.mk
+
+# always build en-US locale, add build locale if supported
+BUILD_LOCALES = en-US
+ifneq (,$(filter $(AB_CD),$(shell cat $(srcdir)/locales/all-locales)))
+BUILD_LOCALES += $(AB_CD)
 endif
 
+DIRS += resources
+
 XUL_APP_DEFINES += -DVENKMAN_VERSION=$(VENKMAN_VERSION)
 DEFINES += -DVENKMAN_VERSION=$(VENKMAN_VERSION)
 
 include $(topsrcdir)/config/rules.mk
 
+libs realchrome:: locales/Makefile
+	@$(EXIT_ON_ERROR)                    \
+	for locale in $(BUILD_LOCALES); do   \
+	  $(MAKE) -C locales AB_CD=$$locale; \
+	done
diff --git a/extensions/irc/locales/Makefile.in b/extensions/venkman/locales/Makefile.in
similarity index 51%
copy from extensions/irc/locales/Makefile.in
copy to extensions/venkman/locales/Makefile.in
index 29dc39d..e543fd6 100644
--- a/extensions/irc/locales/Makefile.in
+++ b/extensions/venkman/locales/Makefile.in
@@ -40,18 +40,44 @@ DEPTH=../../..
 topsrcdir=@top_srcdir@
 srcdir=@srcdir@
 VPATH=@srcdir@
-relativesrcdir = extensions/irc/locales
+relativesrcdir = extensions/venkman/locales
+
+VENKMAN_VERSION=$(shell cat $(srcdir)/../version.txt)
+VENKMAN_BASE_VERSION=$(shell echo "$(VENKMAN_VERSION)" | sed "s|\([0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}\).*|\1|")
+
+XPI_NAME               = venkman
+USE_EXTENSION_MANIFEST = 1
+NO_JAR_AUTO_REG        = 1
+INSTALL_EXTENSION_ID   = {f13b157f-b174-47e7-a34d-4815ddfdfeb8}
+XPI_PKGNAME            = venkman-$(VENKMAN_VERSION)
 
 # include config.mk before we override the AB_CD var it sets
 include $(topsrcdir)/config/config.mk
 
 # if the wanted language is not in all-locales, fall back to en-US
 ifeq (,$(filter $(AB_CD),$(shell cat $(srcdir)/all-locales)))
-AB_CD = en-US
+override AB_CD = en-US
 endif
 
 DEFINES += -DAB_CD=$(AB_CD)
 
+ifneq (en-US,$(AB_CD))
+XPI_NAME               = venkman-$(AB_CD)
+INSTALL_EXTENSION_ID   = langpack-$(AB_CD)@venkman.mozilla.org
+XPI_PKGNAME            = venkman-$(VENKMAN_VERSION).$(AB_CD)
+DIST_FILES             = generic/install.rdf generic/install.js
+XULAPP_DEFINES = \
+    $(DEFINES) \
+    $(ACDEFINES) \
+    -I$(call EXPAND_LOCALE_SRCDIR,toolkit/locales)/defines.inc \
+    -I$(LOCALE_SRCDIR)/defines.inc \
+    $(NULL)
+endif
+
+DEFINES += -DINSTALL_EXTENSION_ID=$(INSTALL_EXTENSION_ID)
+DEFINES += -DVENKMAN_VERSION=$(VENKMAN_VERSION)
+DEFINES += -DVENKMAN_BASE_VERSION=$(VENKMAN_BASE_VERSION)
+
 include $(topsrcdir)/config/rules.mk
 
 ifneq (en-US,$(AB_CD))
@@ -59,3 +85,32 @@ libs realchrome::
 	@echo "Comparing $(AB_CD) to en-US"
 	@$(PERL) $(topsrcdir)/toolkit/locales/compare-locales.pl $(srcdir)/en-US $(LOCALE_SRCDIR)
 endif
+
+libs-%: AB_CD=$*
+libs-%:
+	# XXX: it would be nice if we could just do nothing if no langpack is being done
+	#  currently, we just go and (re)build en-US if called with a non-supported locale
+	$(MAKE) libs AB_CD=$*
+
+repackage-zip: $(STAGEDIST)
+ifneq (en-US,$(AB_CD))
+	$(RM) -rf $(STAGEDIST)/extensions/$(INSTALL_EXTENSION_ID)
+	mkdir $(STAGEDIST)/extensions/$(INSTALL_EXTENSION_ID)
+	$(RM) -r $(DIST)/xpi-stage/$(XPI_NAME)/chrome/venkman
+	# use tar for copying as cp doesn't portably preserve timestamps
+	cd $(DIST)/xpi-stage/$(XPI_NAME) && \
+	  tar $(TAR_CREATE_FLAGS) - * | ( cd $(STAGEDIST)/extensions/$(INSTALL_EXTENSION_ID) && tar -xf - )
+	@echo "$(AB_CD)"
+endif
+
+repackage-zip-%: $(STAGEDIST)
+	@$(MAKE) repackage-zip AB_CD=$* STAGEDIST=$(STAGEDIST)
+
+repackage-win32-installer: $(STAGEDIST)
+ifneq (en-US,$(AB_CD))
+	mkdir -p $(STAGEDIST)/optional/extensions
+	mv $(DIST)/xpi-stage/$(XPI_NAME) $(STAGEDIST)/optional/extensions/$(INSTALL_EXTENSION_ID)
+endif
+
+repackage-win32-installer-%: $(STAGEDIST)
+	@$(MAKE) repackage-win32-installer AB_CD=$* STAGEDIST=$(STAGEDIST)
diff --git a/extensions/venkman/locales/all-locales b/extensions/venkman/locales/all-locales
new file mode 100644
index 0000000..81e42c9
--- /dev/null
+++ b/extensions/venkman/locales/all-locales
@@ -0,0 +1,5 @@
+de
+fr
+nb-NO
+ru
+sv-SE
diff --git a/extensions/venkman/resources/locale/en-US/profile.csv.tpl b/extensions/venkman/locales/en-US/chrome/profile.csv.tpl
similarity index 100%
rename from extensions/venkman/resources/locale/en-US/profile.csv.tpl
rename to extensions/venkman/locales/en-US/chrome/profile.csv.tpl
diff --git a/extensions/venkman/resources/locale/en-US/profile.html.tpl b/extensions/venkman/locales/en-US/chrome/profile.html.tpl
similarity index 100%
rename from extensions/venkman/resources/locale/en-US/profile.html.tpl
rename to extensions/venkman/locales/en-US/chrome/profile.html.tpl
diff --git a/extensions/venkman/resources/locale/en-US/profile.txt.tpl b/extensions/venkman/locales/en-US/chrome/profile.txt.tpl
similarity index 100%
rename from extensions/venkman/resources/locale/en-US/profile.txt.tpl
rename to extensions/venkman/locales/en-US/chrome/profile.txt.tpl
diff --git a/extensions/venkman/resources/locale/en-US/profile.xml.tpl b/extensions/venkman/locales/en-US/chrome/profile.xml.tpl
similarity index 100%
rename from extensions/venkman/resources/locale/en-US/profile.xml.tpl
rename to extensions/venkman/locales/en-US/chrome/profile.xml.tpl
diff --git a/extensions/venkman/resources/locale/en-US/venkman-help.tpl b/extensions/venkman/locales/en-US/chrome/venkman-help.tpl
similarity index 100%
rename from extensions/venkman/resources/locale/en-US/venkman-help.tpl
rename to extensions/venkman/locales/en-US/chrome/venkman-help.tpl
diff --git a/extensions/venkman/resources/locale/en-US/venkman-output-locale.css b/extensions/venkman/locales/en-US/chrome/venkman-output-locale.css
similarity index 100%
rename from extensions/venkman/resources/locale/en-US/venkman-output-locale.css
rename to extensions/venkman/locales/en-US/chrome/venkman-output-locale.css
diff --git a/extensions/venkman/resources/locale/en-US/venkman-overlay.dtd b/extensions/venkman/locales/en-US/chrome/venkman-overlay.dtd
similarity index 100%
rename from extensions/venkman/resources/locale/en-US/venkman-overlay.dtd
rename to extensions/venkman/locales/en-US/chrome/venkman-overlay.dtd
diff --git a/extensions/venkman/resources/locale/en-US/venkman.dtd b/extensions/venkman/locales/en-US/chrome/venkman.dtd
similarity index 100%
rename from extensions/venkman/resources/locale/en-US/venkman.dtd
rename to extensions/venkman/locales/en-US/chrome/venkman.dtd
diff --git a/extensions/venkman/resources/locale/en-US/venkman.properties b/extensions/venkman/locales/en-US/chrome/venkman.properties
similarity index 99%
rename from extensions/venkman/resources/locale/en-US/venkman.properties
rename to extensions/venkman/locales/en-US/chrome/venkman.properties
index 19b59ec..0503c54 100644
--- a/extensions/venkman/resources/locale/en-US/venkman.properties
+++ b/extensions/venkman/locales/en-US/chrome/venkman.properties
@@ -332,6 +332,8 @@ msg.files.rec         = Files
 #msg.doc.popuphdr     = Popups
 #msg.doc.keyhdr       = Keys
 
+msg.help.hostproblem  = You're running Venkman in an application which doesn't have a browser. Therefore, we can't show you this help content. If you install Venkman in Firefox, SeaMonkey or Flock, you can copy this URL into the address bar to show the help: x-jsd:help . You can also use the help command with a parameter to get help information on a specific command.
+
 msg.note.console     = This command is available from the console.
 msg.note.noconsole    = This command is NOT available from the console.
 msg.note.needstack   = You must be stopped at a breakpoint to use this command.
diff --git a/extensions/venkman/locales/en-US/defines.inc b/extensions/venkman/locales/en-US/defines.inc
new file mode 100644
index 0000000..459d958
--- /dev/null
+++ b/extensions/venkman/locales/en-US/defines.inc
@@ -0,0 +1,11 @@
+#filter emptyLines
+
+#define MOZ_LANGPACK_CREATOR The JavaScript Debugger Team
+
+#define MOZ_LANGPACK_HOMEPAGE http://www.hacksrus.com/~ginda/venkman/
+
+# If non-English locales wish to credit multiple contributors, uncomment this
+# variable definition and use the format specified.
+# #define MOZ_LANGPACK_CONTRIBUTORS <em:contributor>Joe Solon</em:contributor> <em:contributor>Suzy Solon</em:contributor>
+
+#unfilter emptyLines
diff --git a/extensions/venkman/resources/locale/en-US/contents.rdf b/extensions/venkman/locales/generic/chrome/contents.rdf
similarity index 100%
rename from extensions/venkman/resources/locale/en-US/contents.rdf
rename to extensions/venkman/locales/generic/chrome/contents.rdf
diff --git a/extensions/venkman/locales/generic/install.js b/extensions/venkman/locales/generic/install.js
new file mode 100644
index 0000000..678c341
--- /dev/null
+++ b/extensions/venkman/locales/generic/install.js
@@ -0,0 +1,54 @@
+#filter substitution
+// variables
+var version = "@VENKMAN_VERSION@";
+var locale = "@AB_CD@";
+var jarFile = "venkman.jar";
+var installName = "JavaScript Debugger " + version + " @MOZ_LANG_TITLE@ Language Pack";
+// size of the locale jar file in kibibytes (1024 bytes per KiB)
+// en-US files need about 110 KiB currently, estimate up to 200 KiB for others
+var srDest = 200;
+
+// end variables, start real work
+
+// this function verifies disk space in kilobytes
+function verifyDiskSpace(dirPath, spaceRequired)
+{
+  var spaceAvailable;
+
+  // Get the available disk space on the given path
+  spaceAvailable = fileGetDiskSpaceAvailable(dirPath);
+
+  // Convert the available disk space into kilobytes
+  spaceAvailable = parseInt(spaceAvailable / 1024);
+
+  // do the verification
+  if(spaceAvailable < spaceRequired)
+  {
+    logComment("Insufficient disk space: " + dirPath);
+    logComment("  required : " + spaceRequired + " K");
+    logComment("  available: " + spaceAvailable + " K");
+    return(false);
+  }
+
+  return(true);
+}
+
+var err = initInstall(installName, "JavaScript Debugger " + locale, version); 
+logComment("initInstall: " + err);
+
+if (verifyDiskSpace(getFolder("Program"), srDest))
+{
+    addFile("JavaScript Debugger " + locale,
+            "chrome/" + jarFile,        // jar source folder 
+            getFolder("Chrome"),        // target folder
+            "");                        // target subdir 
+
+    registerChrome(LOCALE | DELAYED_CHROME, getFolder("Chrome", jarFile), "locale/" + locale + "/chatzilla/");
+
+    if (err==SUCCESS)
+        performInstall(); 
+    else
+        cancelInstall(err);
+}
+else
+    cancelInstall(INSUFFICIENT_DISK_SPACE);
diff --git a/extensions/venkman/locales/generic/install.rdf b/extensions/venkman/locales/generic/install.rdf
new file mode 100644
index 0000000..b159b92
--- /dev/null
+++ b/extensions/venkman/locales/generic/install.rdf
@@ -0,0 +1,94 @@
+<?xml version="1.0"?>
+#filter substitution
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+  <Description about="urn:mozilla:install-manifest"
+               em:id="@INSTALL_EXTENSION_ID@"
+               em:name="JavaScript Debugger @MOZ_LANG_TITLE@ Language Pack"
+               em:version="@VENKMAN_VERSION@"
+               em:type="8"
+               em:creator="@MOZ_LANGPACK_CREATOR@"
+               em:homepageURL="@MOZ_LANGPACK_HOMEPAGE@">
+#ifdef MOZ_LANGPACK_CONTRIBUTORS
+    @MOZ_LANGPACK_CONTRIBUTORS@
+#endif
+
+    <!-- require Javascript Debugger (ignored on Gecko <= 1.8.*) -->
+    <em:requires>
+      <Description>
+        <em:id>{f13b157f-b174-47e7-a34d-4815ddfdfeb8}</em:id>
+        <em:minVersion>@VENKMAN_BASE_VERSION@</em:minVersion>
+        <em:maxVersion>@VENKMAN_BASE_VERSION@.*</em:maxVersion>
+      </Description>
+    </em:requires>
+
+    <!-- target: Mozilla Firefox, version 0.9 to 3.0 -->
+    <em:targetApplication>
+      <Description>
+        <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
+        <em:minVersion>0.9</em:minVersion>
+        <em:maxVersion>3.0</em:maxVersion>
+      </Description>
+    </em:targetApplication>
+
+    <!-- target: Mozilla Thunderbird, version 0.9 to 3.0 -->
+    <em:targetApplication>
+      <Description>
+        <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
+        <em:minVersion>0.9</em:minVersion>
+        <em:maxVersion>3.0</em:maxVersion>
+      </Description>
+    </em:targetApplication>
+
+    <!-- target: Flock, version 1.0 -->
+    <em:targetApplication>
+      <Description>
+        <em:id>{a463f10c-3994-11da-9945-000d60ca027b}</em:id>
+        <em:minVersion>0.4</em:minVersion>
+        <em:maxVersion>1.0.*</em:maxVersion>
+      </Description>
+    </em:targetApplication>
+
+    <!-- target: Mozilla Sunbird version 0.3 and later -->
+    <em:targetApplication>
+      <Description>
+        <em:id>{718e30fb-e89b-41dd-9da7-e25a45638b28}</em:id>
+        <em:minVersion>0.3a1</em:minVersion>
+        <em:maxVersion>0.8pre</em:maxVersion>
+      </Description>
+    </em:targetApplication>
+
+    <!-- target: SeaMonkey version 2.0 -->
+    <em:targetApplication>
+      <Description>
+        <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
+        <em:minVersion>2.0a</em:minVersion>
+        <em:maxVersion>2.0</em:maxVersion>
+      </Description>
+    </em:targetApplication>
+
+    <!-- target: Gecko Toolkit version 1.9 -->
+    <em:targetApplication>
+      <Description>
+        <em:id>toolkit@mozilla.org</em:id>
+        <em:minVersion>1.9a7</em:minVersion>
+        <em:maxVersion>1.9</em:maxVersion>
+      </Description>
+    </em:targetApplication>
+
+    <!-- target: Netscape Navigator, version 9.0b1 to 9.0.* -->
+    <em:targetApplication>
+      <Description>
+        <em:id>{3db10fab-e461-4c80-8b97-957ad5f8ea47}</em:id>
+        <em:minVersion>9.0b1</em:minVersion>
+        <em:maxVersion>9.0.*</em:maxVersion>
+      </Description>
+    </em:targetApplication>
+
+    <!-- package files -->
+    <em:file>
+      <Description about="urn:mozilla:extension:file:venkman.jar">
+        <em:locale>locale/@AB_CD@/venkman/</em:locale>
+      </Description>
+    </em:file>
+  </Description>
+</RDF>
diff --git a/extensions/venkman/locales/jar.mn b/extensions/venkman/locales/jar.mn
new file mode 100644
index 0000000..d0a15dd
--- /dev/null
+++ b/extensions/venkman/locales/jar.mn
@@ -0,0 +1,15 @@
+#filter substitution
+
+venkman.jar:
+# the "% locale" line gets put into the .manifest used by toolkit-based apps
+% locale venkman @AB_CD@ %locale/@AB_CD@/venkman/
+* locale/@AB_CD@/venkman/contents.rdf              (generic/chrome/contents.rdf)
+  locale/@AB_CD@/venkman/venkman.dtd               (%chrome/venkman.dtd)
+  locale/@AB_CD@/venkman/venkman.properties        (%chrome/venkman.properties)
+  locale/@AB_CD@/venkman/venkman-output-locale.css (%chrome/venkman-output-locale.css)
+  locale/@AB_CD@/venkman/venkman-overlay.dtd       (%chrome/venkman-overlay.dtd)
+  locale/@AB_CD@/venkman/venkman-help.tpl          (%chrome/venkman-help.tpl)
+  locale/@AB_CD@/venkman/profile.csv.tpl           (%chrome/profile.csv.tpl)
+  locale/@AB_CD@/venkman/profile.txt.tpl           (%chrome/profile.txt.tpl)
+  locale/@AB_CD@/venkman/profile.html.tpl          (%chrome/profile.html.tpl)
+  locale/@AB_CD@/venkman/profile.xml.tpl           (%chrome/profile.xml.tpl)
diff --git a/extensions/venkman/makefiles.sh b/extensions/venkman/makefiles.sh
index 7617871..38c6fac 100755
--- a/extensions/venkman/makefiles.sh
+++ b/extensions/venkman/makefiles.sh
@@ -38,5 +38,6 @@
 
 add_makefiles "
   extensions/venkman/Makefile
+  extensions/venkman/locales/Makefile
   extensions/venkman/resources/Makefile
 "
diff --git a/extensions/venkman/resources/Makefile.in b/extensions/venkman/resources/Makefile.in
index 13f0f9f..73e6476 100644
--- a/extensions/venkman/resources/Makefile.in
+++ b/extensions/venkman/resources/Makefile.in
@@ -45,13 +45,11 @@ include $(DEPTH)/config/autoconf.mk
 
 VENKMAN_VERSION=$(shell cat $(srcdir)/../version.txt)
 
-ifdef MOZ_XUL_APP
 XPI_NAME = venkman
 USE_EXTENSION_MANIFEST = 1
 NO_JAR_AUTO_REG = 1
 INSTALL_EXTENSION_ID = {f13b157f-b174-47e7-a34d-4815ddfdfeb8}
 XPI_PKGNAME = venkman-$(VENKMAN_VERSION)
-endif
 
 DEFINES += -DVENKMAN_VERSION=$(VENKMAN_VERSION)
 
diff --git a/extensions/venkman/resources/content/venkman-commands.js b/extensions/venkman/resources/content/venkman-commands.js
index 2f38ef5..5e86db0 100644
--- a/extensions/venkman/resources/content/venkman-commands.js
+++ b/extensions/venkman/resources/content/venkman-commands.js
@@ -1180,27 +1180,28 @@ function cmdHelp (e)
     var ary;
     if (!e.pattern)
     {
-        openTopWin ("x-jsd:help", "venkman-help");
-        return true;
-    }
-    else
-    {
-        ary = console.commandManager.list (e.pattern, CMD_CONSOLE);
- 
-        if (ary.length == 0)
+        if (!console.haveBrowser)
         {
-            display (getMsg(MSN_ERR_NO_COMMAND, e.pattern), MT_ERROR);
+            display(MSG_HELP_HOSTPROBLEM, MT_ERROR);
             return false;
         }
+        openTopWin("x-jsd:help", "venkman-help");
+        return true;
+    }
 
-        for (var i in ary)
-        {        
-            display (getMsg(MSN_FMT_USAGE, [ary[i].name, ary[i].usage]), 
-                     MT_USAGE);
-            display (ary[i].help, MT_HELP);
-        }
+    ary = console.commandManager.list(e.pattern, CMD_CONSOLE);
+
+    if (ary.length == 0)
+    {
+        display(getMsg(MSN_ERR_NO_COMMAND, e.pattern), MT_ERROR);
+        return false;
     }
 
+    for (var i in ary)
+    {
+        display(getMsg(MSN_FMT_USAGE, [ary[i].name, ary[i].usage]), MT_USAGE);
+        display(ary[i].help, MT_HELP);
+    }
     return true;
 }
 
@@ -2036,7 +2037,7 @@ function cmdStop (e)
     if (console.jsds.interruptHook)
         setStopState(false);
     else
-        setStopState(true);
+        setTimeout(setStopState, 1, true);
 }
 
 function cmdTMode (e)
diff --git a/extensions/venkman/resources/content/venkman-overlay.xul b/extensions/venkman/resources/content/venkman-overlay.xul
index a77a487..937d144 100644
--- a/extensions/venkman/resources/content/venkman-overlay.xul
+++ b/extensions/venkman/resources/content/venkman-overlay.xul
@@ -69,7 +69,7 @@
 
 <toolbarpalette id="BrowserToolbarPalette">
   <toolbarbutton id="tb-venkman-open" oncommand="start_venkman()" 
-      class="toolbarbutton-1"
+      class="toolbarbutton-1 venkman-open-tb-button"
       label="&vnkButton.label;" tooltiptext="&vnkButton.label;"/>
 </toolbarpalette>
 
@@ -90,7 +90,7 @@
 <!-- Sunbird toolbar button -->
 <toolbarpalette id="calendarToolbarPalette">
   <toolbarbutton id="sb-venkman-open" oncommand="start_venkman()" 
-      class="toolbarbutton-1"
+      class="toolbarbutton-1 venkman-open-tb-button"
       label="&vnkButton.label;" tooltiptext="&vnkButton.label;"/>
 </toolbarpalette>
 
diff --git a/extensions/venkman/resources/content/venkman-records.js b/extensions/venkman/resources/content/venkman-records.js
index c5a90a2..0ac7570 100644
--- a/extensions/venkman/resources/content/venkman-records.js
+++ b/extensions/venkman/resources/content/venkman-records.js
@@ -618,8 +618,7 @@ function vr_getexpression(extra)
     if ("value" in this.parentRecord)
     {
         var cur = this.parentRecord;
-        while (cur != console.views["locals"].childData &&
-               cur != console.views["locals"].scopeRecord)
+        while (!("isRootRecord" in cur) || !cur.isRootRecord)
         {
             if ("isECMAProto" in cur)
                 items.unshift("__proto__");
diff --git a/extensions/venkman/resources/content/venkman-static.js b/extensions/venkman/resources/content/venkman-static.js
index dc168e5..bc99c47 100644
--- a/extensions/venkman/resources/content/venkman-static.js
+++ b/extensions/venkman/resources/content/venkman-static.js
@@ -631,15 +631,61 @@ function init()
 
 function initApplicationCompatibility()
 {
-    // This routine does nothing more than tweak the UI based on the host 
+    // This function does nothing more than tweak the UI based on the host
     // application.
 
-    var windowMenu = document.getElementById("windowMenu");
-
     // Set up simple host and platform information.
-    console.host = "Mozilla";
-    if (!windowMenu.firstChild)
-        console.host = "Firefox";
+    console.host = "Unknown";
+    console.haveBrowser = false;
+
+    var app = getService("@mozilla.org/xre/app-info;1", "nsIXULAppInfo");
+    // nsIXULAppInfo wasn't implemented before 1.8...
+    if (app)
+    {
+        // Use the XULAppInfo.ID to find out what host we run on.
+        switch (app.ID)
+        {
+            case "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}":
+                console.host = "Firefox";
+                console.haveBrowser = true;
+                break;
+            case "{3550f703-e582-4d05-9a08-453d09bdfdc6}": // Thunderbird
+                console.host = "Thunderbird";
+                break;
+            case "{a463f10c-3994-11da-9945-000d60ca027b}": // Flock
+                console.host = "Flock";
+                console.haveBrowser = true;
+                break;
+            case "{718e30fb-e89b-41dd-9da7-e25a45638b28}": // Sunbird
+                console.host = "Sunbird";
+                break;
+            case "{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}": // SeaMonkey
+                console.host = "Mozilla";
+                console.haveBrowser = true;
+                break;
+            default:
+                console.unknownAppUID = app.ID;
+                console.host = "ToolkitApp"; // Unknown host, platform install
+        }
+    }
+    else if ("getBrowserURL" in window)
+    {
+        var url = getBrowserURL();
+        if (url == "chrome://navigator/content/navigator.xul")
+        {
+            console.host = "Mozilla";
+            console.haveBrowser = true;
+        }
+        else if (url == "chrome://browser/content/browser.xul")
+        {
+            console.host = "Firefox";
+            console.haveBrowser = true;
+        }
+        else
+        {
+            console.unknownAppUID = url;
+        }
+    }
 
     console.platform = "Unknown";
     if (navigator.platform.search(/mac/i) > -1)
@@ -648,6 +694,8 @@ function initApplicationCompatibility()
         console.platform = "Windows";
     if (navigator.platform.search(/linux/i) > -1)
         console.platform = "Linux";
+    if (navigator.platform.search(/os\/2/i) > -1)
+        console.platform = "OS/2";
 
     console.hostPlatform = console.host + console.platform;
 
@@ -657,15 +705,11 @@ function initApplicationCompatibility()
     //var toolsMenu = document.getElementById("mainmenu:tools");
     var comBar    = document.getElementById("component-bar");
 
-    if (console.host == "Firefox") {
+    if (console.host != "Mozilla") {
         tasksMenu.parentNode.removeChild(tasksMenu);
         winMenu.parentNode.removeChild(winMenu);
         comBar.collapsed = true;
     }
-
-    //if ((console.host != "Firefox") || (console.platform == "Linux")) {
-    //    toolsMenu.parentNode.removeChild(toolsMenu);
-    //}
 }
 
 function initPost()
diff --git a/extensions/venkman/resources/content/venkman-utils.js b/extensions/venkman/resources/content/venkman-utils.js
index 3b34b39..f5eea45 100644
--- a/extensions/venkman/resources/content/venkman-utils.js
+++ b/extensions/venkman/resources/content/venkman-utils.js
@@ -215,6 +215,37 @@ function dumpObjectTree (o, recurse, compress, level)
     
 }
 
+function getService(contractID, iface)
+{
+    var rv;
+    var cls = Components.classes[contractID];
+
+    if (!cls)
+        return null;
+
+    switch (typeof iface)
+    {
+        case "undefined":
+            rv = cls.getService();
+            break;
+
+        case "string":
+            rv = cls.getService(Components.interfaces[iface]);
+            break;
+
+        case "object":
+            rv = cls.getService(iface);
+            break;
+
+        default:
+            rv = null;
+            break;
+    }
+
+    return rv;
+
+}
+
 function safeHTML(str)
 {
     function replaceChars(ch)
diff --git a/extensions/venkman/resources/content/venkman-views.js b/extensions/venkman/resources/content/venkman-views.js
index f21cb49..beb77f4 100644
--- a/extensions/venkman/resources/content/venkman-views.js
+++ b/extensions/venkman/resources/content/venkman-views.js
@@ -569,6 +569,7 @@ function lv_init ()
     };
 
     this.caption = MSG_VIEW_LOCALS;
+    this.childData.isRootRecord = true;
 
     this.jsdFrame = null;
     this.savedStates = new Object();
@@ -619,6 +620,7 @@ function lv_renit (jsdFrame)
         this.scopeRecord = new ValueRecord(jsdFrame.scope, MSG_VAL_SCOPE, "",
                                            jsdFrame);
         this.scopeRecord.onPreRefresh = null;
+        this.scopeRecord.isRootRecord = true;
         this.childData.appendChild(this.scopeRecord);
         if (!state && jsdFrame.scope.propertyCount <
             console.prefs["localsView.autoOpenMax"])
@@ -632,6 +634,7 @@ function lv_renit (jsdFrame)
         this.scopeRecord = new XTLabelRecord ("locals:col-0", MSV_VAL_SCOPE,
                                               ["locals:col-1", "locals:col-2",
                                                "locals:col-3"]);
+        this.scopeRecord.isRootRecord = true;
         this.scopeRecord.property = ValueRecord.prototype.atomObject;
         this.childData.appendChild(this.scopeRecord);
     }
@@ -4146,6 +4149,7 @@ function wv_init()
     };
 
     this.caption = MSG_VIEW_WATCHES;
+    this.childData.isRootRecord = true;
 
 }
 
@@ -4226,8 +4230,7 @@ function wv_getcx(cx)
                 {
                     cx.parentValue = rec.parentRecord.value;
                     var cur = rec.parentRecord;
-                    while (cur != watches.childData &&
-                           cur != watches.scopeRecord)
+                    while (!("isRootRecord" in cur) || !cur.isRootRecord)
                     {
                         if ("isECMAProto" in cur)
                             items.unshift("__proto__");
diff --git a/extensions/venkman/resources/jar.mn b/extensions/venkman/resources/jar.mn
index 13302ad..1252433 100644
--- a/extensions/venkman/resources/jar.mn
+++ b/extensions/venkman/resources/jar.mn
@@ -2,7 +2,6 @@ venkman.jar:
 % content venkman            %content/venkman/
 % content venkman-ff         %content/venkman/ff/
 % content venkman-sm         %content/venkman/sm/
-% locale  venkman en-US      %locale/en-US/venkman/
 % skin    venkman modern/1.0 %skin/modern/venkman/
 % overlay chrome://communicator/content/tasksOverlay.xul  chrome://venkman/content/venkman-overlay.xul      application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
 % overlay chrome://venkman/content/venkman-menus.xul      chrome://communicator/content/tasksOverlay.xul    application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
@@ -14,7 +13,6 @@ venkman.jar:
   content/venkman/ff/contents.rdf       (content/ff/contents.rdf)
   content/venkman/sm/contents.rdf       (content/sm/contents.rdf)
 * content/venkman/contents.rdf          (content/contents.rdf)
-* locale/en-US/venkman/contents.rdf     (locale/en-US/contents.rdf)
   skin/modern/venkman/contents.rdf      (skin/contents.rdf)
   content/venkman/venkman.xul           (content/venkman.xul)
   content/venkman/venkman-views.xul     (content/venkman-views.xul)
@@ -54,15 +52,6 @@ venkman.jar:
   content/venkman/venkman-overlay.xul   (content/venkman-overlay.xul)
   content/venkman/venkman-overlay.js    (content/venkman-overlay.js)
   skin/modern/venkman/venkman.css       (skin/venkman.css)
-  locale/en-US/venkman/venkman.dtd      (locale/en-US/venkman.dtd)
-  locale/en-US/venkman/venkman.properties        (locale/en-US/venkman.properties)
-  locale/en-US/venkman/venkman-output-locale.css (locale/en-US/venkman-output-locale.css)
-  locale/en-US/venkman/venkman-overlay.dtd   (locale/en-US/venkman-overlay.dtd)
-  locale/en-US/venkman/venkman-help.tpl      (locale/en-US/venkman-help.tpl)
-  locale/en-US/venkman/profile.csv.tpl       (locale/en-US/profile.csv.tpl)
-  locale/en-US/venkman/profile.txt.tpl       (locale/en-US/profile.txt.tpl)
-  locale/en-US/venkman/profile.html.tpl      (locale/en-US/profile.html.tpl)
-  locale/en-US/venkman/profile.xml.tpl       (locale/en-US/profile.xml.tpl)
   content/venkman/venkman-output-window.html (content/venkman-output-window.html)
   content/venkman/venkman-output-base.css     (content/venkman-output-base.css)
   skin/modern/venkman/venkman-overlay.css      (skin/venkman-overlay.css)
diff --git a/extensions/venkman/resources/skin/venkman-overlay.css b/extensions/venkman/resources/skin/venkman-overlay.css
index 4eb224f..56e3460 100644
--- a/extensions/venkman/resources/skin/venkman-overlay.css
+++ b/extensions/venkman/resources/skin/venkman-overlay.css
@@ -32,9 +32,9 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#tb-venkman-open {
+.venkman-open-tb-button {
   list-style-image: url("chrome://venkman/skin/images/step-into.png");
 }
-toolbar[iconsize="small"] #tb-venkman-open {
+toolbar[iconsize="small"] .venkman-open-tb-button {
   list-style-image: url("chrome://venkman/skin/images/file-js-bp.png");
 }
diff --git a/extensions/irc/xpi/makexpi.sh b/extensions/venkman/xpi/makelocalexpi.sh
old mode 100644
new mode 100755
similarity index 50%
copy from extensions/irc/xpi/makexpi.sh
copy to extensions/venkman/xpi/makelocalexpi.sh
index 5fa4bd7..9c41107
--- a/extensions/irc/xpi/makexpi.sh
+++ b/extensions/venkman/xpi/makelocalexpi.sh
@@ -1,27 +1,33 @@
 #!/bin/sh
 
+# Set up locale.
+if [ -z "$AB_CD" ]; then
+  if [ -z "$1" ]; then AB_CD=en-US; else AB_CD=$1; fi
+fi
 # Set up settings and paths for finding files.
 if [ -z "$DEBUG" ]; then DEBUG=0; fi
 if [ -z "$PERL" ]; then PERL=perl; fi
-if [ -z "$FEDIR" ]; then FEDIR=$PWD/..; fi
-if [ -z "$CONFIGDIR" ]; then CONFIGDIR=$FEDIR/../../config; fi
-if [ -z "$XPIFILES" ]; then XPIFILES=$PWD/resources; fi
-if [ -z "$XPIROOT" ]; then XPIROOT=$PWD/xpi-tree; fi
-if [ -z "$JARROOT" ]; then JARROOT=$PWD/jar-tree; fi
-if [ -z "$LOCALEDIR" ]; then LOCALEDIR=$FEDIR/locales; fi
-if [ -z "$AB_CD" ]; then AB_CD=en-US; fi
+if [ -z "$FEDIR" ]; then FEDIR=$PWD/../resources; fi
+if [ -z "$CONFIGDIR" ]; then CONFIGDIR=$FEDIR/../../../config; fi
+if [ -z "$XPIROOT" ]; then XPIROOT=$PWD/xpi-tree-$AB_CD; fi
+if [ -z "$JARROOT" ]; then JARROOT=$PWD/jar-tree-$AB_CD; fi
+if [ -z "$LOCALEDIR" ]; then LOCALEDIR=$FEDIR/../locales; fi
+# the dir containing the actual localisation files
+# usually this is in l10n/ repository (parallel to mozilla/)
+# note that toolkit/defines.inc is expected in parallel to extensions/venkman there
+if [ -z "$L10NDIR" ]; then L10NDIR="$FEDIR/../../../../l10n/$AB_CD/extensions/venkman"; fi
 
 # Display all the settings and paths if we're in debug mode.
 if [ $DEBUG -ge 1 ]; then
-	echo "\$DEBUG     = $DEBUG"
-	echo "\$PERL      = $PERL"
-	echo "\$CONFIGDIR = $CONFIGDIR"
-	echo "\$XPIFILES  = $XPIFILES"
-	echo "\$XPIROOT   = $XPIROOT"
-	echo "\$JARROOT   = $JARROOT"
-	echo "\$FEDIR     = $FEDIR"
-	echo "\$LOCALEDIR = $LOCALEDIR"
-	echo "\$AB_CD     = $AB_CD"
+  echo "\$DEBUG     = $DEBUG"
+  echo "\$PERL      = $PERL"
+  echo "\$CONFIGDIR = $CONFIGDIR"
+  echo "\$XPIROOT   = $XPIROOT"
+  echo "\$JARROOT   = $JARROOT"
+  echo "\$FEDIR     = $FEDIR"
+  echo "\$LOCALEDIR = $LOCALEDIR"
+  echo "\$AB_CD     = $AB_CD"
+  echo "\$L10NDIR   = $L10NDIR"
 fi
 
 ## Simple function to display all the parameters/arguments to itself.
@@ -70,7 +76,7 @@ function safeCommand()
     LASTP="$P"
   done
   
-  if [ $DEBUG -ge 2 ]; then
+  if [ $DEBUG -gt 0 ]; then
     echo
     showParams "${CMD[@]}"
     echo 'INPUT  :' "$INF"
@@ -89,7 +95,7 @@ function safeCommand()
   fi
   
   EC=$?
-  if [ $DEBUG -ge 2 ]; then
+  if [ $DEBUG -gt 0 ]; then
     echo 'RESULT :' $EC
   fi
   if [ "$EC" != "0" ]; then
@@ -107,7 +113,6 @@ function safeCommand()
 ## Begin real program ##
 
 
-# Clean up XPI and JAR build directories.
 if [ "$1" = "clean" ]; then
   echo -n "Cleaning up files"
   echo -n .
@@ -119,34 +124,24 @@ if [ "$1" = "clean" ]; then
   exit
 fi
 
-
 # Check that requested language is in all-locales file (i.e. exists and it
-# allowed to be used). Fall back to en-US if not.
+# allowed to be used).
 # FIXME: THIS DOES NOT WORK WITH CYGWIN.
 grep -sx "$AB_CD" "$LOCALEDIR/all-locales" > /dev/null
 if [ $? != 0 ]; then
-  AB_CD=en-US
+  echo "ERROR: Language $AB_CD is currently not supported."
+  exit 1
 fi
 if [ $DEBUG -ge 1 ]; then echo "Language   = $AB_CD"; fi
 
 
-# Set up where the actual localisation files are to be found; below $LOCALEDIR
-# for en-US, in l10n/ repository for other languages.
-if [ "$AB_CD" = "en-US" ]; then
-  L10NDIR="$LOCALEDIR/$AB_CD"
-else
-  L10NDIR="$FEDIR/../../../l10n/$AB_CD/extensions/irc"
-fi
-if [ $DEBUG -ge 1 ]; then echo "L10n dir   = $L10NDIR"; fi
-
-
 # Check directory setup.
-if ! [ -d "$CONFIGDIR" ]; then
-  echo "ERROR: mozilla/config directory (CONFIGDIR) not found."
+if ! [ -d "$FEDIR" ]; then
+  echo "ERROR: Base JavaScript Debugger directory (FEDIR) not found."
   exit 1
 fi
-if ! [ -d "$FEDIR" ]; then
-  echo "ERROR: Base ChatZilla directory (FEDIR) not found."
+if ! [ -d "$CONFIGDIR" ]; then
+  echo "ERROR: mozilla/config directory (CONFIGDIR) not found."
   exit 1
 fi
 if ! [ -d "$L10NDIR" ]; then
@@ -156,24 +151,18 @@ fi
 
 
 # Extract version number.
-VERSION=`grep "const __cz_version" "$FEDIR/xul/content/static.js" | sed "s|.*\"\([^\"]\{1,\}\)\".*|\1|"`
+VERSION=`cat $FEDIR/../version.txt`
+BASE_VERSION=`echo "$VERSION" | sed "s|\([0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}\).*|\1|"`
+
 if [ -z "$VERSION" ]; then
   echo "ERROR: Unable to get version number."
   exit 1
 fi
 
+echo "Beginning build of $AB_CD language pack for JavaScript Debugger $VERSION..."
 
-echo Beginning build of ChatZilla $VERSION...
-
-
-# Set up XPI name using version and language.
-if [ "$AB_CD" = "en-US" ]; then
-  XPINAME="chatzilla-$VERSION.xpi"
-else
-  XPINAME="chatzilla-$AB_CD-$VERSION.xpi"
-  echo "  NOTE: Building $AB_CD language."
-fi
-
+# Set up LangPack XPI name using version and language.
+XPINAME="venkman-$VERSION.$AB_CD.xpi"
 
 # Check for an existing XPI file and print a warning.
 if [ -r "$XPINAME" ]; then
@@ -184,45 +173,35 @@ fi
 # Check for required directory layouts.
 echo -n "  Checking XPI structure"
 echo -n .
-if ! [ -d xpi-tree ]; then mkdir xpi-tree; fi
-echo -n .
-if ! [ -d xpi-tree/chrome ]; then mkdir xpi-tree/chrome; fi
-echo -n .
-if ! [ -d xpi-tree/chrome/icons ]; then mkdir xpi-tree/chrome/icons; fi
+if ! [ -d "$XPIROOT" ]; then mkdir -p $XPIROOT; fi
 echo -n .
-if ! [ -d xpi-tree/chrome/icons/default ]; then mkdir xpi-tree/chrome/icons/default; fi
-echo -n .
-if ! [ -d xpi-tree/components ]; then mkdir xpi-tree/components; fi
-echo   ".           done"
+if ! [ -d "$XPIROOT/chrome" ]; then mkdir $XPIROOT/chrome; fi
+echo   ".                        done"
 
 echo -n "  Checking JAR structure"
 echo -n .
-if ! [ -d jar-tree ]; then mkdir jar-tree; fi
-echo   ".               done"
+if ! [ -d "$JARROOT" ]; then mkdir -p $JARROOT; fi
+echo   ".                         done"
 
 
-# Make Firefox updates.
-echo -n "  Updating Firefox Extension files"
-echo -n .
-safeCommand $PERL $CONFIGDIR/preprocessor.pl -DCHATZILLA_VERSION=$VERSION "$XPIFILES/install.rdf" '>' "$XPIROOT/install.rdf"
+# Make Toolkit updates.
+echo -n "  Updating Toolkit Extension files"
 echo -n .
-safeCommand cp "$XPIFILES/chatzilla-window.ico" "$XPIROOT/chrome/icons/default/chatzilla-window.ico"
+# make sure we have all defines we need when preprocessing the install.rdf file
+# toolkit/defines.inc contains the definition for the locale name we use in the langpack title
+safeCommand $PERL "$CONFIGDIR/preprocessor.pl" -DAB_CD=$AB_CD -DVENKMAN_VERSION=$VERSION -DVENKMAN_BASE_VERSION=$BASE_VERSION -DINSTALL_EXTENSION_ID=langpack-$AB_CD@venkman.mozilla.org -I$L10NDIR/../../toolkit/defines.inc -I$L10NDIR/defines.inc "$LOCALEDIR/generic/install.rdf" '>' "$XPIROOT/install.rdf"
 echo -n .
-safeCommand cp "$XPIFILES/chatzilla-window.xpm" "$XPIROOT/chrome/icons/default/chatzilla-window.xpm"
-echo -n .
-safeCommand cp "$XPIFILES/chatzilla-window16.xpm" "$XPIROOT/chrome/icons/default/chatzilla-window16.xpm"
-echo   ".  done"
+echo   ".              done"
 
 
-# Make Mozilla Suite updates.
-echo -n "  Updating Mozilla Extension files"
+# Make Mozilla Suite/ SeaMonkey 1.x updates.
+echo -n "  Updating XPFE Extension files"
 echo -n .
-safeCommand sed "s|@REVISION@|$VERSION|g" '<' "$XPIFILES/install.js" '>' "$XPIROOT/install.js"
+# make sure we have all defines we need when preprocessing the install.js file
+# toolkit/defines.inc contains the definition for the locale name we use in the langpack title
+safeCommand $PERL "$CONFIGDIR/preprocessor.pl" -DAB_CD=$AB_CD -DVENKMAN_VERSION=$VERSION -DVENKMAN_BASE_VERSION=$BASE_VERSION -DINSTALL_EXTENSION_ID=langpack-$AB_CD@venkman.mozilla.org -I$L10NDIR/../../toolkit/defines.inc -I$L10NDIR/defines.inc "$LOCALEDIR/generic/install.js" '>' "$XPIROOT/install.js"
 echo -n .
-safeCommand mv "$FEDIR/xul/content/contents.rdf" "$FEDIR/xul/content/contents.rdf.in"
-safeCommand sed "s|\(chrome:displayName=\)\"[^\"]\{1,\}\"|\1\"ChatZilla $VERSION\"|g" '<' "$FEDIR/xul/content/contents.rdf.in" '>' "$FEDIR/xul/content/contents.rdf"
-safeCommand rm "$FEDIR/xul/content/contents.rdf.in"
-echo   ".    done"
+echo   ".                 done"
 
 
 # Create JAR.
@@ -232,36 +211,27 @@ OLDPWD=`pwd`
 cd "$CONFIGDIR"
 echo -n .
 
-safeCommand $PERL make-jars.pl -v -z zip -p preprocessor.pl -s "$FEDIR" -d "$JARROOT" '<' "$FEDIR/jar.mn"
-echo -n .
-safeCommand $PERL make-jars.pl -v -z zip -p preprocessor.pl -s "$FEDIR/sm" -d "$JARROOT" '<' "$FEDIR/sm/jar.mn"
-echo -n .
-safeCommand $PERL make-jars.pl -v -z zip -p preprocessor.pl -s "$FEDIR/ff" -d "$JARROOT" '<' "$FEDIR/ff/jar.mn"
-echo -n .
 safeCommand $PERL preprocessor.pl -DAB_CD="$AB_CD" "$LOCALEDIR/jar.mn" '>' "$LOCALEDIR/jar.mn.pp"
+echo -n .
 safeCommand $PERL make-jars.pl -v -z zip -p preprocessor.pl -s "$LOCALEDIR" -d "$JARROOT" -c "$L10NDIR" -- "-DAB_CD=\"$AB_CD\" -DMOZILLA_LOCALE_VERSION=\"\"" '<' "$LOCALEDIR/jar.mn.pp"
-safeCommand rm "$LOCALEDIR/jar.mn.pp"
 echo -n .
+safeCommand rm "$LOCALEDIR/jar.mn.pp"
 cd "$OLDPWD"
-echo   ".        done"
+echo   ".                    done"
 
 
 # Make XPI.
 echo -n "  Constructing XPI package"
 echo -n .
-safeCommand cp -v "$JARROOT/chatzilla.jar" "$XPIROOT/chrome/"
-echo -n .
-safeCommand cp -v "$FEDIR/js/lib/chatzilla-service.js" "$XPIROOT/components/"
-echo -n .
-safeCommand chmod 664 "$XPIROOT/chrome/chatzilla.jar"
+safeCommand cp -v "$JARROOT/venkman.jar" "$XPIROOT/chrome/"
 echo -n .
-safeCommand chmod 664 "$XPIROOT/components/chatzilla-service.js"
+safeCommand chmod 664 "$XPIROOT/chrome/venkman.jar"
 echo -n .
 OLDPWD=`pwd`
 cd "$XPIROOT"
 safeCommand zip -vr ../$XPINAME . -i "*" -x "log*"
 cd "$OLDPWD"
-echo   ".         done"
+echo   ".                     done"
 
 
-echo "Build of ChatZilla $VERSION...         ALL DONE"
+echo "Build of $AB_CD language pack for JavaScript Debugger $VERSION... ALL DONE"
diff --git a/extensions/venkman/xpi/makexpi.sh b/extensions/venkman/xpi/makexpi.sh
index 78dc6ce..d482e51 100644
--- a/extensions/venkman/xpi/makexpi.sh
+++ b/extensions/venkman/xpi/makexpi.sh
@@ -1,15 +1,28 @@
-#!/bin/bash
+#!/bin/sh
 
-# Set up paths for finding files.
+# Set up settings and paths for finding files.
+if [ -z "$DEBUG" ]; then DEBUG=0; fi
+if [ -z "$PERL" ]; then PERL=perl; fi
 if [ -z "$FEDIR" ]; then FEDIR=$PWD/../resources; fi
-if [ -z "$CONFIGDIR" ]; then CONFIGDIR=$FEDIR/../../config; fi
+if [ -z "$CONFIGDIR" ]; then CONFIGDIR=$FEDIR/../../../config; fi
 if [ -z "$XPIFILES" ]; then XPIFILES=$PWD/resources; fi
 if [ -z "$XPIROOT" ]; then XPIROOT=$PWD/xpi-tree; fi
 if [ -z "$JARROOT" ]; then JARROOT=$PWD/jar-tree; fi
-if [ -z "$PERL" ]; then PERL=perl; fi
-if [ -z "$DEBUG" ]; then DEBUG=0; fi
-
+if [ -z "$LOCALEDIR" ]; then LOCALEDIR=$FEDIR/../locales; fi
+
+# Display all the settings and paths if we're in debug mode.
+if [ $DEBUG -ge 1 ]; then
+  echo "\$DEBUG     = $DEBUG"
+  echo "\$PERL      = $PERL"
+  echo "\$CONFIGDIR = $CONFIGDIR"
+  echo "\$XPIFILES  = $XPIFILES"
+  echo "\$XPIROOT   = $XPIROOT"
+  echo "\$JARROOT   = $JARROOT"
+  echo "\$FEDIR     = $FEDIR"
+  echo "\$LOCALEDIR = $LOCALEDIR"
+fi
 
+## Simple function to display all the parameters/arguments to itself.
 function showParams()
 {
   I=0
@@ -55,7 +68,7 @@ function safeCommand()
     LASTP="$P"
   done
   
-  if [ $DEBUG -gt 0 ]; then
+  if [ $DEBUG -ge 2 ]; then
     echo
     showParams "${CMD[@]}"
     echo 'INPUT  :' "$INF"
@@ -74,7 +87,7 @@ function safeCommand()
   fi
   
   EC=$?
-  if [ $DEBUG -gt 0 ]; then
+  if [ $DEBUG -ge 2 ]; then
     echo 'RESULT :' $EC
   fi
   if [ "$EC" != "0" ]; then
@@ -92,6 +105,7 @@ function safeCommand()
 ## Begin real program ##
 
 
+# Clean up XPI and JAR build directories.
 if [ "$1" = "clean" ]; then
   echo -n "Cleaning up files"
   echo -n .
@@ -104,7 +118,7 @@ if [ "$1" = "clean" ]; then
 fi
 
 
-# Check setup.
+# Check directory setup.
 if ! [ -d "$FEDIR" ]; then
   echo "ERROR: Base JavaScript Debugger directory (FEDIR) not found."
   exit 1
@@ -126,8 +140,10 @@ fi
 echo Beginning build of JavaScript Debugger $VERSION...
 
 
-# Check for existing.
-if [ -r "venkman-$VERSION.xpi" ]; then
+# Set up XPI name.
+XPINAME="venkman-$VERSION.xpi"
+# Check for an existing XPI file and print a warning.
+if [ -r "$XPINAME" ]; then
   echo "  WARNING: output XPI will be overwritten."
 fi
 
@@ -135,16 +151,16 @@ fi
 # Check for required directory layouts.
 echo -n "  Checking XPI structure"
 echo -n .
-if ! [ -d xpi-tree ]; then mkdir xpi-tree; fi
+if ! [ -d "$XPIROOT" ]; then mkdir -p "$XPIROOT"; fi
 echo -n .
-if ! [ -d xpi-tree/chrome ]; then mkdir xpi-tree/chrome; fi
+if ! [ -d "$XPIROOT/chrome" ]; then mkdir "$XPIROOT/chrome"; fi
 echo -n .
-if ! [ -d xpi-tree/components ]; then mkdir xpi-tree/components; fi
+if ! [ -d "$XPIROOT/components" ]; then mkdir "$XPIROOT/components"; fi
 echo   ".               done"
 
 echo -n "  Checking JAR structure"
 echo -n .
-if ! [ -d jar-tree ]; then mkdir jar-tree; fi
+if ! [ -d "$JARROOT" ]; then mkdir -p "$JARROOT"; fi
 echo   ".                 done"
 
 
@@ -162,16 +178,10 @@ safeCommand sed "s|@REVISION@|$VERSION|g" '<' "$XPIFILES/install.js" '>' "$XPIRO
 echo -n .
 safeCommand mv "$FEDIR/content/contents.rdf" "$FEDIR/content/contents.rdf.in"
 echo -n .
-safeCommand sed "s|@MOZILLA_VERSION@|vnk-$VERSION|g;s|\(chrome:displayName=\)\"[^\"]\{1,\}\"|\1\"JavaScript Debugger $VERSION\"|g" '<' "$FEDIR/content/contents.rdf.in" '>' "$FEDIR/content/contents.rdf"
+safeCommand sed "s|\(chrome:displayName=\)\"[^\"]\{1,\}\"|\1\"JavaScript Debugger $VERSION\"|g" '<' "$FEDIR/content/contents.rdf.in" '>' "$FEDIR/content/contents.rdf"
 echo -n .
 safeCommand rm "$FEDIR/content/contents.rdf.in"
-echo -n .
-safeCommand mv "$FEDIR/locale/en-US/contents.rdf" "$FEDIR/locale/en-US/contents.rdf.in"
-echo -n .
-safeCommand sed "s|@MOZILLA_VERSION@|vnk-$VERSION|g" '<' "$FEDIR/locale/en-US/contents.rdf.in" '>' "$FEDIR/locale/en-US/contents.rdf"
-echo -n .
-safeCommand rm "$FEDIR/locale/en-US/contents.rdf.in"
-echo   ".    done"
+echo   ".       done"
 
 
 # Create JAR.
@@ -182,8 +192,12 @@ cd "$CONFIGDIR"
 echo -n .
 safeCommand $PERL make-jars.pl -v -z zip -p preprocessor.pl -s "$FEDIR" -d "$JARROOT"  -- -DVENKMAN_VERSION=$VERSION '<' "$FEDIR/jar.mn"
 echo -n .
+safeCommand $PERL preprocessor.pl -DAB_CD="en-US" "$LOCALEDIR/jar.mn" '>' "$LOCALEDIR/jar.mn.pp"
+safeCommand $PERL make-jars.pl -v -z zip -p preprocessor.pl -s "$LOCALEDIR" -d "$JARROOT" -c "$LOCALEDIR/en-US" -- "-DAB_CD=\"en-US\" -DMOZILLA_LOCALE_VERSION=\"\"" '<' "$LOCALEDIR/jar.mn.pp"
+safeCommand rm "$LOCALEDIR/jar.mn.pp"
+echo -n .
 cd "$OLDPWD"
-echo   ".           done"
+echo   ".            done"
 
 
 # Make XPI.
@@ -199,7 +213,7 @@ safeCommand chmod 664 "$XPIROOT/components/venkman-service.js"
 echo -n .
 OLDPWD=`pwd`
 cd "$XPIROOT"
-safeCommand zip -vr ../venkman-$VERSION.xpi . -i "*" -x "log*"
+safeCommand zip -vr ../$XPINAME . -i "*" -x "log*"
 cd "$OLDPWD"
 echo   ".           done"
 
diff --git a/extensions/webdav/src/Makefile.in b/extensions/webdav/src/Makefile.in
index 081c08f..2f2f86f 100644
--- a/extensions/webdav/src/Makefile.in
+++ b/extensions/webdav/src/Makefile.in
@@ -47,11 +47,12 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= webdav
 LIBRARY_NAME    = webdav
-#EXPORT_LIBRARY  = 0
+# We don't want an EXPORT_LIBRARY
 IS_COMPONENT    = 1
 MODULE_NAME     = nsWebDAVService
 GRE_MODULE      = 1
 FORCE_SHARED_LIB = 1
+USE_STATIC_LIBS = 1 # This links against the static CRT on Windows
 # PACKAGE_FILE    = webdav.pkg
 
 # XXX widget is because of a transitive inclusion from nsIDocument.h of
diff --git a/extensions/webservices/schema/src/nsSchemaLoader.cpp b/extensions/webservices/schema/src/nsSchemaLoader.cpp
index 0005bc0..5277aab 100644
--- a/extensions/webservices/schema/src/nsSchemaLoader.cpp
+++ b/extensions/webservices/schema/src/nsSchemaLoader.cpp
@@ -618,10 +618,10 @@ nsSchemaLoader::GetResolvedURI(const nsAString& aSchemaURI,
                                nsIURI** aURI)
 {
   nsresult rv;
-  nsCOMPtr<nsIXPCNativeCallContext> cc;
+  nsAXPCNativeCallContext *cc = nsnull;
   nsCOMPtr<nsIXPConnect> xpc(do_GetService(nsIXPConnect::GetCID(), &rv));
   if(NS_SUCCEEDED(rv)) {
-    rv = xpc->GetCurrentNativeCallContext(getter_AddRefs(cc));
+    rv = xpc->GetCurrentNativeCallContext(&cc);
   }
 
   if (NS_SUCCEEDED(rv) && cc) {
diff --git a/extensions/webservices/security/src/nsWebScriptsAccess.cpp b/extensions/webservices/security/src/nsWebScriptsAccess.cpp
index 2ae5c99..15ab67e 100755
--- a/extensions/webservices/security/src/nsWebScriptsAccess.cpp
+++ b/extensions/webservices/security/src/nsWebScriptsAccess.cpp
@@ -137,8 +137,8 @@ nsWebScriptsAccess::CanAccess(nsIURI* aTransportURI,
       // security model's decision.
       nsCOMPtr<nsIXPConnect> xpc(do_GetService(nsIXPConnect::GetCID()));
       if (xpc) {
-        nsCOMPtr<nsIXPCNativeCallContext> cc;
-        xpc->GetCurrentNativeCallContext(getter_AddRefs(cc));
+        nsAXPCNativeCallContext *cc = nsnull;
+        xpc->GetCurrentNativeCallContext(&cc);
         if (cc) {
           JSContext* cx;
           rv = cc->GetJSContext(&cx);
diff --git a/extensions/webservices/soap/src/nsSOAPBlock.cpp b/extensions/webservices/soap/src/nsSOAPBlock.cpp
index 3629e58..59132bf 100644
--- a/extensions/webservices/soap/src/nsSOAPBlock.cpp
+++ b/extensions/webservices/soap/src/nsSOAPBlock.cpp
@@ -191,8 +191,8 @@ NS_IMETHODIMP nsSOAPBlock::SetValue(nsIVariant * aValue)
 }
 
 NS_IMETHODIMP
-    nsSOAPBlock::Initialize(JSContext * cx, JSObject * obj,
-                            PRUint32 argc, jsval * argv)
+nsSOAPBlock::Initialize(nsISupports* aOwner, JSContext* cx,
+                        JSObject* obj, PRUint32 argc, jsval* argv)
 {
 
 //  Get the arguments.
diff --git a/extensions/webservices/soap/src/nsSOAPBlock.h b/extensions/webservices/soap/src/nsSOAPBlock.h
index b45508c..ee24573 100644
--- a/extensions/webservices/soap/src/nsSOAPBlock.h
+++ b/extensions/webservices/soap/src/nsSOAPBlock.h
@@ -59,8 +59,8 @@ public:
       // nsISOAPBlock
   NS_DECL_NSISOAPBLOCK
       // nsIJSNativeInitializer
-  NS_IMETHOD Initialize(JSContext * cx, JSObject * obj,
-                        PRUint32 argc, jsval * argv);
+  NS_IMETHOD Initialize(nsISupports* aOwner, JSContext* cx, JSObject* obj,
+                        PRUint32 argc, jsval* argv);
 
 protected:
   nsString mNamespaceURI;
diff --git a/extensions/webservices/wsdl/src/nsWSDLLoader.cpp b/extensions/webservices/wsdl/src/nsWSDLLoader.cpp
index c3c37f4..1ef1750 100644
--- a/extensions/webservices/wsdl/src/nsWSDLLoader.cpp
+++ b/extensions/webservices/wsdl/src/nsWSDLLoader.cpp
@@ -132,10 +132,10 @@ nsWSDLLoader::GetResolvedURI(const nsAString& aWSDLURI, const char* aMethod,
                              nsIURI** aURI)
 {
   nsresult rv;
-  nsCOMPtr<nsIXPCNativeCallContext> cc;
+  nsAXPCNativeCallContext *cc = nsnull;
   nsCOMPtr<nsIXPConnect> xpc(do_GetService(nsIXPConnect::GetCID()));
   if(xpc) {
-    xpc->GetCurrentNativeCallContext(getter_AddRefs(cc));
+    xpc->GetCurrentNativeCallContext(&cc);
   }
 
   if (cc) {
diff --git a/extensions/xforms/Makefile.in b/extensions/xforms/Makefile.in
index 77d3d43..2dca336 100644
--- a/extensions/xforms/Makefile.in
+++ b/extensions/xforms/Makefile.in
@@ -57,7 +57,6 @@ else
 MODULE_NAME	= xforms
 EXPORT_LIBRARY	= 1
 endif
-MOZILLA_INTERNAL_API = 1
 
 # Also build schema-validation
 DIRS			= ../schema-validation \
@@ -112,6 +111,7 @@ REQUIRES	= \
 		pref \
 		htmlparser \
 		exthandler \
+		chardet \
 		$(NULL)
 
 # XForms IDLs
@@ -154,6 +154,8 @@ XPIDLSRCS	= \
 		nsIXFormsComboboxUIWidget.idl \
 		nsIXFormsXPathFunctions.idl \
 		nsIXFormsXPathState.idl \
+		nsIXFormsDOMEvent.idl \
+		nsIXFormsContextInfo.idl \
 		$(NULL)
 
 # XForms source files
@@ -217,10 +219,16 @@ CPPSRCS		= \
 		nsXFormsRangeConditionAccessors.cpp \
 		nsXFormsXPathFunctions.cpp \
 		nsXFormsXPathState.cpp \
+		nsXFormsDOMEvent.cpp \
+		nsXFormsContextInfo.cpp \
 		$(NULL)
 
 # Standard Mozilla make rules
-EXTRA_DSO_LDOPTS = $(MOZ_COMPONENT_LIBS)
+EXTRA_DSO_LDOPTS = \
+		$(MOZ_COMPONENT_NSPR_LIBS) \
+		$(LIBXUL_DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX) \
+		$(XPCOM_GLUE_LDOPTS) \
+		$(NULL)
 
 # Do not clean schema-validation on distclean, it should handle that itself
 distclean:: LOOP_OVER_DIRS=
diff --git a/extensions/xforms/nsIXFormsActionModuleElement.idl b/extensions/xforms/nsIXFormsActionModuleElement.idl
index 414cb8d..3a6ff7a 100644
--- a/extensions/xforms/nsIXFormsActionModuleElement.idl
+++ b/extensions/xforms/nsIXFormsActionModuleElement.idl
@@ -41,9 +41,15 @@
 interface nsIDOMEvent;
 interface nsIXFormsActionElement;
 
-[uuid(b19c47e4-2478-4a73-91a3-d86f91d91ffd)]
+[uuid(4fa5fd18-902b-4ea8-a197-e93d5ce1ce71)]
 interface nsIXFormsActionModuleElement : nsISupports
 {
   void handleAction(in nsIDOMEvent aEvent, in nsIXFormsActionElement aParentAction);
+  /**
+   * Get the event currently being processed in handleAction. The XPath
+   * event() method uses this method to get the context info for the
+   * current event.
+   */
+  nsIDOMEvent getCurrentEvent();
 };
 
diff --git a/extensions/xforms/nsXFormsXPathXMLUtil.h b/extensions/xforms/nsIXFormsContextInfo.idl
similarity index 56%
copy from extensions/xforms/nsXFormsXPathXMLUtil.h
copy to extensions/xforms/nsIXFormsContextInfo.idl
index bdcf17c..1814f42 100644
--- a/extensions/xforms/nsXFormsXPathXMLUtil.h
+++ b/extensions/xforms/nsIXFormsContextInfo.idl
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
@@ -15,13 +15,12 @@
  * The Original Code is Mozilla XForms support.
  *
  * The Initial Developer of the Original Code is
- * Novell, Inc.
- * Portions created by the Initial Developer are Copyright (C) 2004
+ * IBM Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2007
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
- *  Allan Beaufour <abeaufour@novell.com>
- *  David Landwehr <dlandwehr@novell.com>
+ *  Merle Sterling <msterlin@us.ibm.com>
  *
  * 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
@@ -37,42 +36,41 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsString.h"
+#include "nsISupports.idl"
+#include "nsIDOMNode.idl"
+#include "nsIDOMXPathResult.idl"
 
 /**
- * Miscellaneous utility functions for determining the class of a character, used by
- * nsXFormsXPathScanner.
- * 
- * @note Should be reimplemented and moved to Transformiix
- * 
+ * Interface exposing the event context info of an XForms control.
+ *
+ * Context info is accessed by name using nsIXFormsDOMEvent::GetContextInfo
+ * or the XPath function event().
+ *
  */
-class nsXFormsXPathXMLUtil {
-private:
-  /** Helper function for public functions */
-  static PRBool IsInRange(const PRUnichar* range, const PRUint32 range_length, const PRUnichar c);
-  
-public:
-  /** Checks if a char is a whitespace */
-  static PRBool IsWhitespace(const PRUnichar c);
-
-  /** Checks of a char is a digit */
-  static PRBool IsDigit(const PRUnichar c);
-
-  /** Checks if a char is an ideographic */
-  static PRBool IsIdeographic(const PRUnichar c);
-
-  /** Checks if a char is a letter */
-  static PRBool IsLetter(const PRUnichar c);
-
-  /** Checks if a char is a base char */
-  static PRBool IsBaseChar(const PRUnichar c);
 
-  /** Check is a char matches the first rule of a NCName */
-  static PRBool IsNCNameChar(const PRUnichar c);
+[scriptable, uuid(b012a3e5-7dbc-42b4-99da-5e94c37dc44e)]
+interface nsIXFormsContextInfo : nsISupports
+{
+  // Name of the event property; eg. 'resource-uri'
+  readonly attribute DOMString name;
 
-  /** Check if a char is a combining char */
-  static PRBool IsCombiningChar(const PRUnichar c);
+  // Type of the property: String, Number, Node, Nodeset
+  const unsigned short STRING_TYPE  = 1;
+  const unsigned short NUMBER_TYPE  = 2;
+  const unsigned short NODE_TYPE    = 3;
+  const unsigned short NODESET_TYPE = 4;
+  readonly attribute long type;
 
-  /** Check if a char is an extender */
-  static PRBool IsExtender(const PRUnichar c);
+  /** Get the value of a STRING_TYPE context info property.
+   */
+  readonly attribute DOMString stringValue;
+  /** Get the value of a NUMBER_TYPE context info property.
+   */
+  readonly attribute long numberValue;
+  /** Get the value of a NODE_TYPE context info property.
+   */
+  readonly attribute nsIDOMNode nodeValue;
+  /** Get the value of a NODESET_TYPE context info property.
+   */
+  readonly attribute nsIDOMXPathResult nodesetValue;
 };
diff --git a/extensions/xforms/nsIXFormsActionModuleElement.idl b/extensions/xforms/nsIXFormsDOMEvent.idl
similarity index 69%
copy from extensions/xforms/nsIXFormsActionModuleElement.idl
copy to extensions/xforms/nsIXFormsDOMEvent.idl
index 414cb8d..11a6baa 100644
--- a/extensions/xforms/nsIXFormsActionModuleElement.idl
+++ b/extensions/xforms/nsIXFormsDOMEvent.idl
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
@@ -15,16 +15,16 @@
  * The Original Code is Mozilla XForms support.
  *
  * The Initial Developer of the Original Code is
- * Olli Pettay.
- * Portions created by the Initial Developer are Copyright (C) 2004
+ * IBM Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2007
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
- *   Olli Pettay <Olli.Pettay@helsinki.fi> (original author)
+ *  Merle Sterling <msterlin@us.ibm.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
- * either of 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"),
+ * 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
@@ -36,14 +36,19 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsISupports.idl"
+#include "nsIXFormsContextInfo.idl"
+#include "nsIDOMEvent.idl"
 
-interface nsIDOMEvent;
-interface nsIXFormsActionElement;
+/**
+ * Interface exposing the events of an XForms control.
+ *
+ */
 
-[uuid(b19c47e4-2478-4a73-91a3-d86f91d91ffd)]
-interface nsIXFormsActionModuleElement : nsISupports
+[scriptable, uuid(ae6735d5-a8a4-4ac5-9f00-ec653433005c)]
+interface nsIXFormsDOMEvent : nsIDOMEvent
 {
-  void handleAction(in nsIDOMEvent aEvent, in nsIXFormsActionElement aParentAction);
+  /** Get a context property from an nsXFormsDOMEvent.
+   *  @param aName - context property name.
+   */
+  nsIXFormsContextInfo getContextInfo(in DOMString aName);
 };
-
diff --git a/extensions/xforms/nsIXFormsXPathFunctions.idl b/extensions/xforms/nsIXFormsXPathFunctions.idl
index 1b12fa6..73da0a6 100644
--- a/extensions/xforms/nsIXFormsXPathFunctions.idl
+++ b/extensions/xforms/nsIXFormsXPathFunctions.idl
@@ -40,7 +40,7 @@
 #include "nsISupports.idl"
 #include "txIFunctionEvaluationContext.idl"
 
-[scriptable, uuid(d3c957be-9f59-42f3-8ca9-7a22edf0e231)]
+[scriptable, uuid(4c92138c-5d7d-4f82-99d7-3a1aa0167a56)]
 interface nsIXFormsXPathFunctions : nsISupports
 {
     double avg(in txINodeSet aNodeSet);
@@ -54,8 +54,11 @@ interface nsIXFormsXPathFunctions : nsISupports
     double min(in txINodeSet aNodeSet);
     double months(in DOMString aDuration);
     DOMString now();
+    DOMString localDate();
+    DOMString localDateTime();
     DOMString property(in DOMString aProperty);
     double seconds(in DOMString aDuration);
     double secondsFromDateTime(in DOMString aDateTime);
     txINodeSet current(in txIFunctionEvaluationContext aContext);
+    txINodeSet event(in txIFunctionEvaluationContext aContext, in DOMString aString);
 };
diff --git a/extensions/xforms/nsXFormsAccessors.cpp b/extensions/xforms/nsXFormsAccessors.cpp
index 897f66a..1c9bdfc 100644
--- a/extensions/xforms/nsXFormsAccessors.cpp
+++ b/extensions/xforms/nsXFormsAccessors.cpp
@@ -37,11 +37,10 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsString.h"
+#include "nsStringAPI.h"
 #include "nsIDOMElement.h"
 #include "nsXFormsUtils.h"
 #include "nsXFormsAccessors.h"
-#include "nsDOMString.h"
 #include "nsIEventStateManager.h"
 #include "nsIContent.h"
 #include "nsIXFormsControl.h"
@@ -72,7 +71,7 @@ nsXFormsAccessors::GetValue(nsAString &aValue)
   if (mDelegate) {
     mDelegate->GetValue(aValue);
   } else {
-    SetDOMStringToNull(aValue);
+    aValue.SetIsVoid(PR_TRUE);
   }
   return NS_OK;
 }
diff --git a/extensions/xforms/nsXFormsActionElement.cpp b/extensions/xforms/nsXFormsActionElement.cpp
index 5d81591..e9b0e5e 100644
--- a/extensions/xforms/nsXFormsActionElement.cpp
+++ b/extensions/xforms/nsXFormsActionElement.cpp
@@ -49,8 +49,7 @@
 #define DEFERRED_REVALIDATE  0x04
 #define DEFERRED_REFRESH     0x08
 
-nsXFormsActionElement::nsXFormsActionElement() :
-  nsXFormsActionModuleBase(PR_TRUE)
+nsXFormsActionElement::nsXFormsActionElement() : mElement(nsnull)
 {
 }
 
@@ -155,6 +154,13 @@ PR_STATIC_CALLBACK(PLDHashOperator) DoDeferredActions(nsISupports * aModel,
   return PL_DHASH_NEXT;
 }
 
+NS_IMETHODIMP
+nsXFormsActionElement::HandleAction(nsIDOMEvent* aEvent,
+                                    nsIXFormsActionElement* aParentAction)
+{
+  return nsXFormsActionModuleBase::DoHandleAction(this, aEvent, aParentAction);
+}
+
 nsresult
 nsXFormsActionElement::HandleSingleAction(nsIDOMEvent* aEvent,
                                           nsIXFormsActionElement *aParentAction)
@@ -291,6 +297,13 @@ nsXFormsActionElement::SetRefresh(nsIModelElementPrivate* aModel,
   return NS_OK;
 }
 
+NS_IMETHODIMP
+nsXFormsActionElement::GetCurrentEvent(nsIDOMEvent** aEvent)
+{
+  NS_IF_ADDREF(*aEvent = mCurrentEvent);
+  return NS_OK;
+}
+
 NS_HIDDEN_(nsresult)
 NS_NewXFormsActionElement(nsIXTFElement **aResult)
 {
diff --git a/extensions/xforms/nsXFormsActionElement.h b/extensions/xforms/nsXFormsActionElement.h
index 00f29f5..13a4a24 100644
--- a/extensions/xforms/nsXFormsActionElement.h
+++ b/extensions/xforms/nsXFormsActionElement.h
@@ -46,24 +46,30 @@
 
 class nsIXTFElementWrapper;
 
-class nsXFormsActionElement : public nsIXFormsActionElement,
-                              public nsXFormsActionModuleBase
+class nsXFormsActionElement : public nsXFormsStubElement,
+                              public nsIXFormsActionElement,
+                              public nsIXFormsActionModuleElement,
+                              public nsIDOMEventListener,
+                              public nsXFormsActionModuleHelper
 {
 public:
   nsXFormsActionElement();
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIDOMEVENTLISTENER
   NS_DECL_NSIXFORMSACTIONELEMENT
+  NS_DECL_NSIXFORMSACTIONMODULEELEMENT
   NS_IMETHOD OnCreated(nsIXTFElementWrapper *aWrapper);
   NS_IMETHOD OnDestroyed();
   NS_IMETHOD WillChangeDocument(nsIDOMDocument *aNewDocument);
   NS_IMETHOD DocumentChanged(nsIDOMDocument *aNewDocument);
   NS_IMETHOD WillChangeParent(nsIDOMElement *aNewParent);
   NS_IMETHOD ParentChanged(nsIDOMElement *aNewParent);
-protected:
-  nsresult HandleSingleAction(nsIDOMEvent* aEvent,
-                              nsIXFormsActionElement *aParentAction);
+
+  virtual nsIDOMElement* GetElement() { return mElement; }
+  virtual nsresult HandleSingleAction(nsIDOMEvent* aEvent,
+                                      nsIXFormsActionElement* aParentAction);
 private:
+  nsIDOMElement*                                mElement;
   nsCOMPtr<nsIXFormsActionElement>              mParentAction;
   nsDataHashtable<nsISupportsHashKey, PRUint32> mDeferredUpdates;
 };
diff --git a/extensions/xforms/nsXFormsActionModuleBase.cpp b/extensions/xforms/nsXFormsActionModuleBase.cpp
index 9f67a05..e160a22 100644
--- a/extensions/xforms/nsXFormsActionModuleBase.cpp
+++ b/extensions/xforms/nsXFormsActionModuleBase.cpp
@@ -43,7 +43,7 @@
 #include "nsMemory.h"
 #include "nsIDOMNodeList.h"
 #include "nsXFormsModelElement.h"
-#include "nsString.h"
+#include "nsStringAPI.h"
 #include "nsIDOMElement.h"
 #include "nsIDOMNodeList.h"
 #include "nsIXTFElementWrapper.h"
@@ -58,8 +58,7 @@
 #include "nsIPrefService.h"
 #include "nsServiceManagerUtils.h"
 
-nsXFormsActionModuleBase::nsXFormsActionModuleBase(PRBool canIterate) :
-  nsXFormsStubElement(), mCanIterate(canIterate)
+nsXFormsActionModuleBase::nsXFormsActionModuleBase() : mElement(nsnull)
 {
 }
 
@@ -145,8 +144,17 @@ NS_IMETHODIMP
 nsXFormsActionModuleBase::HandleAction(nsIDOMEvent            *aEvent,
                                        nsIXFormsActionElement *aParentAction)
 {
-  if (!mElement)
-    return NS_OK;
+  return nsXFormsActionModuleBase::DoHandleAction(this, aEvent, aParentAction);
+}
+
+/* static */ nsresult
+nsXFormsActionModuleBase::DoHandleAction(nsXFormsActionModuleHelper *aXFormsAction,
+                                         nsIDOMEvent                *aEvent,
+                                         nsIXFormsActionElement     *aParentAction)
+{
+  nsCOMPtr<nsIDOMElement> element = aXFormsAction->GetElement();
+  NS_ENSURE_STATE(element);
+  aXFormsAction->SetCurrentEvent(aEvent);
 
   // Set the maximum run time for the loop (in microseconds).
   PRTime microseconds = nsXFormsUtils::waitLimit * PR_USEC_PER_SEC;
@@ -157,17 +165,17 @@ nsXFormsActionModuleBase::HandleAction(nsIDOMEvent            *aEvent,
     // Test the `if` and `while` attributes to determine whether this action
     // can be performed and should be repeated.
     PRBool usesWhile;
-    if (!CanPerformAction(&usesWhile)) {
+    if (!nsXFormsActionModuleBase::CanPerformAction(element, &usesWhile)) {
       return NS_OK;
     }
 
-    nsresult rv = HandleSingleAction(aEvent, aParentAction);
+    nsresult rv = aXFormsAction->HandleSingleAction(aEvent, aParentAction);
     NS_ENSURE_SUCCESS(rv, rv);
 
     // Repeat this action if it can iterate and if it uses the `while`
     // attribute (the expression of which must have evaluated to true to
     // arrive here).
-    if (!mCanIterate || !usesWhile) {
+    if (!aXFormsAction->CanIterate() || !usesWhile) {
       return NS_OK;
     }
 
@@ -180,7 +188,7 @@ nsXFormsActionModuleBase::HandleAction(nsIDOMEvent            *aEvent,
 
     // The remaining part of the loop prompts the user about cancelling the
     // loop, and is only executed if we've gone over the time limit.
-    PRBool stopWaiting = nsXFormsUtils::AskStopWaiting(mElement);
+    PRBool stopWaiting = nsXFormsUtils::AskStopWaiting(element);
 
     if (stopWaiting) {
       // Stop the loop
@@ -191,18 +199,20 @@ nsXFormsActionModuleBase::HandleAction(nsIDOMEvent            *aEvent,
   }
 }
 
+/* static */
 PRBool
-nsXFormsActionModuleBase::CanPerformAction(PRBool     *aUsesWhile,
-                                           nsIDOMNode *aContext,
-                                           PRInt32     aContextSize,
-                                           PRInt32     aContextPosition)
+nsXFormsActionModuleBase::CanPerformAction(nsIDOMElement *aElement,
+                                           PRBool        *aUsesWhile,
+                                           nsIDOMNode    *aContext,
+                                           PRInt32        aContextSize,
+                                           PRInt32        aContextPosition)
 {
   *aUsesWhile = PR_FALSE;
 
   nsAutoString ifExpr;
   nsAutoString whileExpr;
-  mElement->GetAttribute(NS_LITERAL_STRING("if"), ifExpr);
-  mElement->GetAttribute(NS_LITERAL_STRING("while"), whileExpr);
+  aElement->GetAttribute(NS_LITERAL_STRING("if"), ifExpr);
+  aElement->GetAttribute(NS_LITERAL_STRING("while"), whileExpr);
 
   if (whileExpr.IsEmpty() && ifExpr.IsEmpty()) {
     return PR_TRUE;
@@ -222,7 +232,7 @@ nsXFormsActionModuleBase::CanPerformAction(PRBool     *aUsesWhile,
     nsCOMPtr<nsIDOMElement> bindElement;
     nsCOMPtr<nsIXFormsControl> parentControl;
     PRBool outerBind;
-    rv = nsXFormsUtils::GetNodeContext(mElement, 0,
+    rv = nsXFormsUtils::GetNodeContext(aElement, 0,
                                        getter_AddRefs(model),
                                        getter_AddRefs(bindElement),
                                        &outerBind,
@@ -235,7 +245,7 @@ nsXFormsActionModuleBase::CanPerformAction(PRBool     *aUsesWhile,
   if (!whileExpr.IsEmpty()) {
     *aUsesWhile = PR_TRUE;
 
-    rv = nsXFormsUtils::EvaluateXPath(whileExpr, contextNode, mElement,
+    rv = nsXFormsUtils::EvaluateXPath(whileExpr, contextNode, aElement,
                                       nsIDOMXPathResult::BOOLEAN_TYPE,
                                       getter_AddRefs(res),
                                       aContextPosition, aContextSize);
@@ -248,7 +258,7 @@ nsXFormsActionModuleBase::CanPerformAction(PRBool     *aUsesWhile,
   }
 
   if (!ifExpr.IsEmpty()) {
-    rv = nsXFormsUtils::EvaluateXPath(ifExpr, contextNode, mElement, 
+    rv = nsXFormsUtils::EvaluateXPath(ifExpr, contextNode, aElement,
                                       nsIDOMXPathResult::BOOLEAN_TYPE,
                                       getter_AddRefs(res),
                                       aContextPosition, aContextSize);
@@ -262,3 +272,11 @@ nsXFormsActionModuleBase::CanPerformAction(PRBool     *aUsesWhile,
 
   return PR_TRUE;
 }
+
+NS_IMETHODIMP
+nsXFormsActionModuleBase::GetCurrentEvent(nsIDOMEvent **aEvent)
+{
+  NS_IF_ADDREF(*aEvent = mCurrentEvent);
+  return NS_OK;
+}
+
diff --git a/extensions/xforms/nsXFormsActionModuleBase.h b/extensions/xforms/nsXFormsActionModuleBase.h
index e987efa..07dd782 100644
--- a/extensions/xforms/nsXFormsActionModuleBase.h
+++ b/extensions/xforms/nsXFormsActionModuleBase.h
@@ -48,12 +48,55 @@
 #include "nsCOMPtr.h"
 #include "nsXFormsUtils.h"
 
+class nsXFormsActionModuleHelper
+{
+  /**
+   * nsXFormsActionModuleHelper provides the foundation that allows event
+   * iteration to work.  Every xforms action needs to inherit from
+   * nsXFormsActionModuleHelper in some capacity; they can inherit indirectly
+   * through nsXFormsActionModuleBase or directly from
+   * nsXFormsActionModuleHelper in the cases where the action actually needs to
+   * have binding capabilities (like nsXFormsAlertElement, etc)
+   */
+
+public:
+  nsXFormsActionModuleHelper() : mCanIterate(PR_TRUE) {}
+  virtual nsIDOMElement* GetElement() = 0;
+  PRBool CanIterate() { return mCanIterate; }
+  void SetCurrentEvent(nsIDOMEvent* aEvent) { mCurrentEvent = aEvent; }
+  /**
+   * With the `while` attribute, actions can potentially be iterated.  The
+   * `HandleSingleAction` method processes one iteration of an action (that
+   * is, the "body" of the action); it should be dispatched by the
+   * `HandleAction` method, which manages the conditional execution and
+   * iteration of the action.
+   */
+  virtual nsresult
+    HandleSingleAction(nsIDOMEvent *aEvent,
+                       nsIXFormsActionElement *aParentAction) = 0;
+protected:
+  /**
+   * This signals whether or not this action can iterate.  Technically, all
+   * XForms 1.1 actions are allowed to iterate, but for some of them it
+   * may not make sense.  Currently, this is set to PR_TRUE for all actions,
+   * but we can optionally disable iteration for specific actions based upon
+   * additional information in the future.
+   */
+  PRBool mCanIterate;
+
+  /**
+   * The event currently being processed.
+   */
+  nsCOMPtr<nsIDOMEvent> mCurrentEvent;
+};
+
 class nsXFormsActionModuleBase : public nsIDOMEventListener,
-                                 public virtual nsXFormsStubElement,
-                                 public nsIXFormsActionModuleElement
+                                 public nsXFormsStubElement,
+                                 public nsIXFormsActionModuleElement,
+                                 public nsXFormsActionModuleHelper
 {
 public:
-  nsXFormsActionModuleBase(PRBool canIterate = PR_FALSE);
+  nsXFormsActionModuleBase();
   virtual ~nsXFormsActionModuleBase();
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIXFORMSACTIONMODULEELEMENT
@@ -64,7 +107,12 @@ public:
   NS_IMETHOD DocumentChanged(nsIDOMDocument *aNewDocument);
   NS_IMETHOD WillChangeParent(nsIDOMElement *aNewParent);
   NS_IMETHOD ParentChanged(nsIDOMElement *aNewParent);
-protected:
+
+  virtual nsIDOMElement *GetElement() { return mElement; }
+
+  static nsresult DoHandleAction(nsXFormsActionModuleHelper *aXFormsAction,
+                                 nsIDOMEvent                *aEvent,
+                                 nsIXFormsActionElement     *aParentAction);
   /**
    * Determine whether this action element should be executed, based upon
    * optional `if` and `while` attributes.  For each of these attributes
@@ -75,30 +123,13 @@ protected:
    * This method indicates to the caller whether the action element uses a
    * `while` attribute through the `usesWhile` parameter.
    */
-  NS_HIDDEN_(PRBool) CanPerformAction(PRBool         *usesWhile,
-                                      nsIDOMNode     *contextNode = nsnull,
-                                      PRInt32         contextSize = 0,
-                                      PRInt32         contextPosition = 0);
-
-  /**
-   * With the `while` attribute, actions can potentially be iterated.  The
-   * `HandleSingleAction` method processes one iteration of an action (that
-   * is, the "body" of the action); it should be dispatched by the
-   * `HandleAction` method, which manages the conditional execution and
-   * iteration of the action.
-   */
-  virtual nsresult
-    HandleSingleAction(nsIDOMEvent* aEvent,
-                       nsIXFormsActionElement *aParentAction) = 0;
-
-  /**
-   * This signals whether or not this action can iterate.  Technically, all
-   * XForms 1.1 actions are allowed to iterate, but for some of them it
-   * may not make sense.  Currently, this is set to PR_TRUE for all actions,
-   * but we can optionally disable iteration for specific actions based upon
-   * additional information in the future.
-   */
-  PRBool mCanIterate;
+  static PRBool CanPerformAction(nsIDOMElement  *aElement,
+                                 PRBool         *aUsesWhile,
+                                 nsIDOMNode     *aContextNode = nsnull,
+                                 PRInt32         aContextSize = 0,
+                                 PRInt32         aContextPosition = 0);
+protected:
+  nsIDOMElement *mElement;
 };
 
 #endif
diff --git a/extensions/xforms/nsXFormsAtoms.cpp b/extensions/xforms/nsXFormsAtoms.cpp
index cf494c4..3e3c034 100644
--- a/extensions/xforms/nsXFormsAtoms.cpp
+++ b/extensions/xforms/nsXFormsAtoms.cpp
@@ -36,6 +36,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+#include "nsIAtomService.h"
+#include "nsServiceManagerUtils.h"
 #include "nsXFormsAtoms.h"
 #include "nsMemory.h"
 
@@ -74,7 +76,7 @@ nsIAtom* nsXFormsAtoms::itemset;
 nsIAtom* nsXFormsAtoms::select;
 nsIAtom* nsXFormsAtoms::select1;
 
-const nsStaticAtom nsXFormsAtoms::Atoms_info[] = {
+const nsXFormsStaticAtom nsXFormsAtoms::Atoms_info[] = {
   { "src",                      &nsXFormsAtoms::src },
   { "bind",                     &nsXFormsAtoms::bind },
   { "type",                     &nsXFormsAtoms::type },
@@ -114,5 +116,16 @@ const nsStaticAtom nsXFormsAtoms::Atoms_info[] = {
 void
 nsXFormsAtoms::InitAtoms()
 {
-  NS_RegisterStaticAtoms(Atoms_info, NS_ARRAY_LENGTH(Atoms_info));
+  PRUint32 numAtoms = NS_ARRAY_LENGTH(Atoms_info);
+
+  nsCOMPtr<nsIAtomService> atomServ =
+    do_GetService(NS_ATOMSERVICE_CONTRACTID);
+  if (!atomServ) {
+    return;
+  }
+
+  for (PRUint32 i = 0; i < numAtoms; ++i) {
+    atomServ->GetPermanentAtomUTF8(Atoms_info[i].mString,
+                                   Atoms_info[i].mAtom);
+  }
 }
diff --git a/extensions/xforms/nsXFormsAtoms.h b/extensions/xforms/nsXFormsAtoms.h
index 3397ad8..8df96b7 100644
--- a/extensions/xforms/nsXFormsAtoms.h
+++ b/extensions/xforms/nsXFormsAtoms.h
@@ -39,7 +39,21 @@
 #ifndef nsXFormsAtoms_h_
 #define nsXFormsAtoms_h_
 
-#include "nsStaticAtom.h"
+#include "nsIAtom.h"
+
+// stolen from nsStaticAtom.h.  Not frozen though, so figured I should steal.
+// Class for declaring a static list of atoms, for use with gperf
+// Keep this VERY simple
+// mString: the value of the atom - the policy is that this is only
+//          ASCII, in order to avoid unnecessary conversions if
+//          someone asks for this in unicode
+// mAtom:   a convienience pointer - if you want to store the value of
+//          the atom created by this structure somewhere, put its
+//          address here
+struct nsXFormsStaticAtom {
+    const char* mString;
+    nsIAtom ** mAtom;
+};
 
 /**
  * Class for singleton XForms nsIAtom pointers
@@ -86,7 +100,7 @@ class nsXFormsAtoms
   static NS_HIDDEN_(void) InitAtoms();
 
  private:
-  static NS_HIDDEN_(const nsStaticAtom) Atoms_info[];
+  static NS_HIDDEN_(const nsXFormsStaticAtom) Atoms_info[];
 };
 
 #endif
diff --git a/extensions/xforms/nsXFormsCaseElement.cpp b/extensions/xforms/nsXFormsCaseElement.cpp
index cf15c2a..107e0a8 100644
--- a/extensions/xforms/nsXFormsCaseElement.cpp
+++ b/extensions/xforms/nsXFormsCaseElement.cpp
@@ -44,7 +44,7 @@
 #include "nsIXFormsSwitchElement.h"
 #include "nsCOMPtr.h"
 #include "nsIDOMElement.h"
-#include "nsString.h"
+#include "nsStringAPI.h"
 #include "nsIXTFElementWrapper.h"
 
 /**
@@ -63,11 +63,12 @@ public:
   NS_IMETHOD DoneAddingChildren();
 
   nsXFormsCaseElement()
-  : nsXFormsStubElement(), mSelected(PR_FALSE), mCachedSelectedAttr(PR_FALSE)
+  : mElement(nsnull), mSelected(PR_FALSE), mCachedSelectedAttr(PR_FALSE)
   {
   }
 
 protected:
+  nsIDOMElement* mElement;
   PRPackedBool   mSelected;
   PRPackedBool   mCachedSelectedAttr;
 };
diff --git a/extensions/xforms/nsXFormsChoicesElement.cpp b/extensions/xforms/nsXFormsChoicesElement.cpp
index e1f7ae3..81a13cb 100644
--- a/extensions/xforms/nsXFormsChoicesElement.cpp
+++ b/extensions/xforms/nsXFormsChoicesElement.cpp
@@ -39,7 +39,7 @@
 #include "nsIXFormsSelectChild.h"
 #include "nsXFormsStubElement.h"
 #include "nsIDOMHTMLOptGroupElement.h"
-#include "nsString.h"
+#include "nsStringAPI.h"
 #include "nsCOMPtr.h"
 #include "nsIXTFElementWrapper.h"
 #include "nsIDOMDocument.h"
@@ -51,7 +51,7 @@ class nsXFormsChoicesElement : public nsXFormsStubElement,
                                public nsIXFormsSelectChild
 {
 public:
-  nsXFormsChoicesElement() : nsXFormsStubElement(), mDoneAddingChildren(PR_FALSE) {}
+  nsXFormsChoicesElement() : mElement(nsnull), mDoneAddingChildren(PR_FALSE) {}
 
   NS_DECL_ISUPPORTS_INHERITED
 
@@ -69,6 +69,7 @@ public:
   NS_DECL_NSIXFORMSSELECTCHILD
 
 private:
+  nsIDOMElement* mElement;
   PRBool         mDoneAddingChildren;
 
   void Refresh();
diff --git a/extensions/xforms/nsXFormsContextInfo.cpp b/extensions/xforms/nsXFormsContextInfo.cpp
new file mode 100644
index 0000000..8b668a1
--- /dev/null
+++ b/extensions/xforms/nsXFormsContextInfo.cpp
@@ -0,0 +1,227 @@
+/* -*- 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 Mozilla XForms support.
+ *
+ * The Initial Developer of the Original Code is
+ * IBM Corporation
+ * Portions created by the Initial Developer are Copyright (C) 2007
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Merle Sterling <msterlin@us.ibm.com>
+ *
+ * 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 "nsXFormsContextInfo.h"
+#include "nsIDOMDocument.h"
+#include "nsIDOMDOMImplementation.h"
+#include "nsIDOMText.h"
+#include "nsXFormsUtils.h"
+
+/**
+ * Implementation for XForms event context info.
+ *
+ */
+
+NS_IMPL_ISUPPORTS1(nsXFormsContextInfo, nsIXFormsContextInfo)
+
+nsXFormsContextInfo::nsXFormsContextInfo(nsIDOMElement *aElement)
+ : mElement(aElement), mType(0)
+{
+  mNode = nsnull;
+}
+
+nsXFormsContextInfo::~nsXFormsContextInfo()
+{
+  if (mType == nsIXFormsContextInfo::NODESET_TYPE) {
+    NS_IF_RELEASE(mNodeset);
+  } else {
+    // String, Number, and Node are all nodes.
+    NS_IF_RELEASE(mNode);
+  }
+}
+
+nsresult
+nsXFormsContextInfo::SetName(nsAString &aName)
+{
+  mName = aName;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsXFormsContextInfo::GetName(nsAString &aResult)
+{
+  aResult = mName;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsXFormsContextInfo::GetType(PRInt32 *aType)
+{
+  *aType = mType;
+  return NS_OK;
+}
+
+nsresult
+nsXFormsContextInfo::SetStringValue(const char *aName, const nsAString &aString)
+{
+  // Store the string value of the context property as a node.
+  SetNodeValueInternal(aName, aString);
+  mType = nsIXFormsContextInfo::STRING_TYPE;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsXFormsContextInfo::GetStringValue(nsAString &aResult)
+{
+  aResult.Truncate();
+
+  if (mType == nsIXFormsContextInfo::STRING_TYPE) {
+    nsXFormsUtils::GetNodeValue(mNode, aResult);
+  } else {
+    NS_WARNING("GetStringValue: context type is not a string!");
+  }
+  return NS_OK;
+}
+
+nsresult
+nsXFormsContextInfo::SetNumberValue(const char *aName, PRInt32 aNumber)
+{
+  // Convert the number to a string and store the (string)number
+  // value of the context property as a node.
+  nsAutoString numberStr;
+  numberStr.AppendInt(aNumber);
+
+  SetNodeValueInternal(aName, numberStr);
+  mType = nsIXFormsContextInfo::NUMBER_TYPE;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsXFormsContextInfo::GetNumberValue(PRInt32 *aResult)
+{
+  *aResult = 0;
+
+  if (mType == nsIXFormsContextInfo::NUMBER_TYPE) {
+    nsAutoString numberStr;
+    nsXFormsUtils::GetNodeValue(mNode, numberStr);
+
+    nsresult rv;
+    *aResult = numberStr.ToInteger(&rv);
+    NS_ENSURE_SUCCESS(rv, rv);
+  } else {
+    NS_WARNING("GetNumberValue: context type is not a number!");
+  }
+
+  return NS_OK;
+}
+
+nsresult
+nsXFormsContextInfo::SetNodeValue(const char *aName, nsIDOMNode *aNode)
+{
+  // Set the name of the context property.
+  nsAutoString name;
+  name.AppendLiteral(aName);
+  SetName(name);
+
+  // Set the node value of the context property.
+  NS_IF_ADDREF(mNode = aNode);
+  mType = nsIXFormsContextInfo::NODE_TYPE;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsXFormsContextInfo::GetNodeValue(nsIDOMNode **aResult)
+{
+  *aResult = nsnull;
+
+  // String and number context types are stored as nodes, so
+  // GetNodeValue can be used to get a string or number type
+  // as a node.
+  if (mType == nsIXFormsContextInfo::NODE_TYPE   ||
+      mType == nsIXFormsContextInfo::STRING_TYPE ||
+      mType == nsIXFormsContextInfo::NUMBER_TYPE) {
+    NS_IF_ADDREF(*aResult = mNode);
+  } else {
+    NS_WARNING("GetNodeValue: context type is not a node, string, or number!");
+  }
+  return NS_OK;
+}
+
+nsresult
+nsXFormsContextInfo::SetNodesetValue(const char *aName,
+                                     nsIDOMXPathResult *aNodeset)
+{
+  // Set the name of the context property.
+  nsAutoString name;
+  name.AppendLiteral(aName);
+  SetName(name);
+
+  // Set the nodeset value of the context property.
+  NS_IF_ADDREF(mNodeset = aNodeset);
+  mType = nsIXFormsContextInfo::NODESET_TYPE;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsXFormsContextInfo::GetNodesetValue(nsIDOMXPathResult **aResult)
+{
+  *aResult = nsnull;
+
+  if (mType == nsIXFormsContextInfo::NODESET_TYPE) {
+    NS_IF_ADDREF(*aResult = mNodeset);
+  } else {
+    NS_WARNING("GetNodesetValue: context type is not a nodeset!");
+  }
+  return NS_OK;
+}
+
+nsresult
+nsXFormsContextInfo::SetNodeValueInternal(const char *aName,
+                                          const nsAString &aValue)
+{
+  if (!mElement)
+    return NS_ERROR_FAILURE;
+
+  nsresult rv;
+
+  nsCOMPtr<nsIDOMDocument> doc;
+  rv = mElement->GetOwnerDocument(getter_AddRefs(doc));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  nsCOMPtr<nsIDOMDOMImplementation> domImpl;
+  rv = doc->GetImplementation(getter_AddRefs(domImpl));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  nsCOMPtr<nsIDOMText> textNode;
+  rv = doc->CreateTextNode(aValue, getter_AddRefs(textNode));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  SetNodeValue(aName, textNode);
+
+  return NS_OK;
+}
diff --git a/extensions/xforms/nsXFormsContextInfo.h b/extensions/xforms/nsXFormsContextInfo.h
new file mode 100644
index 0000000..4b315c4
--- /dev/null
+++ b/extensions/xforms/nsXFormsContextInfo.h
@@ -0,0 +1,126 @@
+/* -*- 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 Mozilla XForms support.
+ *
+ * The Initial Developer of the Original Code is
+ * IBM Corporation
+ * Portions created by the Initial Developer are Copyright (C) 2007
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Merle Sterling <msterlin@us.ibm.com>
+ *
+ * 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 nsXFormsContextInfo_h_
+#define nsXFormsContextInfo_h_
+
+#include "nsCOMArray.h"
+#include "nsCOMPtr.h"
+#include "nsIDOMElement.h"
+#include "nsIDOMNode.h"
+#include "nsIDOMXPathResult.h"
+#include "nsIXFormsContextInfo.h"
+
+/**
+ * Implementation for XForms Event Context Info.
+ *
+ */
+
+class nsXFormsContextInfo : public nsIXFormsContextInfo
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIXFORMSCONTEXTINFO
+
+  nsXFormsContextInfo(nsIDOMElement *aElement);
+  virtual ~nsXFormsContextInfo();
+
+  /** Set the name of the context info property; eg. 'resource-uri'
+   *
+   * @param aName - property name
+   */
+  nsresult SetName(nsAString &aName);
+
+
+  /** Set a string value for a context info property.
+   *  String values are encapsulated in a text node because
+   *  the XPath Event function can only work with nodes.
+   *
+   * @param aName   - name of the string property.
+   * @param aString - string value.
+   */
+  nsresult SetStringValue(const char *aName, const nsAString &aString);
+
+  /** Set a number value for a context info property.
+   *  Number values are encapsulated in a text node because
+   *  the XPath Event function can only work with nodes.
+   *
+   * @param aName   - name of the number property.
+   * @param aNumber - number value.
+   */
+  nsresult SetNumberValue(const char *aName, PRInt32 aNumber);
+
+  /** Set a node value for a context info property.
+   *
+   * @param aName - name of the node property.
+   * @param aNode - node value.
+   */
+  nsresult SetNodeValue(const char *aName, nsIDOMNode *aNode);
+
+  /** Set a nodeset value for a context info property.
+   *
+   * @param aName    - name of the nodeset property.
+   * @param aNodeset - nodeset value.
+   */
+  nsresult SetNodesetValue(const char *aName, nsIDOMXPathResult *aNodeset);
+
+private:
+  /**
+   *  Create a text node to encapsulate string and number context property
+   *  types. The XPath Event function returns a txINodeset and only nodes
+   *  can be added to the nodeset.
+   *
+   * @param aName - name of the node property.
+   * @param aValue - value of the text node.
+  */
+  nsresult SetNodeValueInternal(const char *aName, const nsAString &aValue);
+
+  // The element to which the context info refers.
+  nsIDOMElement *mElement;
+  // The name of the context info property.
+  nsString mName;
+  // The type of the context info property.
+  PRInt32 mType;
+  // The value of the context property.
+  union {
+    nsIDOMNode        *mNode;
+    nsIDOMXPathResult *mNodeset;
+  };
+};
+
+#endif
diff --git a/extensions/xforms/nsXFormsControlStub.cpp b/extensions/xforms/nsXFormsControlStub.cpp
index f20c226..1f803b6 100644
--- a/extensions/xforms/nsXFormsControlStub.cpp
+++ b/extensions/xforms/nsXFormsControlStub.cpp
@@ -517,7 +517,7 @@ nsXFormsControlStub::HandleDefault(nsIDOMEvent *aEvent,
     nsAutoString type;
     aEvent->GetType(type);
 
-    if (type.EqualsASCII(sXFormsEventsEntries[eEvent_Focus].name)) {
+    if (type.EqualsLiteral(sXFormsEventsEntries[eEvent_Focus].name)) {
       TryFocus(aHandled);
     } else if (type.Equals(NS_LITERAL_STRING("keypress"))) { 
       nsCOMPtr<nsIDOMKeyEvent> keyEvent = do_QueryInterface(aEvent);
@@ -551,8 +551,8 @@ nsXFormsControlStub::HandleDefault(nsIDOMEvent *aEvent,
           }
         }
       }
-    } else if (type.EqualsASCII(sXFormsEventsEntries[eEvent_Next].name) ||     
-               type.EqualsASCII(sXFormsEventsEntries[eEvent_Previous].name)) { 
+    } else if (type.EqualsLiteral(sXFormsEventsEntries[eEvent_Next].name) ||
+               type.EqualsLiteral(sXFormsEventsEntries[eEvent_Previous].name)) {
 
       // only continue this processing if xforms-next or xforms-previous were
       // dispatched by the form and not as part of the 'tab' and 'shift+tab'
@@ -577,12 +577,12 @@ nsXFormsControlStub::HandleDefault(nsIDOMEvent *aEvent,
       nsIFocusController *focusController =
         doc->GetWindow()->GetRootFocusController();
       if (focusController &&
-          type.EqualsASCII(sXFormsEventsEntries[eEvent_Next].name)) {
+          type.EqualsLiteral(sXFormsEventsEntries[eEvent_Next].name)) {
         focusController->MoveFocus(PR_TRUE, nsnull);
       } else {
         focusController->MoveFocus(PR_FALSE, nsnull);
       }
-    } else if (type.EqualsASCII(sXFormsEventsEntries[eEvent_BindingException].name)) {
+    } else if (type.EqualsLiteral(sXFormsEventsEntries[eEvent_BindingException].name)) {
       // we threw up a popup during the nsXFormsUtils::DispatchEvent that sent
       // this error to this control
       *aHandled = PR_TRUE;
diff --git a/extensions/xforms/nsXFormsControlStub.h b/extensions/xforms/nsXFormsControlStub.h
index ea7eb14..610f6f8 100644
--- a/extensions/xforms/nsXFormsControlStub.h
+++ b/extensions/xforms/nsXFormsControlStub.h
@@ -41,7 +41,7 @@
 #define nsXFormsControlStub_h_
 
 #include "nsCOMPtr.h"
-#include "nsString.h"
+#include "nsStringAPI.h"
 
 #include "nsIDOMElement.h"
 #include "nsIDOMNode.h"
@@ -64,7 +64,7 @@ class nsIDOMXPathResult;
  * Common stub for all XForms controls that inherit from nsIXFormsControl and
  * is bound to an instance node.
  */
-class nsXFormsControlStub : public virtual nsXFormsStubElement,
+class nsXFormsControlStub : public nsXFormsStubElement,
                             public nsIXFormsControl
 {
 public:
@@ -159,7 +159,6 @@ public:
 
   /** Constructor */
   nsXFormsControlStub() :
-    nsXFormsStubElement(),
     kStandardNotificationMask(nsIXTFElement::NOTIFY_WILL_SET_ATTRIBUTE |
                               nsIXTFElement::NOTIFY_ATTRIBUTE_SET |
                               nsIXTFElement::NOTIFY_WILL_REMOVE_ATTRIBUTE | 
@@ -178,6 +177,9 @@ public:
     {};
 
 protected:
+  /** The nsIXTFElementWrapper */
+  nsIDOMElement*                      mElement;
+
   /** The node that the control is bound to. */
   nsCOMPtr<nsIDOMNode>                mBoundNode;
 
diff --git a/extensions/xforms/nsXFormsCopyElement.cpp b/extensions/xforms/nsXFormsCopyElement.cpp
index 63c6d77..814eb2a 100644
--- a/extensions/xforms/nsXFormsCopyElement.cpp
+++ b/extensions/xforms/nsXFormsCopyElement.cpp
@@ -41,7 +41,7 @@
 #include "nsIXTFElementWrapper.h"
 #include "nsXFormsUtils.h"
 #include "nsIDOMElement.h"
-#include "nsString.h"
+#include "nsStringAPI.h"
 #include "nsIXFormsItemElement.h"
 
 /**
@@ -56,7 +56,7 @@ class nsXFormsCopyElement : public nsXFormsStubElement,
                             public nsIXFormsCopyElement
 {
 public:
-  nsXFormsCopyElement() : nsXFormsStubElement() {}
+  nsXFormsCopyElement() : mElement(nsnull) {}
 
   NS_DECL_ISUPPORTS_INHERITED
 
@@ -67,6 +67,9 @@ public:
 
   // nsIXFormsCopyElement
   NS_DECL_NSIXFORMSCOPYELEMENT
+
+private:
+  nsIDOMElement *mElement;
 };
 
 NS_IMPL_ISUPPORTS_INHERITED1(nsXFormsCopyElement,
diff --git a/extensions/xforms/nsXFormsDOMEvent.cpp b/extensions/xforms/nsXFormsDOMEvent.cpp
new file mode 100644
index 0000000..c77b298
--- /dev/null
+++ b/extensions/xforms/nsXFormsDOMEvent.cpp
@@ -0,0 +1,180 @@
+/* -*- 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 Mozilla XForms support.
+ *
+ * The Initial Developer of the Original Code is
+ * IBM Corporation
+ * Portions created by the Initial Developer are Copyright (C) 2007
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Merle Sterling <msterlin@us.ibm.com>
+ *
+ * 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 "nsXFormsDOMEvent.h"
+
+/**
+ * Implementation for XForms events.
+ *
+ */
+
+NS_IMPL_ISUPPORTS3(nsXFormsDOMEvent, nsIXFormsDOMEvent, nsIDOMNSEvent, nsIPrivateDOMEvent)
+
+nsXFormsDOMEvent::nsXFormsDOMEvent(nsIDOMEvent *aInner,
+                                   nsCOMArray<nsIXFormsContextInfo> *aContextInfo)
+{
+  mInner = aInner;
+  mContextInfo.Init();
+  SetContextInfo(aContextInfo);
+}
+
+nsXFormsDOMEvent::~nsXFormsDOMEvent()
+{}
+
+nsresult
+nsXFormsDOMEvent::SetContextInfo(nsCOMArray<nsIXFormsContextInfo> *aContextInfo)
+{
+ if (aContextInfo) {
+   for (int i = 0; i < aContextInfo->Count(); i++) {
+     nsCOMPtr<nsIXFormsContextInfo> ctxtInfo = aContextInfo->ObjectAt(i);
+     nsAutoString name;
+     ctxtInfo->GetName(name);
+     mContextInfo.Put(name, ctxtInfo);
+   }
+ }
+ return NS_OK;
+}
+
+NS_IMETHODIMP
+nsXFormsDOMEvent::GetContextInfo(const nsAString &aName,
+                                 nsIXFormsContextInfo **aResult)
+{
+  NS_ENSURE_ARG_POINTER(aResult);
+  mContextInfo.Get(aName, aResult);
+  return NS_OK;
+}
+
+// nsIDOMNSEvent interface
+NS_IMETHODIMP
+nsXFormsDOMEvent::GetOriginalTarget(nsIDOMEventTarget **aOriginalTarget)
+{
+  nsCOMPtr<nsIDOMNSEvent> nsevent = do_QueryInterface(mInner);
+  return nsevent->GetOriginalTarget(aOriginalTarget);
+}
+
+NS_IMETHODIMP
+nsXFormsDOMEvent::GetExplicitOriginalTarget(nsIDOMEventTarget **aExplicitOriginalTarget)
+{
+  nsCOMPtr<nsIDOMNSEvent> nsevent = do_QueryInterface(mInner);
+  return nsevent->GetExplicitOriginalTarget(aExplicitOriginalTarget);
+}
+
+NS_IMETHODIMP
+nsXFormsDOMEvent::GetTmpRealOriginalTarget(nsIDOMEventTarget **aTmpRealOriginalTarget)
+{
+  nsCOMPtr<nsIDOMNSEvent> nsevent = do_QueryInterface(mInner);
+  return nsevent->GetTmpRealOriginalTarget(aTmpRealOriginalTarget);
+}
+
+NS_IMETHODIMP
+nsXFormsDOMEvent::PreventBubble(void)
+{
+  nsCOMPtr<nsIDOMNSEvent> nsevent = do_QueryInterface(mInner);
+  return nsevent->PreventBubble();
+}
+
+NS_IMETHODIMP
+nsXFormsDOMEvent::PreventCapture(void)
+{
+  nsCOMPtr<nsIDOMNSEvent> nsevent = do_QueryInterface(mInner);
+  return nsevent->PreventCapture();
+}
+
+NS_IMETHODIMP
+nsXFormsDOMEvent::GetIsTrusted(PRBool *aIsTrusted)
+{
+  nsCOMPtr<nsIDOMNSEvent> nsevent = do_QueryInterface(mInner);
+  return nsevent->GetIsTrusted(aIsTrusted);
+}
+
+// nsIPrivateDOMEvent interface
+NS_METHOD
+nsXFormsDOMEvent::DuplicatePrivateData()
+{
+  nsCOMPtr<nsIPrivateDOMEvent> privEvent = do_QueryInterface(mInner);
+  return privEvent->DuplicatePrivateData();
+}
+
+NS_METHOD
+nsXFormsDOMEvent::SetTarget(nsIDOMEventTarget* aTarget)
+{
+  nsCOMPtr<nsIPrivateDOMEvent> privEvent = do_QueryInterface(mInner);
+  return privEvent->SetTarget(aTarget);
+}
+
+NS_METHOD
+nsXFormsDOMEvent::SetCurrentTarget(nsIDOMEventTarget* aTarget)
+{
+  nsCOMPtr<nsIPrivateDOMEvent> privEvent = do_QueryInterface(mInner);
+  return privEvent->SetCurrentTarget(aTarget);
+}
+
+NS_METHOD
+nsXFormsDOMEvent::SetOriginalTarget(nsIDOMEventTarget* aTarget)
+{
+  nsCOMPtr<nsIPrivateDOMEvent> privEvent = do_QueryInterface(mInner);
+  return privEvent->SetOriginalTarget(aTarget);
+}
+
+NS_METHOD
+nsXFormsDOMEvent::IsDispatchStopped(PRBool* aIsDispatchPrevented)
+{
+  nsCOMPtr<nsIPrivateDOMEvent> privEvent = do_QueryInterface(mInner);
+  return privEvent->IsDispatchStopped(aIsDispatchPrevented);
+}
+
+NS_METHOD
+nsXFormsDOMEvent::GetInternalNSEvent(nsEvent** aNSEvent)
+{
+  nsCOMPtr<nsIPrivateDOMEvent> privEvent = do_QueryInterface(mInner);
+  return privEvent->GetInternalNSEvent(aNSEvent);
+}
+
+NS_METHOD
+nsXFormsDOMEvent::HasOriginalTarget(PRBool* aResult)
+{
+  nsCOMPtr<nsIPrivateDOMEvent> privEvent = do_QueryInterface(mInner);
+  return privEvent->HasOriginalTarget(aResult);
+}
+
+NS_METHOD
+nsXFormsDOMEvent::SetTrusted(PRBool aTrusted)
+{
+  nsCOMPtr<nsIPrivateDOMEvent> privEvent = do_QueryInterface(mInner);
+  return privEvent->SetTrusted(aTrusted);
+}
diff --git a/extensions/xforms/nsXFormsXPathXMLUtil.h b/extensions/xforms/nsXFormsDOMEvent.h
similarity index 52%
copy from extensions/xforms/nsXFormsXPathXMLUtil.h
copy to extensions/xforms/nsXFormsDOMEvent.h
index bdcf17c..e62a2e9 100644
--- a/extensions/xforms/nsXFormsXPathXMLUtil.h
+++ b/extensions/xforms/nsXFormsDOMEvent.h
@@ -15,13 +15,12 @@
  * The Original Code is Mozilla XForms support.
  *
  * The Initial Developer of the Original Code is
- * Novell, Inc.
- * Portions created by the Initial Developer are Copyright (C) 2004
+ * IBM Corporation
+ * Portions created by the Initial Developer are Copyright (C) 2007
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
- *  Allan Beaufour <abeaufour@novell.com>
- *  David Landwehr <dlandwehr@novell.com>
+ *  Merle Sterling <msterlin@us.ibm.com>
  *
  * 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
@@ -37,42 +36,51 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsString.h"
+#include "nsCOMPtr.h"
+#include "nsCOMArray.h"
+#include "nsInterfaceHashtable.h"
+#include "nsXFormsContextInfo.h"
+#include "nsIXFormsDOMEvent.h"
+#include "nsIDOMNSEvent.h"
+#include "nsIPrivateDOMEvent.h"
 
 /**
- * Miscellaneous utility functions for determining the class of a character, used by
- * nsXFormsXPathScanner.
- * 
- * @note Should be reimplemented and moved to Transformiix
- * 
+ * Implementation for XForms events.
+ *
  */
-class nsXFormsXPathXMLUtil {
-private:
-  /** Helper function for public functions */
-  static PRBool IsInRange(const PRUnichar* range, const PRUint32 range_length, const PRUnichar c);
-  
-public:
-  /** Checks if a char is a whitespace */
-  static PRBool IsWhitespace(const PRUnichar c);
-
-  /** Checks of a char is a digit */
-  static PRBool IsDigit(const PRUnichar c);
-
-  /** Checks if a char is an ideographic */
-  static PRBool IsIdeographic(const PRUnichar c);
 
-  /** Checks if a char is a letter */
-  static PRBool IsLetter(const PRUnichar c);
-
-  /** Checks if a char is a base char */
-  static PRBool IsBaseChar(const PRUnichar c);
-
-  /** Check is a char matches the first rule of a NCName */
-  static PRBool IsNCNameChar(const PRUnichar c);
+class nsXFormsDOMEvent : public nsIXFormsDOMEvent,
+                         public nsIDOMNSEvent,
+                         public nsIPrivateDOMEvent
+{
+public:
+  NS_DECL_ISUPPORTS
+  // nsIXFormsDOMEvent interface
+  NS_DECL_NSIXFORMSDOMEVENT
+  // nsIDOMNSEvent interface
+  NS_DECL_NSIDOMNSEVENT
+  // nsIDOMEvent interface
+  NS_FORWARD_NSIDOMEVENT(mInner->)
+  // nsIPrivateDOMEvent interface
+  NS_IMETHOD DuplicatePrivateData();
+  NS_IMETHOD SetTarget(nsIDOMEventTarget* aTarget);
+  NS_IMETHOD SetCurrentTarget(nsIDOMEventTarget* aTarget);
+  NS_IMETHOD SetOriginalTarget(nsIDOMEventTarget* aTarget);
+  NS_IMETHOD IsDispatchStopped(PRBool* aIsDispatchPrevented);
+  NS_IMETHOD GetInternalNSEvent(nsEvent** aNSEvent);
+  NS_IMETHOD HasOriginalTarget(PRBool* aResult);
+  NS_IMETHOD SetTrusted(PRBool aTrusted);
 
-  /** Check if a char is a combining char */
-  static PRBool IsCombiningChar(const PRUnichar c);
+  nsXFormsDOMEvent(nsIDOMEvent *aInner,
+                   nsCOMArray<nsIXFormsContextInfo> *aContextInfo);
+  virtual ~nsXFormsDOMEvent();
+  nsresult SetContextInfo(nsCOMArray<nsIXFormsContextInfo> *aContextInfo);
 
-  /** Check if a char is an extender */
-  static PRBool IsExtender(const PRUnichar c);
+protected:
+  nsCOMPtr<nsIDOMEvent> mInner;
+  /**
+   * Hashtable of all context info properties for a given event.
+   * key = context property name, value = nsIXFormsContextInfo
+   */
+  nsInterfaceHashtable<nsStringHashKey, nsIXFormsContextInfo> mContextInfo;
 };
diff --git a/extensions/xforms/nsXFormsDelegateStub.cpp b/extensions/xforms/nsXFormsDelegateStub.cpp
index f4c5736..5f454fa 100644
--- a/extensions/xforms/nsXFormsDelegateStub.cpp
+++ b/extensions/xforms/nsXFormsDelegateStub.cpp
@@ -46,7 +46,6 @@
 #include "nsIDOMDocumentView.h"
 #include "nsIDOMAbstractView.h"
 #include "nsIDOMDocumentEvent.h"
-#include "nsDOMString.h"
 #include "nsIModelElementPrivate.h"
 #include "nsIXFormsUIWidget.h"
 #include "nsXFormsAtoms.h"
@@ -142,7 +141,7 @@ nsXFormsDelegateStub::TryFocus(PRBool* aOK)
 NS_IMETHODIMP
 nsXFormsDelegateStub::GetValue(nsAString& aValue)
 {
-  SetDOMStringToNull(aValue);
+  aValue.SetIsVoid(PR_TRUE);
   if (mBoundNode) {
     nsXFormsUtils::GetNodeValue(mBoundNode, aValue);
   }
@@ -174,7 +173,7 @@ nsXFormsDelegateStub::GetHasBoundNode(PRBool *aHasBoundNode)
 NS_IMETHODIMP
 nsXFormsDelegateStub::ReportError(const nsAString& aErrorMsg)
 {
-  const nsPromiseFlatString& flat = PromiseFlatString(aErrorMsg);
+  const nsString& flat = PromiseFlatString(aErrorMsg);
   nsXFormsUtils::ReportError(flat, mElement);
   return NS_OK;
 }
@@ -182,7 +181,7 @@ nsXFormsDelegateStub::ReportError(const nsAString& aErrorMsg)
 NS_IMETHODIMP
 nsXFormsDelegateStub::ReportErrorMessage(const nsAString& aErrorMsg)
 {
-  const nsPromiseFlatString& flat = PromiseFlatString(aErrorMsg);
+  const nsString& flat = PromiseFlatString(aErrorMsg);
   nsXFormsUtils::ReportErrorMessage(flat, mElement);
   return NS_OK;
 }
diff --git a/extensions/xforms/nsXFormsDelegateStub.h b/extensions/xforms/nsXFormsDelegateStub.h
index cef71c8..02131e1 100644
--- a/extensions/xforms/nsXFormsDelegateStub.h
+++ b/extensions/xforms/nsXFormsDelegateStub.h
@@ -42,7 +42,7 @@
 
 #include "nsAutoPtr.h"
 #include "nsCOMPtr.h"
-#include "nsString.h"
+#include "nsStringAPI.h"
 #include "nsIDOMElement.h"
 #include "nsIDelegateInternal.h"
 #include "nsXFormsControlStub.h"
diff --git a/extensions/xforms/nsXFormsDispatchElement.cpp b/extensions/xforms/nsXFormsDispatchElement.cpp
index ec8a205..a70fecc 100644
--- a/extensions/xforms/nsXFormsDispatchElement.cpp
+++ b/extensions/xforms/nsXFormsDispatchElement.cpp
@@ -42,20 +42,18 @@
 #include "nsIDOMEvent.h"
 #include "nsIDOMElement.h"
 #include "nsIDOMEventTarget.h"
-#include "nsString.h"
+#include "nsStringAPI.h"
 #include "nsXFormsUtils.h"
 
 class nsXFormsDispatchElement : public nsXFormsActionModuleBase
 {
 public:
   nsXFormsDispatchElement();
-protected:
   nsresult HandleSingleAction(nsIDOMEvent* aEvent,
                               nsIXFormsActionElement *aParentAction);
 };
 
-nsXFormsDispatchElement::nsXFormsDispatchElement() :
-  nsXFormsActionModuleBase(PR_TRUE)
+nsXFormsDispatchElement::nsXFormsDispatchElement()
 {
 }
 
diff --git a/extensions/xforms/nsXFormsElementFactory.cpp b/extensions/xforms/nsXFormsElementFactory.cpp
index c83a299..ad8b0b6 100644
--- a/extensions/xforms/nsXFormsElementFactory.cpp
+++ b/extensions/xforms/nsXFormsElementFactory.cpp
@@ -41,7 +41,7 @@
 #include "nsXFormsAtoms.h"
 #include "nsIDocument.h"
 #include "nsIDOMNode.h"
-#include "nsString.h"
+#include "nsStringAPI.h"
 
 // Form controls
 NS_HIDDEN_(nsresult) NS_NewXFormsInputElement(nsIXTFElement **aElement);
diff --git a/extensions/xforms/nsXFormsGroupElement.cpp b/extensions/xforms/nsXFormsGroupElement.cpp
index 46b6614..193d53e 100644
--- a/extensions/xforms/nsXFormsGroupElement.cpp
+++ b/extensions/xforms/nsXFormsGroupElement.cpp
@@ -37,7 +37,7 @@
  * ***** END LICENSE BLOCK ***** */
 #include "nsAutoPtr.h"
 #include "nsCOMPtr.h"
-#include "nsString.h"
+#include "nsStringAPI.h"
 
 #include "nsIDOM3Node.h"
 #include "nsIDOMElement.h"
diff --git a/extensions/xforms/nsXFormsInsertDeleteElement.cpp b/extensions/xforms/nsXFormsInsertDeleteElement.cpp
dissimilarity index 64%
index c704996..2abcf0c 100644
--- a/extensions/xforms/nsXFormsInsertDeleteElement.cpp
+++ b/extensions/xforms/nsXFormsInsertDeleteElement.cpp
@@ -1,840 +1,904 @@
-/* -*- 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 XForms code.
- *
- * The Initial Developer of the Original Code is
- * Novell, Inc.
- * Portions created by the Initial Developer are Copyright (C) 2005
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *  Allan Beaufour <abeaufour@novell.com>
- *  Merle Sterling <msterlin@us.ibm.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of 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 "nsIDOMAttr.h"
-#include "nsIDOMEvent.h"
-#include "nsIDOMNode.h"
-#include "nsIDOMElement.h"
-#include "nsIDOMDocument.h"
-#include "nsIDOMNodeList.h"
-#include "nsIDOMNamedNodeMap.h"
-#include "nsIXFormsRepeatElement.h"
-#include "nsIXFormsControl.h"
-
-#include "nsString.h"
-
-#include "nsIInstanceElementPrivate.h"
-#include "nsXFormsActionModuleBase.h"
-#include "nsXFormsActionElement.h"
-#include "nsXFormsUtils.h"
-#include "nsIDOM3Node.h"
-
-#include "math.h"
-
-#ifdef DEBUG
-//#define DEBUG_XF_INSERTDELETE
-#endif
-
-/**
- * Implementation of the XForms \<insert\> and \<delete\> elements.
- *
- * @see http://www.w3.org/TR/xforms/slice9.html#action-insert
- *
- * @todo The spec. states that the events must set their Context Info to:
- * "Path expression used for insert/delete (xsd:string)" (XXX)
- * @see http://www.w3.org/TR/xforms/slice4.html#evt-insert
- * @see https://bugzilla.mozilla.org/show_bug.cgi?id=280423
- *
- */
-class nsXFormsInsertDeleteElement : public nsXFormsActionModuleBase
-{
-private:
-  PRBool mIsInsert;
-
-  enum Location {
-    eLocation_After,
-    eLocation_Before,
-    eLocation_FirstChild
-  };
-
-  /** Get the first node of a given type in aNodes.
-   *
-   *  @param aNodes        array of nodes
-   *  @param aNodeType     type of node to find
-   *
-   *  @return aResult      node of type aNodeType
-   */
-  nsresult GetFirstNodeOfType(nsCOMArray<nsIDOMNode> *aNodes,
-                              PRUint16 aNodeType,
-                              nsIDOMNode **aResult);
-
-  /** Insert a node.
-   *
-   *  @param aTargetNode     target location node
-   *  @param aNewNode        node to insert
-   *  @param aLocation       insert location relative to target
-   *
-   *  @return aResult        result node
-   */
-  nsresult InsertNode(nsIDOMNode *aTargetNode, nsIDOMNode *aNewNode,
-                      Location aLocation, nsIDOMNode **aResNode);
-
-  nsresult RefreshRepeats(nsCOMArray<nsIDOMNode> *aNodes);
-
-public:
-  NS_DECL_NSIXFORMSACTIONMODULEELEMENT
-
-  /** Constructor */
-  nsXFormsInsertDeleteElement(PRBool aIsInsert) :
-    nsXFormsActionModuleBase(PR_TRUE),
-    mIsInsert(aIsInsert)
-    {}
-protected:
-  /**
-   * Normally, an action element implements the body of its action handler
-   * using this method; however, since an `nsXFormsInsertDeleteElement` sets
-   * up additional context before evaluating `if` and `while`, it overrides
-   * the `HandleAction` method instead to get full control over the
-   * execution of its action.
-   */
-  nsresult HandleSingleAction(nsIDOMEvent* aEvent,
-                              nsIXFormsActionElement *aParentAction)
-  {
-    return NS_OK;
-  }
-};
-
-NS_IMETHODIMP
-nsXFormsInsertDeleteElement::HandleAction(nsIDOMEvent            *aEvent,
-                                          nsIXFormsActionElement *aParentAction)
-{
-  if (!mElement)
-    return NS_OK;
-
-  nsresult rv;
-
-  //
-  // Step 1 (Insert or Delete): Determine the insert/delete context.
-  //
-  // If the bind attribute is present or if the context attribute is not given,
-  // the insert context is the in-scope evaluation context. Otherwise, the
-  // XPath expression provided by the context attribute is evaluated using the
-  // in-scope evaluation context, and the first node rule is applied to obtain
-  // the insert context.
-  //
-  nsCOMPtr<nsIDOMXPathResult> contextNodeset;
-  nsCOMPtr<nsIDOMNode> contextNode;
-  PRUint32 contextNodesetSize = 0;
-  PRInt32 contextPosition;
-
-  // Get the in-scope evaluation context. The last parameter to GetNodeContext
-  // indicates whether it should try to get the context using @bind. We want to
-  // ignore @bind because it should not change the in-scope evaluation context
-  // for insert.
-  nsCOMPtr<nsIModelElementPrivate> model;
-  nsCOMPtr<nsIDOMElement> bindElement;
-  nsCOMPtr<nsIXFormsControl> parentControl;
-  PRBool outerBind;
-  rv = nsXFormsUtils::GetNodeContext(mElement,
-                                     nsXFormsUtils::ELEMENT_WITH_MODEL_ATTR,
-                                     getter_AddRefs(model),
-                                     getter_AddRefs(bindElement),
-                                     &outerBind,
-                                     getter_AddRefs(parentControl),
-                                     getter_AddRefs(contextNode),
-                                     &contextPosition,
-                                     (PRInt32*)&contextNodesetSize,
-                                     PR_FALSE);
-
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  // Determine if the context node is specified via @context.
-  // If @bind is present, @context is ignored.
-  nsAutoString bindExpr;
-  nsAutoString contextExpr;
-  mElement->GetAttribute(NS_LITERAL_STRING("bind"), bindExpr);
-  mElement->GetAttribute(NS_LITERAL_STRING("context"), contextExpr);
-
-  if (bindExpr.IsEmpty() && !contextExpr.IsEmpty()) {
-    // @context is specified and overrides the in-scope evaluation context.
-    // The insert context is the result of evaluating @context in the current
-    // in-scope evaluation context.
-    rv = nsXFormsUtils::EvaluateXPath(contextExpr, contextNode, mElement,
-                                      nsIDOMXPathResult::ORDERED_NODE_SNAPSHOT_TYPE,
-                                      getter_AddRefs(contextNodeset));
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    // The insert/delete action is terminated with no effect if the context
-    // is the empty node-set.
-    if (contextNodeset) {
-      rv = contextNodeset->GetSnapshotLength(&contextNodesetSize);
-      NS_ENSURE_SUCCESS(rv, rv);
-  
-      if (contextNodesetSize < 1)
-        return NS_OK;
-  
-      // Context node is the first node in the nodeset.
-      contextNodeset->SnapshotItem(0, getter_AddRefs(contextNode));
-      contextPosition = 1;
-    }
-  }
-
-  // The insert/delete action is terminated with no effect if the context
-  // is the empty node-set.
-  if (!contextNode)
-    return NS_OK;
-
-  // The insert action is terminated with no effect if the context attribute
-  // is given and the insert context does not evaluate to an element node.
-  if (mIsInsert && !contextExpr.IsEmpty()) {
-    PRUint16 nodeType;
-    contextNode->GetNodeType(&nodeType);
-    if (nodeType != nsIDOMNode::ELEMENT_NODE)
-      return NS_OK;
-  }
-
-  // Test the `if` and `while` attributes to determine whether this action
-  // can be performed and should be repeated.  As the insert and delete
-  // actions can change their context, we do this testing here instead of
-  // relying on the default logic from our parent class' `HandleAction`
-  // definition.
-  PRBool usesWhile;
-  if (!CanPerformAction(&usesWhile, contextNode,
-                        contextNodesetSize, contextPosition)) {
-    return NS_OK;
-  }
-
-  //
-  // Step 2 (Insert or Delete): Determine the node-set binding.
-  //
-  // If the bind attribute is present, it directly determines the Node Set
-  // Binding node-set. If a nodeset attribute is present, it is evaluated
-  // within the context to determine the Node Set Binding node-set.
-  //
-  // A NodeSet binding attribute (@bind or @nodeset) is required unless
-  // the context attribute is present.
-  //
-  nsCOMPtr<nsIDOMXPathResult> nodeset;
-  PRUint32 nodesetSize = 0;
-
-  if (bindExpr.IsEmpty()) {
-    nsAutoString nodesetExpr;
-    mElement->GetAttribute(NS_LITERAL_STRING("nodeset"), nodesetExpr);
-    if (!nodesetExpr.IsEmpty()) {
-      // Evaluate the nodeset attribute within the insert context.
-      rv = nsXFormsUtils::EvaluateXPath(nodesetExpr, contextNode, mElement,
-                                        nsIDOMXPathResult::ORDERED_NODE_SNAPSHOT_TYPE,
-                                        getter_AddRefs(nodeset));
-      NS_ENSURE_SUCCESS(rv, rv);
-    }
-  } else {
-    PRBool usesModelBinding;
-    rv = nsXFormsUtils::EvaluateNodeBinding(mElement,
-                                            nsXFormsUtils::ELEMENT_WITH_MODEL_ATTR,
-                                            EmptyString(),
-                                            EmptyString(),
-                                            nsIDOMXPathResult::ORDERED_NODE_SNAPSHOT_TYPE,
-                                            getter_AddRefs(model),
-                                            getter_AddRefs(nodeset),
-                                            &usesModelBinding);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    if (!model)
-      return NS_OK;
-  }
-
-  if (nodeset) {
-    rv = nodeset->GetSnapshotLength(&nodesetSize);
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
-
-  // The insert action is terminated with no effect if the context attribute
-  // is not given and the Node Set Binding node-set is the empty node-set.
-  //
-  // The delete action is terminated with no effect if the Node Set Binding
-  // node-set is the empty node-set.
-  if (!nodeset || nodesetSize < 1) {
-    if (!mIsInsert || (mIsInsert && contextExpr.IsEmpty()))
-      return NS_OK;
-  }
-
-  //
-  // Step 3 (Insert): Determine the origin node-set.
-  //
-  nsCOMPtr<nsIDOMXPathResult> originNodeset;
-  nsCOMPtr<nsIDOMXPathResult> originNode;
-  PRUint32 originNodesetSize = 0;
-
-  if (mIsInsert) {
-    // If the origin attribute is not given and the Node Set Binding node-set
-    // is empty, then the origin node-set is the empty node-set. Otherwise,
-    // if the origin attribute is not given, then the origin node-set consists
-    // of the last node of the Node Set Binding node-set (which we will obtain
-    // just before performing the insert).
-    //
-    // If the origin attribute is given, the origin node-set is the result of
-    // the evaluation of the origin attribute in the insert context.
-    nsAutoString origin;
-    mElement->GetAttribute(NS_LITERAL_STRING("origin"), origin);
-
-    if (!origin.IsEmpty()) {
-      rv = nsXFormsUtils::EvaluateXPath(origin, contextNode, mElement,
-                                        nsIDOMXPathResult::ORDERED_NODE_SNAPSHOT_TYPE,
-                                        getter_AddRefs(originNodeset));
-      NS_ENSURE_SUCCESS(rv, rv);
-
-      // The insert action is terminated with no effect if the origin node-set
-      // is the empty node-set.
-      if (!originNodeset)
-        return NS_OK;
-
-      rv = originNodeset->GetSnapshotLength(&originNodesetSize);
-      NS_ENSURE_SUCCESS(rv, rv);
-
-      // The insert action is terminated with no effect if the origin node-set
-      // is the empty node-set.
-      if (originNodesetSize < 1)
-        return NS_OK;
-    }
-  }
-
-  //
-  // Step 4 (Insert), Step 3 (Delete):
-  // Determine the insert/delete location node.
-  //
-  // Insert: If the Node Set Binding node-set is not specified or empty, the
-  // insert location node is the insert context node. Otherwise, if the at
-  // attribute is not given, then the insert location node is the last node
-  // of the Node Set Binding node-set. Otherwise, an insert location node is
-  // determined from the at attribute.
-  //
-  // Delete: If the at attribute is not specified, there is no delete location.
-  // Otherwise, the delete location is determined by evaluating the XPath
-  // expression specified by the at attribute.
-  //
-
-  nsCOMPtr<nsIDOMNode> locationNode;
-  PRUint32 atInt = 0;
-  double atDoub = 0;
-
-  nsAutoString atExpr;
-  mElement->GetAttribute(NS_LITERAL_STRING("at"), atExpr);
-        
-  if (mIsInsert) {
-    if (!nodeset || nodesetSize < 1) {
-       // The insert location node is the insert context node.
-       locationNode = contextNode;
-    } else if (atExpr.IsEmpty()) {
-      // The insert location node is the last node of the Node Set Binding
-      // node-set.
-      nodeset->SnapshotItem(nodesetSize - 1, getter_AddRefs(locationNode));
-      NS_ENSURE_STATE(locationNode);
-    }
-  }
-
-  if (!locationNode) {
-    // For insert, we have a nodeset and got past the special cases of an empty
-    // nodeset or no @at expression so the insert location node is determined by
-    // @at.
-    //
-    // For delete, the delete location is determined by the @at expression if
-    // present; otherwise there is no delete location and each node in the
-    // Node Set Binding node-set is deleted, unless the node is the root
-    // document element of an instance.
-    if (!atExpr.IsEmpty()) {
-      // The evaluation context node is the first node in document order of
-      // the Node Set Binding node-set.
-      nsCOMPtr<nsIDOMNode> evalContextNode;
-      nodeset->SnapshotItem(0, getter_AddRefs(evalContextNode));
-
-      // The context size is the size of the Node Set Binding node-set and
-      // the context position is 1.
-      nsCOMPtr<nsIDOMXPathResult> xpRes;
-      rv = nsXFormsUtils::EvaluateXPath(atExpr, evalContextNode, mElement,
-                                        nsIDOMXPathResult::NUMBER_TYPE,
-                                        getter_AddRefs(xpRes), 1, nodesetSize);
-
-      if (xpRes) {
-        rv = xpRes->GetNumberValue(&atDoub);
-        NS_ENSURE_SUCCESS(rv, rv);
-      }
-
-      // Determine the insert/delete location.
-      if (atDoub < 1) {
-        atInt = 1;
-      } else {
-        // If the location is greater than the nodeset size or NaN,
-        // the location is the end of the nodeset.
-        // XXX: Need to check for NaN but isnan() is not portable.
-        atInt = (PRInt32) floor(atDoub+0.5);
-        if (atInt > nodesetSize)
-          atInt = nodesetSize;
-      }
-
-      // The location node is the node in the Node Set Binding node-set at
-      // the position given by the location.
-      nodeset->SnapshotItem(atInt - 1, getter_AddRefs(locationNode));
-      NS_ENSURE_STATE(locationNode);
-    }
-  }
-
-  //
-  // Step 5 (Insert): Each node in the origin node-set is cloned in the
-  // order it appears in the origin node-set. If the origin node-set is empty
-  // (Step 3), the origin node-set consists of the last node of the Node Set
-  // Binding node-set.
-  //
-  // The clones are deep copies of the original nodes except the contents of
-  // nodes of type xsd:ID are modified to remain as unique values in the
-  // instance data after the clones are inserted.
-  //
-  // XXX: Need to modify the contents of nodes of type xsd:ID to remain
-  // unique.
-
-  nsCOMArray<nsIDOMNode> cloneNodes;
-  nsCOMPtr<nsIDOMXPathResult> cloneNodeset;
-  PRUint32 cloneNodesetSize = 0;
-
-  if (mIsInsert) {
-    nsCOMPtr<nsIDOMNode> prototypeNode, newNode;
-    PRUint32 cloneIndex;
-    
-    // Get prototype node(s) and clone.
-    if (originNodesetSize < 1) {
-      // Origin nodeset is empty. Clone the last node of nodeset.
-      cloneNodeset = nodeset;
-      cloneNodesetSize = nodesetSize;
-      cloneIndex = nodesetSize - 1;
-    } else {
-      // Clone all the nodes in the origin node-set.
-      cloneNodeset = originNodeset;
-      cloneNodesetSize = originNodesetSize;
-      cloneIndex = 0;
-    }
-
-    cloneNodeset->SnapshotItem(cloneIndex, getter_AddRefs(prototypeNode));
-    NS_ENSURE_STATE(prototypeNode);
-
-    // The prototypeNode (node to be cloned) and the locationNode (node to
-    // which the clone will be inserted) may belong to different instances.
-    nsCOMPtr<nsIDOMDocument> originDoc, locationDoc;
-    prototypeNode->GetOwnerDocument(getter_AddRefs(originDoc));
-    NS_ENSURE_STATE(originDoc);
-    locationNode->GetOwnerDocument(getter_AddRefs(locationDoc));
-    NS_ENSURE_STATE(locationDoc);
-
-    while ((cloneIndex < cloneNodesetSize) && prototypeNode) {
-      if (!SameCOMIdentity(originDoc, locationDoc)) {
-        locationDoc->ImportNode(prototypeNode, PR_TRUE, getter_AddRefs(newNode));
-      } else {
-        prototypeNode->CloneNode(PR_TRUE, getter_AddRefs(newNode));
-      }
-      NS_ENSURE_STATE(newNode);
-      cloneNodes.AppendObject(newNode);
-
-      // Get the next node in the node-set.
-      ++cloneIndex;
-      cloneNodeset->SnapshotItem(cloneIndex, getter_AddRefs(prototypeNode));
-    }
-  }
-
-  //
-  // Step 6 and 7 (Insert): Determine the target location (Steps 6a-d) and
-  // insert all of the nodes that were cloned in Step 5.
-  //
-  // Step 4 (Delete): Delete the nodes.
-  //
-  
-  nsCOMPtr<nsIDOMDocument> locationDoc;
-  nsCOMPtr<nsIDOMElement> locationDocElement;
-  nsCOMPtr<nsIDOMNode> parentNode, newNode, resNode, instNode;
-  if (mIsInsert) {
-    // The cloned node or nodes are inserted in the order they were cloned at
-    // their target location depending on their node type.
-    nsCOMPtr<nsIDOMNode> newNode;
-    
-    for (PRInt32 i = 0; i < cloneNodes.Count(); ++i) {
-      // Node to be inserted.
-      newNode = cloneNodes[i];
-
-      // Get the node type of the insert node and location node.
-      PRUint16 newNodeType, locationNodeType;
-      newNode->GetNodeType(&newNodeType);
-      locationNode->GetNodeType(&locationNodeType);
-
-      // Step 6a - If the Node Set Binding node-set is not specified or empty
-      // OR Step 6b - If the Node Set Binding node-set is specified and not
-      // empty and the type of the cloned node is different from the type of
-      // the insert location node, the target location depends on the node
-      // type of the cloned node.
-      //
-      // If the cloned node is an attribute, then the target location is before
-      // the first attribute of the insert location node. If the cloned node is
-      // not an attribute, then the target location is before the first child
-      // of the insert location node.
-      if ((!nodeset || nodesetSize < 1) ||
-          (nodeset && nodesetSize > 0 && newNodeType != locationNodeType)) {
-        Location location = eLocation_Before;
-        if (newNodeType != nsIDOMNode::ATTRIBUTE_NODE) {
-          // Target location is before the first child of location node. If the
-          // location node is empty (has no children), it remains the location
-          // node and the new node will become the first child of the location
-          // node.
-          nsCOMPtr<nsIDOMNode> targetNode;
-          locationNode->GetFirstChild(getter_AddRefs(targetNode));
-          if (targetNode) {
-            locationNode.swap(targetNode);
-          } else {
-            // New node will become first child of locationNode.
-            location = eLocation_FirstChild;
-          }
-        }
-        InsertNode(locationNode, newNode, location, getter_AddRefs(resNode));
-      } else {
-          // Step 6c - If insert location node is the root element of an
-          // instance, then that instance root element location is the target
-          // location and the cloned node replaces the instance element. If
-          // there is more than one cloned node to insert, only the first node
-          // that does not cause a conflict is considered.
-          //
-          locationNode->GetOwnerDocument(getter_AddRefs(locationDoc));
-          NS_ENSURE_STATE(locationDoc);
-          locationDoc->GetDocumentElement(getter_AddRefs(locationDocElement));
-
-          if (SameCOMIdentity(locationNode, locationDocElement)) {
-            // Step 7 - Replace the instance element with the first element
-            // node of the cloned node(s).
-            nsCOMPtr<nsIDOMNode> insertNode;
-            GetFirstNodeOfType(&cloneNodes, nsIDOMNode::ELEMENT_NODE,
-                               getter_AddRefs(insertNode));
-            if (insertNode) {
-              nsCOMPtr<nsIDOMNode> child;
-              locationDoc->RemoveChild(locationNode, getter_AddRefs(child));
-              locationDoc->AppendChild(insertNode, getter_AddRefs(resNode));
-              // Done...because we only consider the first node that does
-              // not cause a conflict.
-              break;
-            }
-          } else {
-            // Step 6d - the target location is immediately before or after the
-            // insert location node, based on the position attribute setting or
-            // its default.
-            PRBool insertAfter = PR_TRUE;
-            nsAutoString position;
-            mElement->GetAttribute(NS_LITERAL_STRING("position"), position);
-            if (!position.IsEmpty()) {
-              if (position.EqualsLiteral("before")) {
-                insertAfter = PR_FALSE;
-              } else if (!position.EqualsLiteral("after")) {
-                // This is not a valid document...
-                return NS_ERROR_FAILURE;
-              }
-            }
-            InsertNode(locationNode, newNode,
-                       insertAfter ? eLocation_After: eLocation_Before,
-                       getter_AddRefs(resNode));
-          }
-        }
-      }
-      rv = nsXFormsUtils::GetInstanceNodeForData(resNode, getter_AddRefs(instNode));
-      NS_ENSURE_SUCCESS(rv, rv);
-
-    // Step 8: Set indexes for repeats
-    rv = RefreshRepeats(&cloneNodes);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-  } else {
-    // Delete
-    // If there is no delete location, each node in the Node Set Binding
-    // node-set is deleted, unless the node is the root document element of an
-    // instance.
-    //
-    // If there is a delete location, the node at the delete location in the
-    // Node Set Binding node-set is deleted, unless the node is the root
-    // document element of an instance.
-    PRBool didDelete = PR_FALSE;
-
-    PRUint32 deleteIndex, deleteCount;
-
-    if (!locationNode) {
-      // Delete all the nodes in the node-set.
-      deleteIndex = 0;
-      deleteCount = nodesetSize;
-    } else {
-      // Delete the node at the delete location.
-      deleteIndex = atInt - 1;
-      deleteCount = atInt;
-    }
-
-    nodeset->SnapshotItem(deleteIndex, getter_AddRefs(locationNode));
-    NS_ENSURE_STATE(locationNode);
-
-    locationNode->GetOwnerDocument(getter_AddRefs(locationDoc));
-    NS_ENSURE_STATE(locationDoc);
-
-    rv = nsXFormsUtils::GetInstanceNodeForData(locationNode, getter_AddRefs(instNode));
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    locationDoc->GetDocumentElement(getter_AddRefs(locationDocElement));
-    while ((deleteIndex < deleteCount) && locationNode) {
-      // Delete the node(s) unless the delete location is the root document
-      // element of an instance.
-      PRUint16 locationNodeType;
-      locationNode->GetNodeType(&locationNodeType);
-      if (locationNodeType == nsIDOMNode::ATTRIBUTE_NODE) {
-        nsCOMPtr<nsIDOMElement> ownerElement;
-        nsCOMPtr<nsIDOMAttr> attrNode(do_QueryInterface(locationNode));
-        attrNode->GetOwnerElement(getter_AddRefs(ownerElement));
-        NS_ENSURE_STATE(ownerElement);
-
-        nsCOMPtr<nsIDOMAttr> resAttr;
-        ownerElement->RemoveAttributeNode(attrNode, getter_AddRefs(resAttr));
-        resNode = locationNode;
-
-        // Deleted at least one node so delete will not terminate.
-        didDelete = PR_TRUE;
-      } else {
-        if (!SameCOMIdentity(locationNode, locationDocElement)) {
-          locationNode->GetParentNode(getter_AddRefs(parentNode));
-          NS_ENSURE_STATE(parentNode);
-
-          rv = parentNode->RemoveChild(locationNode, getter_AddRefs(resNode));
-          NS_ENSURE_SUCCESS(rv, rv);
-
-          // Deleted at least one node so delete will not terminate.
-          didDelete = PR_TRUE;
-        }
-      }
-      // Get the next node in the node-set.
-      ++deleteIndex;
-      nodeset->SnapshotItem(deleteIndex, getter_AddRefs(locationNode));
-    }
-
-    // The delete action is terminated with no effect if no node is deleted.
-    if (!didDelete)
-      return NS_OK;
-  }
-  NS_ENSURE_STATE(resNode);
-
-  // Dispatch xforms-insert/delete event to the instance node we have modified
-  // data for
-  rv = nsXFormsUtils::DispatchEvent(instNode,
-                                    mIsInsert ? eEvent_Insert : eEvent_Delete);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  // Dispatch refreshing events to the model
-  if (aParentAction) {
-    aParentAction->SetRebuild(model, PR_TRUE);
-    aParentAction->SetRecalculate(model, PR_TRUE);
-    aParentAction->SetRevalidate(model, PR_TRUE);
-    aParentAction->SetRefresh(model, PR_TRUE);
-  } else {
-    rv = model->RequestRebuild();
-    NS_ENSURE_SUCCESS(rv, rv);
-    rv = model->RequestRecalculate();
-    NS_ENSURE_SUCCESS(rv, rv);
-    rv = model->RequestRevalidate();
-    NS_ENSURE_SUCCESS(rv, rv);
-    rv = model->RequestRefresh();
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
-
-  // Repeat this action if it uses the `while` attribute (which must have
-  // evaluated to true to arrive here).
-  if (usesWhile) {
-    return HandleAction(aEvent, aParentAction);
-  }
-
-  return NS_OK;
-}
-
-
-nsresult
-nsXFormsInsertDeleteElement::GetFirstNodeOfType(nsCOMArray<nsIDOMNode> *aNodes,
-                                                PRUint16 aNodeType,
-                                                nsIDOMNode **aResult)
-{
-  nsCOMPtr<nsIDOMNode> currentNode;
-
-  for (PRInt32 i = 0; i < aNodes->Count(); ++i) {
-    currentNode = aNodes->ObjectAt(i);
-    PRUint16 nodeType;
-    currentNode->GetNodeType(&nodeType);
-    if (nodeType == aNodeType) {
-      NS_IF_ADDREF(*aResult = currentNode);
-      break;
-    }
-  }
-
-  return NS_OK;
-}
-
-nsresult
-nsXFormsInsertDeleteElement::InsertNode(nsIDOMNode *aTargetNode,
-                                        nsIDOMNode *aNewNode,
-                                        Location   aLocation,
-                                        nsIDOMNode **aResNode)
-{
-  NS_ENSURE_ARG(aTargetNode);
-  NS_ENSURE_ARG(aNewNode);
-  NS_ENSURE_ARG_POINTER(aResNode);
-
-  // Make sure the result node is null in case we encounter a condition
-  // where the node cannot be inserted and is skipped.
-  *aResNode = nsnull;
-
-  // Step 7 - The new node is inserted at the target location depending on its
-  // node type. If the cloned node is a duplicate of another attribute in its
-  // parent element, then the duplicate attribute is first removed. If a cloned
-  // node cannot be placed at the target location due to a node type conflict,
-  // then the insertion for that particular clone node is ignored.
-  nsCOMPtr<nsIDOMNode> resNode;
-  
-  PRUint16 targetNodeType, newNodeType;
-  aTargetNode->GetNodeType(&targetNodeType);
-  aNewNode->GetNodeType(&newNodeType);
-  
-  if (newNodeType == nsIDOMNode::ATTRIBUTE_NODE) {
-    // Can add an attribute to an element node or the owning element
-    // of an attribute node.
-    nsCOMPtr<nsIDOMElement> ownerElement;
-
-    if (targetNodeType == nsIDOMNode::ELEMENT_NODE) {
-      ownerElement = do_QueryInterface(aTargetNode);
-    } else if (targetNodeType == nsIDOMNode::ATTRIBUTE_NODE) {
-      nsCOMPtr<nsIDOMAttr> targetAttrNode(do_QueryInterface(aTargetNode));
-      targetAttrNode->GetOwnerElement(getter_AddRefs(ownerElement));
-    }
-    NS_ENSURE_STATE(ownerElement);
-
-    // Check for a duplicate attribute.
-    nsAutoString attrNamespace, attrName, attrValue;
-    aNewNode->GetNamespaceURI(attrNamespace);
-    aNewNode->GetLocalName(attrName);
-    aNewNode->GetNodeValue(attrValue);
-
-    PRBool hasAttribute = PR_FALSE;
-    ownerElement->HasAttributeNS(attrNamespace, attrName, &hasAttribute);
-    if (hasAttribute) {
-      ownerElement->RemoveAttributeNS(attrNamespace, attrName);
-    }
-    ownerElement->SetAttributeNS(attrNamespace, attrName, attrValue);
-    resNode = aTargetNode;
-    resNode.swap(*aResNode);
-
-  } else {
-    // New node will be inserted at location aLocation.
-    nsCOMPtr<nsIDOMNode> targetNode = aTargetNode;
-
-    nsCOMPtr<nsIDOMNode> parentNode;
-    targetNode->GetParentNode(getter_AddRefs(parentNode));
-    NS_ENSURE_STATE(parentNode);
-
-    if (aLocation == eLocation_FirstChild) {
-      aTargetNode->AppendChild(aNewNode, getter_AddRefs(resNode));
-      resNode.swap(*aResNode);
-    } else {
-      if (aLocation == eLocation_After) {
-        // If we're at the end of the nodeset, this returns nsnull, which is
-        // fine, because InsertBefore then inserts at the end of the nodeset.
-        aTargetNode->GetNextSibling(getter_AddRefs(targetNode));
-      }
-      parentNode->InsertBefore(aNewNode, targetNode,
-                               getter_AddRefs(resNode));
-      resNode.swap(*aResNode);
-    }
-  }
-  
-  return NS_OK;
-}
-
-nsresult
-nsXFormsInsertDeleteElement::RefreshRepeats(nsCOMArray<nsIDOMNode> *aNodes)
-{
-  // XXXbeaufour: only check repeats belonging to the same model...
-  // possibly use mFormControls? Should be quicker than searching through
-  // entire document!! mModel->GetControls("repeat"); Would also possibly
-  // save a QI?
-
-  nsCOMPtr<nsIDOMDocument> document;
-
-  nsresult rv = mElement->GetOwnerDocument(getter_AddRefs(document));
-  NS_ENSURE_STATE(document);
-
-  nsCOMPtr<nsIDOMNodeList> repeatNodes;
-  document->GetElementsByTagNameNS(NS_LITERAL_STRING(NS_NAMESPACE_XFORMS),
-                                   NS_LITERAL_STRING("repeat"),
-                                   getter_AddRefs(repeatNodes));
-  NS_ENSURE_STATE(repeatNodes);
-
-  // work over each node and if the node contains the inserted element
-  PRUint32 nodeCount;
-  rv = repeatNodes->GetLength(&nodeCount);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  for (PRUint32 node = 0; node < nodeCount; ++node) {
-    nsCOMPtr<nsIDOMNode> repeatNode;
-
-    rv = repeatNodes->Item(node, getter_AddRefs(repeatNode));
-    nsCOMPtr<nsIXFormsRepeatElement> repeatEl(do_QueryInterface(repeatNode));
-    NS_ENSURE_STATE(repeatEl);
-
-    for (PRInt32 i = 0; i < aNodes->Count(); ++i) {
-      nsCOMPtr<nsIDOMNode> newNode = aNodes->ObjectAt(i);
-      rv = repeatEl->HandleNodeInsert(newNode);
-      NS_ENSURE_SUCCESS(rv, rv);
-    }
-  }
-
-  return NS_OK;
-}
- 
-
-NS_HIDDEN_(nsresult)
-NS_NewXFormsInsertElement(nsIXTFElement **aResult)
-{
-  *aResult = new nsXFormsInsertDeleteElement(PR_TRUE);
-  if (!*aResult)
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  NS_ADDREF(*aResult);
-  return NS_OK;
-}
-
-
-NS_HIDDEN_(nsresult)
-NS_NewXFormsDeleteElement(nsIXTFElement **aResult)
-{
-  *aResult = new nsXFormsInsertDeleteElement(PR_FALSE);
-  if (!*aResult)
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  NS_ADDREF(*aResult);
-  return NS_OK;
-}
+/* -*- 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 XForms code.
+ *
+ * The Initial Developer of the Original Code is
+ * Novell, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2005
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Allan Beaufour <abeaufour@novell.com>
+ *  Merle Sterling <msterlin@us.ibm.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of 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 "nsIDOMAttr.h"
+#include "nsIDOMEvent.h"
+#include "nsIDOMNode.h"
+#include "nsIDOMElement.h"
+#include "nsIDOMDocument.h"
+#include "nsIDOMNodeList.h"
+#include "nsIDOMNamedNodeMap.h"
+#include "nsIXFormsRepeatElement.h"
+#include "nsIXFormsControl.h"
+#include "nsIXFormsContextInfo.h"
+
+#include "nsStringAPI.h"
+
+#include "nsIInstanceElementPrivate.h"
+#include "nsXFormsActionModuleBase.h"
+#include "nsXFormsActionElement.h"
+#include "nsXFormsUtils.h"
+#include "nsIDOM3Node.h"
+
+#include "math.h"
+
+#ifdef DEBUG
+//#define DEBUG_XF_INSERTDELETE
+#endif
+
+/**
+ * Implementation of the XForms \<insert\> and \<delete\> elements.
+ */
+class nsXFormsInsertDeleteElement : public nsXFormsActionModuleBase
+{
+private:
+  PRBool mIsInsert;
+
+  enum Location {
+    eLocation_After,
+    eLocation_Before,
+    eLocation_FirstChild
+  };
+
+  // Context Info for events.
+  nsCOMArray<nsIXFormsContextInfo> mContextInfo;
+
+  /** Get the first node of a given type in aNodes.
+   *
+   *  @param aNodes        array of nodes
+   *  @param aNodeType     type of node to find
+   *
+   *  @return aResult      node of type aNodeType
+   */
+  nsresult GetFirstNodeOfType(nsCOMArray<nsIDOMNode> *aNodes,
+                              PRUint16 aNodeType,
+                              nsIDOMNode **aResult);
+
+  /** Insert a node.
+   *
+   *  @param aTargetNode     target location node
+   *  @param aNewNode        node to insert
+   *  @param aLocation       insert location relative to target
+   *
+   *  @return aResult        result node
+   */
+  nsresult InsertNode(nsIDOMNode *aTargetNode, nsIDOMNode *aNewNode,
+                      Location aLocation, nsIDOMNode **aResNode);
+
+  nsresult RefreshRepeats(nsCOMArray<nsIDOMNode> *aNodes);
+
+public:
+  /** Constructor */
+  nsXFormsInsertDeleteElement(PRBool aIsInsert) : mIsInsert(aIsInsert) {}
+
+  NS_IMETHOD
+  HandleAction(nsIDOMEvent* aEvent, nsIXFormsActionElement *aParentAction);
+
+  /**
+   * Normally, an action element implements the body of its action handler
+   * using this method; however, since an `nsXFormsInsertDeleteElement` sets
+   * up additional context before evaluating `if` and `while`, it overrides
+   * the `HandleAction` method instead to get full control over the
+   * execution of its action.
+   */
+  nsresult HandleSingleAction(nsIDOMEvent* aEvent,
+                              nsIXFormsActionElement *aParentAction)
+  {
+    return NS_OK;
+  }
+};
+
+NS_IMETHODIMP
+nsXFormsInsertDeleteElement::HandleAction(nsIDOMEvent            *aEvent,
+                                          nsIXFormsActionElement *aParentAction)
+{
+  // Keep element alive while iterating.
+  nsCOMPtr<nsIDOMElement> element = mElement;
+  if (!element)
+    return NS_OK;
+
+  mCurrentEvent = aEvent;
+
+  nsresult rv;
+
+  // Set the maximum run time for the loop (in microseconds).
+  PRTime microseconds = nsXFormsUtils::waitLimit * PR_USEC_PER_SEC;
+  PRTime runTime = 0, start = PR_Now();
+  while (PR_TRUE) {
+    //
+    // Step 1 (Insert or Delete): Determine the insert/delete context.
+    //
+    // If the bind attribute is present or if the context attribute is not given,
+    // the insert context is the in-scope evaluation context. Otherwise, the
+    // XPath expression provided by the context attribute is evaluated using the
+    // in-scope evaluation context, and the first node rule is applied to obtain
+    // the insert context.
+    //
+    nsCOMPtr<nsIDOMXPathResult> contextNodeset;
+    nsCOMPtr<nsIDOMNode> contextNode;
+    PRUint32 contextNodesetSize = 0;
+    PRInt32 contextPosition;
+  
+    // Get the in-scope evaluation context. The last parameter to GetNodeContext
+    // indicates whether it should try to get the context using @bind. We want to
+    // ignore @bind because it should not change the in-scope evaluation context
+    // for insert.
+    nsCOMPtr<nsIModelElementPrivate> model;
+    nsCOMPtr<nsIDOMElement> bindElement;
+    nsCOMPtr<nsIXFormsControl> parentControl;
+    PRBool outerBind;
+    rv = nsXFormsUtils::GetNodeContext(element,
+                                       nsXFormsUtils::ELEMENT_WITH_MODEL_ATTR,
+                                       getter_AddRefs(model),
+                                       getter_AddRefs(bindElement),
+                                       &outerBind,
+                                       getter_AddRefs(parentControl),
+                                       getter_AddRefs(contextNode),
+                                       &contextPosition,
+                                       (PRInt32*)&contextNodesetSize,
+                                       PR_FALSE);
+  
+    NS_ENSURE_SUCCESS(rv, rv);
+  
+    // Determine if the context node is specified via @context.
+    // If @bind is present, @context is ignored.
+    nsAutoString bindExpr;
+    nsAutoString contextExpr;
+    element->GetAttribute(NS_LITERAL_STRING("bind"), bindExpr);
+    element->GetAttribute(NS_LITERAL_STRING("context"), contextExpr);
+  
+    if (bindExpr.IsEmpty() && !contextExpr.IsEmpty()) {
+      // @context is specified and overrides the in-scope evaluation context.
+      // The insert context is the result of evaluating @context in the current
+      // in-scope evaluation context.
+      rv = nsXFormsUtils::EvaluateXPath(contextExpr, contextNode, element,
+                                        nsIDOMXPathResult::ORDERED_NODE_SNAPSHOT_TYPE,
+                                        getter_AddRefs(contextNodeset));
+      NS_ENSURE_SUCCESS(rv, rv);
+  
+      // The insert/delete action is terminated with no effect if the context
+      // is the empty node-set.
+      if (contextNodeset) {
+        rv = contextNodeset->GetSnapshotLength(&contextNodesetSize);
+        NS_ENSURE_SUCCESS(rv, rv);
+    
+        if (contextNodesetSize < 1)
+          return NS_OK;
+    
+        // Context node is the first node in the nodeset.
+        contextNodeset->SnapshotItem(0, getter_AddRefs(contextNode));
+        contextPosition = 1;
+      }
+    }
+  
+    // The insert/delete action is terminated with no effect if the context
+    // is the empty node-set.
+    if (!contextNode)
+      return NS_OK;
+  
+    // The insert action is terminated with no effect if the context attribute
+    // is given and the insert context does not evaluate to an element node.
+    if (mIsInsert && !contextExpr.IsEmpty()) {
+      PRUint16 nodeType;
+      contextNode->GetNodeType(&nodeType);
+      if (nodeType != nsIDOMNode::ELEMENT_NODE)
+        return NS_OK;
+    }
+  
+    // Test the `if` and `while` attributes to determine whether this action
+    // can be performed and should be repeated.  As the insert and delete
+    // actions can change their context, we do this testing here instead of
+    // relying on the default logic from our parent class' `HandleAction`
+    // (or `DoHandleAction`) definition.
+    PRBool usesWhile;
+    if (!nsXFormsActionModuleBase::CanPerformAction(element, &usesWhile,
+                                                    contextNode,
+                                                    contextNodesetSize,
+                                                    contextPosition)) {
+      return NS_OK;
+    }
+  
+    //
+    // Step 2 (Insert or Delete): Determine the node-set binding.
+    //
+    // If the bind attribute is present, it directly determines the Node Set
+    // Binding node-set. If a nodeset attribute is present, it is evaluated
+    // within the context to determine the Node Set Binding node-set.
+    //
+    // A NodeSet binding attribute (@bind or @nodeset) is required unless
+    // the context attribute is present.
+    //
+    nsCOMPtr<nsIDOMXPathResult> nodeset;
+    PRUint32 nodesetSize = 0;
+    nsAutoString nodesetExpr;
+  
+    if (bindExpr.IsEmpty()) {
+      element->GetAttribute(NS_LITERAL_STRING("nodeset"), nodesetExpr);
+      if (!nodesetExpr.IsEmpty()) {
+        // Evaluate the nodeset attribute within the insert context.
+        rv = nsXFormsUtils::EvaluateXPath(nodesetExpr, contextNode, element,
+                                          nsIDOMXPathResult::ORDERED_NODE_SNAPSHOT_TYPE,
+                                          getter_AddRefs(nodeset));
+        NS_ENSURE_SUCCESS(rv, rv);
+      }
+    } else {
+      PRBool usesModelBinding;
+      rv = nsXFormsUtils::EvaluateNodeBinding(element,
+                                              nsXFormsUtils::ELEMENT_WITH_MODEL_ATTR,
+                                              EmptyString(),
+                                              EmptyString(),
+                                              nsIDOMXPathResult::ORDERED_NODE_SNAPSHOT_TYPE,
+                                              getter_AddRefs(model),
+                                              getter_AddRefs(nodeset),
+                                              &usesModelBinding);
+      NS_ENSURE_SUCCESS(rv, rv);
+  
+      if (!model)
+        return NS_OK;
+    }
+  
+    if (nodeset) {
+      rv = nodeset->GetSnapshotLength(&nodesetSize);
+      NS_ENSURE_SUCCESS(rv, rv);
+    }
+  
+    // The insert action is terminated with no effect if the context attribute
+    // is not given and the Node Set Binding node-set is the empty node-set.
+    //
+    // The delete action is terminated with no effect if the Node Set Binding
+    // node-set is the empty node-set.
+    if (!nodeset || nodesetSize < 1) {
+      if (!mIsInsert || (mIsInsert && contextExpr.IsEmpty()))
+        return NS_OK;
+    }
+  
+    //
+    // Step 3 (Insert): Determine the origin node-set.
+    //
+    nsCOMPtr<nsIDOMXPathResult> originNodeset;
+    nsCOMPtr<nsIDOMXPathResult> originNode;
+    PRUint32 originNodesetSize = 0;
+  
+    if (mIsInsert) {
+      // If the origin attribute is not given and the Node Set Binding node-set
+      // is empty, then the origin node-set is the empty node-set. Otherwise,
+      // if the origin attribute is not given, then the origin node-set consists
+      // of the last node of the Node Set Binding node-set (which we will obtain
+      // just before performing the insert).
+      //
+      // If the origin attribute is given, the origin node-set is the result of
+      // the evaluation of the origin attribute in the insert context.
+      nsAutoString origin;
+      element->GetAttribute(NS_LITERAL_STRING("origin"), origin);
+  
+      if (!origin.IsEmpty()) {
+        rv = nsXFormsUtils::EvaluateXPath(origin, contextNode, element,
+                                          nsIDOMXPathResult::ORDERED_NODE_SNAPSHOT_TYPE,
+                                          getter_AddRefs(originNodeset));
+        NS_ENSURE_SUCCESS(rv, rv);
+  
+        // The insert action is terminated with no effect if the origin node-set
+        // is the empty node-set.
+        if (!originNodeset)
+          return NS_OK;
+  
+        rv = originNodeset->GetSnapshotLength(&originNodesetSize);
+        NS_ENSURE_SUCCESS(rv, rv);
+  
+        // The insert action is terminated with no effect if the origin node-set
+        // is the empty node-set.
+        if (originNodesetSize < 1)
+          return NS_OK;
+  
+        // Context Info: 'origin-nodes'
+        nsCOMPtr<nsXFormsContextInfo> contextInfo =
+          new nsXFormsContextInfo(element);
+        NS_ENSURE_TRUE(contextInfo, NS_ERROR_OUT_OF_MEMORY);
+        contextInfo->SetNodesetValue("origin-nodes", originNodeset);
+        mContextInfo.AppendObject(contextInfo);
+      }
+    }
+  
+    //
+    // Step 4 (Insert), Step 3 (Delete):
+    // Determine the insert/delete location node.
+    //
+    // Insert: If the Node Set Binding node-set is not specified or empty, the
+    // insert location node is the insert context node. Otherwise, if the at
+    // attribute is not given, then the insert location node is the last node
+    // of the Node Set Binding node-set. Otherwise, an insert location node is
+    // determined from the at attribute.
+    //
+    // Delete: If the at attribute is not specified, there is no delete location.
+    // Otherwise, the delete location is determined by evaluating the XPath
+    // expression specified by the at attribute.
+    //
+  
+    nsCOMPtr<nsIDOMNode> locationNode;
+    PRUint32 atInt = 0;
+    double atDoub = 0;
+  
+    nsAutoString atExpr;
+    element->GetAttribute(NS_LITERAL_STRING("at"), atExpr);
+          
+    if (mIsInsert) {
+      if (!nodeset || nodesetSize < 1) {
+         // The insert location node is the insert context node.
+         locationNode = contextNode;
+      } else if (atExpr.IsEmpty()) {
+        // The insert location node is the last node of the Node Set Binding
+        // node-set.
+        nodeset->SnapshotItem(nodesetSize - 1, getter_AddRefs(locationNode));
+        NS_ENSURE_STATE(locationNode);
+      }
+    }
+  
+    if (!locationNode) {
+      // For insert, we have a nodeset and got past the special cases of an empty
+      // nodeset or no @at expression so the insert location node is determined by
+      // @at.
+      //
+      // For delete, the delete location is determined by the @at expression if
+      // present; otherwise there is no delete location and each node in the
+      // Node Set Binding node-set is deleted, unless the node is the root
+      // document element of an instance.
+      if (!atExpr.IsEmpty()) {
+        // The evaluation context node is the first node in document order of
+        // the Node Set Binding node-set.
+        nsCOMPtr<nsIDOMNode> evalContextNode;
+        nodeset->SnapshotItem(0, getter_AddRefs(evalContextNode));
+  
+        // The context size is the size of the Node Set Binding node-set and
+        // the context position is 1.
+        nsCOMPtr<nsIDOMXPathResult> xpRes;
+        rv = nsXFormsUtils::EvaluateXPath(atExpr, evalContextNode, element,
+                                          nsIDOMXPathResult::NUMBER_TYPE,
+                                          getter_AddRefs(xpRes), 1, nodesetSize);
+  
+        if (xpRes) {
+          rv = xpRes->GetNumberValue(&atDoub);
+          NS_ENSURE_SUCCESS(rv, rv);
+        }
+  
+        // Determine the insert/delete location.
+        if (atDoub < 1) {
+          atInt = 1;
+        } else {
+          // If the location is greater than the nodeset size or NaN,
+          // the location is the end of the nodeset.
+          // XXX: Need to check for NaN but isnan() is not portable.
+          atInt = (PRInt32) floor(atDoub+0.5);
+          if (atInt > nodesetSize)
+            atInt = nodesetSize;
+        }
+  
+        // The location node is the node in the Node Set Binding node-set at
+        // the position given by the location.
+        nodeset->SnapshotItem(atInt - 1, getter_AddRefs(locationNode));
+        NS_ENSURE_STATE(locationNode);
+      }
+    }
+  
+    // Context Info: 'insert-location-node' or 'delete-location'
+    nsCOMPtr<nsXFormsContextInfo> contextInfo;
+    if (mIsInsert) {
+      contextInfo = new nsXFormsContextInfo(element);
+      NS_ENSURE_TRUE(contextInfo, NS_ERROR_OUT_OF_MEMORY);
+      contextInfo->SetNodeValue("insert-location-node", locationNode);
+      mContextInfo.AppendObject(contextInfo);
+    } else {
+      contextInfo = new nsXFormsContextInfo(element);
+      NS_ENSURE_TRUE(contextInfo, NS_ERROR_OUT_OF_MEMORY);
+      contextInfo->SetNumberValue("delete-location", atInt);
+      mContextInfo.AppendObject(contextInfo);
+    }
+  
+    //
+    // Step 5 (Insert): Each node in the origin node-set is cloned in the
+    // order it appears in the origin node-set. If the origin node-set is empty
+    // (Step 3), the origin node-set consists of the last node of the Node Set
+    // Binding node-set.
+    //
+    // The clones are deep copies of the original nodes except the contents of
+    // nodes of type xsd:ID are modified to remain as unique values in the
+    // instance data after the clones are inserted.
+    //
+    // XXX: Need to modify the contents of nodes of type xsd:ID to remain
+    // unique.
+  
+    nsCOMArray<nsIDOMNode> cloneNodes;
+    nsCOMPtr<nsIDOMXPathResult> cloneNodeset;
+    PRUint32 cloneNodesetSize = 0;
+  
+    if (mIsInsert) {
+      nsCOMPtr<nsIDOMNode> prototypeNode, newNode;
+      PRUint32 cloneIndex;
+      
+      // Get prototype node(s) and clone.
+      if (originNodesetSize < 1) {
+        // Origin nodeset is empty. Clone the last node of nodeset.
+        cloneNodeset = nodeset;
+        cloneNodesetSize = nodesetSize;
+        cloneIndex = nodesetSize - 1;
+      } else {
+        // Clone all the nodes in the origin node-set.
+        cloneNodeset = originNodeset;
+        cloneNodesetSize = originNodesetSize;
+        cloneIndex = 0;
+      }
+      // Context Info: 'inserted-nodes'
+      nsCOMPtr<nsXFormsContextInfo> contextInfo =
+        new nsXFormsContextInfo(element);
+      NS_ENSURE_TRUE(contextInfo, NS_ERROR_OUT_OF_MEMORY);
+      contextInfo->SetNodesetValue("inserted-nodes", cloneNodeset);
+      mContextInfo.AppendObject(contextInfo);
+  
+      cloneNodeset->SnapshotItem(cloneIndex, getter_AddRefs(prototypeNode));
+      NS_ENSURE_STATE(prototypeNode);
+  
+      // The prototypeNode (node to be cloned) and the locationNode (node to
+      // which the clone will be inserted) may belong to different instances.
+      nsCOMPtr<nsIDOMDocument> originDoc, locationDoc;
+      prototypeNode->GetOwnerDocument(getter_AddRefs(originDoc));
+      NS_ENSURE_STATE(originDoc);
+      locationNode->GetOwnerDocument(getter_AddRefs(locationDoc));
+      NS_ENSURE_STATE(locationDoc);
+  
+      while ((cloneIndex < cloneNodesetSize) && prototypeNode) {
+        if (!SameCOMIdentity(originDoc, locationDoc)) {
+          locationDoc->ImportNode(prototypeNode, PR_TRUE, getter_AddRefs(newNode));
+        } else {
+          prototypeNode->CloneNode(PR_TRUE, getter_AddRefs(newNode));
+        }
+        NS_ENSURE_STATE(newNode);
+        cloneNodes.AppendObject(newNode);
+  
+        // Get the next node in the node-set.
+        ++cloneIndex;
+        cloneNodeset->SnapshotItem(cloneIndex, getter_AddRefs(prototypeNode));
+      }
+    }
+  
+    //
+    // Step 6 and 7 (Insert): Determine the target location (Steps 6a-d) and
+    // insert all of the nodes that were cloned in Step 5.
+    //
+    // Step 4 (Delete): Delete the nodes.
+    //
+    
+    nsCOMPtr<nsIDOMDocument> locationDoc;
+    nsCOMPtr<nsIDOMElement> locationDocElement;
+    nsCOMPtr<nsIDOMNode> parentNode, newNode, resNode, instNode;
+    if (mIsInsert) {
+      // The cloned node or nodes are inserted in the order they were cloned at
+      // their target location depending on their node type.
+      nsCOMPtr<nsIDOMNode> newNode;
+      
+      for (PRInt32 i = 0; i < cloneNodes.Count(); ++i) {
+        // Node to be inserted.
+        newNode = cloneNodes[i];
+  
+        // Get the node type of the insert node and location node.
+        PRUint16 newNodeType, locationNodeType;
+        newNode->GetNodeType(&newNodeType);
+        locationNode->GetNodeType(&locationNodeType);
+  
+        // Step 6a - If the Node Set Binding node-set is not specified or empty
+        // OR Step 6b - If the Node Set Binding node-set is specified and not
+        // empty and the type of the cloned node is different from the type of
+        // the insert location node, the target location depends on the node
+        // type of the cloned node.
+        //
+        // If the cloned node is an attribute, then the target location is before
+        // the first attribute of the insert location node. If the cloned node is
+        // not an attribute, then the target location is before the first child
+        // of the insert location node.
+        if ((!nodeset || nodesetSize < 1) ||
+            (nodeset && nodesetSize > 0 && newNodeType != locationNodeType)) {
+          Location location = eLocation_Before;
+          if (newNodeType != nsIDOMNode::ATTRIBUTE_NODE) {
+            // Target location is before the first child of location node. If the
+            // location node is empty (has no children), it remains the location
+            // node and the new node will become the first child of the location
+            // node.
+            nsCOMPtr<nsIDOMNode> targetNode;
+            locationNode->GetFirstChild(getter_AddRefs(targetNode));
+            if (targetNode) {
+              locationNode.swap(targetNode);
+            } else {
+              // New node will become first child of locationNode.
+              location = eLocation_FirstChild;
+            }
+          }
+          InsertNode(locationNode, newNode, location, getter_AddRefs(resNode));
+        } else {
+            // Step 6c - If insert location node is the root element of an
+            // instance, then that instance root element location is the target
+            // location and the cloned node replaces the instance element. If
+            // there is more than one cloned node to insert, only the first node
+            // that does not cause a conflict is considered.
+            //
+            locationNode->GetOwnerDocument(getter_AddRefs(locationDoc));
+            NS_ENSURE_STATE(locationDoc);
+            locationDoc->GetDocumentElement(getter_AddRefs(locationDocElement));
+  
+            if (SameCOMIdentity(locationNode, locationDocElement)) {
+              // Step 7 - Replace the instance element with the first element
+              // node of the cloned node(s).
+              nsCOMPtr<nsIDOMNode> insertNode;
+              GetFirstNodeOfType(&cloneNodes, nsIDOMNode::ELEMENT_NODE,
+                                 getter_AddRefs(insertNode));
+              if (insertNode) {
+                nsCOMPtr<nsIDOMNode> child;
+                locationDoc->RemoveChild(locationNode, getter_AddRefs(child));
+                locationDoc->AppendChild(insertNode, getter_AddRefs(resNode));
+                // Done...because we only consider the first node that does
+                // not cause a conflict.
+                break;
+              }
+            } else {
+              // Step 6d - the target location is immediately before or after the
+              // insert location node, based on the position attribute setting or
+              // its default.
+              PRBool insertAfter = PR_TRUE;
+              nsAutoString position;
+              element->GetAttribute(NS_LITERAL_STRING("position"), position);
+              if (!position.IsEmpty()) {
+                if (position.EqualsLiteral("before")) {
+                  insertAfter = PR_FALSE;
+                } else if (!position.EqualsLiteral("after")) {
+                  // This is not a valid document...
+                  return NS_ERROR_FAILURE;
+                }
+              }
+              // Context Info: 'position'.
+              nsCOMPtr<nsXFormsContextInfo> contextInfo =
+                new nsXFormsContextInfo(element);
+              NS_ENSURE_TRUE(contextInfo, NS_ERROR_OUT_OF_MEMORY);
+              contextInfo->SetStringValue("position", position);
+              mContextInfo.AppendObject(contextInfo);
+  
+              InsertNode(locationNode, newNode,
+                         insertAfter ? eLocation_After: eLocation_Before,
+                         getter_AddRefs(resNode));
+            }
+          }
+        }
+        rv = nsXFormsUtils::GetInstanceNodeForData(resNode, getter_AddRefs(instNode));
+        NS_ENSURE_SUCCESS(rv, rv);
+  
+      // Step 8: Set indexes for repeats
+      rv = RefreshRepeats(&cloneNodes);
+      NS_ENSURE_SUCCESS(rv, rv);
+  
+    } else {
+      // Delete
+      // If there is no delete location, each node in the Node Set Binding
+      // node-set is deleted, unless the node is the root document element of an
+      // instance.
+      //
+      // If there is a delete location, the node at the delete location in the
+      // Node Set Binding node-set is deleted, unless the node is the root
+      // document element of an instance.
+      PRBool didDelete = PR_FALSE;
+  
+      PRUint32 deleteIndex, deleteCount;
+  
+      if (!locationNode) {
+        // Delete all the nodes in the node-set.
+        deleteIndex = 0;
+        deleteCount = nodesetSize;
+      } else {
+        // Delete the node at the delete location.
+        deleteIndex = atInt - 1;
+        deleteCount = atInt;
+      }
+      // Context Info: 'deleted-nodes'
+      nsCOMPtr<nsXFormsContextInfo> contextInfo =
+        new nsXFormsContextInfo(element);
+      NS_ENSURE_TRUE(contextInfo, NS_ERROR_OUT_OF_MEMORY);
+      contextInfo->SetNodesetValue("deleted-nodes", nodeset);
+      mContextInfo.AppendObject(contextInfo);
+  
+      nodeset->SnapshotItem(deleteIndex, getter_AddRefs(locationNode));
+      NS_ENSURE_STATE(locationNode);
+  
+      locationNode->GetOwnerDocument(getter_AddRefs(locationDoc));
+      NS_ENSURE_STATE(locationDoc);
+  
+      rv = nsXFormsUtils::GetInstanceNodeForData(locationNode, getter_AddRefs(instNode));
+      NS_ENSURE_SUCCESS(rv, rv);
+  
+      locationDoc->GetDocumentElement(getter_AddRefs(locationDocElement));
+      while ((deleteIndex < deleteCount) && locationNode) {
+        // Delete the node(s) unless the delete location is the root document
+        // element of an instance.
+        PRUint16 locationNodeType;
+        locationNode->GetNodeType(&locationNodeType);
+        if (locationNodeType == nsIDOMNode::ATTRIBUTE_NODE) {
+          nsCOMPtr<nsIDOMElement> ownerElement;
+          nsCOMPtr<nsIDOMAttr> attrNode(do_QueryInterface(locationNode));
+          attrNode->GetOwnerElement(getter_AddRefs(ownerElement));
+          NS_ENSURE_STATE(ownerElement);
+  
+          nsCOMPtr<nsIDOMAttr> resAttr;
+          ownerElement->RemoveAttributeNode(attrNode, getter_AddRefs(resAttr));
+          resNode = locationNode;
+  
+          // Deleted at least one node so delete will not terminate.
+          didDelete = PR_TRUE;
+        } else {
+          if (!SameCOMIdentity(locationNode, locationDocElement)) {
+            locationNode->GetParentNode(getter_AddRefs(parentNode));
+            NS_ENSURE_STATE(parentNode);
+  
+            rv = parentNode->RemoveChild(locationNode, getter_AddRefs(resNode));
+            NS_ENSURE_SUCCESS(rv, rv);
+  
+            // Deleted at least one node so delete will not terminate.
+            didDelete = PR_TRUE;
+          }
+        }
+        // Get the next node in the node-set.
+        ++deleteIndex;
+        nodeset->SnapshotItem(deleteIndex, getter_AddRefs(locationNode));
+      }
+  
+      // The delete action is terminated with no effect if no node is deleted.
+      if (!didDelete)
+        return NS_OK;
+    }
+    NS_ENSURE_STATE(resNode);
+  
+    // Dispatch xforms-insert/delete event to the instance node we have modified
+    // data for
+    rv = nsXFormsUtils::DispatchEvent(instNode,
+                                      mIsInsert ? eEvent_Insert : eEvent_Delete,
+                                      nsnull, nsnull, &mContextInfo);
+    NS_ENSURE_SUCCESS(rv, rv);
+  
+    // Dispatch refreshing events to the model
+    if (aParentAction) {
+      aParentAction->SetRebuild(model, PR_TRUE);
+      aParentAction->SetRecalculate(model, PR_TRUE);
+      aParentAction->SetRevalidate(model, PR_TRUE);
+      aParentAction->SetRefresh(model, PR_TRUE);
+    } else {
+      rv = model->RequestRebuild();
+      NS_ENSURE_SUCCESS(rv, rv);
+      rv = model->RequestRecalculate();
+      NS_ENSURE_SUCCESS(rv, rv);
+      rv = model->RequestRevalidate();
+      NS_ENSURE_SUCCESS(rv, rv);
+      rv = model->RequestRefresh();
+      NS_ENSURE_SUCCESS(rv, rv);
+    }
+
+    // Repeat this action if it can iterate and if it uses the `while`
+    // attribute (the expression of which must have evaluated to true to
+    // arrive here).
+    if (!CanIterate() || !usesWhile) {
+      return NS_OK;
+    }
+
+    // See if we've exceeded our time limit, and if so, prompt the user to
+    // determine if she wants to cancel the loop.
+    LL_SUB(runTime, PR_Now(), start);
+    if (microseconds <= 0 || runTime < microseconds) {
+      continue;
+    }
+
+    // The remaining part of the loop prompts the user about cancelling the
+    // loop, and is only executed if we've gone over the time limit.
+    PRBool stopWaiting = nsXFormsUtils::AskStopWaiting(element);
+
+    if (stopWaiting) {
+      // Stop the loop
+      return NS_OK;
+    } else {
+      start = PR_Now();
+    }
+  }
+
+  return NS_OK;
+}
+
+nsresult
+nsXFormsInsertDeleteElement::GetFirstNodeOfType(nsCOMArray<nsIDOMNode> *aNodes,
+                                                PRUint16 aNodeType,
+                                                nsIDOMNode **aResult)
+{
+  nsCOMPtr<nsIDOMNode> currentNode;
+
+  for (PRInt32 i = 0; i < aNodes->Count(); ++i) {
+    currentNode = aNodes->ObjectAt(i);
+    PRUint16 nodeType;
+    currentNode->GetNodeType(&nodeType);
+    if (nodeType == aNodeType) {
+      NS_IF_ADDREF(*aResult = currentNode);
+      break;
+    }
+  }
+
+  return NS_OK;
+}
+
+nsresult
+nsXFormsInsertDeleteElement::InsertNode(nsIDOMNode *aTargetNode,
+                                        nsIDOMNode *aNewNode,
+                                        Location   aLocation,
+                                        nsIDOMNode **aResNode)
+{
+  NS_ENSURE_ARG(aTargetNode);
+  NS_ENSURE_ARG(aNewNode);
+  NS_ENSURE_ARG_POINTER(aResNode);
+
+  // Make sure the result node is null in case we encounter a condition
+  // where the node cannot be inserted and is skipped.
+  *aResNode = nsnull;
+
+  // Step 7 - The new node is inserted at the target location depending on its
+  // node type. If the cloned node is a duplicate of another attribute in its
+  // parent element, then the duplicate attribute is first removed. If a cloned
+  // node cannot be placed at the target location due to a node type conflict,
+  // then the insertion for that particular clone node is ignored.
+  nsCOMPtr<nsIDOMNode> resNode;
+  
+  PRUint16 targetNodeType, newNodeType;
+  aTargetNode->GetNodeType(&targetNodeType);
+  aNewNode->GetNodeType(&newNodeType);
+  
+  if (newNodeType == nsIDOMNode::ATTRIBUTE_NODE) {
+    // Can add an attribute to an element node or the owning element
+    // of an attribute node.
+    nsCOMPtr<nsIDOMElement> ownerElement;
+
+    if (targetNodeType == nsIDOMNode::ELEMENT_NODE) {
+      ownerElement = do_QueryInterface(aTargetNode);
+    } else if (targetNodeType == nsIDOMNode::ATTRIBUTE_NODE) {
+      nsCOMPtr<nsIDOMAttr> targetAttrNode(do_QueryInterface(aTargetNode));
+      targetAttrNode->GetOwnerElement(getter_AddRefs(ownerElement));
+    }
+    NS_ENSURE_STATE(ownerElement);
+
+    // Check for a duplicate attribute.
+    nsAutoString attrNamespace, attrName, attrValue;
+    aNewNode->GetNamespaceURI(attrNamespace);
+    aNewNode->GetLocalName(attrName);
+    aNewNode->GetNodeValue(attrValue);
+
+    PRBool hasAttribute = PR_FALSE;
+    ownerElement->HasAttributeNS(attrNamespace, attrName, &hasAttribute);
+    if (hasAttribute) {
+      ownerElement->RemoveAttributeNS(attrNamespace, attrName);
+    }
+    ownerElement->SetAttributeNS(attrNamespace, attrName, attrValue);
+    resNode = aTargetNode;
+    resNode.swap(*aResNode);
+
+  } else {
+    // New node will be inserted at location aLocation.
+    nsCOMPtr<nsIDOMNode> targetNode = aTargetNode;
+
+    nsCOMPtr<nsIDOMNode> parentNode;
+    targetNode->GetParentNode(getter_AddRefs(parentNode));
+    NS_ENSURE_STATE(parentNode);
+
+    if (aLocation == eLocation_FirstChild) {
+      aTargetNode->AppendChild(aNewNode, getter_AddRefs(resNode));
+      resNode.swap(*aResNode);
+    } else {
+      if (aLocation == eLocation_After) {
+        // If we're at the end of the nodeset, this returns nsnull, which is
+        // fine, because InsertBefore then inserts at the end of the nodeset.
+        aTargetNode->GetNextSibling(getter_AddRefs(targetNode));
+      }
+      parentNode->InsertBefore(aNewNode, targetNode,
+                               getter_AddRefs(resNode));
+      resNode.swap(*aResNode);
+    }
+  }
+  
+  return NS_OK;
+}
+
+nsresult
+nsXFormsInsertDeleteElement::RefreshRepeats(nsCOMArray<nsIDOMNode> *aNodes)
+{
+  // XXXbeaufour: only check repeats belonging to the same model...
+  // possibly use mFormControls? Should be quicker than searching through
+  // entire document!! mModel->GetControls("repeat"); Would also possibly
+  // save a QI?
+
+  nsCOMPtr<nsIDOMDocument> document;
+
+  nsresult rv = mElement->GetOwnerDocument(getter_AddRefs(document));
+  NS_ENSURE_STATE(document);
+
+  nsCOMPtr<nsIDOMNodeList> repeatNodes;
+  document->GetElementsByTagNameNS(NS_LITERAL_STRING(NS_NAMESPACE_XFORMS),
+                                   NS_LITERAL_STRING("repeat"),
+                                   getter_AddRefs(repeatNodes));
+  NS_ENSURE_STATE(repeatNodes);
+
+  // work over each node and if the node contains the inserted element
+  PRUint32 nodeCount;
+  rv = repeatNodes->GetLength(&nodeCount);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  for (PRUint32 node = 0; node < nodeCount; ++node) {
+    nsCOMPtr<nsIDOMNode> repeatNode;
+
+    rv = repeatNodes->Item(node, getter_AddRefs(repeatNode));
+    nsCOMPtr<nsIXFormsRepeatElement> repeatEl(do_QueryInterface(repeatNode));
+    NS_ENSURE_STATE(repeatEl);
+
+    for (PRInt32 i = 0; i < aNodes->Count(); ++i) {
+      nsCOMPtr<nsIDOMNode> newNode = aNodes->ObjectAt(i);
+      rv = repeatEl->HandleNodeInsert(newNode);
+      NS_ENSURE_SUCCESS(rv, rv);
+    }
+  }
+
+  return NS_OK;
+}
+ 
+
+NS_HIDDEN_(nsresult)
+NS_NewXFormsInsertElement(nsIXTFElement **aResult)
+{
+  *aResult = new nsXFormsInsertDeleteElement(PR_TRUE);
+  if (!*aResult)
+    return NS_ERROR_OUT_OF_MEMORY;
+
+  NS_ADDREF(*aResult);
+  return NS_OK;
+}
+
+
+NS_HIDDEN_(nsresult)
+NS_NewXFormsDeleteElement(nsIXTFElement **aResult)
+{
+  *aResult = new nsXFormsInsertDeleteElement(PR_FALSE);
+  if (!*aResult)
+    return NS_ERROR_OUT_OF_MEMORY;
+
+  NS_ADDREF(*aResult);
+  return NS_OK;
+}
diff --git a/extensions/xforms/nsXFormsInstanceElement.cpp b/extensions/xforms/nsXFormsInstanceElement.cpp
index 63c15bb..6f63696 100644
--- a/extensions/xforms/nsXFormsInstanceElement.cpp
+++ b/extensions/xforms/nsXFormsInstanceElement.cpp
@@ -43,7 +43,7 @@
 #include "nsIDOM3Node.h"
 #include "nsMemory.h"
 #include "nsXFormsAtoms.h"
-#include "nsString.h"
+#include "nsStringAPI.h"
 #include "nsIDOMEventTarget.h"
 #include "nsIDOMDOMImplementation.h"
 #include "nsIXTFElementWrapper.h"
@@ -62,7 +62,7 @@ NS_IMPL_ISUPPORTS_INHERITED6(nsXFormsInstanceElement,
                              nsIChannelEventSink)
 
 nsXFormsInstanceElement::nsXFormsInstanceElement()
-  : nsXFormsStubElement()
+  : mElement(nsnull)
   , mInitialized(PR_FALSE)
   , mLazy(PR_FALSE)
 {
@@ -582,7 +582,7 @@ nsXFormsInstanceElement::LoadExternalInstance(const nsAString &aSrc)
     if (doc->GetProperty(nsXFormsAtoms::isInstanceDocument)) {
       /// Property exists, which means we are an instance document trying
       /// to load an external instance document. We do not allow that.
-      const nsPromiseFlatString& flat = PromiseFlatString(aSrc);
+      const nsString& flat = PromiseFlatString(aSrc);
       const PRUnichar *strings[] = { flat.get() };
       nsXFormsUtils::ReportError(NS_LITERAL_STRING("instanceInstanceLoad"),
                                  strings, 1, mElement, mElement);
@@ -592,8 +592,7 @@ nsXFormsInstanceElement::LoadExternalInstance(const nsAString &aSrc)
         nsCOMPtr<nsIDocument> newDoc = do_QueryInterface(mDocument);
 
         nsCOMPtr<nsIURI> uri;
-        NS_NewURI(getter_AddRefs(uri), aSrc,
-                  doc->GetDocumentCharacterSet().get(), doc->GetDocumentURI());
+        nsXFormsUtils::GetNewURI(doc, aSrc, getter_AddRefs(uri));
         if (uri) {
           if (nsXFormsUtils::CheckConnectionAllowed(mElement, uri)) {
             nsCOMPtr<nsILoadGroup> loadGroup;
diff --git a/extensions/xforms/nsXFormsInstanceElement.h b/extensions/xforms/nsXFormsInstanceElement.h
index 1e1916a..2f5a92b 100644
--- a/extensions/xforms/nsXFormsInstanceElement.h
+++ b/extensions/xforms/nsXFormsInstanceElement.h
@@ -103,6 +103,7 @@ private:
 
   nsCOMPtr<nsIDOMDocument>    mDocument;
   nsCOMPtr<nsIDOMDocument>    mOriginalDocument;
+  nsIDOMElement              *mElement;
   nsCOMPtr<nsIStreamListener> mListener;
   PRBool                      mInitialized;
   PRBool                      mLazy;
diff --git a/extensions/xforms/nsXFormsItemElement.cpp b/extensions/xforms/nsXFormsItemElement.cpp
index 27b1724..044938f 100644
--- a/extensions/xforms/nsXFormsItemElement.cpp
+++ b/extensions/xforms/nsXFormsItemElement.cpp
@@ -44,7 +44,7 @@
 #include "nsIDOMDocument.h"
 #include "nsIDOMDocumentEvent.h"
 #include "nsIPrivateDOMEvent.h"
-#include "nsString.h"
+#include "nsStringAPI.h"
 #include "nsXFormsUtils.h"
 #include "nsIXFormsValueElement.h"
 #include "nsVoidArray.h"
@@ -290,7 +290,7 @@ nsXFormsItemElement::GetValue(nsAString &aValue)
     // if this item was built by an itemset and the itemset's template used
     // a copy element, then there is no value element to be had.  No sense
     // continuing.
-    aValue.Truncate(0);
+    aValue.Truncate();
     return NS_ERROR_FAILURE;
   }
 
@@ -314,7 +314,7 @@ nsXFormsItemElement::GetValue(nsAString &aValue)
   }     
 
   // No value children, so our value is empty
-  aValue.Truncate(0);
+  aValue.Truncate();
   return NS_OK;
 }
 
@@ -423,7 +423,7 @@ NS_IMETHODIMP
 nsXFormsItemElement::GetLabelText(nsAString& aValue)
 {
   NS_ENSURE_STATE(mElement);
-  aValue.Truncate(0);
+  aValue.Truncate();
   
   nsCOMPtr<nsIDOMNodeList> children;
   mElement->GetChildNodes(getter_AddRefs(children));
diff --git a/extensions/xforms/nsXFormsItemSetElement.cpp b/extensions/xforms/nsXFormsItemSetElement.cpp
index fd24ae6..fee25dc 100644
--- a/extensions/xforms/nsXFormsItemSetElement.cpp
+++ b/extensions/xforms/nsXFormsItemSetElement.cpp
@@ -39,7 +39,7 @@
 #include "nsIXFormsSelectChild.h"
 #include "nsXFormsStubElement.h"
 #include "nsIDOMHTMLOptGroupElement.h"
-#include "nsString.h"
+#include "nsStringAPI.h"
 #include "nsCOMPtr.h"
 #include "nsIXTFElementWrapper.h"
 #include "nsIDOMNodeList.h"
diff --git a/extensions/xforms/nsXFormsLabelElement.cpp b/extensions/xforms/nsXFormsLabelElement.cpp
index 0a97331..0aa3753 100644
--- a/extensions/xforms/nsXFormsLabelElement.cpp
+++ b/extensions/xforms/nsXFormsLabelElement.cpp
@@ -51,7 +51,7 @@
 #include "nsIDOM3Node.h"
 #include "nsIDOMDocument.h"
 #include "nsIDOMText.h"
-#include "nsString.h"
+#include "nsStringAPI.h"
 #include "nsIXFormsUIWidget.h"
 #include "nsIDocument.h"
 #include "nsNetUtil.h"
@@ -94,9 +94,18 @@ public:
 private:
   NS_HIDDEN_(void) LoadExternalLabel(const nsAString& aValue);
 
+  /** Set context info for events.
+   *
+   * @param aName     Name of the context property.
+   * @param aValue    Value of the context property.
+   */
+  nsresult SetContextInfo(const char *aName, const nsAString &aValue);
+
   nsCString            mSrcAttrText;
   nsCOMPtr<nsIChannel> mChannel;
   PRBool               mWidgetLoaded;
+  // Context Info for events.
+  nsCOMArray<nsIXFormsContextInfo> mContextInfo;
 };
 
 NS_IMPL_ISUPPORTS_INHERITED3(nsXFormsLabelElement,
@@ -251,8 +260,7 @@ nsXFormsLabelElement::LoadExternalLabel(const nsAString& aSrc)
   nsCOMPtr<nsIDocument> doc(do_QueryInterface(domDoc));
   if (doc) {
     nsCOMPtr<nsIURI> uri;
-    NS_NewURI(getter_AddRefs(uri), aSrc, doc->GetDocumentCharacterSet().get(),
-              doc->GetDocumentURI());
+    nsXFormsUtils::GetNewURI(doc, aSrc, getter_AddRefs(uri));
     if (uri) {
       if (nsXFormsUtils::CheckConnectionAllowed(mElement, uri)) {
         nsCOMPtr<nsILoadGroup> loadGroup;
@@ -271,7 +279,7 @@ nsXFormsLabelElement::LoadExternalLabel(const nsAString& aSrc)
             // URI doesn't exist; report error.
             mChannel = nsnull;
 
-            const nsPromiseFlatString& flat = PromiseFlatString(aSrc);
+            const nsString& flat = PromiseFlatString(aSrc);
             const PRUnichar *strings[] = { flat.get(),
                                            NS_LITERAL_STRING("label").get() };
             nsXFormsUtils::ReportError(NS_LITERAL_STRING("externalLink1Error"),
@@ -280,8 +288,13 @@ nsXFormsLabelElement::LoadExternalLabel(const nsAString& aSrc)
             nsCOMPtr<nsIModelElementPrivate> modelPriv =
                                               nsXFormsUtils::GetModel(mElement);
             nsCOMPtr<nsIDOMNode> model = do_QueryInterface(modelPriv);
+
+            // Context Info: 'resource-uri'
+            // The URI associated with the failed link.
+            nsAutoString resourceURI(aSrc);
+            SetContextInfo("resource-uri", resourceURI);
             nsXFormsUtils::DispatchEvent(model, eEvent_LinkError, nsnull,
-                                         mElement);
+                                         mElement, &mContextInfo);
           }
         }
       } else {
@@ -291,7 +304,13 @@ nsXFormsLabelElement::LoadExternalLabel(const nsAString& aSrc)
         nsCOMPtr<nsIModelElementPrivate> modelPriv =
           nsXFormsUtils::GetModel(mElement);
         nsCOMPtr<nsIDOMNode> model = do_QueryInterface(modelPriv);
-        nsXFormsUtils::DispatchEvent(model, eEvent_LinkError, nsnull, mElement);
+
+        // Context Info: 'resource-uri'
+        // The URI associated with the failed link.
+        nsAutoString resourceURI(aSrc);
+        SetContextInfo("resource-uri", resourceURI);
+        nsXFormsUtils::DispatchEvent(model, eEvent_LinkError, nsnull, mElement,
+                                     &mContextInfo);
       }
     }
   }
@@ -417,7 +436,12 @@ nsXFormsLabelElement::OnStopRequest(nsIRequest *aRequest,
     nsCOMPtr<nsIModelElementPrivate> modelPriv =
       nsXFormsUtils::GetModel(mElement);
     nsCOMPtr<nsIDOMNode> model = do_QueryInterface(modelPriv);
-    nsXFormsUtils::DispatchEvent(model, eEvent_LinkError, nsnull, mElement);
+
+    // Context Info: 'resource-uri'
+    // The URI associated with the failed link.
+    SetContextInfo("resource-uri", src);
+    nsXFormsUtils::DispatchEvent(model, eEvent_LinkError, nsnull, mElement,
+                                 &mContextInfo);
 
     mSrcAttrText.Truncate();
   }
@@ -428,6 +452,17 @@ nsXFormsLabelElement::OnStopRequest(nsIRequest *aRequest,
   return NS_OK;
 }
 
+nsresult
+nsXFormsLabelElement::SetContextInfo(const char *aName, const nsAString &aValue)
+{
+  nsCOMPtr<nsXFormsContextInfo> contextInfo = new nsXFormsContextInfo(mElement);
+  NS_ENSURE_TRUE(contextInfo, NS_ERROR_OUT_OF_MEMORY);
+  contextInfo->SetStringValue(aName, aValue);
+  mContextInfo.AppendObject(contextInfo);
+
+  return NS_OK;
+}
+
 NS_HIDDEN_(nsresult)
 NS_NewXFormsLabelElement(nsIXTFElement **aResult)
 {
diff --git a/extensions/xforms/nsXFormsLoadElement.cpp b/extensions/xforms/nsXFormsLoadElement.cpp
index f8dd48c..c6adf2a 100644
--- a/extensions/xforms/nsXFormsLoadElement.cpp
+++ b/extensions/xforms/nsXFormsLoadElement.cpp
@@ -49,13 +49,11 @@ class nsXFormsLoadElement : public nsXFormsActionModuleBase
 {
 public:
   nsXFormsLoadElement();
-protected:
-  nsresult HandleSingleAction(nsIDOMEvent* aEvent,
-                              nsIXFormsActionElement *aParentAction);
+  virtual nsresult HandleSingleAction(nsIDOMEvent* aEvent,
+                                      nsIXFormsActionElement *aParentAction);
 };
 
-nsXFormsLoadElement::nsXFormsLoadElement() :
-  nsXFormsActionModuleBase(PR_TRUE)
+nsXFormsLoadElement::nsXFormsLoadElement()
 {
 }
 
diff --git a/extensions/xforms/nsXFormsMessageElement.cpp b/extensions/xforms/nsXFormsMessageElement.cpp
index f53cb39..de1a17c 100644
--- a/extensions/xforms/nsXFormsMessageElement.cpp
+++ b/extensions/xforms/nsXFormsMessageElement.cpp
@@ -104,10 +104,12 @@ class nsXFormsEventListener;
  * @see http://www.w3.org/TR/xforms/slice10.html#action-info
  */
 class nsXFormsMessageElement : public nsXFormsDelegateStub,
+                               public nsIDOMEventListener,
+                               public nsIXFormsActionModuleElement,
                                public nsIStreamListener,
                                public nsIInterfaceRequestor,
                                public nsIChannelEventSink,
-                               public nsXFormsActionModuleBase
+                               public nsXFormsActionModuleHelper
 {
 public:
   NS_DECL_ISUPPORTS_INHERITED
@@ -118,7 +120,6 @@ public:
   // nsIXTFElement overrides
   NS_IMETHOD OnCreated(nsIXTFElementWrapper *aWrapper);
   NS_IMETHOD WillChangeDocument(nsIDOMDocument *aNewDocument);
-  NS_IMETHOD DocumentChanged(nsIDOMDocument *aNewDocument);
   NS_IMETHOD OnDestroyed();
   NS_IMETHOD ParentChanged(nsIDOMElement *aNewParent);
   NS_IMETHOD WillChangeParent(nsIDOMElement *aNewParent);
@@ -131,7 +132,11 @@ public:
   NS_DECL_NSISTREAMLISTENER
   NS_DECL_NSIINTERFACEREQUESTOR
   NS_DECL_NSIDOMEVENTLISTENER
+  NS_DECL_NSIXFORMSACTIONMODULEELEMENT
 
+  virtual nsIDOMElement* GetElement() { return mElement; }
+  virtual nsresult HandleSingleAction(nsIDOMEvent* aEvent,
+                                      nsIXFormsActionElement *aParentAction);
   // Start the timer, which is used to set the message visible
   void StartEphemeral();
   // Set the message visible and start timer to hide it later.
@@ -159,13 +164,9 @@ public:
 
 
   nsXFormsMessageElement(MessageType aType) :
-    nsXFormsDelegateStub(), nsXFormsActionModuleBase(PR_TRUE),
     mType(aType), mPosX(-1), mPosY(-1), mDocument(nsnull),
     mStopType(eStopType_None), mSrcAttrText(""),
     mDoneAddingChildren(PR_FALSE) {}
-protected:
-  nsresult HandleSingleAction(nsIDOMEvent* aEvent,
-                              nsIXFormsActionElement *aParentAction);
 private:
   nsresult HandleEphemeralMessage(nsIDOMDocument* aDoc, nsIDOMEvent* aEvent);
   nsresult HandleModalAndModelessMessage(nsIDOMDocument* aDoc, nsAString& aLevel);
@@ -197,6 +198,13 @@ private:
    */
   PRBool IsEphemeral();
 
+  /** Set context info for events.
+   *
+   * @param aName     Name of the context property.
+   * @param aValue    Value of the context property.
+   */
+  nsresult SetContextInfo(const char *aName, const nsAString &aValue);
+
   MessageType          mType;
 
   // The position of the ephemeral message
@@ -209,6 +217,9 @@ private:
   StopType             mStopType;
   nsCString            mSrcAttrText;
   PRBool               mDoneAddingChildren;
+  // Context Info for events.
+  nsCOMArray<nsIXFormsContextInfo> mContextInfo;
+  nsString             mSrc;
 };
 
 NS_IMPL_ADDREF_INHERITED(nsXFormsMessageElement, nsXFormsDelegateStub)
@@ -265,20 +276,6 @@ nsXFormsMessageElement::WillChangeDocument(nsIDOMDocument *aNewDocument)
   return nsXFormsDelegateStub::WillChangeDocument(aNewDocument);
 }
 
-/**
- * The `nsXFormsMessageElement` class inherits from both
- * `nsXFormsActionModuleBase` and `nsXFormsControlStub`, which both
- * implement a `DocumentChanged` method.  The method defined by
- * `nsXFormsControlStub` completely subsumes that of
- * `nsXFormsActionModuleBase`, so we delegate to the former method as the
- * implementation of this method.
- */
-NS_IMETHODIMP
-nsXFormsMessageElement::DocumentChanged(nsIDOMDocument *aNewDocument)
-{
-  return nsXFormsControlStub::DocumentChanged(aNewDocument);
-}
-
 NS_IMETHODIMP
 nsXFormsMessageElement::OnDestroyed()
 {
@@ -457,6 +454,13 @@ nsXFormsMessageElement::DoneAddingChildren()
   return NS_OK;
 }
 
+NS_IMETHODIMP
+nsXFormsMessageElement::HandleAction(nsIDOMEvent* aEvent,
+                                     nsIXFormsActionElement *aParentAction)
+{
+  return nsXFormsActionModuleBase::DoHandleAction(this, aEvent, aParentAction);
+}
+
 nsresult
 nsXFormsMessageElement::HandleSingleAction(nsIDOMEvent *aEvent,
                                            nsIXFormsActionElement *aParentAction)
@@ -473,7 +477,13 @@ nsXFormsMessageElement::HandleSingleAction(nsIDOMEvent *aEvent,
     nsCOMPtr<nsIModelElementPrivate> modelPriv =
       nsXFormsUtils::GetModel(mElement);
     nsCOMPtr<nsIDOMNode> model = do_QueryInterface(modelPriv);
-    nsXFormsUtils::DispatchEvent(model, eEvent_LinkError);
+
+    // Context Info: 'resource-uri'
+    // The URI associated with the failed link.
+    SetContextInfo("resource-uri", mSrc);
+
+    nsXFormsUtils::DispatchEvent(model, eEvent_LinkError, nsnull, nsnull,
+                                 &mContextInfo);
     return NS_OK;
   }
 
@@ -690,8 +700,7 @@ nsXFormsMessageElement::HandleModalAndModelessMessage(nsIDOMDocument* aDoc,
     nsCOMPtr<nsIDocument> doc(do_QueryInterface(aDoc));
     NS_ENSURE_STATE(doc);
     nsCOMPtr<nsIURI> uri;
-    NS_NewURI(getter_AddRefs(uri), src, doc->GetDocumentCharacterSet().get(),
-              doc->GetDocumentURI());
+    nsXFormsUtils::GetNewURI(doc, src, getter_AddRefs(uri));
     NS_ENSURE_STATE(uri);
     nsCAutoString uriSpec;
     uri->GetSpec(uriSpec);
@@ -935,14 +944,16 @@ nsXFormsMessageElement::TestExternalFile()
   if (src.IsEmpty()) {
     return NS_OK;
   }
+  // Remember the src attribute so we can set it in the context info
+  // for the xforms-link-error event if the link fails.
+  mSrc = src;
 
   nsCOMPtr<nsIDOMDocument> domDoc;
   mElement->GetOwnerDocument(getter_AddRefs(domDoc));
   nsCOMPtr<nsIDocument> doc(do_QueryInterface(domDoc));
   NS_ENSURE_STATE(doc);
   nsCOMPtr<nsIURI> uri;
-  NS_NewURI(getter_AddRefs(uri), src, doc->GetDocumentCharacterSet().get(),
-            doc->GetDocumentURI());
+  nsXFormsUtils::GetNewURI(doc, src, getter_AddRefs(uri));
   NS_ENSURE_STATE(uri);
 
   if (!nsXFormsUtils::CheckConnectionAllowed(mElement, uri)) {
@@ -999,6 +1010,9 @@ nsXFormsMessageElement::TestExternalFile()
     nsXFormsUtils::ReportError(NS_LITERAL_STRING("externalLink1Error"),
                                strings, 2, mElement, mElement);
     mStopType = eStopType_LinkError;
+    // Remember the src attribute so we can set it in the context info
+    // for the xforms-link-error event.
+    mSrc = src;
     return NS_ERROR_FAILURE;
   }
 
@@ -1109,6 +1123,9 @@ nsXFormsMessageElement::OnStartRequest(nsIRequest *aRequest,
       nsXFormsUtils::ReportError(NS_LITERAL_STRING("externalLink2Error"),
                                  strings, 2, mElement, mElement);
       mStopType = eStopType_LinkError;
+      // Remember the src attribute so we can set it in the context info
+      // for the xforms-link-error event.
+      mSrc = src;
     }
 
     AddRemoveExternalResource(PR_FALSE);
@@ -1135,6 +1152,9 @@ nsXFormsMessageElement::OnStartRequest(nsIRequest *aRequest,
       nsXFormsUtils::ReportError(NS_LITERAL_STRING("externalLink2Error"),
                                  strings, 2, mElement, mElement);
       mStopType = eStopType_LinkError;
+      // Remember the src attribute so we can set it in the context info
+      // for the xforms-link-error event.
+      mSrc = src;
     }
   }
 
@@ -1262,6 +1282,24 @@ PRBool nsXFormsMessageElement::IsEphemeral()
   return level.Equals(NS_LITERAL_STRING("ephemeral"));
 }
 
+nsresult
+nsXFormsMessageElement::SetContextInfo(const char *aName, const nsAString &aValue)
+{
+  nsCOMPtr<nsXFormsContextInfo> contextInfo = new nsXFormsContextInfo(mElement);
+  NS_ENSURE_TRUE(contextInfo, NS_ERROR_OUT_OF_MEMORY);
+  contextInfo->SetStringValue(aName, aValue);
+  mContextInfo.AppendObject(contextInfo);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsXFormsMessageElement::GetCurrentEvent(nsIDOMEvent **aEvent)
+{
+  NS_IF_ADDREF(*aEvent = mCurrentEvent);
+  return NS_OK;
+}
+
 NS_HIDDEN_(nsresult)
 NS_NewXFormsMessageElement(nsIXTFElement **aResult)
 {
diff --git a/extensions/xforms/nsXFormsModelElement.cpp b/extensions/xforms/nsXFormsModelElement.cpp
index 0746b01..c2c80a0 100644
--- a/extensions/xforms/nsXFormsModelElement.cpp
+++ b/extensions/xforms/nsXFormsModelElement.cpp
@@ -46,7 +46,7 @@
 #include "nsIDOM3Node.h"
 #include "nsIDOMNodeList.h"
 #include "nsIVariant.h"
-#include "nsString.h"
+#include "nsStringAPI.h"
 #include "nsIDocument.h"
 #include "nsXFormsAtoms.h"
 #include "nsINameSpaceManager.h"
@@ -72,7 +72,6 @@
 #include "nsXFormsUtils.h"
 #include "nsXFormsSchemaValidator.h"
 #include "nsIXFormsUIWidget.h"
-#include "nsIAttribute.h"
 #include "nsISchemaLoader.h"
 #include "nsISchema.h"
 #include "nsAutoPtr.h"
@@ -84,6 +83,8 @@
 #include "nsIPrefBranch.h"
 #include "nsIEventStateManager.h"
 #include "nsStringEnumerator.h"
+#include "nsIAtomService.h"
+#include "nsIAttribute.h"
 
 #define XFORMS_LAZY_INSTANCE_BINDING \
   "chrome://xforms/content/xforms.xml#xforms-lazy-instance"
@@ -641,7 +642,7 @@ nsXFormsModelElement::CancelPostRefresh(nsIXFormsControl* aControl)
 }
 
 nsXFormsModelElement::nsXFormsModelElement()
-  : nsXFormsStubElement(),
+  : mElement(nsnull),
     mFormControls(nsnull, &mControlListHash),
     mSchemaCount(0),
     mSchemaTotal(0),
@@ -810,6 +811,7 @@ nsXFormsModelElement::InitializeInstances()
 
     for (PRInt32 i=0; i<mSchemaTotal; ++i) {
       rv = NS_OK;
+      nsCAutoString uriSpec;
       nsCOMPtr<nsIURI> newURI;
       NS_NewURI(getter_AddRefs(newURI), *schemas[i], nsnull, baseURI);
       nsCOMPtr<nsIURL> newURL = do_QueryInterface(newURI);
@@ -847,7 +849,6 @@ nsXFormsModelElement::InitializeInstances()
             i--;
           }
         } else {
-          nsCAutoString uriSpec;
           newURI->GetSpec(uriSpec);
           rv = mSchemas->LoadAsync(NS_ConvertUTF8toUTF16(uriSpec), this);
         }
@@ -855,7 +856,11 @@ nsXFormsModelElement::InitializeInstances()
       if (NS_FAILED(rv)) {
         // this is a fatal error
         nsXFormsUtils::ReportError(NS_LITERAL_STRING("schemaLoadError"), mElement);
-        nsXFormsUtils::DispatchEvent(mElement, eEvent_LinkException);
+        // Context Info: 'resource-uri'
+        // The URI associated with the failed link.
+        SetContextInfo("resource-uri", NS_ConvertUTF8toUTF16(uriSpec));
+        nsXFormsUtils::DispatchEvent(mElement, eEvent_LinkException, nsnull,
+                                     nsnull, &mContextInfo);
         return NS_OK;
       }
     }
@@ -939,20 +944,20 @@ nsXFormsModelElement::HandleDefault(nsIDOMEvent *aEvent, PRBool *aHandled)
   aEvent->GetType(type);
   nsresult rv = NS_OK;
 
-  if (type.EqualsASCII(sXFormsEventsEntries[eEvent_Refresh].name)) {
+  if (type.EqualsLiteral(sXFormsEventsEntries[eEvent_Refresh].name)) {
     rv = Refresh();
-  } else if (type.EqualsASCII(sXFormsEventsEntries[eEvent_Revalidate].name)) {
+  } else if (type.EqualsLiteral(sXFormsEventsEntries[eEvent_Revalidate].name)) {
     rv = Revalidate();
-  } else if (type.EqualsASCII(sXFormsEventsEntries[eEvent_Recalculate].name)) {
+  } else if (type.EqualsLiteral(sXFormsEventsEntries[eEvent_Recalculate].name)) {
     rv = Recalculate();
-  } else if (type.EqualsASCII(sXFormsEventsEntries[eEvent_Rebuild].name)) {
+  } else if (type.EqualsLiteral(sXFormsEventsEntries[eEvent_Rebuild].name)) {
     rv = Rebuild();
-  } else if (type.EqualsASCII(sXFormsEventsEntries[eEvent_ModelConstructDone].name)) {
+  } else if (type.EqualsLiteral(sXFormsEventsEntries[eEvent_ModelConstructDone].name)) {
     rv = ConstructDone();
     mConstructDoneHandled = PR_TRUE;
-  } else if (type.EqualsASCII(sXFormsEventsEntries[eEvent_Reset].name)) {
+  } else if (type.EqualsLiteral(sXFormsEventsEntries[eEvent_Reset].name)) {
     Reset();
-  } else if (type.EqualsASCII(sXFormsEventsEntries[eEvent_BindingException].name)) {
+  } else if (type.EqualsLiteral(sXFormsEventsEntries[eEvent_BindingException].name)) {
     // we threw up a popup during the nsXFormsUtils::DispatchEvent that sent
     // this error to the model
     *aHandled = PR_TRUE;
@@ -1040,7 +1045,7 @@ nsXFormsModelElement::GetInstanceDocument(const nsAString& aInstanceID,
     return NS_OK;
   }
 
-  const nsPromiseFlatString& flat = PromiseFlatString(aInstanceID);
+  const nsString& flat = PromiseFlatString(aInstanceID);
   const PRUnichar *strings[] = { flat.get() };
   nsXFormsUtils::ReportError(aInstanceID.IsEmpty() ?
                                NS_LITERAL_STRING("defInstanceNotFound") :
@@ -1830,12 +1835,17 @@ nsXFormsModelElement::GetTypeFromNode(nsIDOMNode *aInstanceData,
 
   // If there was no type information on the node itself, check for a type
   // bound to the node via \<xforms:bind\>
+  nsresult rv = NS_ERROR_FAILURE;
   if (!typeVal && !mNodeToType.Get(aInstanceData, &typeVal)) {
     // check if schema validation left us a nsISchemaType*
-    nsCOMPtr<nsIAtom> key = do_GetAtom("xsdtype");
-    NS_ENSURE_TRUE(key, NS_ERROR_OUT_OF_MEMORY);
+    nsCOMPtr<nsIAtomService> atomServ =
+      do_GetService(NS_ATOMSERVICE_CONTRACTID, &rv);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    nsCOMPtr<nsIAtom> key;
+    rv = atomServ->GetAtomUTF8("xsdtype", getter_AddRefs(key));
+    NS_ENSURE_SUCCESS(rv, rv);
 
-    nsresult rv = NS_ERROR_FAILURE;
     nsCOMPtr<nsIVariant> xsdType;
     // this is stored on the DOM3Node as a property called xsdtype
     nsCOMPtr<nsIContent> pContent(do_QueryInterface(aInstanceData));
@@ -1895,12 +1905,11 @@ nsXFormsModelElement::GetTypeFromNode(nsIDOMNode *aInstanceData,
   }
 
   // get the namespace url from the prefix using instance data node
-  nsresult rv;
   nsCOMPtr<nsIDOM3Node> domNode3 = do_QueryInterface(aInstanceData, &rv);
   NS_ENSURE_SUCCESS(rv, rv);
   rv = domNode3->LookupNamespaceURI(prefix, aNSUri);
 
-  if (DOMStringIsNull(aNSUri)) {
+  if (aNSUri.IsVoid()) {
     // if not found using instance data node, use <xf:instance> node
     nsCOMPtr<nsIDOMNode> instanceNode;
     rv = nsXFormsUtils::GetInstanceNodeForData(aInstanceData,
@@ -2331,7 +2340,15 @@ nsXFormsModelElement::MaybeNotifyCompletion()
     if (!extFunctionAtt.IsEmpty()) {
       nsXFormsUtils::ReportError(NS_LITERAL_STRING("invalidExtFunction"),
                                  tElement);
-      nsXFormsUtils::DispatchEvent(tElement, eEvent_ComputeException);
+
+      // Context Info: 'error-message'
+      // Error message containing the expression being processed.
+      nsAutoString errorMsg;
+      errorMsg.AssignLiteral("Non-existent extension functions: ");
+      errorMsg.Append(extFunctionAtt);
+      SetContextInfo("error-message", errorMsg);
+      nsXFormsUtils::DispatchEvent(tElement, eEvent_ComputeException, nsnull,
+                                   nsnull, &mContextInfo);
       return;
     }
   }
@@ -2426,7 +2443,15 @@ nsXFormsModelElement::ProcessBind(nsIDOMXPathEvaluator *aEvaluator,
       const PRUnichar *strings[] = { exprString.get() };
       nsXFormsUtils::ReportError(NS_LITERAL_STRING("exprParseError"),
                                  strings, 1, aBindElement, nsnull);
-      nsXFormsUtils::DispatchEvent(mElement, eEvent_ComputeException);
+
+      // Context Info: 'error-message'
+      // Error message containing the expression being processed.
+      nsAutoString errorMsg;
+      errorMsg.AssignLiteral("Error parsing XPath expression: ");
+      errorMsg.Append(exprString);
+      SetContextInfo("error-message", errorMsg);
+      nsXFormsUtils::DispatchEvent(mElement, eEvent_ComputeException, nsnull,
+                                   nsnull, &mContextInfo);
     } else {
 #ifdef DEBUG
       printf("xforms-binding-exception: XPath Evaluation failed\n");
@@ -2554,7 +2579,15 @@ nsXFormsModelElement::ProcessBind(nsIDOMXPathEvaluator *aEvaluator,
           const PRUnichar *strings[] = { propStrings[j].get() };
           nsXFormsUtils::ReportError(NS_LITERAL_STRING("mipParseError"),
                                      strings, 1, aBindElement, aBindElement);
-          nsXFormsUtils::DispatchEvent(mElement, eEvent_ComputeException);
+
+          // Context Info: 'error-message'
+          // Error message containing the expression being processed.
+          nsAutoString errorMsg;
+          errorMsg.AssignLiteral("Error while parsing model item property: ");
+          errorMsg.Append(propStrings[j]);
+          SetContextInfo("error-message", errorMsg);
+          nsXFormsUtils::DispatchEvent(mElement, eEvent_ComputeException,
+                                       nsnull, nsnull, &mContextInfo);
           return rv;
         }
 
@@ -3198,32 +3231,28 @@ nsXFormsModelElement::GetDerivedTypeList(const nsAString &aType,
   nsStringArray typeArray;
   nsresult rv = WalkTypeChainInternal(schemaType, PR_FALSE, nsnull, &typeArray);
   if (NS_SUCCEEDED(rv)) {
-    nsCOMPtr<nsIStringEnumerator> stringEnum;
-    rv = NS_NewStringEnumerator(getter_AddRefs(stringEnum), &typeArray);
-    if (NS_SUCCEEDED(rv)) {
-      nsAutoString constructorString;
-      PRBool hasMore = PR_FALSE;
-      rv = stringEnum->HasMore(&hasMore);
-      while (NS_SUCCEEDED(rv) && hasMore) {
-        nsAutoString tempString;
-        rv = stringEnum->GetNext(tempString);
-        if (NS_SUCCEEDED(rv)) {
-          constructorString.Append(tempString);
-          stringEnum->HasMore(&hasMore);
-          if (hasMore) {
-            constructorString.AppendLiteral(" ");
-          }
-        }
+    PRUint32 numStrings = typeArray.Count();
+    nsAutoString constructorString;
+    for (PRUint32 i = 0; i < numStrings; ++i) {
+      nsAutoString tempString;
+      typeArray.StringAt(i, tempString);
+      constructorString.Append(tempString);
+      if (i != numStrings - 1) {
+        // if we aren't appending the last string, then stick in the space
+        // delimeter
+        constructorString.AppendLiteral(" ");
       }
+    }
 
-      if (NS_SUCCEEDED(rv)) {
-        aTypeList.Assign(constructorString);
-      }
+    if (numStrings) {
+      aTypeList.Assign(constructorString);
+    } else {
+      aTypeList.Truncate();
     }
   }
 
   if (NS_FAILED(rv)) {
-    aTypeList.Assign(EmptyString());
+    aTypeList.Truncate();
   }
 
   typeArray.Clear();
@@ -3470,9 +3499,8 @@ nsXFormsModelElement::IsDuplicateSchema(nsIDOMElement *aSchemaElement)
   if (!schemaColl)
     return PR_FALSE;
 
-  const nsAFlatString& empty = EmptyString();
   nsAutoString targetNamespace;
-  aSchemaElement->GetAttributeNS(empty,
+  aSchemaElement->GetAttributeNS(EmptyString(),
                                  NS_LITERAL_STRING("targetNamespace"),
                                  targetNamespace);
   targetNamespace.Trim(" \r\n\t");
@@ -3486,7 +3514,7 @@ nsXFormsModelElement::IsDuplicateSchema(nsIDOMElement *aSchemaElement)
   // schema collection and the first instance has already been processed.
   // Report an error to the JS console and dispatch the LinkError event,
   // but do not consider it a fatal error.
-  const nsPromiseFlatString& flat = PromiseFlatString(targetNamespace);
+  const nsString& flat = PromiseFlatString(targetNamespace);
   const PRUnichar *strings[] = { flat.get() };
   nsXFormsUtils::ReportError(NS_LITERAL_STRING("duplicateSchema"),
                              strings, 1, aSchemaElement, aSchemaElement,
@@ -3496,6 +3524,17 @@ nsXFormsModelElement::IsDuplicateSchema(nsIDOMElement *aSchemaElement)
 }
 
 nsresult
+nsXFormsModelElement::SetContextInfo(const char *aName, const nsAString &aValue)
+{
+  nsCOMPtr<nsXFormsContextInfo> contextInfo = new nsXFormsContextInfo(mElement);
+  NS_ENSURE_TRUE(contextInfo, NS_ERROR_OUT_OF_MEMORY);
+  contextInfo->SetStringValue(aName, aValue);
+  mContextInfo.AppendObject(contextInfo);
+
+  return NS_OK;
+}
+
+nsresult
 NS_NewXFormsModelElement(nsIXTFElement **aResult)
 {
   *aResult = new nsXFormsModelElement();
diff --git a/extensions/xforms/nsXFormsModelElement.h b/extensions/xforms/nsXFormsModelElement.h
index c494c4c..2ce6de6 100644
--- a/extensions/xforms/nsXFormsModelElement.h
+++ b/extensions/xforms/nsXFormsModelElement.h
@@ -462,6 +462,14 @@ private:
   NS_HIDDEN_(nsresult) BuiltinTypeToPrimative(nsISchemaBuiltinType *aSchemaType,
                                               PRUint16             *aPrimType);
 
+  /** Set context info for events.
+   *
+   * @param aName     Name of the context property.
+   * @param aValue    Value of the context property.
+   */
+  nsresult SetContextInfo(const char *aName, const nsAString &aValue);
+
+  nsIDOMElement            *mElement;
   nsCOMPtr<nsISchemaLoader> mSchemas;
   nsStringArray             mPendingInlineSchemas;
   nsXFormsControlListItem   mFormControls;
@@ -554,6 +562,9 @@ private:
    */
   nsClassHashtable<nsISupportsHashKey, nsString> mNodeToP3PType;
 
+  // Context Info for events.
+  nsCOMArray<nsIXFormsContextInfo> mContextInfo;
+
   friend class Updating;
 };
 
diff --git a/extensions/xforms/nsXFormsModule.cpp b/extensions/xforms/nsXFormsModule.cpp
index 3c4a0a9..83c20ac 100644
--- a/extensions/xforms/nsXFormsModule.cpp
+++ b/extensions/xforms/nsXFormsModule.cpp
@@ -46,6 +46,7 @@
 #include "nsIServiceManager.h"
 #include "nsIClassInfoImpl.h"
 #include "nsXFormsXPathFunctions.h"
+#include "nsServiceManagerUtils.h"
 
 // bb0d9c8b-3096-4b66-92a0-6c1ddf80e65f
 #define NS_XFORMSUTILITYSERVICE_CID \
@@ -81,7 +82,7 @@ RegisterXFormsModule(nsIComponentManager *aCompMgr,
   if (!catman)
     return NS_ERROR_FAILURE;
 
-  nsXPIDLCString previous;
+  nsCString previous;
   nsresult rv =
     catman->AddCategoryEntry(NS_DOMNS_FEATURE_PREFIX "org.w3c.xforms.dom",
                              "1.0",
diff --git a/extensions/xforms/nsXFormsOutputElement.cpp b/extensions/xforms/nsXFormsOutputElement.cpp
index 44e9f16..b44a915 100755
--- a/extensions/xforms/nsXFormsOutputElement.cpp
+++ b/extensions/xforms/nsXFormsOutputElement.cpp
@@ -44,8 +44,7 @@
 #include "nsAutoPtr.h"
 #include "nsCOMPtr.h"
 #include "nsMemory.h"
-#include "nsString.h"
-#include "nsDOMString.h"
+#include "nsStringAPI.h"
 #include "nsIDOM3Node.h"
 #include "nsIDOMDocument.h"
 #include "nsIDOMElement.h"
@@ -107,7 +106,7 @@ nsXFormsOutputElement::nsXFormsOutputElement()
 nsresult
 nsXFormsOutputElement::Bind(PRBool *aContextChanged)
 {
-  SetDOMStringToNull(mValue);
+  mValue.SetIsVoid(PR_TRUE);
   mUseValueAttribute = PR_FALSE;
 
   nsresult rv = nsXFormsDelegateStub::Bind(aContextChanged);
diff --git a/extensions/xforms/nsXFormsRangeAccessors.cpp b/extensions/xforms/nsXFormsRangeAccessors.cpp
index d821fb5..6c7baf5 100644
--- a/extensions/xforms/nsXFormsRangeAccessors.cpp
+++ b/extensions/xforms/nsXFormsRangeAccessors.cpp
@@ -37,9 +37,8 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsXFormsRangeAccessors.h"
-#include "nsDOMString.h"
 #include "nsIDOMElement.h"
-#include "nsString.h"
+#include "nsStringAPI.h"
 #include "nsXFormsUtils.h"
 
 NS_IMPL_ISUPPORTS_INHERITED2(nsXFormsRangeAccessors,
@@ -56,7 +55,7 @@ nsXFormsRangeAccessors::AttributeGetter(const nsAString &aAttr, nsAString &aVal)
     mElement->GetAttribute(aAttr, val);
   }
   if (val.IsEmpty()) {
-    SetDOMStringToNull(aVal);
+    aVal.SetIsVoid(PR_TRUE);
   } else {
     aVal = val;
   }
diff --git a/extensions/xforms/nsXFormsRebuildElement.cpp b/extensions/xforms/nsXFormsRebuildElement.cpp
index 637b0d5..3ec1810 100644
--- a/extensions/xforms/nsXFormsRebuildElement.cpp
+++ b/extensions/xforms/nsXFormsRebuildElement.cpp
@@ -43,13 +43,11 @@ class nsXFormsRebuildElement : public nsXFormsActionModuleBase
 {
 public:
   nsXFormsRebuildElement();
-protected:
-  nsresult HandleSingleAction(nsIDOMEvent* aEvent,
-                              nsIXFormsActionElement *aParentAction);
+  virtual nsresult HandleSingleAction(nsIDOMEvent* aEvent,
+                                      nsIXFormsActionElement *aParentAction);
 };
 
-nsXFormsRebuildElement::nsXFormsRebuildElement() :
-  nsXFormsActionModuleBase(PR_TRUE)
+nsXFormsRebuildElement::nsXFormsRebuildElement()
 {
 }
 
diff --git a/extensions/xforms/nsXFormsRecalculateElement.cpp b/extensions/xforms/nsXFormsRecalculateElement.cpp
index cac9112..33e6e9b 100644
--- a/extensions/xforms/nsXFormsRecalculateElement.cpp
+++ b/extensions/xforms/nsXFormsRecalculateElement.cpp
@@ -43,13 +43,11 @@ class nsXFormsRecalculateElement : public nsXFormsActionModuleBase
 {
 public:
   nsXFormsRecalculateElement();
-protected:
-  nsresult HandleSingleAction(nsIDOMEvent* aEvent,
-                              nsIXFormsActionElement *aParentAction);
+  virtual nsresult HandleSingleAction(nsIDOMEvent* aEvent,
+                                      nsIXFormsActionElement *aParentAction);
 };
 
-nsXFormsRecalculateElement::nsXFormsRecalculateElement() :
-  nsXFormsActionModuleBase(PR_TRUE)
+nsXFormsRecalculateElement::nsXFormsRecalculateElement()
 {
 }
 
diff --git a/extensions/xforms/nsXFormsRefreshElement.cpp b/extensions/xforms/nsXFormsRefreshElement.cpp
index 6263c52..0ee3cab 100644
--- a/extensions/xforms/nsXFormsRefreshElement.cpp
+++ b/extensions/xforms/nsXFormsRefreshElement.cpp
@@ -43,13 +43,11 @@ class nsXFormsRefreshElement : public nsXFormsActionModuleBase
 {
 public:
   nsXFormsRefreshElement();
-protected:
-  nsresult HandleSingleAction(nsIDOMEvent* aEvent,
-                              nsIXFormsActionElement *aParentAction);
+  virtual nsresult HandleSingleAction(nsIDOMEvent* aEvent,
+                                      nsIXFormsActionElement *aParentAction);
 };
 
-nsXFormsRefreshElement::nsXFormsRefreshElement() :
-  nsXFormsActionModuleBase(PR_TRUE)
+nsXFormsRefreshElement::nsXFormsRefreshElement()
 {
 }
 
diff --git a/extensions/xforms/nsXFormsRepeatElement.cpp b/extensions/xforms/nsXFormsRepeatElement.cpp
index 09c54d5..2bbb432 100644
--- a/extensions/xforms/nsXFormsRepeatElement.cpp
+++ b/extensions/xforms/nsXFormsRepeatElement.cpp
@@ -42,8 +42,7 @@
 #include "nsISchema.h"
 #include "nsIServiceManager.h"
 #include "nsMemory.h"
-#include "nsString.h"
-#include "nsSubstring.h"
+#include "nsStringAPI.h"
 
 #include "nsIDOM3EventTarget.h"
 #include "nsIDOM3Node.h"
@@ -1301,11 +1300,10 @@ nsXFormsRepeatElement::GetIntAttr(const nsAString &aName,
     return NS_ERROR_NOT_AVAILABLE;
   }
 
-  PRInt32 errCode;
   /// @todo ToInteger is extremely large, "xxx23xxx" will be parsed with no errors
   /// as "23"... (XXX)
-  *aVal = attrVal.ToInteger(&errCode);
-  NS_ENSURE_TRUE(errCode == 0, NS_ERROR_FAILURE);
+  *aVal = attrVal.ToInteger(&rv);
+  NS_ENSURE_SUCCESS(rv, rv);
 
   ///
   /// @todo Check maximum values? (XXX)
diff --git a/extensions/xforms/nsXFormsResetElement.cpp b/extensions/xforms/nsXFormsResetElement.cpp
index 9207592..dc7851f 100644
--- a/extensions/xforms/nsXFormsResetElement.cpp
+++ b/extensions/xforms/nsXFormsResetElement.cpp
@@ -43,13 +43,11 @@ class nsXFormsResetElement : public nsXFormsActionModuleBase
 {
 public:
   nsXFormsResetElement();
-protected:
-  nsresult HandleSingleAction(nsIDOMEvent* aEvent,
-                              nsIXFormsActionElement *aParentAction);
+  virtual nsresult HandleSingleAction(nsIDOMEvent* aEvent,
+                                      nsIXFormsActionElement *aParentAction);
 };
 
-nsXFormsResetElement::nsXFormsResetElement() :
-  nsXFormsActionModuleBase(PR_TRUE)
+nsXFormsResetElement::nsXFormsResetElement()
 {
 }
 
diff --git a/extensions/xforms/nsXFormsRevalidateElement.cpp b/extensions/xforms/nsXFormsRevalidateElement.cpp
index 83b0e5a..416e0b4 100644
--- a/extensions/xforms/nsXFormsRevalidateElement.cpp
+++ b/extensions/xforms/nsXFormsRevalidateElement.cpp
@@ -43,13 +43,11 @@ class nsXFormsRevalidateElement : public nsXFormsActionModuleBase
 {
 public:
   nsXFormsRevalidateElement();
-protected:
-  nsresult HandleSingleAction(nsIDOMEvent* aEvent,
-                              nsIXFormsActionElement *aParentAction);
+  virtual nsresult HandleSingleAction(nsIDOMEvent* aEvent,
+                                      nsIXFormsActionElement *aParentAction);
 };
 
-nsXFormsRevalidateElement::nsXFormsRevalidateElement() :
-  nsXFormsActionModuleBase(PR_TRUE)
+nsXFormsRevalidateElement::nsXFormsRevalidateElement()
 {
 }
 
diff --git a/extensions/xforms/nsXFormsSchemaValidator.cpp b/extensions/xforms/nsXFormsSchemaValidator.cpp
index 144fff2..6cc2dcb 100644
--- a/extensions/xforms/nsXFormsSchemaValidator.cpp
+++ b/extensions/xforms/nsXFormsSchemaValidator.cpp
@@ -38,7 +38,7 @@
 
 // XPCOM includes
 #include "nsIServiceManager.h"
-#include "nsString.h"
+#include "nsStringAPI.h"
 
 #include "nsXFormsUtils.h"
 #include "nsISchemaValidator.h"
@@ -46,6 +46,7 @@
 #include "nsXFormsSchemaValidator.h"
 
 #include "nsIDOM3Node.h"
+#include "nsComponentManagerUtils.h"
 
 #define NS_SCHEMAVALIDATOR_CONTRACTID "@mozilla.org/schemavalidator;1"
 
@@ -196,7 +197,7 @@ nsXFormsSchemaValidator::IsValidSchemaListItem(const nsAString & aValue)
 
   // like a string, but no whitespace
   nsAutoString string(aValue);
-  if (string.FindCharInSet(" \t\r\n") == kNotFound) {
+  if (nsXFormsUtils::FindCharInSet(string, " \t\r\n") == kNotFound) {
     mSchemaValidator->ValidateString(aValue, NS_LITERAL_STRING("string"),
                                      NS_LITERAL_STRING("http://www.w3.org/1999/XMLSchema"),
                                      &isValid);
diff --git a/extensions/xforms/nsXFormsSelect1Element.cpp b/extensions/xforms/nsXFormsSelect1Element.cpp
index aeb4db1..437d9f5 100644
--- a/extensions/xforms/nsXFormsSelect1Element.cpp
+++ b/extensions/xforms/nsXFormsSelect1Element.cpp
@@ -50,7 +50,7 @@
 #include "nsIDOM3Node.h"
 #include "nsIDOMDocument.h"
 #include "nsIDOMText.h"
-#include "nsString.h"
+#include "nsStringAPI.h"
 #include "nsIXFormsUIWidget.h"
 #include "nsIDocument.h"
 #include "nsNetUtil.h"
diff --git a/extensions/xforms/nsXFormsSelectElement.cpp b/extensions/xforms/nsXFormsSelectElement.cpp
index dda2103..097b216 100644
--- a/extensions/xforms/nsXFormsSelectElement.cpp
+++ b/extensions/xforms/nsXFormsSelectElement.cpp
@@ -47,7 +47,7 @@
 #include "nsIDOM3Node.h"
 #include "nsIDOMDocument.h"
 #include "nsIDOMText.h"
-#include "nsString.h"
+#include "nsStringAPI.h"
 #include "nsIXFormsUIWidget.h"
 #include "nsIDocument.h"
 #include "nsNetUtil.h"
diff --git a/extensions/xforms/nsXFormsSendElement.cpp b/extensions/xforms/nsXFormsSendElement.cpp
index a981d50..03942e6 100644
--- a/extensions/xforms/nsXFormsSendElement.cpp
+++ b/extensions/xforms/nsXFormsSendElement.cpp
@@ -38,20 +38,18 @@
 
 #include "nsXFormsActionModuleBase.h"
 #include "nsIDOMDocument.h"
-#include "nsString.h"
+#include "nsStringAPI.h"
 #include "nsCOMPtr.h"
 
 class nsXFormsSendElement : public nsXFormsActionModuleBase
 {
 public:
   nsXFormsSendElement();
-protected:
-  nsresult HandleSingleAction(nsIDOMEvent* aEvent,
-                              nsIXFormsActionElement *aParentAction);
+  virtual nsresult HandleSingleAction(nsIDOMEvent* aEvent,
+                                      nsIXFormsActionElement *aParentAction);
 };
 
-nsXFormsSendElement::nsXFormsSendElement() :
-  nsXFormsActionModuleBase(PR_TRUE)
+nsXFormsSendElement::nsXFormsSendElement()
 {
 }
 
diff --git a/extensions/xforms/nsXFormsSetFocusElement.cpp b/extensions/xforms/nsXFormsSetFocusElement.cpp
index 57b8c25..cd80030 100644
--- a/extensions/xforms/nsXFormsSetFocusElement.cpp
+++ b/extensions/xforms/nsXFormsSetFocusElement.cpp
@@ -39,20 +39,18 @@
 #include "nsXFormsActionModuleBase.h"
 #include "nsIDOMDocument.h"
 #include "nsIDOMElement.h"
-#include "nsString.h"
+#include "nsStringAPI.h"
 #include "nsCOMPtr.h"
 
 class nsXFormsSetFocusElement : public nsXFormsActionModuleBase
 {
 public:
   nsXFormsSetFocusElement();
-protected:
-  nsresult HandleSingleAction(nsIDOMEvent* aEvent,
-                              nsIXFormsActionElement *aParentAction);
+  virtual nsresult HandleSingleAction(nsIDOMEvent* aEvent,
+                                      nsIXFormsActionElement *aParentAction);
 };
 
-nsXFormsSetFocusElement::nsXFormsSetFocusElement() :
-  nsXFormsActionModuleBase(PR_TRUE)
+nsXFormsSetFocusElement::nsXFormsSetFocusElement()
 {
 }
 
diff --git a/extensions/xforms/nsXFormsSetIndexElement.cpp b/extensions/xforms/nsXFormsSetIndexElement.cpp
index 4f0fd1a..f896b4a 100644
--- a/extensions/xforms/nsXFormsSetIndexElement.cpp
+++ b/extensions/xforms/nsXFormsSetIndexElement.cpp
@@ -61,13 +61,11 @@ class nsXFormsSetIndexElement : public nsXFormsActionModuleBase
 {
 public:
   nsXFormsSetIndexElement();
-protected:
-  nsresult HandleSingleAction(nsIDOMEvent* aEvent,
-                              nsIXFormsActionElement *aParentAction);
+  virtual nsresult HandleSingleAction(nsIDOMEvent* aEvent,
+                                      nsIXFormsActionElement *aParentAction);
 };
 
-nsXFormsSetIndexElement::nsXFormsSetIndexElement() :
-  nsXFormsActionModuleBase(PR_TRUE)
+nsXFormsSetIndexElement::nsXFormsSetIndexElement()
 {
 }
 
diff --git a/extensions/xforms/nsXFormsSetValueElement.cpp b/extensions/xforms/nsXFormsSetValueElement.cpp
index 61097a8..b0c4495 100644
--- a/extensions/xforms/nsXFormsSetValueElement.cpp
+++ b/extensions/xforms/nsXFormsSetValueElement.cpp
@@ -51,13 +51,11 @@ class nsXFormsSetValueElement : public nsXFormsActionModuleBase
 {
 public:
   nsXFormsSetValueElement();
-protected:
-  nsresult HandleSingleAction(nsIDOMEvent* aEvent,
-                              nsIXFormsActionElement *aParentAction);
+  virtual nsresult HandleSingleAction(nsIDOMEvent* aEvent,
+                                      nsIXFormsActionElement *aParentAction);
 };
 
-nsXFormsSetValueElement::nsXFormsSetValueElement() :
-  nsXFormsActionModuleBase(PR_TRUE)
+nsXFormsSetValueElement::nsXFormsSetValueElement()
 {
 }
 
diff --git a/extensions/xforms/nsXFormsStubElement.h b/extensions/xforms/nsXFormsStubElement.h
index 247e966..cab2831 100644
--- a/extensions/xforms/nsXFormsStubElement.h
+++ b/extensions/xforms/nsXFormsStubElement.h
@@ -73,8 +73,6 @@ enum nsRepeatState {
 class nsXFormsStubElement : public nsIXTFElement
 {
 protected:
-  nsIDOMElement*                      mElement;
-
   // We need a virtual destructor so that when a subclass does
   // NS_IMPL_ISUPPORTS_INHERITED, our Release() implementation calls the
   // derived class destructor.
@@ -112,7 +110,6 @@ public:
 
   /** Constructor */
   nsXFormsStubElement() :
-    mElement(nsnull),
     mRepeatState(eType_Unknown),
     mHasParent(PR_FALSE),
     mHasDoc(PR_FALSE)
diff --git a/extensions/xforms/nsXFormsSubmissionElement.cpp b/extensions/xforms/nsXFormsSubmissionElement.cpp
index 959eb34..4cd4c77 100644
--- a/extensions/xforms/nsXFormsSubmissionElement.cpp
+++ b/extensions/xforms/nsXFormsSubmissionElement.cpp
@@ -22,6 +22,7 @@
  * Contributor(s):
  *  Darin Fisher <darin@meer.net>
  *  Doron Rosenberg <doronr@us.ibm.com>
+ *  Merle Sterling <msterlin@us.ibm.com>
  *
  * 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
@@ -83,9 +84,7 @@
 #include "nsIHttpChannel.h"
 #include "nsIScriptSecurityManager.h"
 #include "nsIPipe.h"
-#include "nsLinebreakConverter.h"
-#include "nsEscape.h"
-#include "nsString.h"
+#include "nsStringAPI.h"
 #include "nsMemory.h"
 #include "nsCOMPtr.h"
 #include "nsNetUtil.h"
@@ -96,8 +95,9 @@
 #include "nsIPrefService.h"
 #include "nsIMIMEHeaderParam.h"
 #include "nsIExternalProtocolService.h"
-#include "nsEscape.h"
 #include "nsAutoPtr.h"
+#include "nsIDocCharset.h"
+#include "nsPIDOMWindow.h"
 
 // namespace literals
 #define kXMLNSNameSpaceURI \
@@ -117,6 +117,20 @@
 #define ENCODING_MULTIPART_RELATED    0x40    // multipart/related
 #define ENCODING_MULTIPART_FORM_DATA  0x80    // multipart/form-data
 
+// submission errors
+#define kError_SubmissionInProgress \
+        NS_LITERAL_STRING("submission-in-progress");
+#define kError_NoData \
+        NS_LITERAL_STRING("no-data");
+#define kError_ValidationError \
+        NS_LITERAL_STRING("validation-error");
+#define kError_ParseError \
+        NS_LITERAL_STRING("parse-error");
+#define kError_ResourceError \
+        NS_LITERAL_STRING("resource-error");
+#define kError_TargetError \
+        NS_LITERAL_STRING("target-error");
+
 struct SubmissionFormat
 {
   const char *method;
@@ -178,21 +192,20 @@ URLEncode(const nsString &buf, nsCString &result)
   // 2. normalize newlines to \r\n
   // 3. escape, converting ' ' to '+'
 
-  NS_ConvertUTF16toUTF8 utf8Buf(buf);
-
-  char *convertedBuf =
-      nsLinebreakConverter::ConvertLineBreaks(utf8Buf.get(),
-                                              nsLinebreakConverter::eLinebreakAny,
-                                              nsLinebreakConverter::eLinebreakNet);
-  NS_ENSURE_TRUE(convertedBuf, NS_ERROR_OUT_OF_MEMORY);
-
-  char *escapedBuf = nsEscape(convertedBuf, url_XPAlphas);
-  nsMemory::Free(convertedBuf);
-
-  NS_ENSURE_TRUE(escapedBuf, NS_ERROR_OUT_OF_MEMORY);
+  nsCString convertedString;
+  PRBool converted = nsXFormsUtils::ConvertLineBreaks(NS_ConvertUTF16toUTF8(buf),
+                                                      convertedString);
+  NS_ENSURE_TRUE(converted, NS_ERROR_OUT_OF_MEMORY);
+    
+  nsCOMPtr<nsINetUtil> netUtil = do_GetService(NS_NETUTIL_CONTRACTID);
+  if (!netUtil) {
+    return NS_ERROR_UNEXPECTED;
+  }
 
-  result.Adopt(escapedBuf);
-  return NS_OK;
+  nsresult rv = netUtil->EscapeString(convertedString,
+                                      nsINetUtil::ESCAPE_XPALPHAS,
+                                      result);
+  return rv;
 }
 
 static void
@@ -303,6 +316,23 @@ nsXFormsSubmissionElement::HandleDefault(nsIDOMEvent *aEvent, PRBool *aHandled)
     }
 
     *aHandled = PR_TRUE;
+  } else if (type.EqualsLiteral("xforms-submit-serialize")) {
+    nsCOMPtr<nsIXFormsDOMEvent> xfEvent = do_QueryInterface(aEvent);
+    if (xfEvent) {
+      nsCOMPtr<nsIXFormsContextInfo> contextInfo;
+      nsAutoString contextName;
+      contextName.AssignLiteral("submission-body");
+      xfEvent->GetContextInfo(contextName, getter_AddRefs(contextInfo));
+      if (contextInfo) {
+        nsAutoString submissionBody;
+        contextInfo->GetStringValue(submissionBody);
+        if (!submissionBody.EqualsLiteral(" ")) {
+          // Save the new submission body.
+          contextInfo->GetNodeValue(&mSubmissionBody);
+        }
+      }
+    }
+    *aHandled = PR_TRUE;
   } else {
     *aHandled = PR_FALSE;
   }
@@ -415,22 +445,40 @@ nsXFormsSubmissionElement::OnStopRequest(nsIRequest  *aRequest,
 
   PRBool succeeded = NS_SUCCEEDED(aStatus);
   if (succeeded) {
+    PRUint32 avail = 0;
+    mPipeIn->Available(&avail);
+    if (avail > 0) {
+      nsresult rv;
+
+      // Regardless of whether the response status represents success
+      // or failure, we want to read the response. For an error response
+      // nothing in the document is replaced, and submission processing
+      // concludes after dispatching xforms-submit-error with appropriate
+      // context information, including an error-type of resource-error.
+      nsCOMPtr<nsIHttpChannel> httpChannel = do_QueryInterface(channel);
+      if (httpChannel) {
+        PRUint32 response;
+        nsresult rv = httpChannel->GetResponseStatus(&response);
+        nsCAutoString statusText;
+        httpChannel->GetResponseStatusText(statusText);
+        httpChannel->VisitResponseHeaders(this);
+        SetHttpContextInfo(response, NS_ConvertUTF8toUTF16(statusText));
+
+        PRBool requestSucceeded;
+        httpChannel->GetRequestSucceeded(&requestSucceeded);
+        if (!requestSucceeded) {
+          // Server returned an error response code. Parse the error
+          // response body into an XML document for 'response-body'
+          // context info.
+          ParseErrorResponse(httpChannel);
+          mSubmitError = kError_ResourceError;
+          succeeded = PR_FALSE;
+        } else {
+          succeeded = PR_TRUE;
+        }
+      }
 
-    // If it is a HTTP request, then check for error responses, which should
-    // result in NOP and an xforms-submit-error.
-    nsCOMPtr<nsIHttpChannel> httpChannel = do_QueryInterface(channel);
-    if (httpChannel) {
-      PRUint32 response;
-      nsresult rv = httpChannel->GetResponseStatus(&response);
-      succeeded = NS_SUCCEEDED(rv) && (response < 400);
-    }
-
-    if (succeeded) {
-      PRUint32 avail = 0;
-      mPipeIn->Available(&avail);
-      if (avail > 0) {
-
-        nsresult rv;
+      if (succeeded) {
         if (mIsReplaceInstance) {
           rv = LoadReplaceInstance(channel);
         } else {
@@ -439,13 +487,15 @@ nsXFormsSubmissionElement::OnStopRequest(nsIRequest  *aRequest,
           if (replace.IsEmpty() || replace.EqualsLiteral("all"))
             rv = LoadReplaceAll(channel);
           else
+            // replace="none"
             rv = NS_OK;
         }
         succeeded = NS_SUCCEEDED(rv);
       }
+    } else {
+      mSubmitError = kError_ResourceError;
     }
   }
-
   mPipeIn = 0;
 
   EndSubmit(succeeded);
@@ -463,8 +513,20 @@ nsXFormsSubmissionElement::EndSubmit(PRBool aSucceeded)
     mActivator->SetDisabled(PR_FALSE);
     mActivator = nsnull;
   }
+
+  // If there were any errors, set 'error-type' context info.
+  if (!mSubmitError.IsEmpty()) {
+    nsCOMPtr<nsXFormsContextInfo> contextInfo =
+      new nsXFormsContextInfo(mElement);
+    if (contextInfo) {
+      contextInfo->SetStringValue("error-type", mSubmitError);
+      mContextInfo.AppendObject(contextInfo);
+    }
+  }
+
   nsXFormsUtils::DispatchEvent(mElement, aSucceeded ?
-                               eEvent_SubmitDone : eEvent_SubmitError);
+                               eEvent_SubmitDone : eEvent_SubmitError,
+                               nsnull, nsnull, &mContextInfo);
 }
 
 already_AddRefed<nsIModelElementPrivate>
@@ -520,6 +582,7 @@ nsXFormsSubmissionElement::LoadReplaceInstance(nsIChannel *channel)
   if (!newDoc) {
     nsXFormsUtils::ReportError(NS_LITERAL_STRING("instanceParseError"),
                                mElement);
+    mSubmitError = kError_ParseError;
     return NS_ERROR_UNEXPECTED;
   }
   
@@ -537,6 +600,7 @@ nsXFormsSubmissionElement::LoadReplaceInstance(nsIChannel *channel)
         namespaceURI.EqualsLiteral("http://www.mozilla.org/newlayout/xml/parsererror.xml")) {
       nsXFormsUtils::ReportError(NS_LITERAL_STRING("instanceParseError"),
                                  mElement);
+      mSubmitError = kError_ParseError;
       return NS_ERROR_UNEXPECTED;
     }
   }
@@ -574,9 +638,10 @@ nsXFormsSubmissionElement::LoadReplaceInstance(nsIChannel *channel)
     model->Recalculate();
     model->Revalidate();
     model->Refresh();
+  } else {
+    mSubmitError = kError_NoData;
   }
 
-
   return NS_OK;
 }
 
@@ -641,6 +706,7 @@ nsXFormsSubmissionElement::Submit()
   if (mSubmissionActive) {
     nsXFormsUtils::ReportError(NS_LITERAL_STRING("warnSubmitAlreadyRunning"),
                                mElement, nsIScriptError::warningFlag);
+    mSubmitError = kError_SubmissionInProgress;
     return NS_ERROR_FAILURE;
   }
   mSubmissionActive = PR_TRUE;
@@ -654,14 +720,37 @@ nsXFormsSubmissionElement::Submit()
   mElement->GetAttribute(NS_LITERAL_STRING("replace"), replace);
   mIsReplaceInstance = replace.EqualsLiteral("instance");
 
+  // 2. Dispatch xforms-submit-serialize.
+  // If the event context submission-body property string is empty, then no
+  // operation is performed so that the submission will use the normal
+  // serialization data. Otherwise, if the event context submission-body
+  // property string is non-empty, then the serialization data for the
+  // submission is set to be the content of the submission-body string.
+  nsCOMPtr<nsXFormsContextInfo> contextInfo = new nsXFormsContextInfo(mElement);
+  NS_ENSURE_TRUE(contextInfo, NS_ERROR_OUT_OF_MEMORY);
+  nsAutoString submissionBody;
+  submissionBody.AssignLiteral(" ");
+  contextInfo->SetStringValue("submission-body", submissionBody);
+  mContextInfo.AppendObject(contextInfo);
+  nsXFormsUtils::DispatchEvent(mElement, eEvent_SubmitSerialize, nsnull,
+                               nsnull, &mContextInfo);
+
   //
   // 2. get selected node from the instance data
   nsCOMPtr<nsIDOMNode> data;
-  rv = GetBoundInstanceData(getter_AddRefs(data));
-  NS_ENSURE_SUCCESS(rv, rv);
+  if (mSubmissionBody) {
+    // submission-body property was modified during submit-serialize and its
+    // contents is the new serialization data.
+    data = mSubmissionBody;
+  } else {
+    // get selected node from the instance data.
+    rv = GetBoundInstanceData(getter_AddRefs(data));
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
 
   // No data to submit
   if (!data) {
+    mSubmitError = kError_NoData;
     EndSubmit(PR_FALSE);
     return NS_OK;
   }
@@ -670,8 +759,10 @@ nsXFormsSubmissionElement::Submit()
   // 3. Create submission document (include namespaces, purge non-relevant
   // nodes, check simple type validity)
   nsCOMPtr<nsIDOMDocument> submissionDoc;
-  rv = CreateSubmissionDoc(data, getter_AddRefs(submissionDoc));
-  NS_ENSURE_SUCCESS(rv, rv);
+  if (!mSubmissionBody) {
+    rv = CreateSubmissionDoc(data, getter_AddRefs(submissionDoc));
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
 
   //
   // 4. Validate document
@@ -690,7 +781,27 @@ nsXFormsSubmissionElement::Submit()
   nsCAutoString uri, contentType;
   GetSubmissionURI(uri);
 
-  rv = SerializeData(submissionDoc, uri, getter_AddRefs(stream), contentType);
+  if (mSubmissionBody) {
+    // submission-body property was modified during submit-serialize and we will
+    // serialize it as a simple string.
+    nsAutoString nodeValue;
+    nsXFormsUtils::GetNodeValue(mSubmissionBody, nodeValue);
+
+    // make new stream
+    nsCOMPtr<nsIStringInputStream> stringInput =
+      do_CreateInstance("@mozilla.org/io/string-input-stream;1");
+    NS_ENSURE_TRUE(stringInput, NS_ERROR_OUT_OF_MEMORY);
+    nsCAutoString submissionBody = NS_ConvertUTF16toUTF8(nodeValue);
+    nsresult rv = stringInput->SetData(submissionBody.get(),
+                                       submissionBody.Length());
+    NS_ENSURE_SUCCESS(rv, rv);
+    stream = stringInput;
+    contentType.AssignLiteral("application/xml");
+    rv = NS_OK;
+  } else {
+    // Serialize a document based on the submission format and content type.
+    rv = SerializeData(submissionDoc, uri, getter_AddRefs(stream), contentType);
+  }
   if (NS_FAILED(rv)) {
     nsXFormsUtils::ReportError(NS_LITERAL_STRING("warnSubmitSerializeFailed"),
                                mElement, nsIScriptError::warningFlag);
@@ -803,6 +914,13 @@ nsXFormsSubmissionElement::GetSubmissionURI(nsACString& aURI)
     nsXFormsUtils::ReportError(NS_LITERAL_STRING("warnSubmitURI"), mElement,
                                nsIScriptError::warningFlag);
 
+  // Context Info: 'resource-uri'
+  nsCOMPtr<nsXFormsContextInfo> contextInfo =
+    new nsXFormsContextInfo(mElement);
+  NS_ENSURE_TRUE(contextInfo, NS_ERROR_OUT_OF_MEMORY);
+  contextInfo->SetStringValue("resource-uri", uri);
+  mContextInfo.AppendObject(contextInfo);
+
   CopyUTF16toUTF8(uri, aURI);
 
   return rv;
@@ -956,9 +1074,11 @@ nsXFormsSubmissionElement::SerializeDataXML(nsIDOMDocument  *data,
       CopyUTF16toUTF8(mediaType, contentType);
   }
   
-  nsCOMPtr<nsIStorageStream> storage;
-  NS_NewStorageStream(4096, PR_UINT32_MAX, getter_AddRefs(storage));
+  nsCOMPtr<nsIStorageStream> storage =
+    do_CreateInstance("@mozilla.org/storagestream;1");
   NS_ENSURE_TRUE(storage, NS_ERROR_OUT_OF_MEMORY);
+  
+  storage->Init(4096, PR_UINT32_MAX, nsnull);
 
   nsCOMPtr<nsIOutputStream> sink;
   storage->GetOutputStream(0, getter_AddRefs(sink));
@@ -1033,9 +1153,9 @@ nsXFormsSubmissionElement::CheckSameOrigin(nsIDocument *aBaseDocument,
 }
 
 nsresult
-nsXFormsSubmissionElement::AddNameSpaces(nsIDOMElement   *aTarget,
-                                         nsIDOMNode      *aSource,
-                                         nsStringHashSet *aPrefixHash)
+nsXFormsSubmissionElement::AddNameSpaces(
+  nsIDOMElement *aTarget, nsIDOMNode *aSource,
+  nsDataHashtable<nsStringHashKey, PRUint32> *aPrefixHash)
 {
   nsCOMPtr<nsIDOMNamedNodeMap> attrMap;
   nsCOMPtr<nsIDOMNode> attrNode;
@@ -1056,7 +1176,7 @@ nsXFormsSubmissionElement::AddNameSpaces(nsIDOMElement   *aTarget,
       attrNode->GetNodeValue(value);
 
       if (!localName.EqualsLiteral("xmlns")) {
-        if (!aPrefixHash || aPrefixHash->Contains(localName)) {
+        if (!aPrefixHash || aPrefixHash->Get(localName, nsnull)) {
           nsAutoString attrName(NS_LITERAL_STRING("xmlns:"));
           attrName.Append(localName);
           aTarget->SetAttributeNS(kXMLNSNameSpaceURI, attrName, value);
@@ -1082,13 +1202,14 @@ nsXFormsSubmissionElement::AddNameSpaces(nsIDOMElement   *aTarget,
 }
 
 nsresult
-nsXFormsSubmissionElement::GetIncludeNSPrefixesAttr(nsStringHashSet** aHash)
+nsXFormsSubmissionElement::GetIncludeNSPrefixesAttr(
+  nsDataHashtable<nsStringHashKey, PRUint32>** aHash)
 {
   NS_PRECONDITION(aHash, "null ptr");
   if (!aHash)
     return NS_ERROR_NULL_POINTER;
 
-  *aHash = new nsStringHashSet();
+  *aHash = new nsDataHashtable<nsStringHashKey, PRUint32>;
   if (!*aHash)
     return NS_ERROR_OUT_OF_MEMORY;
   (*aHash)->Init(5);
@@ -1102,11 +1223,11 @@ nsXFormsSubmissionElement::GetIncludeNSPrefixesAttr(nsStringHashSet** aHash)
     PRInt32 length = prefixes.Length();
 
     do {
-      end = prefixes.FindCharInSet(" \t\r\n", start);
+      end = nsXFormsUtils::FindCharInSet(prefixes, " \t\r\n", start);
       if (end != kNotFound) {
         if (start != end) {   // this line handles consecutive space chars
           const nsAString& p = Substring(prefixes, start, end - start);
-          (*aHash)->Put(p);
+          (*aHash)->Put(p, 0);
         }
         start = end + 1;
       }
@@ -1114,7 +1235,7 @@ nsXFormsSubmissionElement::GetIncludeNSPrefixesAttr(nsStringHashSet** aHash)
 
     if (start != length) {
       const nsAString& p = Substring(prefixes, start);
-      (*aHash)->Put(p);
+      (*aHash)->Put(p, 0);
     }
   }
 
@@ -1171,7 +1292,7 @@ nsXFormsSubmissionElement::CreateSubmissionDoc(nsIDOMNode      *aRoot,
 
   if (serialize) {
     // Handle "includenamespaceprefixes" attribute, if present
-    nsAutoPtr<nsStringHashSet> prefixHash;
+    nsAutoPtr< nsDataHashtable<nsStringHashKey, PRUint32> > prefixHash;
     PRBool hasPrefixAttr = PR_FALSE;
     mElement->HasAttribute(kIncludeNamespacePrefixes, &hasPrefixAttr);
     if (hasPrefixAttr) {
@@ -1192,7 +1313,7 @@ nsXFormsSubmissionElement::CreateSubmissionDoc(nsIDOMNode      *aRoot,
                                XMLNSAttrValue);
 
     if (XMLNSAttrValue.IsEmpty() && (!prefixHash ||
-        !prefixHash->Contains(NS_LITERAL_STRING("#default")))) {
+        !prefixHash->Get(NS_LITERAL_STRING("#default"), nsnull))) {
       submDocElm->RemoveAttributeNS(kXMLNSNameSpaceURI,
                                     NS_LITERAL_STRING("xmlns"));
     }
@@ -1279,12 +1400,12 @@ nsXFormsSubmissionElement::CreatePurgedDoc(nsIDOMNode      *source,
       encoding.AssignLiteral("UTF-8");
 
     nsAutoString buf =
-      NS_LITERAL_STRING("version=\"1.0\" encoding=\"") +
-      encoding +
-      NS_LITERAL_STRING("\"");
+      NS_LITERAL_STRING("version=\"1.0\" encoding=\"");
+    buf += encoding;
+    buf.AppendLiteral("\"");
 
     if (GetBooleanAttr(NS_LITERAL_STRING("standalone"), PR_FALSE))
-      buf += NS_LITERAL_STRING(" standalone=\"yes\"");
+      buf.AppendLiteral(" standalone=\"yes\"");
 
     nsCOMPtr<nsIDOMProcessingInstruction> pi;
     doc->CreateProcessingInstruction(NS_LITERAL_STRING("xml"), buf,
@@ -1557,6 +1678,7 @@ nsXFormsSubmissionElement::CopyChildren(nsIModelElementPrivate *aModel,
           // abort
           nsXFormsUtils::ReportError(NS_LITERAL_STRING("warnSubmitInvalidNode"),
                                      currentNode, nsIScriptError::warningFlag);
+          mSubmitError = kError_ValidationError;
           return NS_ERROR_ILLEGAL_VALUE;
         }
 
@@ -1592,6 +1714,7 @@ nsXFormsSubmissionElement::CopyChildren(nsIModelElementPrivate *aModel,
               // abort
               nsXFormsUtils::ReportError(NS_LITERAL_STRING("warnSubmitInvalidNode"),
                                          currentNode, nsIScriptError::warningFlag);
+              mSubmitError = kError_ValidationError;
               return NS_ERROR_ILLEGAL_VALUE;
             }
 
@@ -1735,10 +1858,15 @@ nsXFormsSubmissionElement::SerializeDataURLEncoded(nsIDOMDocument *data,
   {
     nsCAutoString buf;
     AppendURLEncodedData(data, separator, buf);
+    *stream = nsnull;
 
     // make new stream
-    NS_NewCStringInputStream(stream, buf);
-    NS_ENSURE_STATE(*stream);
+    nsCOMPtr<nsIStringInputStream>stringInput =
+      do_CreateInstance("@mozilla.org/io/string-input-stream;1");
+    NS_ENSURE_TRUE(stringInput, NS_ERROR_OUT_OF_MEMORY);
+    nsresult rv = stringInput->SetData(buf.get(), buf.Length());
+    NS_ENSURE_SUCCESS(rv, rv);
+    NS_ADDREF(*stream = stringInput);
 
     contentType.AssignLiteral("application/x-www-form-urlencoded");
   }
@@ -1811,7 +1939,10 @@ nsXFormsSubmissionElement::AppendURLEncodedData(nsIDOMNode *data,
     URLEncode(localName, encLocalName);
     URLEncode(value, encValue);
 
-    buf.Append(encLocalName + NS_LITERAL_CSTRING("=") + encValue + separator);
+    buf.Append(encLocalName);
+    buf += NS_LITERAL_CSTRING("=");
+    buf += encValue;
+    buf += separator;
   }
   else
   {
@@ -1858,10 +1989,16 @@ nsXFormsSubmissionElement::SerializeDataMultipartRelated(nsIDOMDocument *data,
   // XXX we should output a 'charset=' with the 'Content-Type' header
 
   nsCString postDataChunk;
-  postDataChunk += NS_LITERAL_CSTRING("--") + boundary
-                +  NS_LITERAL_CSTRING("\r\nContent-Type: ") + type
-                +  NS_LITERAL_CSTRING("\r\nContent-ID: <") + start
-                +  NS_LITERAL_CSTRING(">\r\n\r\n");
+  postDataChunk += NS_LITERAL_CSTRING("--");
+  postDataChunk += boundary;
+  postDataChunk += NS_LITERAL_CSTRING("\r\nContent-Type: ");
+  postDataChunk += type;
+  postDataChunk += NS_LITERAL_CSTRING("\r\nContent-ID: <");
+  postDataChunk += start;
+  postDataChunk += NS_LITERAL_CSTRING(">\r\n\r\n");
+
+
+
   rv = AppendPostDataChunk(postDataChunk, multiStream);
   NS_ENSURE_SUCCESS(rv, rv);
 
@@ -1887,11 +2024,15 @@ nsXFormsSubmissionElement::SerializeDataMultipartRelated(nsIDOMDocument *data,
       type.AssignLiteral("application/octet-stream");
     }
 
-    postDataChunk += NS_LITERAL_CSTRING("\r\n--") + boundary
-                  +  NS_LITERAL_CSTRING("\r\nContent-Type: ") + type
-                  +  NS_LITERAL_CSTRING("\r\nContent-Transfer-Encoding: binary")
-                  +  NS_LITERAL_CSTRING("\r\nContent-ID: <") + a->cid
-                  +  NS_LITERAL_CSTRING(">\r\n\r\n");
+    postDataChunk += NS_LITERAL_CSTRING("\r\n--");
+    postDataChunk += boundary;
+    postDataChunk += NS_LITERAL_CSTRING("\r\nContent-Type: ");
+    postDataChunk += type;
+    postDataChunk += NS_LITERAL_CSTRING("\r\nContent-Transfer-Encoding: binary");
+    postDataChunk += NS_LITERAL_CSTRING("\r\nContent-ID: <");
+    postDataChunk += a->cid;
+    postDataChunk += NS_LITERAL_CSTRING(">\r\n\r\n");
+
     rv = AppendPostDataChunk(postDataChunk, multiStream);
     NS_ENSURE_SUCCESS(rv, rv);
 
@@ -1900,16 +2041,19 @@ nsXFormsSubmissionElement::SerializeDataMultipartRelated(nsIDOMDocument *data,
   }
 
   // final boundary
-  postDataChunk += NS_LITERAL_CSTRING("\r\n--") + boundary
-                +  NS_LITERAL_CSTRING("--\r\n");
+  postDataChunk += NS_LITERAL_CSTRING("\r\n--");
+  postDataChunk += boundary;
+  postDataChunk += NS_LITERAL_CSTRING("--\r\n");
   rv = AppendPostDataChunk(postDataChunk, multiStream);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  contentType =
-      NS_LITERAL_CSTRING("multipart/related; boundary=") + boundary +
-      NS_LITERAL_CSTRING("; type=\"") + type +
-      NS_LITERAL_CSTRING("\"; start=\"<") + start +
-      NS_LITERAL_CSTRING(">\"");
+  contentType = NS_LITERAL_CSTRING("multipart/related; boundary=");
+  contentType += boundary;
+  contentType += NS_LITERAL_CSTRING("; type=\"");
+  contentType += type;
+  contentType += NS_LITERAL_CSTRING("\"; start=\"<");
+  contentType += start;
+  contentType += NS_LITERAL_CSTRING(">\"");
 
   NS_ADDREF(*stream = multiStream);
   return NS_OK;
@@ -1950,12 +2094,14 @@ nsXFormsSubmissionElement::SerializeDataMultipartFormData(nsIDOMDocument *data,
   nsresult rv = AppendMultipartFormData(data, boundary, postDataChunk, multiStream);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  postDataChunk += NS_LITERAL_CSTRING("--") + boundary
-                +  NS_LITERAL_CSTRING("--\r\n\r\n");
+  postDataChunk += NS_LITERAL_CSTRING("--");
+  postDataChunk += boundary;
+  postDataChunk += NS_LITERAL_CSTRING("--\r\n\r\n");
   rv = AppendPostDataChunk(postDataChunk, multiStream);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  contentType = NS_LITERAL_CSTRING("multipart/form-data; boundary=") + boundary;
+  contentType = NS_LITERAL_CSTRING("multipart/form-data; boundary=");
+  contentType += boundary;
 
   NS_ADDREF(*stream = multiStream);
   return NS_OK;
@@ -2001,14 +2147,16 @@ nsXFormsSubmissionElement::AppendMultipartFormData(nsIDOMNode *data,
     rv = GetElementEncodingType(data, &encType);
     NS_ENSURE_SUCCESS(rv, rv);
 
-    NS_ConvertUTF16toUTF8 encName(localName);
-    encName.Adopt(nsLinebreakConverter::ConvertLineBreaks(encName.get(),
-                  nsLinebreakConverter::eLinebreakAny,
-                  nsLinebreakConverter::eLinebreakNet));
+    nsCString encName;
+    PRBool converted = nsXFormsUtils::ConvertLineBreaks(
+      NS_ConvertUTF16toUTF8(localName), encName);
+    NS_ENSURE_TRUE(converted, NS_ERROR_OUT_OF_MEMORY);
 
-    postDataChunk += NS_LITERAL_CSTRING("--") + boundary
-                  +  NS_LITERAL_CSTRING("\r\nContent-Disposition: form-data; name=\"")
-                  +  encName + NS_LITERAL_CSTRING("\"");
+    postDataChunk += NS_LITERAL_CSTRING("--");
+    postDataChunk += boundary;
+    postDataChunk += NS_LITERAL_CSTRING("\r\nContent-Disposition: form-data; name=\"");
+    postDataChunk += encName;
+    postDataChunk += NS_LITERAL_CSTRING("\"");
 
     nsCAutoString contentType;
     nsCOMPtr<nsIInputStream> fileStream;
@@ -2043,9 +2191,9 @@ nsXFormsSubmissionElement::AppendMultipartFormData(nsIDOMNode *data,
         contentType.AssignLiteral("application/octet-stream");
       }
 
-      postDataChunk += NS_LITERAL_CSTRING("; filename=\"")
-                    +  NS_ConvertUTF16toUTF8(leafName)
-                    +  NS_LITERAL_CSTRING("\"");
+      postDataChunk += NS_LITERAL_CSTRING("; filename=\"");
+      postDataChunk += NS_ConvertUTF16toUTF8(leafName);
+      postDataChunk += NS_LITERAL_CSTRING("\"");
     }
     else if (encType == ELEMENT_ENCTYPE_STRING)
     {
@@ -2056,9 +2204,9 @@ nsXFormsSubmissionElement::AppendMultipartFormData(nsIDOMNode *data,
       contentType.AssignLiteral("application/octet-stream");
     }
 
-    postDataChunk += NS_LITERAL_CSTRING("\r\nContent-Type: ")
-                  +  contentType
-                  +  NS_LITERAL_CSTRING("\r\n\r\n");
+    postDataChunk += NS_LITERAL_CSTRING("\r\nContent-Type: ");
+    postDataChunk += contentType;
+    postDataChunk += NS_LITERAL_CSTRING("\r\n\r\n");
 
     if (encType == ELEMENT_ENCTYPE_URI)
     {
@@ -2076,11 +2224,12 @@ nsXFormsSubmissionElement::AppendMultipartFormData(nsIDOMNode *data,
       // xforms spec.
 
       // XXX UTF-8 ok?
-      NS_ConvertUTF16toUTF8 encValue(value);
-      encValue.Adopt(nsLinebreakConverter::ConvertLineBreaks(encValue.get(),
-                     nsLinebreakConverter::eLinebreakAny,
-                     nsLinebreakConverter::eLinebreakNet));
-      postDataChunk += encValue + NS_LITERAL_CSTRING("\r\n");
+      nsCString encValue;
+      converted = nsXFormsUtils::ConvertLineBreaks(NS_ConvertUTF16toUTF8(value),
+                                                   encValue);
+      NS_ENSURE_TRUE(converted, NS_ERROR_OUT_OF_MEMORY);
+      postDataChunk += encValue;
+      postDataChunk += NS_LITERAL_CSTRING("\r\n");
     }
   }
   else
@@ -2103,9 +2252,12 @@ nsresult
 nsXFormsSubmissionElement::AppendPostDataChunk(nsCString &postDataChunk,
                                                nsIMultiplexInputStream *multiStream)
 {
-  nsCOMPtr<nsIInputStream> stream;
-  NS_NewCStringInputStream(getter_AddRefs(stream), postDataChunk);
+  // make new stream
+  nsCOMPtr<nsIStringInputStream> stream =
+    do_CreateInstance("@mozilla.org/io/string-input-stream;1");
   NS_ENSURE_TRUE(stream, NS_ERROR_OUT_OF_MEMORY);
+  nsresult rv = stream->SetData(postDataChunk.get(), postDataChunk.Length());
+  NS_ENSURE_SUCCESS(rv, rv);
 
   multiStream->AppendStream(stream);
 
@@ -2191,19 +2343,25 @@ nsXFormsSubmissionElement::SendData(const nsCString &uriSpec,
 
   nsCOMPtr<nsIURI> currURI = doc->GetDocumentURI();
 
+  nsCOMPtr<nsPIDOMWindow> window = doc->GetWindow();
+  NS_ENSURE_STATE(window);
+  nsCOMPtr<nsIDocCharset> docCharset = do_QueryInterface(window->GetDocShell());
+  NS_ENSURE_STATE(docCharset);
+  nsCString charset;
+  nsresult rv = docCharset->GetCharset(getter_Copies(charset));
+  NS_ENSURE_SUCCESS(rv, rv);
+  
   // Any parameters appended to uriSpec are already ASCII-encoded per the rules
   // of section 11.6.  Use our standard document charset based canonicalization
   // for any other non-ASCII bytes.  (This might be important for compatibility
   // with legacy CGI processors.)
   nsCOMPtr<nsIURI> uri;
   ios->NewURI(uriSpec,
-              doc->GetDocumentCharacterSet().get(),
+              charset.get(),
               currURI,
               getter_AddRefs(uri));
   NS_ENSURE_STATE(uri);
 
-  nsresult rv;
-
   // handle mailto: submission
   if (!mIsReplaceInstance) {
     PRBool isMailto;
@@ -2252,9 +2410,12 @@ nsXFormsSubmissionElement::SendData(const nsCString &uriSpec,
         memset(buf, 0, len+1);
 
         // Read returns 0 if eos
+        nsCOMPtr<nsINetUtil> netUtil = do_GetService(NS_NETUTIL_CONTRACTID);
+        NS_ENSURE_STATE(netUtil);
         while (numReadIn != 0) {
           numReadIn = stream->Read(buf, len, &read);
-          NS_EscapeURL(buf, read, esc_Query|esc_AlwaysCopy, mailtoUrl);
+          netUtil->EscapeURL(nsCString(buf, read), nsINetUtil::ESCAPE_URL_QUERY,
+                             mailtoUrl);
         }
 
         delete [] buf;
@@ -2414,11 +2575,15 @@ nsXFormsSubmissionElement::SendData(const nsCString &uriSpec,
   //
   // pipe's maximum size is unlimited (gasp!)
 
-  nsCOMPtr<nsIOutputStream> pipeOut;
-  rv = NS_NewPipe(getter_AddRefs(mPipeIn), getter_AddRefs(pipeOut),
-                  4096, PR_UINT32_MAX, PR_TRUE, PR_TRUE);
+  nsCOMPtr<nsIPipe> pipe = do_CreateInstance("@mozilla.org/pipe;1");
+  NS_ENSURE_STATE(pipe);
+  rv = pipe->Init(PR_TRUE, PR_TRUE, 4096, PR_UINT32_MAX, nsnull);
   NS_ENSURE_SUCCESS(rv, rv);
 
+  nsCOMPtr<nsIAsyncOutputStream> pipeOut;
+  pipe->GetInputStream(getter_AddRefs(mPipeIn));
+  pipe->GetOutputStream(getter_AddRefs(pipeOut));
+
   // use a simple stream listener to tee our data into the pipe, and
   // notify us when the channel starts and stops.
 
@@ -2433,6 +2598,232 @@ nsXFormsSubmissionElement::SendData(const nsCString &uriSpec,
   return rv;
 }
 
+// nsIHttpHeaderVisitor
+NS_IMETHODIMP
+nsXFormsSubmissionElement::VisitHeader(const nsACString &aHeader,
+                                       const nsACString &aValue)
+{
+  nsresult rv;
+  nsCOMPtr<nsIDOMElement> rootElt;
+  nsCOMPtr<nsIDOMNode> newChild;
+
+  // Every time this callback is called, we add another
+  // <header><name>aHeader</name><value>aValue</value></header> element
+  // to the http header document. The header document is used to create
+  // a nodeset of header elements in the context info.
+  if (!mHttpHeaderDoc) {
+    nsCOMPtr<nsIDOMDocument> doc;
+    rv = mElement->GetOwnerDocument(getter_AddRefs(doc));
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    nsCOMPtr<nsIDOMDOMImplementation> domImpl;
+    rv = doc->GetImplementation(getter_AddRefs(domImpl));
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    rv = domImpl->CreateDocument(EmptyString(), EmptyString(), nsnull,
+                                 getter_AddRefs(mHttpHeaderDoc));
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    rv = mHttpHeaderDoc->CreateElement(NS_LITERAL_STRING("headers"),
+                                       getter_AddRefs(rootElt));
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    mHttpHeaderDoc->AppendChild(rootElt, getter_AddRefs(newChild));
+  }
+
+  nsCOMPtr<nsIDOMElement> headerElt, nameElt, valueElt;
+  nsCOMPtr<nsIDOMNode> rootNode;
+
+  // Root <headers> element.
+  rv = mHttpHeaderDoc->GetFirstChild(getter_AddRefs(rootNode));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  // <header>
+  rv = mHttpHeaderDoc->CreateElement(NS_LITERAL_STRING("header"),
+                                     getter_AddRefs(headerElt));
+
+  // <name>
+  rv = mHttpHeaderDoc->CreateElement(NS_LITERAL_STRING("name"),
+                                     getter_AddRefs(nameElt));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  nsCOMPtr<nsIDOMText> nameTextNode;
+  rv = mHttpHeaderDoc->CreateTextNode(NS_ConvertUTF8toUTF16(aHeader),
+                                      getter_AddRefs(nameTextNode));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  nameElt->AppendChild(nameTextNode, getter_AddRefs(newChild));
+  headerElt->AppendChild(nameElt, getter_AddRefs(newChild));
+
+  // <value>
+  rv = mHttpHeaderDoc->CreateElement(NS_LITERAL_STRING("value"),
+                                     getter_AddRefs(valueElt));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  nsCOMPtr<nsIDOMText> valueTextNode;
+  rv = mHttpHeaderDoc->CreateTextNode(NS_ConvertUTF8toUTF16(aValue),
+                                      getter_AddRefs(valueTextNode));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  valueElt->AppendChild(valueTextNode, getter_AddRefs(newChild));
+  headerElt->AppendChild(valueElt, getter_AddRefs(newChild));
+
+  // Append <header> element to root <headers> element.
+  rootElt = do_QueryInterface(rootNode);
+  rootElt->AppendChild(headerElt, getter_AddRefs(newChild));
+
+  return NS_OK;
+}
+
+nsresult
+nsXFormsSubmissionElement::SetContextInfo()
+{
+
+  return NS_OK;
+}
+
+nsresult
+nsXFormsSubmissionElement::SetHttpContextInfo(PRUint32  aResponse,
+                                              const nsAString &aResponseText)
+{
+  nsresult rv;
+
+  nsCOMPtr<nsXFormsContextInfo> contextInfo = new nsXFormsContextInfo(mElement);
+  NS_ENSURE_TRUE(contextInfo, NS_ERROR_OUT_OF_MEMORY);
+  // response-status-code
+  if (aResponse > 0) {
+    contextInfo->SetNumberValue("response-status-code", aResponse);
+    mContextInfo.AppendObject(contextInfo);
+  }
+  // response-reason-phrase
+  contextInfo = new nsXFormsContextInfo(mElement);
+  NS_ENSURE_TRUE(contextInfo, NS_ERROR_OUT_OF_MEMORY);
+  contextInfo->SetStringValue("response-reason-phrase", aResponseText);
+  mContextInfo.AppendObject(contextInfo);
+  // response-headers
+  if (mHttpHeaderDoc) {
+    nsCOMPtr<nsIDOMNode> rootNode;
+    rv = mHttpHeaderDoc->GetFirstChild(getter_AddRefs(rootNode));
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    nsCOMPtr<nsIDOMXPathResult> headerNodeset;
+    nsAutoString expr;
+    expr.AssignLiteral("header");
+    rv = nsXFormsUtils::EvaluateXPath(expr, rootNode, rootNode,
+                                      nsIDOMXPathResult::ORDERED_NODE_SNAPSHOT_TYPE,
+                                      getter_AddRefs(headerNodeset));
+
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    if (headerNodeset) {
+      contextInfo = new nsXFormsContextInfo(mElement);
+      NS_ENSURE_TRUE(contextInfo, NS_ERROR_OUT_OF_MEMORY);
+      contextInfo->SetNodesetValue("response-headers", headerNodeset);
+      mContextInfo.AppendObject(contextInfo);
+#ifdef DEBUG
+      PRUint32 nodesetSize = 0;
+      headerNodeset->GetSnapshotLength(&nodesetSize);
+      for (PRUint32 i = 0; i < nodesetSize; i++) {
+        nsCOMPtr<nsIDOMNode> headerNode, nameNode, valueNode;
+        headerNodeset->SnapshotItem(i, getter_AddRefs(headerNode));
+        headerNode->GetFirstChild(getter_AddRefs(nameNode));
+        nsAutoString name, value;
+        nsXFormsUtils::GetNodeValue(nameNode, name);
+        nameNode->GetNextSibling(getter_AddRefs(valueNode));
+        nsXFormsUtils::GetNodeValue(valueNode, value);
+      }
+#endif // DEBUG
+    }
+  }
+
+  return NS_OK;
+}
+
+nsresult
+nsXFormsSubmissionElement::ParseErrorResponse(nsIChannel *aChannel)
+{
+  // Context Info: response-body
+  // When the error response specifies an XML media type as defined by
+  // RFC 3023], the response body is parsed into an XML document and the
+  // root element of the document is returned. If the parse fails, or if
+  // the error response specifies a text media type (starting with text/),
+  // then the response body is returned as a string.
+  // Otherwise, an empty string is returned.
+  nsCString contentCharset, contentType;
+  aChannel->GetContentCharset(contentCharset);
+  aChannel->GetContentType(contentType);
+
+  // use DOM parser to construct nsIDOMDocument
+  nsCOMPtr<nsIDOMParser> parser =
+    do_CreateInstance("@mozilla.org/xmlextras/domparser;1");
+  NS_ENSURE_STATE(parser);
+
+  PRUint32 contentLength;
+  mPipeIn->Available(&contentLength);
+
+  // set the base uri so that the document can get the correct security
+  // principal.
+  nsCOMPtr<nsIURI> uri;
+  nsresult rv = aChannel->GetURI(getter_AddRefs(uri));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  NS_ENSURE_STATE(mElement);
+  nsCOMPtr<nsIDOMDocument> domDoc;
+  mElement->GetOwnerDocument(getter_AddRefs(domDoc));
+  nsCOMPtr<nsIDocument> doc = do_QueryInterface(domDoc);
+  NS_ENSURE_STATE(doc);
+  NS_ENSURE_STATE(doc->GetScriptGlobalObject());
+  rv = parser->Init(nsnull, uri, nsnull, doc->GetScriptGlobalObject());
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  // Try to parse the content into an XML document. If the parse fails, the
+  // content type is not an XML type that ParseFromStream can handle. In that
+  // case, read the response as a simple string.
+  nsCOMPtr<nsXFormsContextInfo> contextInfo;
+  nsCOMPtr<nsIDOMDocument> newDoc;
+  rv = parser->ParseFromStream(mPipeIn, contentCharset.get(), contentLength,
+                          contentType.get(), getter_AddRefs(newDoc));
+  if (NS_SUCCEEDED(rv)) {
+    // Succeeded in parsing the error response as an XML document.
+    nsCOMPtr<nsIDOMNode> responseBody = do_QueryInterface(newDoc);
+    if (newDoc) {
+      contextInfo = new nsXFormsContextInfo(mElement);
+      NS_ENSURE_TRUE(contextInfo, NS_ERROR_OUT_OF_MEMORY);
+
+      contextInfo->SetNodeValue("response-body", responseBody);
+      mContextInfo.AppendObject(contextInfo);
+    }
+  } else {
+    // Read the content as a simple string and set a string into the
+    // context info.
+    PRUint32 len, read, numReadIn = 1;
+    nsCAutoString responseBody;
+
+    rv = mPipeIn->Available(&len);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    char *buf = new char[len+1];
+    NS_ENSURE_TRUE(buf, NS_ERROR_OUT_OF_MEMORY);
+    memset(buf, 0, len+1);
+
+    // Read returns 0 if eos
+    while (numReadIn != 0) {
+      numReadIn = mPipeIn->Read(buf, len, &read);
+      responseBody.Append(buf);
+    }
+    delete [] buf;
+
+    // Set the string response body as context info.
+    contextInfo = new nsXFormsContextInfo(mElement);
+    NS_ENSURE_TRUE(contextInfo, NS_ERROR_OUT_OF_MEMORY);
+    contextInfo->SetStringValue("response-body",
+                                NS_ConvertUTF8toUTF16(responseBody));
+    mContextInfo.AppendObject(contextInfo);
+  }
+
+  return NS_OK;
+}
+
 // factory constructor
 
 nsresult
diff --git a/extensions/xforms/nsXFormsSubmissionElement.h b/extensions/xforms/nsXFormsSubmissionElement.h
index 591f448..9a0ba67 100644
--- a/extensions/xforms/nsXFormsSubmissionElement.h
+++ b/extensions/xforms/nsXFormsSubmissionElement.h
@@ -21,6 +21,7 @@
  *
  * Contributor(s):
  *  Darin Fisher <darin@meer.net>
+ *  Merle Sterling <msterlin@us.ibm.com>
  *
  * 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
@@ -41,15 +42,17 @@
 
 #include "nsXFormsStubElement.h"
 #include "nsIRequestObserver.h"
-#include "nsIInputStream.h"
+#include "nsIAsyncInputStream.h"
 #include "nsCOMPtr.h"
 #include "nsIModelElementPrivate.h"
 #include "nsIXFormsSubmitElement.h"
 #include "nsIXFormsSubmissionElement.h"
 #include "nsIChannelEventSink.h"
 #include "nsIInterfaceRequestor.h"
-#include "nsHashSets.h"
 #include "nsIDocument.h"
+#include "nsIHttpHeaderVisitor.h"
+#include "nsIXFormsContextInfo.h"
+#include "nsDataHashtable.h"
 
 
 class nsIMultiplexInputStream;
@@ -71,7 +74,8 @@ class nsXFormsSubmissionElement : public nsXFormsStubElement,
                                   public nsIRequestObserver,
                                   public nsIXFormsSubmissionElement,
                                   public nsIChannelEventSink,
-                                  public nsIInterfaceRequestor
+                                  public nsIInterfaceRequestor,
+                                  public nsIHttpHeaderVisitor
 {
 public:
   NS_DECL_ISUPPORTS_INHERITED
@@ -79,13 +83,15 @@ public:
   NS_DECL_NSIXFORMSSUBMISSIONELEMENT
   NS_DECL_NSICHANNELEVENTSINK
   NS_DECL_NSIINTERFACEREQUESTOR
+  NS_DECL_NSIHTTPHEADERVISITOR
 
   nsXFormsSubmissionElement()
-    : nsXFormsStubElement(),
+    : mElement(nsnull),
       mSubmissionActive(PR_FALSE),
       mIsReplaceInstance(PR_FALSE),
       mIsSOAPRequest(PR_FALSE),
-      mFormat(0)
+      mFormat(0),
+      mSubmissionBody(nsnull)
   {}
 
   // nsIXTFElement overrides
@@ -145,6 +151,7 @@ public:
                                 const nsCString &contentType);
 
 private:
+  nsIDOMElement*                   mElement;
   PRPackedBool                     mSubmissionActive;
    // Valid when mSubmissionActive == PR_TRUE
   PRPackedBool                     mIsReplaceInstance;
@@ -154,16 +161,27 @@ private:
   nsCOMPtr<nsIXFormsSubmitElement> mActivator;
 
   // input end of pipe, which contains response data.
-  nsCOMPtr<nsIInputStream>         mPipeIn;
+  nsCOMPtr<nsIAsyncInputStream>    mPipeIn;
+
+  // Context Info for events.
+  nsCOMArray<nsIXFormsContextInfo> mContextInfo;
+  // Document for http header context info.
+  nsCOMPtr<nsIDOMDocument>         mHttpHeaderDoc;
+  // Submission body from xforms-submit-serialize.
+  nsIDOMNode*                      mSubmissionBody;
+  // Type of submit error.
+  nsString                         mSubmitError;
 
   /**
    * @return true if aTestURI has the same origin as aBaseURI or if
    * there is no need for a same origin check.
    */
   PRBool CheckSameOrigin(nsIDocument *aBaseDocument, nsIURI *aTestURI);
-  nsresult AddNameSpaces(nsIDOMElement* aTarget, nsIDOMNode* aSource,
-                         nsStringHashSet* aPrefixHash);
-  nsresult GetIncludeNSPrefixesAttr(nsStringHashSet** aHash);
+  nsresult AddNameSpaces(
+             nsIDOMElement* aTarget, nsIDOMNode* aSource,
+             nsDataHashtable<nsStringHashKey, PRUint32>* aPrefixHash);
+  nsresult GetIncludeNSPrefixesAttr(
+             nsDataHashtable<nsStringHashKey, PRUint32>** aHash);
 
   /**
    * Send xforms-submit-done/-error, depending on |aSucceeded|
@@ -196,6 +214,21 @@ private:
    */
   nsresult CreateAttachments(nsIModelElementPrivate *aModel, nsIDOMNode *aDoc,
                              SubmissionAttachmentArray *aAttachments);
+
+  /**
+   * Set context info.
+   */
+  nsresult SetContextInfo();
+
+  /**
+   * Set Http context info.
+   *
+   * @param aResponse         Protocol response code
+   * @param aResponseText     Protocol response reason phrase
+   */
+  nsresult SetHttpContextInfo(PRUint32 aResponse, const nsAString &aResponseText);
+
+  nsresult ParseErrorResponse(nsIChannel *aChannel);
 };
 
 NS_HIDDEN_(nsresult)
diff --git a/extensions/xforms/nsXFormsSwitchElement.cpp b/extensions/xforms/nsXFormsSwitchElement.cpp
index 6171c50..ef56746 100644
--- a/extensions/xforms/nsXFormsSwitchElement.cpp
+++ b/extensions/xforms/nsXFormsSwitchElement.cpp
@@ -39,7 +39,7 @@
 #include "nsCOMPtr.h"
 #include "nsIDOMElement.h"
 #include "nsIDOMDocument.h"
-#include "nsString.h"
+#include "nsStringAPI.h"
 #include "nsIDocument.h"
 #include "nsIDOMNodeList.h"
 
diff --git a/extensions/xforms/nsXFormsToggleElement.cpp b/extensions/xforms/nsXFormsToggleElement.cpp
index fea8b68..0705241 100644
--- a/extensions/xforms/nsXFormsToggleElement.cpp
+++ b/extensions/xforms/nsXFormsToggleElement.cpp
@@ -40,7 +40,7 @@
 #include "nsIDOMDocument.h"
 #include "nsIDOMEvent.h"
 #include "nsIDOMElement.h"
-#include "nsString.h"
+#include "nsStringAPI.h"
 #include "nsXFormsUtils.h"
 #include "nsIXFormsSwitchElement.h"
 
@@ -52,13 +52,11 @@ class nsXFormsToggleElement : public nsXFormsActionModuleBase
 {
 public:
   nsXFormsToggleElement();
-protected:
-  nsresult HandleSingleAction(nsIDOMEvent* aEvent,
-                              nsIXFormsActionElement *aParentAction);
+  virtual nsresult HandleSingleAction(nsIDOMEvent* aEvent,
+                                      nsIXFormsActionElement *aParentAction);
 };
 
-nsXFormsToggleElement::nsXFormsToggleElement() :
-  nsXFormsActionModuleBase(PR_TRUE)
+nsXFormsToggleElement::nsXFormsToggleElement()
 {
 }
 
diff --git a/extensions/xforms/nsXFormsTriggerElement.cpp b/extensions/xforms/nsXFormsTriggerElement.cpp
index 385986c..7e73647 100644
--- a/extensions/xforms/nsXFormsTriggerElement.cpp
+++ b/extensions/xforms/nsXFormsTriggerElement.cpp
@@ -47,7 +47,7 @@
 #include "nsIDOMDocumentView.h"
 #include "nsIDOMAbstractView.h"
 #include "nsCOMPtr.h"
-#include "nsString.h"
+#include "nsStringAPI.h"
 #include "nsXFormsAtoms.h"
 #include "nsXFormsUtils.h"
 #include "nsXFormsControlStub.h"
diff --git a/extensions/xforms/nsXFormsUploadElement.cpp b/extensions/xforms/nsXFormsUploadElement.cpp
index 9b392bc..1f9d038 100644
--- a/extensions/xforms/nsXFormsUploadElement.cpp
+++ b/extensions/xforms/nsXFormsUploadElement.cpp
@@ -156,12 +156,12 @@ nsXFormsUploadElement::PickFile()
   rv = bundleService->CreateBundle(NS_HTMLFORM_BUNDLE_URL,
                                    getter_AddRefs(bundle));
   NS_ENSURE_SUCCESS(rv, rv);
-  nsXPIDLString filepickerTitle;
+  nsString filepickerTitle;
   rv = bundle->GetStringFromName(NS_LITERAL_STRING("FileUpload").get(),
                                  getter_Copies(filepickerTitle));
   if (NS_FAILED(rv)) {
     // fall back to English text
-    filepickerTitle.AssignASCII("File Upload");
+    filepickerTitle.AssignLiteral("File Upload");
   }
 
   // get nsIDOMWindowInternal
@@ -191,15 +191,16 @@ nsXFormsUploadElement::PickFile()
       do_GetService("@mozilla.org/mime;1", &rv);
     NS_ENSURE_SUCCESS(rv, rv);
 
-    nsAString::const_iterator start, end, iter;
-    mediaType.BeginReading(start);
-    mediaType.BeginReading(iter);
-    mediaType.EndReading(end);
+    const PRUnichar *start = nsnull, *end = nsnull, *iter = nsnull;
+    mediaType.BeginReading(&start, &end);
+    mediaType.BeginReading(&iter);
 
     nsAutoString fileFilter;
     nsAutoString mimeType;
     while (iter != end) {
-      if (FindCharInReadable(' ', iter, end)) {
+      while (iter < end && *iter != ' ')
+        ++iter;
+      if (iter < end) {
          mimeType = Substring(start, iter);
          // Skip the space.
          ++iter;
@@ -454,7 +455,7 @@ ReportEncodingMemoryError(nsIDOMElement* aElement, nsIFile *aFile,
   }
 
   nsAutoString size;
-  size.AppendInt((PRInt64)aFailedSize);
+  size.AppendInt(aFailedSize);
   const PRUnichar *strings[] = { filename.get(), size.get() };
   nsXFormsUtils::ReportError(NS_LITERAL_STRING("encodingMemoryError"),
                              strings, 2, aElement, aElement);
@@ -494,7 +495,7 @@ nsXFormsUploadElement::EncodeFileContents(nsIFile *aFile, PRUint16 aType,
       *aResult = nsnull;
       char *buffer = PL_Base64Encode(fileData.Elements(), bytesRead, nsnull);
       if (buffer) {
-        *aResult = ToNewUnicode(nsDependentCString(buffer));
+        *aResult = ToNewUnicode(NS_ConvertASCIItoUTF16(buffer));
         PR_Free(buffer);
       }
       if (!*aResult) {
diff --git a/extensions/xforms/nsXFormsUtils.cpp b/extensions/xforms/nsXFormsUtils.cpp
index 3c85aad..4e38f1c 100644
--- a/extensions/xforms/nsXFormsUtils.cpp
+++ b/extensions/xforms/nsXFormsUtils.cpp
@@ -38,7 +38,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsXFormsUtils.h"
-#include "nsString.h"
+#include "nsStringAPI.h"
 #include "nsXFormsAtoms.h"
 #include "nsIDOMElement.h"
 #include "nsIDOMNSHTMLElement.h"
@@ -61,12 +61,9 @@
 #include "nsIDOMLocation.h"
 #include "nsIDOMSerializer.h"
 #include "nsIContent.h"
-#include "nsIAttribute.h"
 #include "nsXFormsAtoms.h"
 #include "nsIXFormsRepeatElement.h"
 #include "nsIContentPolicy.h"
-#include "nsContentUtils.h"
-#include "nsContentPolicyUtils.h"
 #include "nsIXFormsContextControl.h"
 #include "nsIDOMDocumentEvent.h"
 #include "nsIDOMEvent.h"
@@ -81,7 +78,6 @@
 
 #include "nsIScriptSecurityManager.h"
 #include "nsIPermissionManager.h"
-#include "nsServiceManagerUtils.h"
 #include "nsIDOMAttr.h"
 #include "nsIDOM3Node.h"
 #include "nsIConsoleService.h"
@@ -96,7 +92,9 @@
 #include "nsISchemaDuration.h"
 #include "nsXFormsSchemaValidator.h"
 #include "prdtoa.h"
+#include "prprf.h"
 
+#include "nsIPref.h"
 #include "nsIPrefBranch.h"
 #include "nsIPrefService.h"
 #include "nsIDOMDocumentView.h"
@@ -115,6 +113,11 @@
 #include "nsIInterfaceRequestor.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsIPrompt.h"
+#include "nsComponentManagerUtils.h"
+#include "nsServiceManagerUtils.h"
+#include "nsIDocShell.h"
+#include "nsIDocCharset.h"
+#include "nsNetUtil.h"
 
 // For locale aware string methods
 #include "plstr.h"
@@ -122,7 +125,7 @@
 #define CANCELABLE 0x01
 #define BUBBLES    0x02
 
-const EventData sXFormsEventsEntries[42] = {
+const EventData sXFormsEventsEntries[43] = {
   { "xforms-model-construct",      PR_FALSE, PR_TRUE  },
   { "xforms-model-construct-done", PR_FALSE, PR_TRUE  },
   { "xforms-ready",                PR_FALSE, PR_TRUE  },
@@ -164,7 +167,8 @@ const EventData sXFormsEventsEntries[42] = {
   { "xforms-link-exception",       PR_FALSE, PR_TRUE  },
   { "xforms-link-error",           PR_FALSE, PR_TRUE  },
   { "xforms-compute-exception",    PR_FALSE, PR_TRUE  },
-  { "xforms-moz-hint-off",         PR_FALSE, PR_TRUE  }
+  { "xforms-moz-hint-off",         PR_FALSE, PR_TRUE  },
+  { "xforms-submit-serialize",     PR_FALSE, PR_TRUE  }
 };
 
 static const EventData sEventDefaultsEntries[] = {
@@ -220,6 +224,7 @@ struct EventItem
   nsXFormsEvent           event;
   nsCOMPtr<nsIDOMNode>    eventTarget;
   nsCOMPtr<nsIDOMElement> srcElement;
+  nsCOMArray<nsIXFormsContextInfo> *contextInfo;
 };
 
 static PRBool gExperimentalFeaturesEnabled = PR_FALSE;
@@ -566,7 +571,7 @@ nsXFormsUtils::EvaluateXPath(const nsAString        &aExpression,
 
   PRBool throwException = PR_FALSE;
   if (!expression) {
-    const nsPromiseFlatString& flat = PromiseFlatString(aExpression);
+    const nsString& flat = PromiseFlatString(aExpression);
     const PRUnichar *strings[] = { flat.get() };
     nsXFormsUtils::ReportError(NS_LITERAL_STRING("exprParseError"),
                                strings, 1, aContextNode, nsnull);
@@ -611,7 +616,7 @@ nsXFormsUtils::EvaluateXPath(const nsAString        &aExpression,
     }
 
     if (rv == NS_ERROR_XFORMS_CALCULATION_EXCEPTION) {
-      const nsPromiseFlatString& flat = PromiseFlatString(aExpression);
+      const nsString& flat = PromiseFlatString(aExpression);
       const PRUnichar *strings[] = { flat.get() };
       nsXFormsUtils::ReportError(NS_LITERAL_STRING("exprEvaluateError"),
                                  strings, 1, aContextNode, nsnull);
@@ -625,7 +630,21 @@ nsXFormsUtils::EvaluateXPath(const nsAString        &aExpression,
     nsCOMPtr<nsIModelElementPrivate> modelPriv =
       nsXFormsUtils::GetModel(resolverElement);
     nsCOMPtr<nsIDOMNode> model = do_QueryInterface(modelPriv);
-    DispatchEvent(model, eEvent_ComputeException, nsnull, resolverElement);
+
+    // Context Info: 'error-message'
+    // Error message containing the expression being processed.
+    nsAutoString errorMsg;
+    errorMsg.AssignLiteral("Error evaluating expression: ");
+    errorMsg.Append(aExpression);
+
+    nsCOMPtr<nsXFormsContextInfo> contextInfo =
+      new nsXFormsContextInfo(resolverElement);
+    NS_ENSURE_TRUE(contextInfo, NS_ERROR_OUT_OF_MEMORY);
+    contextInfo->SetStringValue("error-message", errorMsg);
+    nsCOMArray<nsIXFormsContextInfo> contextInfoArray;
+    contextInfoArray.AppendObject(contextInfo);
+    DispatchEvent(model, eEvent_ComputeException, nsnull, resolverElement,
+                  &contextInfoArray);
   }
 
   return rv;
@@ -782,7 +801,7 @@ nsXFormsUtils::EvaluateNodeBinding(nsIDOMElement           *aElement,
             const PRUnichar* colon;
             rv = parserService->CheckQName(expr, PR_TRUE, &colon);
             if (NS_SUCCEEDED(rv)) {
-              nsAutoString namespaceURI(EmptyString());
+              nsAutoString namespaceURI;
 
               // if we detect a namespace, we'll add it to the node, otherwise
               // we'll use the empty namespace.  If we should have gotten a
@@ -970,7 +989,8 @@ nsXFormsUtils::GetSingleNodeBindingValue(nsIDOMElement* aElement,
 
 nsresult
 DispatchXFormsEvent(nsIDOMNode* aTarget, nsXFormsEvent aEvent,
-                    PRBool *aDefaultActionEnabled)
+                    PRBool *aDefaultActionEnabled,
+                    nsCOMArray<nsIXFormsContextInfo> *aContextInfo)
 {
   nsCOMPtr<nsIDOMDocument> domDoc;
   aTarget->GetOwnerDocument(getter_AddRefs(domDoc));
@@ -990,8 +1010,12 @@ DispatchXFormsEvent(nsIDOMNode* aTarget, nsXFormsEvent aEvent,
 
   nsXFormsUtils::SetEventTrusted(event, aTarget);
 
+  // Create an nsXFormsDOMEvent with the context info for the event.
+  nsCOMPtr<nsIXFormsDOMEvent> xfDOMEvent = new nsXFormsDOMEvent(event, aContextInfo);
+  NS_ENSURE_TRUE(xfDOMEvent, NS_ERROR_OUT_OF_MEMORY);
+
   PRBool defaultActionEnabled = PR_TRUE;
-  nsresult rv = target->DispatchEvent(event, &defaultActionEnabled);
+  nsresult rv = target->DispatchEvent(xfDOMEvent, &defaultActionEnabled);
 
   if (NS_SUCCEEDED(rv) && aDefaultActionEnabled)
     *aDefaultActionEnabled = defaultActionEnabled;
@@ -1023,6 +1047,10 @@ DispatchXFormsEvent(nsIDOMNode* aTarget, nsXFormsEvent aEvent,
     break;
   }
 
+  // Clear the context info array before the next event.
+  if (aContextInfo)
+    aContextInfo->Clear();
+
   return rv;
 }
 
@@ -1045,7 +1073,8 @@ DeleteVoidArray(void    *aObject,
 
 nsresult
 DeferDispatchEvent(nsIDOMNode* aTarget, nsXFormsEvent aEvent,
-                   nsIDOMElement *aSrcElement)
+                   nsIDOMElement *aSrcElement,
+                   nsCOMArray<nsIXFormsContextInfo> *aContextInfo)
 {
   nsCOMPtr<nsIDOMDocument> domDoc;
   if (aTarget) {
@@ -1075,6 +1104,7 @@ DeferDispatchEvent(nsIDOMNode* aTarget, nsXFormsEvent aEvent,
   deferredEvent->event = aEvent;
   deferredEvent->eventTarget = aTarget;
   deferredEvent->srcElement = aSrcElement;
+  deferredEvent->contextInfo = aContextInfo;
   eventList->AppendElement(deferredEvent);
 
   return NS_OK;
@@ -1083,7 +1113,8 @@ DeferDispatchEvent(nsIDOMNode* aTarget, nsXFormsEvent aEvent,
 /* static */ nsresult
 nsXFormsUtils::DispatchEvent(nsIDOMNode* aTarget, nsXFormsEvent aEvent,
                              PRBool *aDefaultActionEnabled,
-                             nsIDOMElement *aSrcElement)
+                             nsIDOMElement *aSrcElement,
+                             nsCOMArray<nsIXFormsContextInfo> *aContextInfo)
 {
   // it is valid to have aTarget be null if this is an event that must be
   // targeted at a model per spec and aSrcElement is non-null.  Basically we
@@ -1137,7 +1168,7 @@ nsXFormsUtils::DispatchEvent(nsIDOMNode* aTarget, nsXFormsEvent aEvent,
         // model later when the DOM is finished loading
         if (!aTarget) {
           if (aSrcElement) {
-            DeferDispatchEvent(aTarget, aEvent, aSrcElement);
+            DeferDispatchEvent(aTarget, aEvent, aSrcElement, aContextInfo);
             return NS_OK;
           }
           return NS_ERROR_FAILURE;
@@ -1149,7 +1180,7 @@ nsXFormsUtils::DispatchEvent(nsIDOMNode* aTarget, nsXFormsEvent aEvent,
         PRBool safeToSendEvent = PR_FALSE;
         modelPriv->GetHasDOMContentFired(&safeToSendEvent);
         if (!safeToSendEvent) {
-          DeferDispatchEvent(aTarget, aEvent, nsnull);
+          DeferDispatchEvent(aTarget, aEvent, nsnull, aContextInfo);
           return NS_OK;
         }
       
@@ -1191,7 +1222,7 @@ nsXFormsUtils::DispatchEvent(nsIDOMNode* aTarget, nsXFormsEvent aEvent,
         PRBool safeToSendEvent = PR_FALSE;
         modelPriv->GetHasDOMContentFired(&safeToSendEvent);
         if (!safeToSendEvent) {
-          DeferDispatchEvent(aTarget, aEvent, nsnull);
+          DeferDispatchEvent(aTarget, aEvent, nsnull, aContextInfo);
           return NS_OK;
         }
       
@@ -1201,7 +1232,7 @@ nsXFormsUtils::DispatchEvent(nsIDOMNode* aTarget, nsXFormsEvent aEvent,
       break;
   }
 
-  return DispatchXFormsEvent(aTarget, aEvent, aDefaultActionEnabled);
+  return DispatchXFormsEvent(aTarget, aEvent, aDefaultActionEnabled, aContextInfo);
 
 }
 
@@ -1257,7 +1288,7 @@ nsXFormsUtils::DispatchDeferredEvents(nsIDOMDocument* aDocument)
       NS_ENSURE_STATE(item->eventTarget);
     }
 
-    DispatchXFormsEvent(item->eventTarget, item->event, nsnull);
+    DispatchXFormsEvent(item->eventTarget, item->event, nsnull, item->contextInfo);
   }
 
   doc->DeleteProperty(nsXFormsAtoms::deferredEventListProperty);
@@ -1572,7 +1603,7 @@ nsXFormsUtils::CheckSameOrigin(nsIDocument   *aBaseDocument,
   // permitted to access sites from other domains.
 
   nsCOMPtr<nsIPermissionManager> permMgr =
-      do_GetService(NS_PERMISSIONMANAGER_CONTRACTID);
+    do_GetService(NS_PERMISSIONMANAGER_CONTRACTID);
   NS_ENSURE_TRUE(permMgr, PR_FALSE);
 
   nsCOMPtr<nsIURI> principalURI;
@@ -1600,17 +1631,28 @@ nsXFormsUtils::CheckContentPolicy(nsIDOMElement *aElement,
 {
   NS_ASSERTION(aElement && aDoc && aURI, "Got null parameters?!");
 
+  nsIURI *docURI = aDoc->GetDocumentURI();
+  NS_ENSURE_TRUE(docURI, PR_FALSE);
+
+  nsresult rv;
+  nsCOMPtr<nsIContentPolicy> policy =
+    do_GetService("@mozilla.org/layout/content-policy;1", &rv);
+  if (NS_FAILED(rv) || !policy) {
+    return PR_FALSE;
+  }
+
   PRInt16 decision = nsIContentPolicy::ACCEPT;
-  nsresult rv = NS_CheckContentLoadPolicy(nsIContentPolicy::TYPE_OTHER,
-                                          aURI,
-                                          aDoc->NodePrincipal(),
-                                          aElement,        // context
-                                          EmptyCString(),  // mime guess
-                                          nsnull,          // extra
-                                          &decision);
+  rv = policy->ShouldLoad(nsIContentPolicy::TYPE_OTHER,
+                          aURI,
+                          docURI,
+                          aElement,        // context
+                          EmptyCString(),  // mime guess
+                          nsnull,          // extra
+                          &decision);
+
   NS_ENSURE_SUCCESS(rv, PR_FALSE);
 
-  return NS_CP_ACCEPTED(decision);
+  return (decision == nsIContentPolicy::ACCEPT);
 }
 
 /*static*/ PRBool
@@ -1765,7 +1807,7 @@ nsXFormsUtils::ReportError(const nsAString& aMessage, const PRUnichar **aParams,
     nsCOMPtr<nsIStringBundle> bundle;
     bundleService->CreateBundle("chrome://xforms/locale/xforms.properties",
                                 getter_AddRefs(bundle));
-    nsXPIDLString message;
+    nsString message;
     if (aParams) {
       bundle->FormatStringFromName(PromiseFlatString(aMessage).get(), aParams,
                                    aParamLength, getter_Copies(message));
@@ -2604,7 +2646,7 @@ nsXFormsUtils::GetMonths(const nsAString & aValue, PRInt32 * aMonths)
 
   *aMonths = 0;
   nsCOMPtr<nsISchemaDuration> duration;
-  nsCOMPtr<nsISchemaValidator> schemaValidator = 
+  nsCOMPtr<nsISchemaValidator> schemaValidator =
     do_CreateInstance("@mozilla.org/schemavalidator;1");
   NS_ENSURE_TRUE(schemaValidator, NS_ERROR_FAILURE);
 
@@ -2714,16 +2756,15 @@ nsXFormsUtils::GetSecondsFromDateTime(const nsAString & aValue,
     return NS_OK;
   }
 
-  const nsAString& fraction = Substring(aValue, findFractionalSeconds+1,
+  const nsAString& fraction = Substring(aValue, findFractionalSeconds + 1,
                                         aValue.Length());
 
   PRBool done = PR_FALSE;
   PRUnichar currentChar;
   nsCAutoString fractionResult;
-  nsAString::const_iterator start, end, buffStart;
-  fraction.BeginReading(start);
-  fraction.BeginReading(buffStart);
-  fraction.EndReading(end);
+  const PRUnichar *start = nsnull, *end = nsnull, *buffStart = nsnull;
+  fraction.BeginReading(&start, &end);
+  fraction.BeginReading(&buffStart);
 
   while ((start != end) && !done) {
     currentChar = *start++;
@@ -2735,8 +2776,9 @@ nsXFormsUtils::GetSecondsFromDateTime(const nsAString & aValue,
     if ((currentChar == 'Z') || (currentChar == '+') || (currentChar == '-') ||
         (start == end)) {
       fractionResult.AssignLiteral("0.");
-      AppendUTF16toUTF8(Substring(buffStart.get(), start.get()-1),
-                        fractionResult);
+      nsCAutoString tempCString =
+        NS_ConvertUTF16toUTF8(Substring(buffStart, start - 1));
+      fractionResult.Append(tempCString);
     } else if ((currentChar > '9') || (currentChar < '0')) {
       // has to be a numerical character or else abort.  This should have been
       // caught by the schemavalidator, but it is worth double checking.
@@ -2768,18 +2810,17 @@ nsXFormsUtils::GetDaysFromDateTime(const nsAString & aValue, PRInt32 * aDays)
     do_CreateInstance("@mozilla.org/schemavalidator;1");
   NS_ENSURE_TRUE(schemaValidator, NS_ERROR_FAILURE);
 
-  // aValue could be a xsd:date or a xsd:dateTime.  If it is a dateTime, we
-  // should ignore the hours, minutes, and seconds according to 7.10.2 in
-  // the spec.  So search for such things now.  If they are there, strip 'em.
-  PRInt32 findTime = aValue.FindChar('T');
+  // aValue could be a xsd:date or a xsd:dateTime.  If it is a xsd:dateTime,
+  // there will be a 'T' separating the date portion of the string from the time
+  // portion http://www.w3.org/TR/xmlschema-2/#dateTime
+  PRInt32 timeSeparator = aValue.FindChar('T');
 
-  nsAutoString dateString;
-  dateString.Assign(aValue);
-  if (findTime >= 0) {
-    dateString.Assign(Substring(dateString, 0, findTime));
+  nsresult rv;
+  if (timeSeparator >= 0) {
+    rv = schemaValidator->ValidateBuiltinTypeDateTime(aValue, &date);
+  } else {
+    rv = schemaValidator->ValidateBuiltinTypeDate(aValue, &date);
   }
-
-  nsresult rv = schemaValidator->ValidateBuiltinTypeDate(dateString, &date);
   NS_ENSURE_SUCCESS(rv, rv);
 
   PRTime secs64 = date;
@@ -2795,12 +2836,75 @@ nsXFormsUtils::GetDaysFromDateTime(const nsAString & aValue, PRInt32 * aDays)
   // convert whole seconds to PRInt32
   LL_L2I(secs32, secs64);
 
-  // convert whole seconds to days.  86400 seconds in a day.
+  // If aValue was a dateTime, "Hour, minute, and second components are ignored
+  // after normalization" according to 7.10.2 in the spec.  So according to spec
+  // we should strip off the fraction of a day after normalizing and before
+  // figuring out its distance from the epoch.  But secs32 already has been
+  // normalized and contains the distance from the epoch.  So now we might have
+  // to alter aDays to account for the fact that we didn't remove any fraction
+  // before.  For example, if aValue is 1970-01-02T12:00:00, then this is
+  // 1.5 days after the epoch.  But if we removed the fraction before the
+  // calculation we'd have 1970-01-02, which is 1 day from the epoch.  So
+  // GetDaysFromDateTime would return 1.  So we see that if aValue is on or
+  // after the epoch, we can ignore the remainder.  However, if aValue is
+  // 1969-12-31T12:00:00, this would be -0.5 days from the epoch.  Applying
+  // the spec rule of dropping the fractional day, we would be calculating
+  // using 1969-12-31 which would give us -1 days from the epoch (negative
+  // because it is before the epoch).  So we can't simply ignore the remainder.
+  // If we have a negative value with a remainder, we need to round down to
+  // the next whole day value.  So that is what we will do below.
+
+  // Convert seconds to days.  86400 seconds in a day.
   *aDays = secs32/86400;
 
+  // Apply the rule from above to simulate having removed the fractional day
+  // prior to calculating the distance from the epoch.  If secs32 is negative
+  // then if there was a fraction of a day, round down a day.
+  if (secs32 < 0) {
+    PRInt32 remainder = secs32%86400;
+    if (remainder) {
+      --*aDays;
+    }
+  }
+
   return NS_OK;
 }
 
+/* static */ nsresult
+nsXFormsUtils::GetTime(nsAString & aResult, PRBool aUTC)
+{
+    PRExplodedTime time;
+    char ctime[60];
+
+    PR_ExplodeTime(PR_Now(),
+                   aUTC ? PR_GMTParameters : PR_LocalTimeParameters, &time);
+
+    PR_FormatTime(ctime, sizeof(ctime), "%Y-%m-%dT%H:%M:%S\0", &time);
+
+    aResult.AssignLiteral(ctime);
+
+    if (aUTC) {
+      aResult.AppendLiteral("Z");
+      return NS_OK;
+    }
+
+    int gmtoffsethour = time.tm_params.tp_gmt_offset < 0 ?
+                        -1*time.tm_params.tp_gmt_offset / 3600 :
+                        time.tm_params.tp_gmt_offset / 3600;
+    int remainder = time.tm_params.tp_gmt_offset%3600;
+    int gmtoffsetminute = remainder ? remainder/60 : 00;
+  
+    char zone_location[40];
+    const int zoneBufSize = sizeof(zone_location);
+    PR_snprintf(zone_location, zoneBufSize, "%c%02d:%02d\0",
+                time.tm_params.tp_gmt_offset < 0 ? '-' : '+',
+                gmtoffsethour, gmtoffsetminute);
+
+    aResult.Append(NS_ConvertASCIItoUTF16(zone_location));
+
+    return NS_OK;
+}
+
 /* static */ PRBool
 nsXFormsUtils::SetSingleNodeBindingValue(nsIDOMElement *aElement,
                                          const nsAString &aValue,
@@ -2883,7 +2987,7 @@ nsXFormsUtils::AskStopWaiting(nsIDOMElement *aElement)
                               getter_AddRefs(bundle));
   NS_ENSURE_TRUE(bundle, PR_TRUE);
   
-  nsXPIDLString title, msg, stopButton, waitButton;
+  nsString title, msg, stopButton, waitButton;
 
   nsresult rv;
   rv = bundle->GetStringFromName(NS_LITERAL_STRING("KillScriptTitle").get(),
@@ -2895,9 +2999,7 @@ nsXFormsUtils::AskStopWaiting(nsIDOMElement *aElement)
   rv |= bundle->GetStringFromName(NS_LITERAL_STRING("KillScriptMessage").get(),
                                   getter_Copies(msg));
 
-
-  // GetStringFromName can return NS_OK and still give NULL string
-  if (NS_FAILED(rv) || !title || !msg || !stopButton || !waitButton) {
+  if (NS_FAILED(rv)) {
     NS_ERROR("Failed to get localized strings.");
     return PR_TRUE;
   }
@@ -2907,7 +3009,8 @@ nsXFormsUtils::AskStopWaiting(nsIDOMElement *aElement)
                           (nsIPrompt::BUTTON_POS_0 + nsIPrompt::BUTTON_POS_1));
 
   // Open the dialog.
-  rv = prompt->ConfirmEx(title, msg, buttonFlags, stopButton, waitButton,
+  rv = prompt->ConfirmEx(title.get(), msg.get(), buttonFlags,
+                         stopButton.get(), waitButton.get(),
                          nsnull, nsnull, nsnull, &buttonPressed);
 
   if (NS_SUCCEEDED(rv) && (buttonPressed == 0)) {
@@ -2925,3 +3028,141 @@ nsXFormsUtils::ExperimentalFeaturesEnabled()
   // 'not yet standardized' XForms work.
   return gExperimentalFeaturesEnabled;
 }
+
+/* static */ PRInt32
+nsXFormsUtils::FindCharInSet(const nsAString &aString, const char *aSet,
+                             PRInt32 aOffset)
+{
+  if (aString.IsEmpty()) {
+    return kNotFound;
+  }
+
+  if (aOffset < 0) {
+    aOffset = 0;
+  } else if (aOffset > (PRInt32)aString.Length()) {
+    return kNotFound;
+  }
+
+  const PRUnichar *start = nsnull, *end = nsnull, *iter = nsnull;
+  aString.BeginReading(&start, &end);
+  iter = start + aOffset;
+
+  // Starting at aOffset, compare each character in the string against each
+  // character in aSet.  As soon as a character in aSet is found, we return
+  // the offset of that character in the original string.
+  for (; iter != end; ++iter) {
+    for (const char *temp = aSet; *temp; ++temp) {
+      if (*iter == PRUnichar(*temp)) {
+        return (iter - start);
+      }
+    }
+  }
+
+  return kNotFound;
+}
+
+/* static */ PRBool
+nsXFormsUtils::ConvertLineBreaks(const nsCString &aSrc, nsCString &aDest)
+{
+  // Stole most of this code from the ConvertUnknownBreaks function inside
+  // xpcom\io\nsLinebreakConverter.cpp.  Orig authored by sfraser%netscape.com.
+
+  const char *src, *srcEnd;
+  aSrc.BeginReading(&src, &srcEnd);
+  
+  const PRInt32 destBreakLen = 2;  //strlen of "\015\012", a CR LF equiv string
+  PRUint32 finalLen = 0;
+
+  if (src == srcEnd) {
+    // I guess if there isn't anything to convert, we should return PR_TRUE
+    // since we didn't encounter an error.
+    return PR_TRUE;
+  }
+
+  while (src < srcEnd)
+  {
+    if (*src == '\r')
+    {
+      if (src[1] == '\n')
+      {
+        // CRLF
+        finalLen += destBreakLen;
+        src++;
+      }
+      else
+      {
+        // Lone CR
+        finalLen += destBreakLen;
+      }
+    }
+    else if (*src == '\n')
+    {
+      // Lone LF
+      finalLen += destBreakLen;
+    }
+    else
+    {
+      finalLen++;
+    }
+    src++;
+  }
+  
+  char* dst = aDest.BeginWriting(finalLen);
+  if (!dst) return PR_FALSE;
+
+  aSrc.BeginReading(&src);
+
+  while (src < srcEnd)
+  {
+    if (*src == '\r')
+    {
+      if (src[1] == '\n')
+      {
+        // CRLF
+        *dst++ = '\015';
+        *dst++ = '\012';
+        src++;
+      }
+      else
+      {
+        // Lone CR
+        *dst++ = '\015';
+        *dst++ = '\012';
+      }
+    }
+    else if (*src == '\n')
+    {
+      // Lone LF
+      *dst++ = '\015';
+      *dst++ = '\012';
+    }
+    else
+    {
+      *dst++ = *src;
+    }
+    src++;
+  }
+
+  return PR_TRUE;
+}
+
+/* static */ nsresult
+nsXFormsUtils::GetNewURI(nsIDocument* aDoc, const nsAString& aSrc,
+                         nsIURI** aURI)
+{
+  NS_ENSURE_ARG_POINTER(aURI);
+  *aURI = nsnull;
+
+  nsCOMPtr<nsPIDOMWindow> window = aDoc->GetWindow();
+  NS_ENSURE_STATE(window);
+  nsCOMPtr<nsIDocCharset> docCharset = do_QueryInterface(window->GetDocShell());
+  NS_ENSURE_STATE(docCharset);
+  nsCString charset;
+  nsresult rv = docCharset->GetCharset(getter_Copies(charset));
+  NS_ENSURE_SUCCESS(rv, rv);
+  nsCOMPtr<nsIURI> uri;
+  rv = NS_NewURI(getter_AddRefs(uri), aSrc, charset.get(), aDoc->GetDocumentURI());
+  NS_ENSURE_SUCCESS(rv, rv);
+  NS_ADDREF(*aURI = uri);
+  return rv;
+}
diff --git a/extensions/xforms/nsXFormsUtils.h b/extensions/xforms/nsXFormsUtils.h
index e122d34..a2e689d 100644
--- a/extensions/xforms/nsXFormsUtils.h
+++ b/extensions/xforms/nsXFormsUtils.h
@@ -51,6 +51,7 @@
 #include "nsVoidArray.h"
 #include "nsIDOMWindowInternal.h"
 #include "nsXFormsXPathState.h"
+#include "nsXFormsDOMEvent.h"
 
 class nsIDOMElement;
 class nsIXFormsModelElement;
@@ -93,6 +94,8 @@ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GENERAL, 3001)
 #define NS_ERROR_XFORMS_UNION_TYPE \
 NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GENERAL, 3002)
 
+#define kNotFound -1
+
 /**
  * XForms event types
  *
@@ -144,7 +147,8 @@ enum nsXFormsEvent {
   eEvent_LinkException,
   eEvent_LinkError,
   eEvent_ComputeException,
-  eEvent_MozHintOff
+  eEvent_MozHintOff,
+  eEvent_SubmitSerialize
 };
 
 struct EventData
@@ -154,7 +158,7 @@ struct EventData
   PRBool      canBubble;
 };
 
-extern const EventData sXFormsEventsEntries[42];
+extern const EventData sXFormsEventsEntries[43];
 
 // Default intrinsic state for XForms Controls
 extern const PRInt32 kDefaultIntrinsicState;
@@ -356,7 +360,8 @@ public:
   static NS_HIDDEN_(nsresult)
     DispatchEvent(nsIDOMNode* aTarget, nsXFormsEvent aEvent,
                   PRBool *aDefaultActionEnabled = nsnull,
-                  nsIDOMElement *aSrcElement = nsnull);
+                  nsIDOMElement *aSrcElement = nsnull,
+                  nsCOMArray<nsIXFormsContextInfo> *aContextInfo = nsnull);
 
   static NS_HIDDEN_(nsresult)
     DispatchDeferredEvents(nsIDOMDocument* aDocument);
@@ -713,6 +718,17 @@ public:
                                                   PRInt32 * aDays);
 
   /**
+   * Get the current date and time as a string.  For example,
+   * 2007-01-11T17:57:30-6:00 if UTC is not set and 2007-01-11T23:57:30Z if
+   * it is.
+   *
+   * @param aResult          The returned string
+   * @param aUTC             Should the string be expressed in UTC format or
+   *                         in the current timezone.
+   */
+  static NS_HIDDEN_(nsresult) GetTime(nsAString & aResult, PRBool aUTC = false);
+
+  /**
    * Determine whether the given node contains an xf:itemset as a child.
    * In valid XForms documents this should only be possible if aNode is an
    * xf:select/1 or an xf:choices element.  This function is used primarily
@@ -753,6 +769,45 @@ public:
    */
   static NS_HIDDEN_(PRBool) ExperimentalFeaturesEnabled();
 
+  /**
+   * Same as FindCharInSet but safely uses frozen string APIs.  Compares
+   * each character in aString against each character in aSet.  If a match to
+   * one of the characters in aSet is found, the index of that character in
+   * aString is returned.
+   *
+   * @param aString             The string to search
+   * @param aSet                The list of characters to search for
+   * @param aOffset             The position to start looking from inside
+   *                            aString
+   */
+  static NS_HIDDEN_(PRInt32) FindCharInSet(const nsAString &aString,
+                                           const char      *aSet,
+                                           PRInt32          aOffset = 0);
+
+  /**
+   * Convert the line breaks in a string to CRLF.  Returns PR_FALSE if an
+   * an error occurred, otherwise returns PR_TRUE.
+   *
+   * @param aSrc                String whose line breaks need to be converted
+   *                            to CRLF
+   * @param aDest               Result string containing the converted string
+   */
+  static NS_HIDDEN_(PRBool) ConvertLineBreaks(const nsCString &aSrc,
+                                              nsCString &aDest);
+
+  /**
+   * Get a new nsIURI object based on the character set of aDoc.
+   *
+   * @param aDoc The document which character set is used when creating aURI.
+   * @param aSrc The URI string
+   * @param aURI The URI object which was created.
+   *
+   * @note aDoc must be attached to the docshell tree.
+   */
+   static NS_HIDDEN_(nsresult) GetNewURI(nsIDocument* aDoc,
+                                         const nsAString& aSrc,
+                                         nsIURI** aURI);
+
 private:
   /**
    * Do same origin checks on aBaseDocument and aTestURI. Hosts can be
@@ -783,7 +838,6 @@ private:
   static NS_HIDDEN_(PRBool) CheckContentPolicy(nsIDOMElement *aElement,
                                                nsIDocument   *aDoc,
                                                nsIURI        *aURI);
-
 };
 
 #endif
diff --git a/extensions/xforms/nsXFormsValueElement.cpp b/extensions/xforms/nsXFormsValueElement.cpp
index c8c725e..60d34c3 100644
--- a/extensions/xforms/nsXFormsValueElement.cpp
+++ b/extensions/xforms/nsXFormsValueElement.cpp
@@ -42,7 +42,7 @@
 #include "nsIDOM3Node.h"
 #include "nsXFormsUtils.h"
 #include "nsIDOMElement.h"
-#include "nsString.h"
+#include "nsStringAPI.h"
 
 /**
  * Implementation of the XForms \<value\> element.
diff --git a/extensions/xforms/nsXFormsXPathAnalyzer.h b/extensions/xforms/nsXFormsXPathAnalyzer.h
index bc91807..891add0 100644
--- a/extensions/xforms/nsXFormsXPathAnalyzer.h
+++ b/extensions/xforms/nsXFormsXPathAnalyzer.h
@@ -46,7 +46,7 @@
 #include "nsIDOMXPathNSResolver.h"
 #include "nsIDOMNode.h"
 #include "nsCOMPtr.h"
-#include "nsString.h"
+#include "nsStringAPI.h"
 #include "nsVoidArray.h"
 #include "nsIXFormsXPathState.h"
 
diff --git a/extensions/xforms/nsXFormsXPathFunctions.cpp b/extensions/xforms/nsXFormsXPathFunctions.cpp
index 335c5f2..ed86c6b 100644
--- a/extensions/xforms/nsXFormsXPathFunctions.cpp
+++ b/extensions/xforms/nsXFormsXPathFunctions.cpp
@@ -21,6 +21,7 @@
  *
  * Contributor(s):
  *  Aaron Reed <aaronr@us.ibm.com>
+ *  Merle Sterling <msterlin@us.ibm.com>
  *
  * 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
@@ -41,18 +42,20 @@
 #include "nsComponentManagerUtils.h"
 #include "nsIDOMDocument.h"
 #include "nsIDOMElement.h"
-#include "nsString.h"
+#include "nsStringAPI.h"
 #include "nsXFormsUtils.h"
 #include "prprf.h"
 #include "txDouble.h"
 #include "txIFunctionEvaluationContext.h"
 #include "txINodeSet.h"
 #include "nsIClassInfoImpl.h"
+#include "nsIXFormsActionModuleElement.h"
+#include "nsIXFormsContextInfo.h"
 
 #define NS_NAMESPACE_XFORMS "http://www.w3.org/2002/xforms"
 
-static const PRUint32 nanMask[2] = TX_DOUBLE_NaN;
-#define kNaN *((double*)nanMask)
+static const txdpun nanMask = TX_DOUBLE_NaN;
+#define kNaN (nanMask.d)
 
 NS_IMPL_ISUPPORTS1_CI(nsXFormsXPathFunctions, nsIXFormsXPathFunctions)
 
@@ -362,31 +365,54 @@ nsXFormsXPathFunctions::Months(const nsAString & aDuration, double *aResult)
 NS_IMETHODIMP
 nsXFormsXPathFunctions::Now(nsAString & aResult)
 {
-    PRExplodedTime time;
-    char ctime[60];
-
-    PR_ExplodeTime(PR_Now(), PR_LocalTimeParameters, &time);
-    int gmtoffsethour = time.tm_params.tp_gmt_offset < 0 ?
-                        -1*time.tm_params.tp_gmt_offset / 3600 :
-                        time.tm_params.tp_gmt_offset / 3600;
-    int remainder = time.tm_params.tp_gmt_offset%3600;
-    int gmtoffsetminute = remainder ? remainder/60 : 00;
+    return nsXFormsUtils::GetTime(aResult, true);
+}
 
-    char zone_location[40];
-    const int zoneBufSize = sizeof(zone_location);
-    PR_snprintf(zone_location, zoneBufSize, "%c%02d:%02d\0",
-                time.tm_params.tp_gmt_offset < 0 ? '-' : '+',
-                gmtoffsethour, gmtoffsetminute);
+NS_IMETHODIMP
+nsXFormsXPathFunctions::LocalDate(nsAString & aResult)
+{
+    nsAutoString time;
+    nsresult rv = nsXFormsUtils::GetTime(time);
+    NS_ENSURE_SUCCESS(rv, rv);
 
-    PR_FormatTime(ctime, sizeof(ctime), "%Y-%m-%dT%H:%M:%S\0", &time);
+    // since we know that the returned string will be in the format of
+    // yyyy-mm-ddThh:mm:ss.ssszzzz, we just need to grab the first 10
+    // characters to represent the date and then strip off the time zone
+    // information from the end and append it to the string to get our answer
+    aResult = Substring(time, 0, 10);
+    PRInt32 timeSeparator = time.FindChar(PRUnichar('T'));
+    if (timeSeparator == kNotFound) {
+      // though this should probably never happen, if this is the case we
+      // certainly don't have to worry about timezones.  Just return.
+      return NS_OK;
+    }
 
-    aResult.AssignASCII(ctime);
-    AppendASCIItoUTF16(zone_location, aResult);
+    // Time zone information can be of the format '-hh:ss', '+hh:ss', 'Z' or
+    // might be no time zone information at all.
+    nsAutoString hms(Substring(time, timeSeparator+1, time.Length()));
+    PRInt32 timeZoneSeparator = hms.FindChar(PRUnichar('-'));
+    if (timeZoneSeparator == kNotFound) {
+      timeZoneSeparator = hms.FindChar(PRUnichar('+'));
+      if (timeZoneSeparator == kNotFound) {
+        timeZoneSeparator = hms.FindChar(PRUnichar('Z'));
+        if (timeZoneSeparator == kNotFound) {
+          // no time zone information available
+          return NS_OK;
+        }
+      }
+    }
 
+    aResult.Append(Substring(hms, timeZoneSeparator, hms.Length()));
     return NS_OK;
 }
 
 NS_IMETHODIMP
+nsXFormsXPathFunctions::LocalDateTime(nsAString & aResult)
+{
+    return nsXFormsUtils::GetTime(aResult);
+}
+
+NS_IMETHODIMP
 nsXFormsXPathFunctions::Property(const nsAString &aProperty,
                                  nsAString &aResult)
 {
@@ -436,10 +462,6 @@ nsXFormsXPathFunctions::Current(txIFunctionEvaluationContext *aContext,
 {
   *aResult = nsnull;
 
-  if (!nsXFormsUtils::ExperimentalFeaturesEnabled()) {
-    return NS_ERROR_NOT_IMPLEMENTED;
-  }
-
   // now get the contextNode passed in to the evaluation
   nsCOMPtr<nsIXFormsXPathState> state;
   aContext->GetState(getter_AddRefs(state));
@@ -457,3 +479,86 @@ nsXFormsXPathFunctions::Current(txIFunctionEvaluationContext *aContext,
 
   return NS_OK;
 }
+
+NS_IMETHODIMP
+nsXFormsXPathFunctions::Event(txIFunctionEvaluationContext *aContext,
+                              const nsAString &aName,
+                              txINodeSet **aResult)
+{
+    *aResult = nsnull;
+    nsresult rv;
+
+    nsCOMPtr<nsIXFormsXPathState> state;
+    aContext->GetState(getter_AddRefs(state));
+    nsCOMPtr<nsIDOMNode> xfNode;
+    state->GetXformsNode(getter_AddRefs(xfNode));
+    NS_ENSURE_TRUE(xfNode, NS_ERROR_FAILURE);
+
+    nsCOMPtr<txINodeSet> result =
+        do_CreateInstance("@mozilla.org/transformiix-nodeset;1", &rv);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    nsCOMPtr<nsIXFormsContextInfo> contextInfo;
+    nsCOMPtr<nsIXFormsActionModuleElement> actionElt = do_QueryInterface(xfNode);
+    if (actionElt) {
+      nsCOMPtr<nsIDOMEvent> domEvent;
+      actionElt->GetCurrentEvent(getter_AddRefs(domEvent));
+      nsCOMPtr<nsIXFormsDOMEvent> xfEvent = do_QueryInterface(domEvent);
+      if (!xfEvent) {
+        // Event being called for an nsIDOMEvent that is not an
+        // nsIXFormsDOMEvent.
+        result.swap(*aResult);
+        return NS_OK;
+      }
+      xfEvent->GetContextInfo(aName, getter_AddRefs(contextInfo));
+      if (!contextInfo) {
+        // The requested context info property does not exist.
+        result.swap(*aResult);
+        return NS_OK;
+      }
+    }
+
+    // Determine the type of context info property.
+    PRInt32 resultType;
+    contextInfo->GetType(&resultType);
+
+    if (resultType == nsIXFormsContextInfo::NODESET_TYPE) {
+      // The context property is a nodeset. Snapshot each individual node
+      // in the nodeset and add them one at a time to the txINodeset.
+      nsCOMPtr<nsIDOMXPathResult> nodeset;
+      contextInfo->GetNodesetValue(getter_AddRefs(nodeset));
+      if (nodeset) {
+        PRUint32 nodesetSize;
+        rv = nodeset->GetSnapshotLength(&nodesetSize);
+        NS_ENSURE_SUCCESS(rv, rv);
+        for (PRUint32 i=0; i < nodesetSize; ++i) {
+          nsCOMPtr<nsIDOMNode> node;
+          nodeset->SnapshotItem(i, getter_AddRefs(node));
+          result->Add(node);
+        }
+      }
+    } else {
+      // The type is a dom node, string, or number. Strings and numbers
+      // are encapsulated in a text node.
+      nsCOMPtr<nsIDOMNode> node;
+      contextInfo->GetNodeValue(getter_AddRefs(node));
+      if (node) {
+        result->Add(node);
+      }
+#ifdef DEBUG
+      PRInt32 type;
+      contextInfo->GetType(&type);
+      if (type == nsXFormsContextInfo::STRING_TYPE) {
+        nsAutoString str;
+        contextInfo->GetStringValue(str);
+      } else if (type == nsXFormsContextInfo::NUMBER_TYPE) {
+        PRInt32 number;
+        contextInfo->GetNumberValue(&number);
+      }
+#endif
+    }
+
+    result.swap(*aResult);
+
+    return NS_OK;
+}
diff --git a/extensions/xforms/nsXFormsXPathParser.cpp b/extensions/xforms/nsXFormsXPathParser.cpp
index 1e94d1c..2365484 100644
--- a/extensions/xforms/nsXFormsXPathParser.cpp
+++ b/extensions/xforms/nsXFormsXPathParser.cpp
@@ -39,6 +39,7 @@
 
 #include "nsXFormsXPathParser.h"
 #include "nscore.h"
+#include "stdio.h"
 
 /*
  * @todo GIANT hack. Without exceptions everything had to be rewritten, and
diff --git a/extensions/xforms/nsXFormsXPathScanner.h b/extensions/xforms/nsXFormsXPathScanner.h
index 747ae37..85d5038 100644
--- a/extensions/xforms/nsXFormsXPathScanner.h
+++ b/extensions/xforms/nsXFormsXPathScanner.h
@@ -40,7 +40,7 @@
 #ifndef __NSXFORMSXPATHSCANNER_H__
 #define __NSXFORMSXPATHSCANNER_H__
 
-#include "nsString.h"
+#include "nsStringAPI.h"
 
 /**
  * The XPath Expression scanner, used by nsXFormsXPathParser.
diff --git a/extensions/xforms/nsXFormsXPathXMLUtil.h b/extensions/xforms/nsXFormsXPathXMLUtil.h
index bdcf17c..b21aa76 100644
--- a/extensions/xforms/nsXFormsXPathXMLUtil.h
+++ b/extensions/xforms/nsXFormsXPathXMLUtil.h
@@ -37,7 +37,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsString.h"
+#include "nsStringAPI.h"
 
 /**
  * Miscellaneous utility functions for determining the class of a character, used by
diff --git a/extensions/xforms/resources/content/widgets-xhtml.xml b/extensions/xforms/resources/content/widgets-xhtml.xml
index 509db6d..4ba28f9 100644
--- a/extensions/xforms/resources/content/widgets-xhtml.xml
+++ b/extensions/xforms/resources/content/widgets-xhtml.xml
@@ -64,8 +64,8 @@
       <stylesheet src="chrome://xforms/skin/widgets-xhtml.css"/>
     </resources>
 
-    <content xmlns:wairole="http://www.w3.org/2005/01/wai-rdf/GUIRoleTaxonomy#">
-      <html:table role="wairole:grid">
+    <content>
+      <html:table role="grid">
         <html:tbody anonid="dayContainer"/>
       </html:table>
     </content>
@@ -122,7 +122,7 @@
           var header;
           for (var i = 0; i < 7; i++) {
             header = this.ownerDocument.createElementNS(this.XHTML_NS, "th");
-            header.setAttribute("role", "wairole:columnheader");
+            header.setAttribute("role", "columnheader");
             header.textContent = dayOfWeekNames[i];
             row.appendChild(header);
           }
@@ -135,7 +135,7 @@
 
             for (var y = 0; y < 7; y++) {
               cell = this.ownerDocument.createElementNS(this.XHTML_NS, "td");
-              cell.setAttribute("role", "wairole:gridcell");
+              cell.setAttribute("role", "gridcell");
               cell.setAttribute("tabindex", "-1");
               this._dayElements.push(cell);
               row.appendChild(cell);
@@ -178,8 +178,8 @@
 
   <!-- FULL CALENDAR -->
   <binding id="calendar-full" extends="#calendar-compact">
-    <content xmlns:wairole="http://www.w3.org/2005/01/wai-rdf/GUIRoleTaxonomy#">
-      <html:table role="wairole:grid">
+    <content>
+      <html:table role="grid">
         <html:tbody anonid="dayContainer">
         <html:tr>
           <html:td colspan="1">
diff --git a/extensions/xforms/resources/content/widgets-xul.xml b/extensions/xforms/resources/content/widgets-xul.xml
index f2b0409..8bf5443 100644
--- a/extensions/xforms/resources/content/widgets-xul.xml
+++ b/extensions/xforms/resources/content/widgets-xul.xml
@@ -65,9 +65,8 @@
       <stylesheet src="chrome://xforms/skin/widgets-xul.css"/>
     </resources>
 
-    <content xmlns:wairole="http://www.w3.org/2005/01/wai-rdf/GUIRoleTaxonomy#"
-             xmlns:xhtml="http://www.w3.org/1999/xhtml">
-      <xul:grid xhtml:role="wairole:grid">
+    <content>
+      <xul:grid role="grid">
         <xul:columns>
           <xul:column flex="1"/>
           <xul:column flex="1"/>
@@ -139,8 +138,7 @@
                                                              "description");
             description.setAttribute("value", dayOfWeekNames[i]);
             description.setAttribute("class", "header");
-            description.setAttributeNS(this.XHTML_NS, "role",
-                                       "wairole:columnheader");
+            description.setAttribute("role", "columnheader");
             row.appendChild(description);
           }
           this.dayContainer.appendChild(row);
@@ -154,7 +152,7 @@
               var button  = this.ownerDocument.createElementNS(this.XUL_NS,
                                                                "toolbarbutton");
               button.setAttribute("tabindex", "-1");
-              button.setAttributeNS(this.XHTML_NS, "role", "wairole:gridcell");
+              button.setAttribute("role", "gridcell");
               this._dayElements.push(button);
               row.appendChild(button);
             }
@@ -220,12 +218,10 @@
 
   <!-- FULL CALENDAR -->
   <binding id="calendar-full" extends="#calendar-compact">
-    <content orient="vertical"
-             xmlns:wairole="http://www.w3.org/2005/01/wai-rdf/GUIRoleTaxonomy#"
-             xmlns:xhtml="http://www.w3.org/1999/xhtml">
+    <content orient="vertical">
       <xul:hbox mozType:monthyearbox="true" anonid="monthyear"/>
       <!-- calendar days container-->
-      <xul:grid xhtml:role="wairole:grid">
+      <xul:grid role="grid">
         <xul:columns>
           <xul:column flex="1"/>
           <xul:column flex="1"/>
diff --git a/extensions/xforms/resources/content/xforms-message.xul b/extensions/xforms/resources/content/xforms-message.xul
index 08b231b..ae72327 100644
--- a/extensions/xforms/resources/content/xforms-message.xul
+++ b/extensions/xforms/resources/content/xforms-message.xul
@@ -59,10 +59,9 @@
   </script>
 
   <iframe xmlns:xhtml="http://www.w3.org/1999/xhtml"
-          xmlns:wairole="http://www.w3.org/2005/01/wai-rdf/GUIRoleTaxonomy#"
           id="frame" flex="1"
           style="display: none;"
-          xhtml:role="wairole:alert"/>
+          role="alert"/>
 
 </dialog>
 
diff --git a/extensions/xforms/resources/content/xforms-xhtml.xml b/extensions/xforms/resources/content/xforms-xhtml.xml
index 8047a24..233744a 100644
--- a/extensions/xforms/resources/content/xforms-xhtml.xml
+++ b/extensions/xforms/resources/content/xforms-xhtml.xml
@@ -54,8 +54,7 @@
           xmlns="http://www.mozilla.org/xbl"
           xmlns:html="http://www.w3.org/1999/xhtml"
           xmlns:xbl="http://www.mozilla.org/xbl"
-          xmlns:mozType="http://www.mozilla.org/projects/xforms/2005/type"
-          xmlns:wairole="http://www.w3.org/2005/01/wai-rdf/GUIRoleTaxonomy#">
+          xmlns:mozType="http://www.mozilla.org/projects/xforms/2005/type">
 
 
   <!-- OUTPUT: <DEFAULT>
@@ -464,7 +463,7 @@
   <!-- ALERT: <DEFAULT> -->
   <binding id="xformswidget-alert"
            extends="chrome://xforms/content/xforms.xml#xformswidget-alert-base">
-    <content html:role="wairole:alert">
+    <content role="alert">
       <html:div anonid="container" class="-moz-xforms-message-container">
         <html:div anonid="inlineData" style="display: inherit;">
           <children/>
@@ -535,9 +534,9 @@
     <implementation>
       <constructor>
         // xforms:message[level="ephemeral"] element should fire accessibility
-        // alert event when it appears, so we add role='wairole:alert'
+        // alert event when it appears, so we add role='alert'
         // attribute.
-        this.control.container.setAttribute("role", "wairole:alert");
+        this.control.container.setAttribute("role", "alert");
       </constructor>
     </implementation>
   </binding>
diff --git a/extensions/xforms/resources/content/xforms-xul.xml b/extensions/xforms/resources/content/xforms-xul.xml
index 07268fc..d6d8e6b 100644
--- a/extensions/xforms/resources/content/xforms-xul.xml
+++ b/extensions/xforms/resources/content/xforms-xul.xml
@@ -472,9 +472,7 @@
   <binding id="xformswidget-alert"
            extends="chrome://xforms/content/xforms.xml#xformswidget-alert-base">
 
-    <content xmlns:xhtml="http://www.w3.org/1999/xhtml"
-             xmlns:wairole="http://www.w3.org/2005/01/wai-rdf/GUIRoleTaxonomy#"
-             xhtml:role="wairole:alert">
+    <content role="alert">
       <xul:deck anonid="contentswitcher" flex="1" selectedIndex="1">
         <xul:label anonid="implicitcontent" xbl:inherits="orient"/>
         <xul:label xbl:inherits="orient"><children/></xul:label>
-- 
2.11.4.GIT