From 0f3a577bed4d828472469675e90fcab032e33f44 Mon Sep 17 00:00:00 2001 From: xue <> Date: Fri, 2 Jun 2006 18:27:02 +0000 Subject: merge from 3.0 branch till 1133. --- .gitattributes | 104 +- HISTORY | 1 + demos/blog/protected/Pages/Admin/ConfigMan.page | 2 + demos/blog/protected/Pages/Admin/PostMan.page | 2 + demos/blog/protected/Pages/Admin/UserMan.page | 2 + demos/blog/protected/Pages/Posts/MyPost.page | 4 +- demos/blog/themes/Fall/style.css | 5 + demos/blog/themes/Spring/style.css | 5 + demos/blog/themes/Summer/style.css | 5 + demos/blog/themes/Winter/style.css | 5 + demos/quickstart/protected/application.xml | 1 + .../quickstart/protected/comments/CommentList.php | 59 + .../quickstart/protected/comments/CommentList.tpl | 102 + .../protected/comments/QuickStartComments.php | 175 + demos/quickstart/protected/comments/comments.db | Bin 0 -> 6144 bytes demos/quickstart/protected/controls/Layout.tpl | 1 + .../quickstart/protected/pages/Advanced/I18N.page | 6 +- demos/quickstart/protected/pages/Comments.page | 46 + demos/quickstart/protected/pages/Comments.php | 76 + demos/quickstart/themes/PradoSoft/style.css | 138 + framework/3rdParty/Markdown/License.text | 34 + framework/3rdParty/Markdown/MarkdownParser.php | 1257 ++++++ framework/3rdParty/readme.html | 10 +- framework/I18N/TTranslate.php | 78 +- framework/Web/Javascripts/datepicker/datepicker.js | 34 +- framework/Web/Javascripts/js/datepicker.js | 14 +- framework/Web/Javascripts/js/prado.js | 2 +- framework/Web/Javascripts/prototype/event.js | 1 + framework/Web/UI/TTemplateManager.php | 34 +- framework/Web/UI/WebControls/TDataBoundControl.php | 2 +- framework/Web/UI/WebControls/TMarkdown.php | 113 + framework/Web/UI/WebControls/TRepeater.php | 3 +- .../Web/UI/WebControls/TValidationSummary.php | 17 +- framework/Web/UI/WebControls/TWizard.php | 6 +- .../quickstart/Controls/ListBoxTestCase.php | 6 +- .../quickstart/Controls/MultiViewTestCase.php | 8 +- tests/FunctionalTests/selenium/SeleneseRunner.html | 97 - tests/FunctionalTests/selenium/SeleniumLog.html | 61 - .../selenium/TestRunner-splash.html | 55 - tests/FunctionalTests/selenium/TestRunner.hta | 146 - tests/FunctionalTests/selenium/TestRunner.html | 146 - tests/FunctionalTests/selenium/VERSION.txt | 1 - tests/FunctionalTests/selenium/build.xml | 109 - .../selenium/core/SeleneseRunner.html | 111 + .../FunctionalTests/selenium/core/SeleniumLog.html | 79 + .../FunctionalTests/selenium/core/TestPrompt.html | 93 + .../selenium/core/TestRunner-splash.html | 55 + .../FunctionalTests/selenium/core/TestRunner.html | 157 + .../selenium/core/domviewer/butmin.gif | Bin 0 -> 843 bytes .../selenium/core/domviewer/butplus.gif | Bin 0 -> 848 bytes .../selenium/core/domviewer/domviewer.css | 298 ++ .../selenium/core/domviewer/domviewer.html | 16 + .../selenium/core/domviewer/selenium-domviewer.js | 205 + .../selenium/core/scripts/find_matching_child.js | 69 + .../selenium/core/scripts/htmlutils.js | 463 +++ .../selenium/core/scripts/prototype-1.4.0.js | 1781 +++++++++ .../selenium/core/scripts/selenium-api.js | 1402 +++++++ .../selenium/core/scripts/selenium-browserbot.js | 1114 ++++++ .../core/scripts/selenium-browserdetect.js | 115 + .../core/scripts/selenium-commandhandlers.js | 371 ++ .../core/scripts/selenium-executionloop.js | 266 ++ .../selenium/core/scripts/selenium-logging.js | 112 + .../core/scripts/selenium-seleneserunner.js | 300 ++ .../selenium/core/scripts/selenium-testrunner.js | 748 ++++ .../selenium/core/scripts/selenium-version.js | 5 + .../core/scripts/user-extensions.js.sample | 75 + .../selenium/core/scripts/xmlextras.js | 153 + .../selenium/core/selenium-logo.png | Bin 0 -> 6714 bytes tests/FunctionalTests/selenium/core/selenium.css | 211 + tests/FunctionalTests/selenium/core/xpath/dom.js | 428 ++ tests/FunctionalTests/selenium/core/xpath/misc.js | 255 ++ tests/FunctionalTests/selenium/core/xpath/xpath.js | 2182 ++++++++++ tests/FunctionalTests/selenium/doc/FAQ.html | 128 - tests/FunctionalTests/selenium/doc/FAQ.txt | 127 - tests/FunctionalTests/selenium/doc/contact.html | 23 - .../selenium/doc/developingdrivers.html | 134 - tests/FunctionalTests/selenium/doc/driven.html | 206 - tests/FunctionalTests/selenium/doc/home-page.html | 161 - .../selenium/doc/images/Adjacent.png | Bin 39287 -> 0 bytes .../selenium/doc/images/Embedded.png | Bin 30678 -> 0 bytes .../selenium/doc/images/SmallAdjacent.png | Bin 12067 -> 0 bytes .../selenium/doc/images/SmallEmbedded.png | Bin 6141 -> 0 bytes .../selenium/doc/images/SmallStandalone.png | Bin 7336 -> 0 bytes .../selenium/doc/images/Standalone.png | Bin 38131 -> 0 bytes .../selenium/doc/images/localhostAut.png | Bin 4474 -> 0 bytes .../selenium/doc/images/localhostDriver.png | Bin 3865 -> 0 bytes .../selenium/doc/images/localhostSelenium.png | Bin 3600 -> 0 bytes .../selenium/doc/images/stockmeister.png | Bin 6514 -> 0 bytes .../selenium/doc/images/tested-with-selenium.png | Bin 3294 -> 0 bytes tests/FunctionalTests/selenium/doc/index.html | 30 - tests/FunctionalTests/selenium/doc/jsrmi.html | 151 - .../selenium/doc/release-notes.html | 97 - tests/FunctionalTests/selenium/doc/rst2html.bat | 3 - .../selenium/doc/seleniumReference.html | 1148 ------ .../selenium/doc/seleniumReference.txt | 771 ---- tests/FunctionalTests/selenium/doc/testRunner.txt | 99 - tests/FunctionalTests/selenium/doc/testrunner.html | 213 - tests/FunctionalTests/selenium/doc/usage.html | 84 - .../FunctionalTests/selenium/dom-images/butmin.gif | Bin 843 -> 0 bytes .../selenium/dom-images/butplus.gif | Bin 848 -> 0 bytes .../selenium/dom-styles/default.css | 298 -- tests/FunctionalTests/selenium/domviewer.html | 16 - .../selenium/html-xpath/carnation.jpg | Bin 4153 -> 0 bytes .../selenium/html-xpath/example.html | 75 - .../selenium/html-xpath/html-xpath-patched.js | 657 --- .../selenium/html-xpath/html-xpath.js | 610 --- .../selenium/html-xpath/license.txt | 504 --- .../selenium/html-xpath/rainbow.jpg | Bin 6085 -> 0 bytes tests/FunctionalTests/selenium/htmlutils.js | 283 -- tests/FunctionalTests/selenium/index.html | 60 - tests/FunctionalTests/selenium/install-readme.txt | 9 - .../selenium/jsmock/mock-tests.html | 205 - tests/FunctionalTests/selenium/jsmock/mock.js | 124 - tests/FunctionalTests/selenium/php/TestRunner.php | 214 +- tests/FunctionalTests/selenium/php/selenium.php | 8 +- .../selenium/prado-functional-test.js | 41 + .../selenium/readme-selenium-fitrunner.txt | 46 - .../selenium/readme-selenium-rpcrunner.txt | 17 - tests/FunctionalTests/selenium/selenium-api.js | 731 ---- .../selenium/selenium-browserbot.js | 996 ----- .../selenium/selenium-commandhandlers.js | 291 -- .../FunctionalTests/selenium/selenium-domviewer.js | 188 - .../selenium/selenium-executionloop.js | 234 -- .../FunctionalTests/selenium/selenium-fitrunner.js | 597 --- tests/FunctionalTests/selenium/selenium-logging.js | 88 - .../FunctionalTests/selenium/selenium-logo.graffle | 509 --- tests/FunctionalTests/selenium/selenium-logo.png | Bin 6714 -> 0 bytes .../selenium/selenium-seleneserunner.js | 172 - .../selenium/selenium-tableparser.js | 50 - .../selenium/selenium-testrunner.js | 597 --- tests/FunctionalTests/selenium/selenium.css | 211 - .../selenium/user-extensions.js.sample | 62 - tests/FunctionalTests/selenium/xmlextras.js | 153 - tests/FunctionalTests/selenium/xpath.js | 4169 -------------------- .../validators/tests/RequiredListTestCase.php | 11 +- 135 files changed, 13471 insertions(+), 16167 deletions(-) create mode 100644 demos/quickstart/protected/comments/CommentList.php create mode 100644 demos/quickstart/protected/comments/CommentList.tpl create mode 100644 demos/quickstart/protected/comments/QuickStartComments.php create mode 100644 demos/quickstart/protected/comments/comments.db create mode 100644 demos/quickstart/protected/pages/Comments.page create mode 100644 demos/quickstart/protected/pages/Comments.php create mode 100644 framework/3rdParty/Markdown/License.text create mode 100644 framework/3rdParty/Markdown/MarkdownParser.php create mode 100644 framework/Web/UI/WebControls/TMarkdown.php delete mode 100644 tests/FunctionalTests/selenium/SeleneseRunner.html delete mode 100644 tests/FunctionalTests/selenium/SeleniumLog.html delete mode 100644 tests/FunctionalTests/selenium/TestRunner-splash.html delete mode 100644 tests/FunctionalTests/selenium/TestRunner.hta delete mode 100644 tests/FunctionalTests/selenium/TestRunner.html delete mode 100644 tests/FunctionalTests/selenium/VERSION.txt delete mode 100644 tests/FunctionalTests/selenium/build.xml create mode 100755 tests/FunctionalTests/selenium/core/SeleneseRunner.html create mode 100755 tests/FunctionalTests/selenium/core/SeleniumLog.html create mode 100755 tests/FunctionalTests/selenium/core/TestPrompt.html create mode 100755 tests/FunctionalTests/selenium/core/TestRunner-splash.html create mode 100755 tests/FunctionalTests/selenium/core/TestRunner.html create mode 100755 tests/FunctionalTests/selenium/core/domviewer/butmin.gif create mode 100755 tests/FunctionalTests/selenium/core/domviewer/butplus.gif create mode 100755 tests/FunctionalTests/selenium/core/domviewer/domviewer.css create mode 100755 tests/FunctionalTests/selenium/core/domviewer/domviewer.html create mode 100755 tests/FunctionalTests/selenium/core/domviewer/selenium-domviewer.js create mode 100755 tests/FunctionalTests/selenium/core/scripts/find_matching_child.js create mode 100755 tests/FunctionalTests/selenium/core/scripts/htmlutils.js create mode 100755 tests/FunctionalTests/selenium/core/scripts/prototype-1.4.0.js create mode 100755 tests/FunctionalTests/selenium/core/scripts/selenium-api.js create mode 100755 tests/FunctionalTests/selenium/core/scripts/selenium-browserbot.js create mode 100755 tests/FunctionalTests/selenium/core/scripts/selenium-browserdetect.js create mode 100755 tests/FunctionalTests/selenium/core/scripts/selenium-commandhandlers.js create mode 100755 tests/FunctionalTests/selenium/core/scripts/selenium-executionloop.js create mode 100755 tests/FunctionalTests/selenium/core/scripts/selenium-logging.js create mode 100755 tests/FunctionalTests/selenium/core/scripts/selenium-seleneserunner.js create mode 100755 tests/FunctionalTests/selenium/core/scripts/selenium-testrunner.js create mode 100755 tests/FunctionalTests/selenium/core/scripts/selenium-version.js create mode 100755 tests/FunctionalTests/selenium/core/scripts/user-extensions.js.sample create mode 100755 tests/FunctionalTests/selenium/core/scripts/xmlextras.js create mode 100755 tests/FunctionalTests/selenium/core/selenium-logo.png create mode 100755 tests/FunctionalTests/selenium/core/selenium.css create mode 100755 tests/FunctionalTests/selenium/core/xpath/dom.js create mode 100755 tests/FunctionalTests/selenium/core/xpath/misc.js create mode 100755 tests/FunctionalTests/selenium/core/xpath/xpath.js delete mode 100644 tests/FunctionalTests/selenium/doc/FAQ.html delete mode 100644 tests/FunctionalTests/selenium/doc/FAQ.txt delete mode 100644 tests/FunctionalTests/selenium/doc/contact.html delete mode 100644 tests/FunctionalTests/selenium/doc/developingdrivers.html delete mode 100644 tests/FunctionalTests/selenium/doc/driven.html delete mode 100644 tests/FunctionalTests/selenium/doc/home-page.html delete mode 100644 tests/FunctionalTests/selenium/doc/images/Adjacent.png delete mode 100644 tests/FunctionalTests/selenium/doc/images/Embedded.png delete mode 100644 tests/FunctionalTests/selenium/doc/images/SmallAdjacent.png delete mode 100644 tests/FunctionalTests/selenium/doc/images/SmallEmbedded.png delete mode 100644 tests/FunctionalTests/selenium/doc/images/SmallStandalone.png delete mode 100644 tests/FunctionalTests/selenium/doc/images/Standalone.png delete mode 100644 tests/FunctionalTests/selenium/doc/images/localhostAut.png delete mode 100644 tests/FunctionalTests/selenium/doc/images/localhostDriver.png delete mode 100644 tests/FunctionalTests/selenium/doc/images/localhostSelenium.png delete mode 100644 tests/FunctionalTests/selenium/doc/images/stockmeister.png delete mode 100644 tests/FunctionalTests/selenium/doc/images/tested-with-selenium.png delete mode 100644 tests/FunctionalTests/selenium/doc/index.html delete mode 100644 tests/FunctionalTests/selenium/doc/jsrmi.html delete mode 100644 tests/FunctionalTests/selenium/doc/release-notes.html delete mode 100644 tests/FunctionalTests/selenium/doc/rst2html.bat delete mode 100644 tests/FunctionalTests/selenium/doc/seleniumReference.html delete mode 100644 tests/FunctionalTests/selenium/doc/seleniumReference.txt delete mode 100644 tests/FunctionalTests/selenium/doc/testRunner.txt delete mode 100644 tests/FunctionalTests/selenium/doc/testrunner.html delete mode 100644 tests/FunctionalTests/selenium/doc/usage.html delete mode 100644 tests/FunctionalTests/selenium/dom-images/butmin.gif delete mode 100644 tests/FunctionalTests/selenium/dom-images/butplus.gif delete mode 100644 tests/FunctionalTests/selenium/dom-styles/default.css delete mode 100644 tests/FunctionalTests/selenium/domviewer.html delete mode 100644 tests/FunctionalTests/selenium/html-xpath/carnation.jpg delete mode 100644 tests/FunctionalTests/selenium/html-xpath/example.html delete mode 100644 tests/FunctionalTests/selenium/html-xpath/html-xpath-patched.js delete mode 100644 tests/FunctionalTests/selenium/html-xpath/html-xpath.js delete mode 100644 tests/FunctionalTests/selenium/html-xpath/license.txt delete mode 100644 tests/FunctionalTests/selenium/html-xpath/rainbow.jpg delete mode 100644 tests/FunctionalTests/selenium/htmlutils.js delete mode 100644 tests/FunctionalTests/selenium/index.html delete mode 100644 tests/FunctionalTests/selenium/install-readme.txt delete mode 100644 tests/FunctionalTests/selenium/jsmock/mock-tests.html delete mode 100644 tests/FunctionalTests/selenium/jsmock/mock.js delete mode 100644 tests/FunctionalTests/selenium/readme-selenium-fitrunner.txt delete mode 100644 tests/FunctionalTests/selenium/readme-selenium-rpcrunner.txt delete mode 100644 tests/FunctionalTests/selenium/selenium-api.js delete mode 100644 tests/FunctionalTests/selenium/selenium-browserbot.js delete mode 100644 tests/FunctionalTests/selenium/selenium-commandhandlers.js delete mode 100644 tests/FunctionalTests/selenium/selenium-domviewer.js delete mode 100644 tests/FunctionalTests/selenium/selenium-executionloop.js delete mode 100644 tests/FunctionalTests/selenium/selenium-fitrunner.js delete mode 100644 tests/FunctionalTests/selenium/selenium-logging.js delete mode 100644 tests/FunctionalTests/selenium/selenium-logo.graffle delete mode 100644 tests/FunctionalTests/selenium/selenium-logo.png delete mode 100644 tests/FunctionalTests/selenium/selenium-seleneserunner.js delete mode 100644 tests/FunctionalTests/selenium/selenium-tableparser.js delete mode 100644 tests/FunctionalTests/selenium/selenium-testrunner.js delete mode 100644 tests/FunctionalTests/selenium/selenium.css delete mode 100644 tests/FunctionalTests/selenium/user-extensions.js.sample delete mode 100644 tests/FunctionalTests/selenium/xmlextras.js delete mode 100644 tests/FunctionalTests/selenium/xpath.js diff --git a/.gitattributes b/.gitattributes index 08cd6622..a18d9820 100644 --- a/.gitattributes +++ b/.gitattributes @@ -130,6 +130,10 @@ demos/quickstart/index.php -text demos/quickstart/index2.php -text demos/quickstart/protected/.htaccess -text demos/quickstart/protected/application.xml -text +demos/quickstart/protected/comments/CommentList.php -text +demos/quickstart/protected/comments/CommentList.tpl -text +demos/quickstart/protected/comments/QuickStartComments.php -text +demos/quickstart/protected/comments/comments.db -text demos/quickstart/protected/controls/DocLink.php -text demos/quickstart/protected/controls/Layout.php -text demos/quickstart/protected/controls/Layout.tpl -text @@ -233,6 +237,8 @@ demos/quickstart/protected/pages/Advanced/mastercontent.gif -text demos/quickstart/protected/pages/Advanced/mastercontent.vsd -text demos/quickstart/protected/pages/Advanced/pcrelation.gif -text demos/quickstart/protected/pages/Advanced/pcrelation.vsd -text +demos/quickstart/protected/pages/Comments.page -text +demos/quickstart/protected/pages/Comments.php -text demos/quickstart/protected/pages/Configurations/AppConfig.page -text demos/quickstart/protected/pages/Configurations/Overview.page -text demos/quickstart/protected/pages/Configurations/PageConfig.page -text @@ -476,6 +482,8 @@ docs/sqlmap/latex/tut3.tex -text docs/sqlmap/sqlmap.pdf -text docs/sqlmap/sqlmap_tut.pdf -text framework/.htaccess -text +framework/3rdParty/Markdown/License.text -text +framework/3rdParty/Markdown/MarkdownParser.php -text framework/3rdParty/SafeHtml/HTMLSax3.php -text framework/3rdParty/SafeHtml/HTMLSax3/Decorators.php -text framework/3rdParty/SafeHtml/HTMLSax3/States.php -text @@ -1074,6 +1082,7 @@ framework/Web/UI/WebControls/TListControl.php -text framework/Web/UI/WebControls/TListControlValidator.php -text framework/Web/UI/WebControls/TListItem.php -text framework/Web/UI/WebControls/TLiteral.php -text +framework/Web/UI/WebControls/TMarkdown.php -text framework/Web/UI/WebControls/TMultiView.php -text framework/Web/UI/WebControls/TOutputCache.php -text framework/Web/UI/WebControls/TPanel.php -text @@ -1189,76 +1198,39 @@ tests/FunctionalTests/quickstart/Controls/Wizard3TestCase.php -text tests/FunctionalTests/quickstart/Controls/Wizard4TestCase.php -text tests/FunctionalTests/quickstart/Controls/Wizard5TestCase.php -text tests/FunctionalTests/quickstart/Fundamentals/HangmanTestCase.php -text -tests/FunctionalTests/selenium/SeleneseRunner.html -text -tests/FunctionalTests/selenium/SeleniumLog.html -text -tests/FunctionalTests/selenium/TestRunner-splash.html -text -tests/FunctionalTests/selenium/TestRunner.hta -text -tests/FunctionalTests/selenium/TestRunner.html -text -tests/FunctionalTests/selenium/VERSION.txt -text -tests/FunctionalTests/selenium/build.xml -text -tests/FunctionalTests/selenium/doc/FAQ.html -text -tests/FunctionalTests/selenium/doc/FAQ.txt -text -tests/FunctionalTests/selenium/doc/contact.html -text -tests/FunctionalTests/selenium/doc/developingdrivers.html -text -tests/FunctionalTests/selenium/doc/driven.html -text -tests/FunctionalTests/selenium/doc/home-page.html -text -tests/FunctionalTests/selenium/doc/images/Adjacent.png -text -tests/FunctionalTests/selenium/doc/images/Embedded.png -text -tests/FunctionalTests/selenium/doc/images/SmallAdjacent.png -text -tests/FunctionalTests/selenium/doc/images/SmallEmbedded.png -text -tests/FunctionalTests/selenium/doc/images/SmallStandalone.png -text -tests/FunctionalTests/selenium/doc/images/Standalone.png -text -tests/FunctionalTests/selenium/doc/images/localhostAut.png -text -tests/FunctionalTests/selenium/doc/images/localhostDriver.png -text -tests/FunctionalTests/selenium/doc/images/localhostSelenium.png -text -tests/FunctionalTests/selenium/doc/images/stockmeister.png -text -tests/FunctionalTests/selenium/doc/images/tested-with-selenium.png -text -tests/FunctionalTests/selenium/doc/index.html -text -tests/FunctionalTests/selenium/doc/jsrmi.html -text -tests/FunctionalTests/selenium/doc/release-notes.html -text -tests/FunctionalTests/selenium/doc/rst2html.bat -text -tests/FunctionalTests/selenium/doc/seleniumReference.html -text -tests/FunctionalTests/selenium/doc/seleniumReference.txt -text -tests/FunctionalTests/selenium/doc/testRunner.txt -text -tests/FunctionalTests/selenium/doc/testrunner.html -text -tests/FunctionalTests/selenium/doc/usage.html -text -tests/FunctionalTests/selenium/dom-images/butmin.gif -text -tests/FunctionalTests/selenium/dom-images/butplus.gif -text -tests/FunctionalTests/selenium/dom-styles/default.css -text -tests/FunctionalTests/selenium/domviewer.html -text -tests/FunctionalTests/selenium/html-xpath/carnation.jpg -text -tests/FunctionalTests/selenium/html-xpath/example.html -text -tests/FunctionalTests/selenium/html-xpath/html-xpath-patched.js -text -tests/FunctionalTests/selenium/html-xpath/html-xpath.js -text -tests/FunctionalTests/selenium/html-xpath/license.txt -text -tests/FunctionalTests/selenium/html-xpath/rainbow.jpg -text -tests/FunctionalTests/selenium/htmlutils.js -text -tests/FunctionalTests/selenium/index.html -text -tests/FunctionalTests/selenium/install-readme.txt -text -tests/FunctionalTests/selenium/jsmock/mock-tests.html -text -tests/FunctionalTests/selenium/jsmock/mock.js -text +tests/FunctionalTests/selenium/core/SeleneseRunner.html -text +tests/FunctionalTests/selenium/core/SeleniumLog.html -text +tests/FunctionalTests/selenium/core/TestPrompt.html -text +tests/FunctionalTests/selenium/core/TestRunner-splash.html -text +tests/FunctionalTests/selenium/core/TestRunner.html -text +tests/FunctionalTests/selenium/core/domviewer/butmin.gif -text +tests/FunctionalTests/selenium/core/domviewer/butplus.gif -text +tests/FunctionalTests/selenium/core/domviewer/domviewer.css -text +tests/FunctionalTests/selenium/core/domviewer/domviewer.html -text +tests/FunctionalTests/selenium/core/domviewer/selenium-domviewer.js -text +tests/FunctionalTests/selenium/core/scripts/find_matching_child.js -text +tests/FunctionalTests/selenium/core/scripts/htmlutils.js -text +tests/FunctionalTests/selenium/core/scripts/prototype-1.4.0.js -text +tests/FunctionalTests/selenium/core/scripts/selenium-api.js -text +tests/FunctionalTests/selenium/core/scripts/selenium-browserbot.js -text +tests/FunctionalTests/selenium/core/scripts/selenium-browserdetect.js -text +tests/FunctionalTests/selenium/core/scripts/selenium-commandhandlers.js -text +tests/FunctionalTests/selenium/core/scripts/selenium-executionloop.js -text +tests/FunctionalTests/selenium/core/scripts/selenium-logging.js -text +tests/FunctionalTests/selenium/core/scripts/selenium-seleneserunner.js -text +tests/FunctionalTests/selenium/core/scripts/selenium-testrunner.js -text +tests/FunctionalTests/selenium/core/scripts/selenium-version.js -text +tests/FunctionalTests/selenium/core/scripts/user-extensions.js.sample -text +tests/FunctionalTests/selenium/core/scripts/xmlextras.js -text +tests/FunctionalTests/selenium/core/selenium-logo.png -text +tests/FunctionalTests/selenium/core/selenium.css -text +tests/FunctionalTests/selenium/core/xpath/dom.js -text +tests/FunctionalTests/selenium/core/xpath/misc.js -text +tests/FunctionalTests/selenium/core/xpath/xpath.js -text tests/FunctionalTests/selenium/php/TestRunner.php -text tests/FunctionalTests/selenium/php/results.php -text tests/FunctionalTests/selenium/php/selenium.php -text tests/FunctionalTests/selenium/prado-functional-test.js -text -tests/FunctionalTests/selenium/readme-selenium-fitrunner.txt -text -tests/FunctionalTests/selenium/readme-selenium-rpcrunner.txt -text -tests/FunctionalTests/selenium/selenium-api.js -text -tests/FunctionalTests/selenium/selenium-browserbot.js -text -tests/FunctionalTests/selenium/selenium-commandhandlers.js -text -tests/FunctionalTests/selenium/selenium-domviewer.js -text -tests/FunctionalTests/selenium/selenium-executionloop.js -text -tests/FunctionalTests/selenium/selenium-fitrunner.js -text -tests/FunctionalTests/selenium/selenium-logging.js -text -tests/FunctionalTests/selenium/selenium-logo.graffle -text -tests/FunctionalTests/selenium/selenium-logo.png -text -tests/FunctionalTests/selenium/selenium-seleneserunner.js -text -tests/FunctionalTests/selenium/selenium-tableparser.js -text -tests/FunctionalTests/selenium/selenium-testrunner.js -text -tests/FunctionalTests/selenium/selenium.css -text -tests/FunctionalTests/selenium/user-extensions.js.sample -text -tests/FunctionalTests/selenium/xmlextras.js -text -tests/FunctionalTests/selenium/xpath.js -text tests/FunctionalTests/tickets.php -text tests/FunctionalTests/tickets/index.php -text tests/FunctionalTests/tickets/protected/pages/Layout.php -text diff --git a/HISTORY b/HISTORY index 73068587..8e82239b 100644 --- a/HISTORY +++ b/HISTORY @@ -31,6 +31,7 @@ ENH: added TTheme.BaseUrl and TTheme.BasePath property (Qiang) ENH: added TListControl.SelectedValues property (Qiang) ENH: added TThemeManager.AvailableThemes property (Qiang) ENH: refactored TUserManager and TAuthManager so that they are easier to be extended (Qiang) +ENH: template syntax now supports setting event handler via subproperties (Qiang) CHG: Ticket#151 - URL format is modified to handle empty GET values (Qiang) CHG: Ticket#153 - TAssetManager now ignores .svn directories (Qiang) NEW: TTableHeaderRow, TTableFooterRow and table section support (Qiang) diff --git a/demos/blog/protected/Pages/Admin/ConfigMan.page b/demos/blog/protected/Pages/Admin/ConfigMan.page index 5c6cd53d..b959551e 100644 --- a/demos/blog/protected/Pages/Admin/ConfigMan.page +++ b/demos/blog/protected/Pages/Admin/ConfigMan.page @@ -1,3 +1,5 @@ +<%@ Title="System Configuration" %> +

Administration Center

diff --git a/demos/blog/protected/Pages/Admin/PostMan.page b/demos/blog/protected/Pages/Admin/PostMan.page index 68ac44f8..9d96af42 100644 --- a/demos/blog/protected/Pages/Admin/PostMan.page +++ b/demos/blog/protected/Pages/Admin/PostMan.page @@ -1,3 +1,5 @@ +<%@ Title="Post Management" %> +

Administration Center

diff --git a/demos/blog/protected/Pages/Admin/UserMan.page b/demos/blog/protected/Pages/Admin/UserMan.page index a8b634c6..02b1a069 100644 --- a/demos/blog/protected/Pages/Admin/UserMan.page +++ b/demos/blog/protected/Pages/Admin/UserMan.page @@ -1,3 +1,5 @@ +<%@ Title="User Management" %> +

Administration Center

diff --git a/demos/blog/protected/Pages/Posts/MyPost.page b/demos/blog/protected/Pages/Posts/MyPost.page index ca153166..69ba78e4 100644 --- a/demos/blog/protected/Pages/Posts/MyPost.page +++ b/demos/blog/protected/Pages/Posts/MyPost.page @@ -1,3 +1,5 @@ +<%@ Title="My Posts" %> +

My Posts

@@ -25,7 +27,7 @@ + diff --git a/demos/quickstart/protected/comments/CommentList.php b/demos/quickstart/protected/comments/CommentList.php new file mode 100644 index 00000000..4328991f --- /dev/null +++ b/demos/quickstart/protected/comments/CommentList.php @@ -0,0 +1,59 @@ + + * @version : $ Sat May 27 17:53:15 AZOST 2006 $ + * @package Demo.Quickstart.comments + * @since 3.0 + */ +class CommentList extends TTemplateControl +{ + private $_exclude = array( + 'Comments', + 'Markdown', + 'Search', + 'GettingStarted.Introduction'); + + private $_quickstart; + + public function onLoad($param) + { + parent::onLoad($param); + + $this->_quickstart = new QuickStartComments(); + + $page = $this->getService()->getRequestedPagePath(); + + $this->listComments($page); + } + + protected function listComments($page) + { + $this->comments->setDataSource($this->_quickstart->getComments($page)); + $this->comments->dataBind(); + } + + public function addComment_Clicked($sender, $param) + { + $page = $this->getService()->getRequestedPagePath(); + $this->_quickstart->addNewComment($page, + $this->email->getText(), $this->content->getText()); + $this->multiView1->setActiveViewIndex(1); + $this->listComments($page); + } + + public function setVisible($value) + { + $page = $this->getService()->getRequestedPagePath(); + if(in_array($page, $this->_exclude)) + parent::setVisible(false); + else + parent::setVisible($value); + } +} + +?> \ No newline at end of file diff --git a/demos/quickstart/protected/comments/CommentList.tpl b/demos/quickstart/protected/comments/CommentList.tpl new file mode 100644 index 00000000..0aeb2c81 --- /dev/null +++ b/demos/quickstart/protected/comments/CommentList.tpl @@ -0,0 +1,102 @@ +
+ + + +

Comments + ( Add your comments )

+ + +
+ <%# $this->ItemIndex+1 %> + + + DataItem['date_added']) %> /> + +
+ + + <%# $this->DataItem['comment'] %> + + +
+
+ + + + + +
+

Post a comment

+

Note: + Please only use the comments in relation to this page for +

    +
  • questions/critcisms/suggestions on the documentation,
    • +
  • small notes that can solve or clarify a particular problem or task.
    • +
+ If you experience errors please file a ticket + or ask at the forum. + Please use the Prado wiki for longer pieces and detailed solutions. +

+

Comments will be periodically reviewed, integrated into the documentation and removed. + You may use markdown syntax in your comment.

+ +
+ + + + +
+
+ + +
+ +
+
+ content->Text) %> > +
+

Preview comment

+
+ + + <%= $this->content->Text %> + + +
+
+ +
+ + +
+
+ + +
+
Thank you, your comment is quequed for moderation.
+
+

Preview comment

+
+ + + <%= $this->content->Text %> + + +
+
+
+ + +
\ No newline at end of file diff --git a/demos/quickstart/protected/comments/QuickStartComments.php b/demos/quickstart/protected/comments/QuickStartComments.php new file mode 100644 index 00000000..c138bd94 --- /dev/null +++ b/demos/quickstart/protected/comments/QuickStartComments.php @@ -0,0 +1,175 @@ + + * @version : $ Sat May 27 16:49:19 AZOST 2006 $ + * @package Demos.QuickStart.comments + * @since 3.0 + */ +class QuickStartComments +{ + /** + * @var string sqlite database source. + */ + private $_database; + /** + * @var sqlite connection. + */ + private $_connection; + + /** + * Sets the sqlite comment database file. + */ + public function __construct() + { + $this->_database = realpath(dirname(__FILE__).'/comments.db'); + } + + /** + * Closed the database connection. + */ + public function __destruct() + { + if(!is_null($this->_connection)) + sqlite_close($this->_connection); + } + + /** + * @return resource sqlite database connection. + */ + protected function getConnection() + { + if(is_null($this->_connection)) + $this->_connection = sqlite_open($this->_database); + return $this->_connection; + } + + /** + * Quote database input data. + */ + protected function quote($value) + { + return sqlite_escape_string($value); + } + + /** + * Executes an sqlite query. + * @param string SQL + * @return mixed query results. + */ + protected function query($sql) + { + return sqlite_query($this->getConnection(), $sql); + } + + /** + * Returns a row from the sqlite result. + * @param resource sqlite result + * @return array database record. + */ + protected function fetch($resource) + { + if($resource !== false) + return sqlite_fetch_array($resource); + else + return false; + } + + /** + * Fetch all the records for given SQL query. + * @param string SQL query. + * @return array result set. + */ + protected function fetchAll($sql) + { + $rs = $this->query($sql); + $rows = array(); + while($row = $this->fetch($rs)) + $rows[] = $row; + return $rows; + } + + /** + * Returns all the comments for a given page. + * @param string specific page comments + * @return array list of comments + */ + public function getComments($pageID) + { + $page = $this->quote($pageID); + $sql = "SELECT * FROM comments WHERE page=\"$page\" AND approved = 1 ORDER BY date_added ASC"; + return $this->fetchAll($sql); + } + + /** + * Adds a new comment for moderation. + * @param string ID of the page to comment belongs + * @param string email address of the commenter + * @param string comment contents + */ + public function addNewComment($pageID, $email, $comment) + { + $page = $this->quote($pageID); + $email = $this->quote($email); + $comment = $this->quote($comment); + $date_added = time(); + $sql = <<query($sql); + } + + /** + * Update an existing comment. + * @param string comment ID + * @param string page ID + * @param string email address + * @param string updated comment. + */ + public function updateComment($commentID, $page, $email, $content) + { + $ID = intval($commentID); + $email = $this->quote($email); + $comment = $this->quote($content); + $page = $this->quote($page); + $sql = <<query($sql); + } + + /** + * Delete a comment. + * @param string comment ID + */ + public function deleteComment($commentID) + { + $ID = intval($commentID); + $this->query("DELETE FROM comments WHERE id=$ID"); + } + + /** + * @return array all the quequed comments. + */ + public function getQuequedComments() + { + return $this->fetchAll("SELECT * FROM comments WHERE approved != 1"); + } + + /** + * Approve a quequed comment. + * @param string comment ID. + */ + public function approveComment($commentID) + { + $ID = intval($commentID); + $this->query("UPDATE comments SET approved = 1 WHERE id=$ID"); + } +} + +?> \ No newline at end of file diff --git a/demos/quickstart/protected/comments/comments.db b/demos/quickstart/protected/comments/comments.db new file mode 100644 index 00000000..b81d7123 Binary files /dev/null and b/demos/quickstart/protected/comments/comments.db differ diff --git a/demos/quickstart/protected/controls/Layout.tpl b/demos/quickstart/protected/controls/Layout.tpl index 6fbd1380..d4a6a7e5 100644 --- a/demos/quickstart/protected/controls/Layout.tpl +++ b/demos/quickstart/protected/controls/Layout.tpl @@ -32,6 +32,7 @@
+ diff --git a/demos/quickstart/protected/pages/Advanced/I18N.page b/demos/quickstart/protected/pages/Advanced/I18N.page index 5b1fafa0..6c86a6c9 100644 --- a/demos/quickstart/protected/pages/Advanced/I18N.page +++ b/demos/quickstart/protected/pages/Advanced/I18N.page @@ -148,9 +148,11 @@ To translate a message or string in the template, use TTranslate.

<com:TTranslate Text="Goodbye" /> -

TTranslate can also perform string substitution. Any attributes of TTranslate will be substituted with {attribute name} in the translation. E.g.

+

TTranslate can also perform string substitution. +The Parameters property can be use to add name values pairs for substitution. Substrings in the translation enclosed with "{" and "}" are consider as the + parameter names during substitution lookup. The following example will substitute the substring "{time}" with the value of the parameter attribute "Parameters.time=<%= time() %>". -<com:TTranslate time="late"> +<com:TTranslate Parameters.time=<%= time() %> > The time is {time}. </com:TTranslate> diff --git a/demos/quickstart/protected/pages/Comments.page b/demos/quickstart/protected/pages/Comments.page new file mode 100644 index 00000000..32c7bcae --- /dev/null +++ b/demos/quickstart/protected/pages/Comments.page @@ -0,0 +1,46 @@ + + + + + Comments awaiting approval + + + + <%# $this->DataItem['page'] %> + + DataItem['date_added']) %> /> + + +

+ + <%# $this->DataItem['comment']%> + +
+ + + + + + + DataItem['email'] %> /> + DataItem['page'] %> /> + DataItem['comment'] %> TextMode="MultiLine"/> + + + + + + \ No newline at end of file diff --git a/demos/quickstart/protected/pages/Comments.php b/demos/quickstart/protected/pages/Comments.php new file mode 100644 index 00000000..7af70ece --- /dev/null +++ b/demos/quickstart/protected/pages/Comments.php @@ -0,0 +1,76 @@ + + * @version : $ Sat May 27 20:23:00 AZOST 2006 $ + * @package Demo.Quickstart + * @since 3.0 + */ +class Comments extends TPage +{ + private $_quickstart; + + public function onLoad($param) + { + parent::onLoad($param); + $this->_quickstart = new QuickStartComments; + if(!$this->getIsPostBack()) + $this->refreshData(); + } + + protected function refreshData() + { + $this->comments->setDataSource($this->_quickstart->getQuequedComments()); + $this->comments->dataBind(); + } + + public function approveComment($sender, $param) + { + $ID = $this->comments->DataKeys[$this->comments->SelectedItemIndex]; + $this->_quickstart->approveComment($ID); + $this->refreshData(); + $this->comments->SelectedItemIndex=-1; + } + + public function editComment($sender, $param) + { + $this->comments->SelectedItemIndex=-1; + $this->comments->EditItemIndex=$param->Item->ItemIndex; + $this->refreshData(); + } + + public function cancelEdit($sender, $param) + { + $this->comments->SelectedItemIndex=-1; + $this->comments->EditItemIndex=-1; + $this->refreshData(); + } + + public function deleteComment($sender, $param) + { + $ID = $this->comments->DataKeys[$param->Item->ItemIndex]; + $this->_quickstart->deleteComment($ID); + $this->comments->SelectedItemIndex=-1; + $this->comments->EditItemIndex=-1; + $this->refreshData(); + } + + public function updateComment($sender, $param) + { + $item=$param->Item; + $this->_quickstart->updateComment( + $this->comments->DataKeys[$item->ItemIndex], + $item->page->Text, + $item->email->Text, + $item->content->Text); + + $this->comments->EditItemIndex=-1; + $this->refreshData(); + } +} + +?> \ No newline at end of file diff --git a/demos/quickstart/themes/PradoSoft/style.css b/demos/quickstart/themes/PradoSoft/style.css index 0fed7813..782697ae 100644 --- a/demos/quickstart/themes/PradoSoft/style.css +++ b/demos/quickstart/themes/PradoSoft/style.css @@ -379,4 +379,142 @@ dd { text-align: center; margin: 30px; +} + +/** Comments **/ +#comments +{ + margin: 10px; +} + +.comment_header +{ + border-bottom: 1px solid silver; +} + +.comment_item +{ + padding: 10px; + border: 1px solid silver; + margin: 0 10px 10px 10px; +} + +.comment_item .number +{ + float: right; + font-size: 1.5em; + font-weight: bold; + color: silver; +} + +.comment_item1 +{ + background-color: #EDEDED; +} + +.comment_item .email +{ + font-weight: bold; + display: block; +} + +.comment_item .date +{ + font-size: 0.85em; + display: block; + border-bottom: 1px dotted silver; +} + +.comment_item .comment +{ + padding: 10px; +} + +.add_comments +{ + margin-top: 2em; +} + +.add_comments .comment_email +{ + margin-bottom: 5px; +} + +.add_comments .comment_email input +{ + width: 25em; +} + +.add_comments .comment_content textarea +{ + width: 75%; + height: 200px; + padding: 5px; +} + +.add_comments .comment_email label, .add_comments .comment_content label +{ + width: 8em; + float: left; + text-align: right; + padding-right: 5px; +} + +.add_comments .add_comment +{ + padding-left: 8.2em; + padding-top: 0.5em; +} + +.add_comments .please_add +{ + padding-left: 8.2em; +} + +.add_comments h3, .comment_added h3 +{ + border-bottom: 1px solid silver; +} + +.comment_preview +{ + margin: 10px; + padding: 10px; + border: 1px solid silver; +} + +.comment_preview .comment +{ + padding: 10px; +} + +.comment_added +{ + margin-top: 3em; + border-top: 1px dotted silver; + padding: 10px; +} + +.comment_added .comment +{ + padding: 10px; + margin-top: 10px; +} + +.comment_added .thank +{ + background-color: #ffffcc; + padding: 20px; +} + +pre code +{ + display: block; + padding: 0.5em; + border-style:solid; + border-width:1px; + border-color:#eeeeee; + background-color:#ffffee; + font-family: "Courier New", Courier, mono; + margin: 0.2em; } \ No newline at end of file diff --git a/framework/3rdParty/Markdown/License.text b/framework/3rdParty/Markdown/License.text new file mode 100644 index 00000000..ea6a6a1a --- /dev/null +++ b/framework/3rdParty/Markdown/License.text @@ -0,0 +1,34 @@ +Copyright (c) 2004-2005, John Gruber + +All rights reserved. + +Copyright (c) 2004-2005, Michel Fortin + +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + +* Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +* Neither the name "Markdown" nor the names of its contributors may + be used to endorse or promote products derived from this software + without specific prior written permission. + +This software is provided by the copyright holders and contributors "as +is" and any express or implied warranties, including, but not limited +to, the implied warranties of merchantability and fitness for a +particular purpose are disclaimed. In no event shall the copyright owner +or contributors be liable for any direct, indirect, incidental, special, +exemplary, or consequential damages (including, but not limited to, +procurement of substitute goods or services; loss of use, data, or +profits; or business interruption) however caused and on any theory of +liability, whether in contract, strict liability, or tort (including +negligence or otherwise) arising in any way out of the use of this +software, even if advised of the possibility of such damage. diff --git a/framework/3rdParty/Markdown/MarkdownParser.php b/framework/3rdParty/Markdown/MarkdownParser.php new file mode 100644 index 00000000..c0d2becf --- /dev/null +++ b/framework/3rdParty/Markdown/MarkdownParser.php @@ -0,0 +1,1257 @@ + +# +# Copyright (c) 2004-2005 Michel Fortin - PHP Port +# +# + +/** + * PHP5 version of the markdown parser. + * Usage: + * + * $markdown = new MarkdownParser; + * echo $markdown->parse($text); + * + */ +class MarkdownParser +{ + private static $md_nested_brackets; + private static $md_escape_table = array(); + private static $md_backslash_escape_table = array(); + private static $md_nested_brackets_depth = 6; + + protected $md_empty_element_suffix = " />"; # Change to ">" for HTML output + protected $md_tab_width = 4; + + private $md_list_level = 0; + private $md_urls = array(); + private $md_titles = array(); + private $md_html_blocks = array(); + + public function __construct() + { + if(is_null(self::$md_nested_brackets)) + $this->initialize(); + } + + private function initialize() + { + self::$md_nested_brackets = + str_repeat('(?>[^\[\]]+|\[', self::$md_nested_brackets_depth). + str_repeat('\])*', self::$md_nested_brackets_depth); + + self::$md_escape_table = array( + "\\" => md5("\\"), + "`" => md5("`"), + "*" => md5("*"), + "_" => md5("_"), + "{" => md5("{"), + "}" => md5("}"), + "[" => md5("["), + "]" => md5("]"), + "(" => md5("("), + ")" => md5(")"), + ">" => md5(">"), + "#" => md5("#"), + "+" => md5("+"), + "-" => md5("-"), + "." => md5("."), + "!" => md5("!") + ); + + # Table of hash values for escaped characters: + # Create an identical table but for escaped characters. + foreach (self::$md_escape_table as $key => $char) + self::$md_backslash_escape_table["\\$key"] = $char; + } + + public function parse($text) + { + # + # Main function. The order in which other subs are called here is + # essential. Link and image substitutions need to happen before + # _EscapeSpecialCharsWithinTagAttributes(), so that any *'s or _'s in the + # and tags get encoded. + # + # Clear the hashes. If we don't clear these, you get conflicts + # from other articles when generating a page which contains more than + # one article (e.g. an index page that shows the N most recent + # articles): + $this->md_urls = array(); + $this->md_titles = array(); + $this->md_html_blocks = array(); + + # Standardize line endings: + # DOS to Unix and Mac to Unix + $text = str_replace(array("\r\n", "\r"), "\n", $text); + + # Make sure $text ends with a couple of newlines: + $text .= "\n\n"; + + # Convert all tabs to spaces. + $text = $this->_Detab($text); + + # Strip any lines consisting only of spaces and tabs. + # This makes subsequent regexen easier to write, because we can + # match consecutive blank lines with /\n+/ instead of something + # contorted like /[ \t]*\n+/ . + $text = preg_replace('/^[ \t]+$/m', '', $text); + + # Turn block-level HTML blocks into hash entries + $text = $this->_HashHTMLBlocks($text); + + # Strip link definitions, store in hashes. + $text = $this->_StripLinkDefinitions($text); + + $text = $this->_RunBlockGamut($text); + + $text = $this->_UnescapeSpecialChars($text); + + return $text . "\n"; + } + + + private function _StripLinkDefinitions($text) { + # + # Strips link definitions from text, stores the URLs and titles in + # hash references. + # + $less_than_tab = $this->md_tab_width - 1; + + # Link defs are in the form: ^[id]: url "optional title" + $text = preg_replace_callback('{ + ^[ ]{0,'.$less_than_tab.'}\[(.+)\]: # id = $1 + [ \t]* + \n? # maybe *one* newline + [ \t]* + ? # url = $2 + [ \t]* + \n? # maybe one newline + [ \t]* + (?: + (?<=\s) # lookbehind for whitespace + ["(] + (.+?) # title = $3 + [")] + [ \t]* + )? # title is optional + (?:\n+|\Z) + }xm', + array($this,'_StripLinkDefinitions_callback'), + $text); + return $text; + } + + private function _StripLinkDefinitions_callback($matches) { + $link_id = strtolower($matches[1]); + $this->md_urls[$link_id] = $this->_EncodeAmpsAndAngles($matches[2]); + if (isset($matches[3])) + $this->md_titles[$link_id] = str_replace('"', '"', $matches[3]); + return ''; # String that will replace the block + } + + + private function _HashHTMLBlocks($text) { + $less_than_tab = $this->md_tab_width - 1; + + # Hashify HTML blocks: + # We only want to do this for block-level HTML tags, such as headers, + # lists, and tables. That's because we still want to wrap

s around + # "paragraphs" that are wrapped in non-block-level tags, such as anchors, + # phrase emphasis, and spans. The list of tags we're looking for is + # hard-coded: + $block_tags_a = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|'. + 'script|noscript|form|fieldset|iframe|math|ins|del'; + $block_tags_b = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|'. + 'script|noscript|form|fieldset|iframe|math'; + + # First, look for nested blocks, e.g.: + #

+ #
+ # tags for inner block must be indented. + #
+ #
+ # + # The outermost tags must start at the left margin for this to match, and + # the inner nested divs must be indented. + # We need to do this before the next, more liberal match, because the next + # match will start at the first `
` and stop at the first `
`. + $text = preg_replace_callback("{ + ( # save in $1 + ^ # start of line (with /m) + <($block_tags_a) # start tag = $2 + \\b # word break + (.*\\n)*? # any number of lines, minimally matching + # the matching end tag + [ \\t]* # trailing spaces/tabs + (?=\\n+|\\Z) # followed by a newline or end of document + ) + }xm", + array($this,'_HashHTMLBlocks_callback'), + $text); + + # + # Now match more liberally, simply from `\n` to `\n` + # + $text = preg_replace_callback("{ + ( # save in $1 + ^ # start of line (with /m) + <($block_tags_b) # start tag = $2 + \\b # word break + (.*\\n)*? # any number of lines, minimally matching + .* # the matching end tag + [ \\t]* # trailing spaces/tabs + (?=\\n+|\\Z) # followed by a newline or end of document + ) + }xm", + array($this,'_HashHTMLBlocks_callback'), + $text); + + # Special case just for
. It was easier to make a special case than + # to make the other regex more complicated. + $text = preg_replace_callback('{ + (?: + (?<=\n\n) # Starting after a blank line + | # or + \A\n? # the beginning of the doc + ) + ( # save in $1 + [ ]{0,'.$less_than_tab.'} + <(hr) # start tag = $2 + \b # word break + ([^<>])*? # + /?> # the matching end tag + [ \t]* + (?=\n{2,}|\Z) # followed by a blank line or end of document + ) + }x', + array($this,'_HashHTMLBlocks_callback'), + $text); + + # Special case for standalone HTML comments: + $text = preg_replace_callback('{ + (?: + (?<=\n\n) # Starting after a blank line + | # or + \A\n? # the beginning of the doc + ) + ( # save in $1 + [ ]{0,'.$less_than_tab.'} + (?s: + + ) + [ \t]* + (?=\n{2,}|\Z) # followed by a blank line or end of document + ) + }x', + array($this,'_HashHTMLBlocks_callback'), + $text); + + return $text; + } + private function _HashHTMLBlocks_callback($matches) { + $text = $matches[1]; + $key = md5($text); + $this->md_html_blocks[$key] = $text; + return "\n\n$key\n\n"; # String that will replace the block + } + + + private function _RunBlockGamut($text) { + # + # These are all the transformations that form block-level + # tags like paragraphs, headers, and list items. + # + $text = $this->_DoHeaders($text); + + # Do Horizontal Rules: + $text = preg_replace( + array('{^[ ]{0,2}([ ]?\*[ ]?){3,}[ \t]*$}mx', + '{^[ ]{0,2}([ ]? -[ ]?){3,}[ \t]*$}mx', + '{^[ ]{0,2}([ ]? _[ ]?){3,}[ \t]*$}mx'), + "\nmd_empty_element_suffix}\n", + $text); + + $text = $this->_DoLists($text); + $text = $this->_DoCodeBlocks($text); + $text = $this->_DoBlockQuotes($text); + + # We already ran _HashHTMLBlocks() before, in Markdown(), but that + # was to escape raw HTML in the original Markdown source. This time, + # we're escaping the markup we've just created, so that we don't wrap + #

tags around block-level tags. + $text = $this->_HashHTMLBlocks($text); + $text = $this->_FormParagraphs($text); + + return $text; + } + + + private function _RunSpanGamut($text) { + # + # These are all the transformations that occur *within* block-level + # tags like paragraphs, headers, and list items. + # + + $text = $this->_DoCodeSpans($text); + + $text = $this->_EscapeSpecialChars($text); + + # Process anchor and image tags. Images must come first, + # because ![foo][f] looks like an anchor. + $text = $this->_DoImages($text); + $text = $this->_DoAnchors($text); + + # Make links out of things like `` + # Must come after _DoAnchors(), because you can use < and > + # delimiters in inline links like [this](). + $text = $this->_DoAutoLinks($text); + $text = $this->_EncodeAmpsAndAngles($text); + $text = $this->_DoItalicsAndBold($text); + + # Do hard breaks: + $text = preg_replace('/ {2,}\n/', "md_empty_element_suffix}\n", $text); + + return $text; + } + + + private function _EscapeSpecialChars($text) { + $tokens = $this->_TokenizeHTML($text); + + $text = ''; # rebuild $text from the tokens + # $in_pre = 0; # Keep track of when we're inside 

 or  tags.
+	#	$tags_to_skip = "!<(/?)(?:pre|code|kbd|script|math)[\s>]!";
+
+		foreach ($tokens as $cur_token) {
+			if ($cur_token[0] == 'tag') {
+				# Within tags, encode * and _ so they don't conflict
+				# with their use in Markdown for italics and strong.
+				# We're replacing each such character with its
+				# corresponding MD5 checksum value; this is likely
+				# overkill, but it should prevent us from colliding
+				# with the escape values by accident.
+				$cur_token[1] = str_replace(array('*', '_'),
+					array(self::$md_escape_table['*'], self::$md_escape_table['_']),
+					$cur_token[1]);
+				$text .= $cur_token[1];
+			} else {
+				$t = $cur_token[1];
+				$t = $this->_EncodeBackslashEscapes($t);
+				$text .= $t;
+			}
+		}
+		return $text;
+	}
+
+
+	private function _DoAnchors($text) {
+	#
+	# Turn Markdown link shortcuts into XHTML  tags.
+	#
+		#
+		# First, handle reference-style links: [link text] [id]
+		#
+		$bracket = self::$md_nested_brackets;
+		$text = preg_replace_callback("{
+			(					# wrap whole match in $1
+			  \\[
+				({$bracket})	# link text = $2
+			  \\]
+
+			  [ ]?				# one optional space
+			  (?:\\n[ ]*)?		# one optional newline followed by spaces
+
+			  \\[
+				(.*?)		# id = $3
+			  \\]
+			)
+			}xs",
+			array($this,'_DoAnchors_reference_callback'), $text);
+
+		#
+		# Next, inline-style links: [link text](url "optional title")
+		#
+		$text = preg_replace_callback("{
+			(				# wrap whole match in $1
+			  \\[
+				({$bracket})	# link text = $2
+			  \\]
+			  \\(			# literal paren
+				[ \\t]*
+				?	# href = $3
+				[ \\t]*
+				(			# $4
+				  (['\"])	# quote char = $5
+				  (.*?)		# Title = $6
+				  \\5		# matching quote
+				)?			# title is optional
+			  \\)
+			)
+			}xs",
+			array($this,'_DoAnchors_inline_callback'), $text);
+
+		return $text;
+	}
+	private function _DoAnchors_reference_callback($matches) {
+		$whole_match = $matches[1];
+		$link_text   = $matches[2];
+		$link_id     = strtolower($matches[3]);
+
+		if ($link_id == "") {
+			$link_id = strtolower($link_text); # for shortcut links like [this][].
+		}
+
+		if (isset($this->md_urls[$link_id])) {
+			$url = $this->md_urls[$link_id];
+			# We've got to encode these to avoid conflicting with italics/bold.
+			$url = str_replace(array('*', '_'),
+							   array(self::$md_escape_table['*'], self::$md_escape_table['_']),
+							   $url);
+			$result = "md_titles[$link_id] ) ) {
+				$title = $this->md_titles[$link_id];
+				$title = str_replace(array('*',     '_'),
+									 array(self::$md_escape_table['*'], 
+										   self::$md_escape_table['_']), $title);
+				$result .=  " title=\"$title\"";
+			}
+			$result .= ">$link_text";
+		}
+		else {
+			$result = $whole_match;
+		}
+		return $result;
+	}
+	private function _DoAnchors_inline_callback($matches) {
+		$whole_match	= $matches[1];
+		$link_text		= $matches[2];
+		$url			= $matches[3];
+		$title			=& $matches[6];
+
+		# We've got to encode these to avoid conflicting with italics/bold.
+		$url = str_replace(array('*', '_'),
+						   array(self::$md_escape_table['*'], self::$md_escape_table['_']), 
+						   $url);
+		$result = " tags.
+	#
+		#
+		# First, handle reference-style labeled images: ![alt text][id]
+		#
+		$text = preg_replace_callback('{
+			(				# wrap whole match in $1
+			  !\[
+				('.self::$md_nested_brackets.')		# alt text = $2
+			  \]
+
+			  [ ]?				# one optional space
+			  (?:\n[ ]*)?		# one optional newline followed by spaces
+
+			  \[
+				(.*?)		# id = $3
+			  \]
+
+			)
+			}xs', 
+			array($this,'_DoImages_reference_callback'), $text);
+
+		#
+		# Next, handle inline images:  ![alt text](url "optional title")
+		# Don't forget: encode * and _
+
+		$text = preg_replace_callback('{
+			(				# wrap whole match in $1
+			  !\[
+				('.self::$md_nested_brackets.')		# alt text = $2
+			  \]
+			  \(			# literal paren
+				[ \t]*
+				?	# src url = $3
+				[ \t]*
+				(			# $4
+				  ([\'"])	# quote char = $5
+				  (.*?)		# title = $6
+				  \5		# matching quote
+				  [ \t]*
+				)?			# title is optional
+			  \)
+			)
+			}xs',
+			array($this,'_DoImages_inline_callback'), $text);
+
+		return $text;
+	}
+	private function _DoImages_reference_callback($matches) {
+		$whole_match = $matches[1];
+		$alt_text    = $matches[2];
+		$link_id     = strtolower($matches[3]);
+
+		if ($link_id == "") {
+			$link_id = strtolower($alt_text); # for shortcut links like ![this][].
+		}
+
+		$alt_text = str_replace('"', '"', $alt_text);
+		if (isset($this->md_urls[$link_id])) {
+			$url = $this->md_urls[$link_id];
+			# We've got to encode these to avoid conflicting with italics/bold.
+			$url = str_replace(array('*', '_'),
+							   array(self::$md_escape_table['*'], self::$md_escape_table['_']),
+							   $url);
+			$result = "\"$alt_text\"";md_titles[$link_id])) {
+				$title = $this->md_titles[$link_id];
+				$title = str_replace(array('*', '_'),
+									 array(self::$md_escape_table['*'], 
+										   self::$md_escape_table['_']), $title);
+				$result .=  " title=\"$title\"";
+			}
+			$result .= $this->md_empty_element_suffix;
+		}
+		else {
+			# If there's no such link ID, leave intact:
+			$result = $whole_match;
+		}
+
+		return $result;
+	}
+	private function _DoImages_inline_callback($matches) {
+		$whole_match	= $matches[1];
+		$alt_text		= $matches[2];
+		$url			= $matches[3];
+		$title			= '';
+		if (isset($matches[6])) {
+			$title		= $matches[6];
+		}
+
+		$alt_text = str_replace('"', '"', $alt_text);
+		$title    = str_replace('"', '"', $title);
+		# We've got to encode these to avoid conflicting with italics/bold.
+		$url = str_replace(array('*', '_'),
+						   array(self::$md_escape_table['*'], self::$md_escape_table['_']),
+						   $url);
+		$result = "\"$alt_text\"";md_empty_element_suffix;
+
+		return $result;
+	}
+
+
+	private function _DoHeaders($text) {
+		# Setext-style headers:
+		#	  Header 1
+		#	  ========
+		#  
+		#	  Header 2
+		#	  --------
+		#
+		$text = preg_replace(
+			array('{ ^(.+)[ \t]*\n=+[ \t]*\n+ }emx',
+				  '{ ^(.+)[ \t]*\n-+[ \t]*\n+ }emx'),
+			array("'
'.\$this->_RunSpanGamut(\$this->_UnslashQuotes('\\1')).'
\n\n'",
+				  "'
'.\$this->_RunSpanGamut(\$this->_UnslashQuotes('\\1')).'
\n\n'"),
+			$text);
+
+		# atx-style headers:
+		#	# Header 1
+		#	## Header 2
+		#	## Header 2 with closing hashes ##
+		#	...
+		#	###### Header 6
+		#
+		$text = preg_replace("{
+				^(\\#{1,6})	# $1 = string of #'s
+				[ \\t]*
+				(.+?)		# $2 = Header text
+				[ \\t]*
+				\\#*			# optional closing #'s (not counted)
+				\\n+
+			}xme",
+			"''.\$this->_RunSpanGamut(\$this->_UnslashQuotes('\\2')).'\n\n'",
+			$text);
+
+		return $text;
+	}
+
+
+	private function _DoLists($text) {
+	#
+	# Form HTML ordered (numbered) and unordered (bulleted) lists.
+	#
+		$less_than_tab = $this->md_tab_width - 1;
+
+		# Re-usable patterns to match list item bullets and number markers:
+		$marker_ul  = '[*+-]';
+		$marker_ol  = '\d+[.]';
+		$marker_any = "(?:$marker_ul|$marker_ol)";
+
+		$markers = array($marker_ul, $marker_ol);
+
+		foreach ($markers as $marker) {
+			# Re-usable pattern to match any entirel ul or ol list:
+			$whole_list = '
+				(								# $1 = whole list
+				  (								# $2
+					[ ]{0,'.$less_than_tab.'}
+					('.$marker.')				# $3 = first list item marker
+					[ \t]+
+				  )
+				  (?s:.+?)
+				  (								# $4
+					  \z
+					|
+					  \n{2,}
+					  (?=\S)
+					  (?!						# Negative lookahead for another list item marker
+						[ \t]*
+						'.$marker.'[ \t]+
+					  )
+				  )
+				)
+			'; // mx
+			
+			# We use a different prefix before nested lists than top-level lists.
+			# See extended comment in _ProcessListItems().
+		
+			if ($this->md_list_level) {
+				$text = preg_replace_callback('{
+						^
+						'.$whole_list.'
+					}mx',
+					array($this,'_DoLists_callback_top'), $text);
+			}
+			else {
+				$text = preg_replace_callback('{
+						(?:(?<=\n\n)|\A\n?)
+						'.$whole_list.'
+					}mx',
+					array($this,'_DoLists_callback_nested'), $text);
+			}
+		}
+
+		return $text;
+	}
+	private function _DoLists_callback_top($matches) {
+		# Re-usable patterns to match list item bullets and number markers:
+		$marker_ul  = '[*+-]';
+		$marker_ol  = '\d+[.]';
+		$marker_any = "(?:$marker_ul|$marker_ol)";
+		
+		$list = $matches[1];
+		$list_type = preg_match("/$marker_ul/", $matches[3]) ? "ul" : "ol";
+		
+		$marker_any = ( $list_type == "ul" ? $marker_ul : $marker_ol );
+		
+		# Turn double returns into triple returns, so that we can make a
+		# paragraph for the last item in a list, if necessary:
+		$list = preg_replace("/\n{2,}/", "\n\n\n", $list);
+		$result = $this->_ProcessListItems($list, $marker_any);
+		
+		# Trim any trailing whitespace, to put the closing ``
+		# up on the preceding line, to get it past the current stupid
+		# HTML block parser. This is a hack to work around the terrible
+		# hack that is the HTML block parser.
+		$result = rtrim($result);
+		$result = "<$list_type>" . $result . "\n";
+		return $result;
+	}
+	private function _DoLists_callback_nested($matches) {
+		# Re-usable patterns to match list item bullets and number markers:
+		$marker_ul  = '[*+-]';
+		$marker_ol  = '\d+[.]';
+		$marker_any = "(?:$marker_ul|$marker_ol)";
+		
+		$list = $matches[1];
+		$list_type = preg_match("/$marker_ul/", $matches[3]) ? "ul" : "ol";
+		
+		$marker_any = ( $list_type == "ul" ? $marker_ul : $marker_ol );
+		
+		# Turn double returns into triple returns, so that we can make a
+		# paragraph for the last item in a list, if necessary:
+		$list = preg_replace("/\n{2,}/", "\n\n\n", $list);
+		$result = $this->_ProcessListItems($list, $marker_any);
+		$result = "<$list_type>\n" . $result . "\n";
+		return $result;
+	}
+
+
+	private function _ProcessListItems($list_str, $marker_any) {
+	#
+	#	Process the contents of a single ordered or unordered list, splitting it
+	#	into individual list items.
+	#
+
+		# The $md_list_level keeps track of when we're inside a list.
+		# Each time we enter a list, we increment it; when we leave a list,
+		# we decrement. If it's zero, we're not in a list anymore.
+		#
+		# We do this because when we're not inside a list, we want to treat
+		# something like this:
+		#
+		#		I recommend upgrading to version
+		#		8. Oops, now this line is treated
+		#		as a sub-list.
+		#
+		# As a single paragraph, despite the fact that the second line starts
+		# with a digit-period-space sequence.
+		#
+		# Whereas when we're inside a list (or sub-list), that line will be
+		# treated as the start of a sub-list. What a kludge, huh? This is
+		# an aspect of Markdown's syntax that's hard to parse perfectly
+		# without resorting to mind-reading. Perhaps the solution is to
+		# change the syntax rules such that sub-lists must start with a
+		# starting cardinal number; e.g. "1." or "a.".
+		
+		$this->md_list_level++;
+
+		# trim trailing blank lines:
+		$list_str = preg_replace("/\n{2,}\\z/", "\n", $list_str);
+
+		$list_str = preg_replace_callback('{
+			(\n)?							# leading line = $1
+			(^[ \t]*)						# leading whitespace = $2
+			('.$marker_any.') [ \t]+		# list marker = $3
+			((?s:.+?)						# list item text   = $4
+			(\n{1,2}))
+			(?= \n* (\z | \2 ('.$marker_any.') [ \t]+))
+			}xm',
+			array($this,'_ProcessListItems_callback'), $list_str);
+
+		$this->md_list_level--;
+		return $list_str;
+	}
+	private function _ProcessListItems_callback($matches) {
+		$item = $matches[4];
+		$leading_line =& $matches[1];
+		$leading_space =& $matches[2];
+
+		if ($leading_line || preg_match('/\n{2,}/', $item)) {
+			$item = $this->_RunBlockGamut($this->_Outdent($item));
+		}
+		else {
+			# Recursion for sub-lists:
+			$item = $this->_DoLists($this->_Outdent($item));
+			$item = preg_replace('/\n+$/', '', $item);
+			$item = $this->_RunSpanGamut($item);
+		}
+
+		return "
  • " . $item . "
    • \n";
+	}
+
+
+	private function _DoCodeBlocks($text) {
+	#
+	#	Process Markdown `
    ` blocks.
+	#
+		$text = preg_replace_callback('{
+				(?:\n\n|\A)
+				(	            # $1 = the code block -- one or more lines, starting with a space/tab
+				  (?:
+					(?:[ ]{'.$this->md_tab_width.'} | \t)  # Lines must start with a tab or a tab-width of spaces
+					.*\n+
+				  )+
+				)
+				((?=^[ ]{0,'.$this->md_tab_width.'}\S)|\Z)	# Lookahead for non-space at line-start, or end of doc
+			}xm',
+			array($this,'_DoCodeBlocks_callback'), $text);
+
+		return $text;
+	}
+	private function _DoCodeBlocks_callback($matches) {
+		$codeblock = $matches[1];
+
+		$codeblock = $this->_EncodeCode($this->_Outdent($codeblock));
+	//	$codeblock = _Detab($codeblock);
+		# trim leading newlines and trailing whitespace
+		$codeblock = preg_replace(array('/\A\n+/', '/\s+\z/'), '', $codeblock);
+
+		$result = "\n\n
    " . $codeblock . "\n
    \n\n";
+
+		return $result;
+	}
+
+
+	private function _DoCodeSpans($text) {
+	#
+	# 	*	Backtick quotes are used for  spans.
+	#
+	# 	*	You can use multiple backticks as the delimiters if you want to
+	# 		include literal backticks in the code span. So, this input:
+	#
+	#		  Just type ``foo `bar` baz`` at the prompt.
+	#
+	#	  	Will translate to:
+	#
+	#		  
    Just type foo `bar` baz at the prompt.
    
+	#
+	#		There's no arbitrary limit to the number of backticks you
+	#		can use as delimters. If you need three consecutive backticks
+	#		in your code, use four for delimiters, etc.
+	#
+	#	*	You can use spaces to get literal backticks at the edges:
+	#
+	#		  ... type `` `bar` `` ...
+	#
+	#	  	Turns to:
+	#
+	#		  ... type `bar` ...
+	#
+		$text = preg_replace_callback('@
+				(?_EncodeCode($c);
+		return "$c";
+	}
+
+
+	private function _EncodeCode($_) {
+	#
+	# Encode/escape certain characters inside Markdown code runs.
+	# The point is that in code, these characters are literals,
+	# and lose their special Markdown meanings.
+	#
+		# Encode all ampersands; HTML entities are not
+		# entities within a Markdown code span.
+		$_ = str_replace('&', '&', $_);
+
+		# Do the angle bracket song and dance:
+		$_ = str_replace(array('<',    '>'), 
+						 array('<', '>'), $_);
+
+		# Now, escape characters that are magic in Markdown:
+		$_ = str_replace(array_keys(self::$md_escape_table), 
+						 array_values(self::$md_escape_table), $_);
+
+		return $_;
+	}
+
+
+	private function _DoItalicsAndBold($text) {
+		#  must go first:
+		$text = preg_replace('{
+				(						# $1: Marker
+					(?\2', $text);
+		# Then :
+		$text = preg_replace(
+			'{ ( (?\2', $text);
+
+		return $text;
+	}
+
+
+	private function _DoBlockQuotes($text) {
+		$text = preg_replace_callback('/
+			  (								# Wrap whole match in $1
+				(
+				  ^[ \t]*>[ \t]?			# ">" at the start of a line
+					.+\n					# rest of the first line
+				  (.+\n)*					# subsequent consecutive lines
+				  \n*						# blanks
+				)+
+			  )
+			/xm',
+			array($this,'_DoBlockQuotes_callback'), $text);
+
+		return $text;
+	}
+	private function _DoBlockQuotes_callback($matches) {
+		$bq = $matches[1];
+		# trim one level of quoting - trim whitespace-only lines
+		$bq = preg_replace(array('/^[ \t]*>[ \t]?/m', '/^[ \t]+$/m'), '', $bq);
+		$bq = $this->_RunBlockGamut($bq);		# recurse
+
+		$bq = preg_replace('/^/m', "  ", $bq);
+		# These leading spaces screw with 
     content, so we need to fix that:
+		$bq = preg_replace_callback('{(\s*
    .+?
    )}sx', 
+									array($this,'_DoBlockQuotes_callback2'), $bq);
+
+		return "
    \n$bq\n
    \n\n";
+	}
+	private function _DoBlockQuotes_callback2($matches) {
+		$pre = $matches[1];
+		$pre = preg_replace('/^  /m', '', $pre);
+		return $pre;
+	}
+
+
+	private function _FormParagraphs($text) {
+	#
+	#	Params:
+	#		$text - string to process with html 
     tags
+	#
+		# Strip leading and trailing lines:
+		$text = preg_replace(array('/\A\n+/', '/\n+\z/'), '', $text);
+
+		$grafs = preg_split('/\n{2,}/', $text, -1, PREG_SPLIT_NO_EMPTY);
+
+		#
+		# Wrap 
     tags.
+		#
+		foreach ($grafs as $key => $value) {
+			if (!isset( $this->md_html_blocks[$value] )) {
+				$value = $this->_RunSpanGamut($value);
+				$value = preg_replace('/^([ \t]*)/', '
    ', $value);
+				$value .= "
    ";
+				$grafs[$key] = $value;
+			}
+		}
+
+		#
+		# Unhashify HTML blocks
+		#
+		foreach ($grafs as $key => $value) {
+			if (isset( $this->md_html_blocks[$value] )) {
+				$grafs[$key] = $this->md_html_blocks[$value];
+			}
+		}
+
+		return implode("\n\n", $grafs);
+	}
+
+
+	private function _EncodeAmpsAndAngles($text) {
+	# Smart processing for ampersands and angle brackets that need to be encoded.
+
+		# Ampersand-encoding based entirely on Nat Irons's Amputator MT plugin:
+		#   http://bumppo.net/projects/amputator/
+		$text = preg_replace('/&(?!#?[xX]?(?:[0-9a-fA-F]+|\w+);)/', 
+							 '&', $text);;
+
+		# Encode naked <'s
+		$text = preg_replace('{<(?![a-z/?\$!])}i', '<', $text);
+
+		return $text;
+	}
+
+
+	private function _EncodeBackslashEscapes($text) {
+	#
+	#	Parameter:  String.
+	#	Returns:    The string, with after processing the following backslash
+	#				escape sequences.
+	#
+		# Must process escaped backslashes first.
+		return str_replace(array_keys(self::$md_backslash_escape_table),
+						   array_values(self::$md_backslash_escape_table), $text);
+	}
+
+
+	private function _DoAutoLinks($text) {
+		$text = preg_replace("!<((https?|ftp):[^'\">\\s]+)>!", 
+							 '    \1', $text);
+
+		# Email addresses: 
+		$text = preg_replace('{
+			<
+			(?:mailto:)?
+			(
+				[-.\w]+
+				\@
+				[-a-z0-9]+(\.[-a-z0-9]+)*\.[a-z]+
+			)
+			>
+			}exi',
+			"\$this->_EncodeEmailAddress(\$this->_UnescapeSpecialChars(\$this->_UnslashQuotes('\\1')))",
+			$text);
+
+		return $text;
+	}
+
+
+	private function _EncodeEmailAddress($addr) {
+	#
+	#	Input: an email address, e.g. "foo@example.com"
+	#
+	#	Output: the email address as a mailto link, with each character
+	#		of the address encoded as either a decimal or hex entity, in
+	#		the hopes of foiling most address harvesting spam bots. E.g.:
+	#
+	#	  foo
+	#		@example.com
+	#
+	#	Based by a filter by Matthew Wickline, posted to the BBEdit-Talk
+	#	mailing list: 
+	#
+		$addr = "mailto:" . $addr;
+		$length = strlen($addr);
+
+		# leave ':' alone (to spot mailto: later)
+		$addr = preg_replace_callback('/([^\:])/', 
+									  array($this,'_EncodeEmailAddress_callback'), $addr);
+
+		$addr = "$addr";
+		# strip the mailto: from the visible part
+		$addr = preg_replace('/">.+?:/', '">', $addr);
+
+		return $addr;
+	}
+	private function _EncodeEmailAddress_callback($matches) {
+		$char = $matches[1];
+		$r = rand(0, 100);
+		# roughly 10% raw, 45% hex, 45% dec
+		# '@' *must* be encoded. I insist.
+		if ($r > 90 && $char != '@') return $char;
+		if ($r < 45) return '&#x'.dechex(ord($char)).';';
+		return '&#'.ord($char).';';
+	}
+
+
+	private function _UnescapeSpecialChars($text) {
+	#
+	# Swap back in all the special characters we've hidden.
+	#
+		return str_replace(array_values(self::$md_escape_table), 
+						   array_keys(self::$md_escape_table), $text);
+	}
+
+
+	# _TokenizeHTML is shared between PHP Markdown and PHP SmartyPants.
+	# We only define it if it is not already defined.
+	
+	private function _TokenizeHTML($str) {
+	#
+	#   Parameter:  String containing HTML markup.
+	#   Returns:    An array of the tokens comprising the input
+	#               string. Each token is either a tag (possibly with nested,
+	#               tags contained therein, such as , or a
+	#               run of text between tags. Each element of the array is a
+	#               two-element array; the first is either 'tag' or 'text';
+	#               the second is the actual value.
+	#
+	#
+	#   Regular expression derived from the _tokenize() subroutine in 
+	#   Brad Choate's MTRegex plugin.
+	#   
+	#
+		$index = 0;
+		$tokens = array();
+
+		$match = '(?s:)|'.	# comment
+				 '(?s:<\?.*?\?>)|'.				# processing instruction
+												# regular tags
+				 '(?:<[/!$]?[-a-zA-Z0-9:]+\b(?>[^"\'>]+|"[^"]*"|\'[^\']*\')*>)'; 
+
+		$parts = preg_split("{($match)}", $str, -1, PREG_SPLIT_DELIM_CAPTURE);
+
+		foreach ($parts as $part) {
+			if (++$index % 2 && $part != '') 
+				$tokens[] = array('text', $part);
+			else
+				$tokens[] = array('tag', $part);
+		}
+
+		return $tokens;
+	}
+
+	private function _Outdent($text) {
+	#
+	# Remove one level of line-leading tabs or spaces
+	#
+		return preg_replace("/^(\\t|[ ]{1,".$this->md_tab_width."})/m", "", $text);
+	}
+
+
+	private function _Detab($text) {
+	#
+	# Replace tabs with the appropriate amount of space.
+	#
+		# For each line we separate the line in blocks delemited by
+		# tab characters. Then we reconstruct every line by adding the 
+		# appropriate number of space between each blocks.
+		
+		$lines = explode("\n", $text);
+		$text = "";
+		
+		foreach ($lines as $line) {
+			# Split in blocks.
+			$blocks = explode("\t", $line);
+			# Add each blocks to the line.
+			$line = $blocks[0];
+			unset($blocks[0]); # Do not add first block twice.
+			foreach ($blocks as $block) {
+				# Calculate amount of space, insert spaces, insert block.
+				$amount = $this->md_tab_width - strlen($line) % $this->md_tab_width;
+				$line .= str_repeat(" ", $amount) . $block;
+			}
+			$text .= "$line\n";
+		}
+		return $text;
+	}
+
+
+	private function _UnslashQuotes($text) {
+	#
+	#	This function is useful to remove automaticaly slashed double quotes
+	#	when using preg_replace and evaluating an expression.
+	#	Parameter:  String.
+	#	Returns:    The string with any slash-double-quote (\") sequence replaced
+	#				by a single double quote.
+	#
+		return str_replace('\"', '"', $text);
+	}
+}
+
+/*
+
+PHP Markdown
+============
+
+Description
+-----------
+
+This is a PHP translation of the original Markdown formatter written in
+Perl by John Gruber.
+
+Markdown is a text-to-HTML filter; it translates an easy-to-read /
+easy-to-write structured text format into HTML. Markdown's text format
+is most similar to that of plain text email, and supports features such
+as headers, *emphasis*, code blocks, blockquotes, and links.
+
+Markdown's syntax is designed not as a generic markup language, but
+specifically to serve as a front-end to (X)HTML. You can use span-level
+HTML tags anywhere in a Markdown document, and you can use block level
+HTML tags (like 
     and  as well).
+
+For more information about Markdown's syntax, see:
+
+
+
+
+Bugs
+----
+
+To file bug reports please send email to:
+
+
+
+Please include with your report: (1) the example input; (2) the output you
+expected; (3) the output Markdown actually produced.
+
+
+Version History
+--------------- 
+
+See the readme file for detailed release notes for this version.
+
+1.0.1c - 9 Dec 2005
+
+1.0.1b - 6 Jun 2005
+
+1.0.1a - 15 Apr 2005
+
+1.0.1 - 16 Dec 2004
+
+1.0 - 21 Aug 2004
+
+
+Author & Contributors
+---------------------
+
+Original Perl version by John Gruber  
+
+
+PHP port and other contributions by Michel Fortin  
+
+
+
+Copyright and License
+---------------------
+
+Copyright (c) 2004-2005 Michel Fortin  
+  
+All rights reserved.
+
+Copyright (c) 2003-2004 John Gruber   
+   
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+*	Redistributions of source code must retain the above copyright notice,
+	this list of conditions and the following disclaimer.
+
+*	Redistributions in binary form must reproduce the above copyright
+	notice, this list of conditions and the following disclaimer in the
+	documentation and/or other materials provided with the distribution.
+
+*	Neither the name "Markdown" nor the names of its contributors may
+	be used to endorse or promote products derived from this software
+	without specific prior written permission.
+
+This software is provided by the copyright holders and contributors "as
+is" and any express or implied warranties, including, but not limited
+to, the implied warranties of merchantability and fitness for a
+particular purpose are disclaimed. In no event shall the copyright owner
+or contributors be liable for any direct, indirect, incidental, special,
+exemplary, or consequential damages (including, but not limited to,
+procurement of substitute goods or services; loss of use, data, or
+profits; or business interruption) however caused and on any theory of
+liability, whether in contract, strict liability, or tort (including
+negligence or otherwise) arising in any way out of the use of this
+software, even if advised of the possibility of such damage.
+
+*/
+?>
diff --git a/framework/3rdParty/readme.html b/framework/3rdParty/readme.html
index f67526ae..590f1174 100644
--- a/framework/3rdParty/readme.html
+++ b/framework/3rdParty/readme.html
@@ -133,7 +133,15 @@ projects.
 	
 
+
+	
+	
+	
+	
+		
+
+
 
    Slightly modified to work nicely with E_STRICT in php 5.	
 
    MarkdownPHP MarkdownBSDSystem.Web.UI.WebControls.TMarkdownPHP5 class implementation of the PHP Markdown.
    
 
    
 
-
\ No newline at end of file
+
diff --git a/framework/I18N/TTranslate.php b/framework/I18N/TTranslate.php
index 6a30f3a6..da5876d4 100644
--- a/framework/I18N/TTranslate.php
+++ b/framework/I18N/TTranslate.php
@@ -28,19 +28,19 @@ Prado::using('System.I18N.TI18NControl');
  * Depending on the culture set on the page, the phrase "Goodbye" will
  * be translated.
  *
- * The values of any attribute in TTranslate are consider as values for
- * substitution. Strings enclosed with "{" and "}" are consider as the
- * parameters. The following example will substitution the string
- * "{time}" with the value of the attribute "time="#time()". Note that
- * the value of the attribute time is evaluated.
+ * The {@link getParameters Parameters} property can be use to add name values pairs for
+ * substitution. Substrings enclosed with "{" and "}" in the translation message are consider as the
+ * parameter names during substitution lookup. The following example will substitute the substring
+ * "{time}" with the value of the parameter attribute "Parameters.time=<%= time() %>. Note that
+ * the value of the parameter named "time" is evaluated.
  * 
- * 
+ *  >
  *   The unix-time is "{time}".
  * 
  * 
  *
  * More complex string substitution can be applied using the
- * TParam component.
+ * TTranslateParameter component.
  *
  * Namespace: System.I18N
  *
@@ -133,6 +133,68 @@ class TTranslate extends TI18NControl
 		return $this->getViewState('Trim',true);
 	}
 
+	/**
+	 * Returns the list of custom parameters.
+	 * Custom parameters are name-value pairs that may subsititute translation
+	 * place holders during rendering.
+	 * @return TAttributeCollection the list of custom parameters
+	 */
+	public function getParameters()
+	{
+		if($parameters=$this->getViewState('Parameters',null))
+			return $parameters;
+		else
+		{
+			$parameters=new TAttributeCollection;
+			$this->setViewState('Parameters',$parameters,null);
+			return $parameters;
+		}
+	}
+
+	/**
+	 * @return boolean whether the named parameter exists
+	 */
+	public function hasParameter($name)
+	{
+		if($parameters=$this->getViewState('Parameters',null))
+			return $parameters->contains($name);
+		else
+			return false;
+	}
+
+	/**
+	 * @return string parameter value, null if parameter does not exist
+	 */
+	public function getParameter($name)
+	{
+		if($parameters=$this->getViewState('Parameters',null))
+			return $parameters->itemAt($name);
+		else
+			return null;
+	}
+
+	/**
+	 * @param string parameter name
+	 * @param string value of the parameter
+	 */
+	public function setParameter($name,$value)
+	{
+		$this->getParameters()->add($name,$value);
+	}
+
+	/**
+	 * Removes the named parameter.
+	 * @param string the name of the parameter to be removed.
+	 * @return string parameter value removed, null if parameter does not exist.
+	 */
+	public function removeParameter($name)
+	{
+		if($parameters=$this->getViewState('Parameters',null))
+			return $parameters->remove($name);
+		else
+			return null;
+	}
+
 	/**
 	 * renders the translated string.
 	 */
@@ -141,6 +203,8 @@ class TTranslate extends TI18NControl
 		$textWriter=new TTextWriter;
 		$htmlWriter=new THtmlWriter($textWriter);
 		$subs = array();
+		foreach($this->getParameters() as $key => $value)
+			$subs['{'.$key.'}'] = $value;
 		foreach($this->getControls() as $control)
 		{
 			if($control instanceof TTranslateParameter)
diff --git a/framework/Web/Javascripts/datepicker/datepicker.js b/framework/Web/Javascripts/datepicker/datepicker.js
index d5d9496c..e704e950 100644
--- a/framework/Web/Javascripts/datepicker/datepicker.js
+++ b/framework/Web/Javascripts/datepicker/datepicker.js
@@ -282,8 +282,11 @@ Prado.WebUI.TDatePicker.prototype =
 		Event.observe(this._calDiv, "mousewheel", this.mouseWheelChange.bindEvent(this));		
 		
 		Event.observe(calendarBody, "click", this.selectDate.bindEvent(this));
+		
+		Event.observe(this.control, "blur", this.hide.bind(this));
+		Prado.Element.focus(this.control);
 				
-	},
+	},A
 	
 	ieHack : function(cleanup) 
 	{
@@ -305,7 +308,7 @@ Prado.WebUI.TDatePicker.prototype =
 		if (!ev) ev = document.parentWindow.event;
 		var kc = ev.keyCode != null ? ev.keyCode : ev.charCode;
 		
-		if(kc == Event.KEY_RETURN)
+		if(kc == Event.KEY_RETURN || kc == Event.KEY_SPACEBAR)
 		{
 			this.setSelectedDate(this.selectedDate);
 			Event.stop(ev);
@@ -526,6 +529,22 @@ Prado.WebUI.TDatePicker.prototype =
 		this.setMonth(this.selectedDate.getMonth()-1);
 	},
 	
+	getDatePickerOffsetHeight : function()
+	{
+		if(this.options.InputMode == "TextBox")
+			return this.control.offsetHeight;
+
+		var control = Prado.WebUI.TDatePicker.getDayListControl(this.control);
+		if(control) return control.offsetHeight;
+
+		var control = Prado.WebUI.TDatePicker.getMonthListControl(this.control);
+		if(control) return control.offsetHeight;		
+
+		var control = Prado.WebUI.TDatePicker.getYearListControl(this.control);
+		if(control) return control.offsetHeight;	
+		return 0;
+	},
+	
 	show : function() 
 	{
 		this.create();
@@ -534,15 +553,8 @@ Prado.WebUI.TDatePicker.prototype =
 		{
 			var pos = Position.cumulativeOffset(this.control);
 			
-			if(this.options.InputMode == "TextBox")
-				pos[1] += this.control.offsetHeight;
-			else
-			{
-				var dayList = Prado.WebUI.TDatePicker.getDayListControl(this.control);
-				if(dayList)
-					pos[1] += dayList.offsetHeight-1;
-			}
-
+			pos[1] += this.getDatePickerOffsetHeight();
+			
 			this._calDiv.style.display = "block";
 			this._calDiv.style.top = (pos[1]-1) + "px";
 			this._calDiv.style.left = pos[0] + "px";
diff --git a/framework/Web/Javascripts/js/datepicker.js b/framework/Web/Javascripts/js/datepicker.js
index a81bbeb4..e0bba502 100644
--- a/framework/Web/Javascripts/js/datepicker.js
+++ b/framework/Web/Javascripts/js/datepicker.js
@@ -23,10 +23,10 @@ div=document.createElement("div");div.className="calendarFooter";this._calDiv.ap
 this.iePopUp.scrolling="no"
 this.iePopUp.frameBorder="0"
 document.body.appendChild(this.iePopUp);}
-document.body.appendChild(this._calDiv);this.update();this.updateHeader();this.ieHack(true);previousMonth.hideFocus=true;nextMonth.hideFocus=true;todayButton.hideFocus=true;Event.observe(previousMonth,"click",this.prevMonth.bindEvent(this));Event.observe(nextMonth,"click",this.nextMonth.bindEvent(this));Event.observe(todayButton,"click",this.selectToday.bindEvent(this));Event.observe(this._monthSelect,"change",this.monthSelect.bindEvent(this));Event.observe(this._yearSelect,"change",this.yearSelect.bindEvent(this));Event.observe(this._calDiv,"mousewheel",this.mouseWheelChange.bindEvent(this));Event.observe(calendarBody,"click",this.selectDate.bindEvent(this));},ieHack:function(cleanup)
+document.body.appendChild(this._calDiv);this.update();this.updateHeader();this.ieHack(true);previousMonth.hideFocus=true;nextMonth.hideFocus=true;todayButton.hideFocus=true;Event.observe(previousMonth,"click",this.prevMonth.bindEvent(this));Event.observe(nextMonth,"click",this.nextMonth.bindEvent(this));Event.observe(todayButton,"click",this.selectToday.bindEvent(this));Event.observe(this._monthSelect,"change",this.monthSelect.bindEvent(this));Event.observe(this._yearSelect,"change",this.yearSelect.bindEvent(this));Event.observe(this._calDiv,"mousewheel",this.mouseWheelChange.bindEvent(this));Event.observe(calendarBody,"click",this.selectDate.bindEvent(this));Event.observe(this.control,"blur",this.hide.bind(this));Prado.Element.focus(this.control);},ieHack:function(cleanup)
 {if(this.iePopUp)
 {this.iePopUp.style.display="block";this.iePopUp.style.top=(this._calDiv.offsetTop-1)+"px";this.iePopUp.style.left=(this._calDiv.offsetLeft-1)+"px";this.iePopUp.style.width=Math.abs(this._calDiv.offsetWidth-2)+"px";this.iePopUp.style.height=(this._calDiv.offsetHeight+1)+"px";if(cleanup)this.iePopUp.style.display="none";}},keyPressed:function(ev)
-{if(!this.showing)return;if(!ev)ev=document.parentWindow.event;var kc=ev.keyCode!=null?ev.keyCode:ev.charCode;if(kc==Event.KEY_RETURN)
+{if(!this.showing)return;if(!ev)ev=document.parentWindow.event;var kc=ev.keyCode!=null?ev.keyCode:ev.charCode;if(kc==Event.KEY_RETURN||kc==Event.KEY_SPACEBAR)
 {this.setSelectedDate(this.selectedDate);Event.stop(ev);this.hide();}
 if(kc==Event.KEY_ESC)
 {Event.stop(ev);this.hide();}
@@ -88,13 +88,11 @@ this.onChange();},getElement:function()
 {var d=this.newDate(this.selectedDate);d.setFullYear(year);this.setSelectedDate(d);},setMonth:function(month)
 {var d=this.newDate(this.selectedDate);d.setMonth(month);this.setSelectedDate(d);},nextMonth:function()
 {this.setMonth(this.selectedDate.getMonth()+1);},prevMonth:function()
-{this.setMonth(this.selectedDate.getMonth()-1);},show:function()
+{this.setMonth(this.selectedDate.getMonth()-1);},getDatePickerOffsetHeight:function()
+{if(this.options.InputMode=="TextBox")
+return this.control.offsetHeight;var control=Prado.WebUI.TDatePicker.getDayListControl(this.control);if(control)return control.offsetHeight;var control=Prado.WebUI.TDatePicker.getMonthListControl(this.control);if(control)return control.offsetHeight;var control=Prado.WebUI.TDatePicker.getYearListControl(this.control);if(control)return control.offsetHeight;return 0;},show:function()
 {this.create();if(!this.showing)
-{var pos=Position.cumulativeOffset(this.control);if(this.options.InputMode=="TextBox")
-pos[1]+=this.control.offsetHeight;else
-{var dayList=Prado.WebUI.TDatePicker.getDayListControl(this.control);if(dayList)
-pos[1]+=dayList.offsetHeight-1;}
-this._calDiv.style.display="block";this._calDiv.style.top=(pos[1]-1)+"px";this._calDiv.style.left=pos[0]+"px";this.ieHack(false);this.documentClickEvent=this.hideOnClick.bindEvent(this);this.documentKeyDownEvent=this.keyPressed.bindEvent(this);Event.observe(document.body,"click",this.documentClickEvent);var date=this.getDateFromInput();if(date)
+{var pos=Position.cumulativeOffset(this.control);pos[1]+=this.getDatePickerOffsetHeight();this._calDiv.style.display="block";this._calDiv.style.top=(pos[1]-1)+"px";this._calDiv.style.left=pos[0]+"px";this.ieHack(false);this.documentClickEvent=this.hideOnClick.bindEvent(this);this.documentKeyDownEvent=this.keyPressed.bindEvent(this);Event.observe(document.body,"click",this.documentClickEvent);var date=this.getDateFromInput();if(date)
 {this.selectedDate=date;this.setSelectedDate(date);}
 Event.observe(document,"keydown",this.documentKeyDownEvent);this.showing=true;}},getDateFromInput:function()
 {if(this.options.InputMode=="TextBox")
diff --git a/framework/Web/Javascripts/js/prado.js b/framework/Web/Javascripts/js/prado.js
index aa02e98e..87fd69a6 100644
--- a/framework/Web/Javascripts/js/prado.js
+++ b/framework/Web/Javascripts/js/prado.js
@@ -111,7 +111,7 @@ this.registerFormCallbacks();else
 this.registerCallback(this.element);},onElementEvent:function(){var value=this.getValue();if(this.lastValue!=value){this.callback(this.element,value);this.lastValue=value;}},registerFormCallbacks:function(){var elements=Form.getElements(this.element);for(var i=0;iconfigureEvent($control,$name,$value,$control);
+		else if(($pos=strrpos($name,'.'))===false)	// is a simple property or custom attribute
+			$this->configureProperty($control,$name,$value);
+		else	// is a subproperty
+		{
+			$subName=substr($name,$pos+1);
+			if(strncasecmp($subName,'on',2)===0) // is an event: XXX.YYY.OnZZZ
+			{
+				$object=$control->getSubProperty(substr($name,0,$pos));
+				if(($object instanceof TControl))
+					$this->configureEvent($object,$subName,$value,$control);
+				else
+					$this->configureSubProperty($control,$name,$value);
+			}
+			else
+				$this->configureSubProperty($control,$name,$value);
+		}
+	}
+
 	protected function configureControl($control,$name,$value)
 	{
 		if(strncasecmp($name,'on',2)===0)		// is an event
-			$this->configureEvent($control,$name,$value);
-		else if(strpos($name,'.')===false)	// is a simple property or custom attribute
+			$this->configureEvent($control,$name,$value,$control);
+		else if(($pos=strrpos($name,'.'))===false)	// is a simple property or custom attribute
 			$this->configureProperty($control,$name,$value);
 		else	// is a subproperty
 			$this->configureSubProperty($control,$name,$value);
 	}
-
 	/**
 	 * Configures a property of a non-control component.
 	 * @param TComponent component to be configured
@@ -412,13 +433,14 @@ class TTemplate extends TApplicationComponent implements ITemplate
 	 * @param TControl control to be configured
 	 * @param string event name
 	 * @param string event handler
+	 * @param TControl context control
 	 */
-	protected function configureEvent($component,$name,$value)
+	protected function configureEvent($control,$name,$value,$contextControl)
 	{
 		if(strpos($value,'.')===false)
-			$component->attachEventHandler($name,array($component,'TemplateControl.'.$value));
+			$control->attachEventHandler($name,array($contextControl,'TemplateControl.'.$value));
 		else
-			$component->attachEventHandler($name,array($component,$value));
+			$control->attachEventHandler($name,array($contextControl,$value));
 	}
 
 	/**
diff --git a/framework/Web/UI/WebControls/TDataBoundControl.php b/framework/Web/UI/WebControls/TDataBoundControl.php
index 0bb771bf..9e6ecbf3 100644
--- a/framework/Web/UI/WebControls/TDataBoundControl.php
+++ b/framework/Web/UI/WebControls/TDataBoundControl.php
@@ -59,7 +59,7 @@ abstract class TDataBoundControl extends TWebControl
 	 */
 	public function setDataSource($value)
 	{
-		$this->_dataSource=$this->validateDataSource($value);;
+		$this->_dataSource=$this->validateDataSource($value);
 		$this->onDataSourceChanged();
 	}
 
diff --git a/framework/Web/UI/WebControls/TMarkdown.php b/framework/Web/UI/WebControls/TMarkdown.php
new file mode 100644
index 00000000..49660b4e
--- /dev/null
+++ b/framework/Web/UI/WebControls/TMarkdown.php
@@ -0,0 +1,113 @@
+
+ * @link http://www.pradosoft.com/
+ * @copyright Copyright © 2005 PradoSoft
+ * @license http://www.pradosoft.com/license/
+ * @version $Revision: $  $Date: $
+ * @package System.Web.UI.WebControls
+ */
+
+/**
+ * TMarkdown class
+ *
+ * TMarkdown is a control that produces HTML from code with markdown syntax.
+ *
+ * Markdown is a text-to-HTML conversion tool for web writers. Markdown allows 
+ * you to write using an easy-to-read, easy-to-write plain text format, then 
+ * convert it to structurally valid XHTML (or HTML).
+ * Further documentation regarding Markdown can be found at
+ * http://daringfireball.net/projects/markdown/
+ *
+ * To use TMarkdown, simply enclose the content to be rendered within
+ * the body of TMarkdown in a template.
+ *
+ * See http://www.pradosoft.com/demos/quickstart/?page=Markdown for
+ * details on the Markdown syntax usage.
+ *
+ * @author Wei Zhuo 
+ * @version $Revision: $  $Date: $
+ * @package System.Web.UI.WebControls
+ * @since 3.0
+ */
+class TMarkdown extends TControl
+{
+	/**
+	 * @var TTextHighlighter
+	 */
+	private $_highlighter;
+
+	/**
+	 * Renders body content.
+	 * This method overrides parent implementation by removing
+	 * malicious javascript code from the body content
+	 * @param THtmlWriter writer
+	 */
+	public function render($writer)
+	{
+		$textWriter=new TTextWriter;
+		parent::render(new THtmlWriter($textWriter));
+		$writer->write($this->renderMarkdown($textWriter->flush()));
+	}
+
+	/**
+	 * Use MarkdownParser to render the HTML content.
+	 * @param string markdown content
+	 * @return string HTML content
+	 */
+	protected function renderMarkdown($text)
+	{
+		$renderer = Prado::createComponent('System.3rdParty.Markdown.MarkdownParser');
+		$result = $renderer->parse($text);
+		return preg_replace_callback(
+				'/
    \[\s*(\w+)\s*\]\n+((.|\n)*?)\s*<\\/code><\\/pre>/im', 
+				array($this, 'highlightCode'), $result);
+	}
+
+	/**
+	 * @return TTextHighlighter source code highlighter
+	 */
+	public function getTextHighlighter()
+	{
+		if(is_null($this->_highlighter))
+			$this->_highlighter = new TTextHighlighter;
+		return $this->_highlighter;
+	}
+
+	
+	/**
+	 * Highlights source code using TTextHighlighter
+	 * @param array matches of code blocks
+	 * @return string highlighted code.
+	 */
+	protected function highlightCode($matches)
+	{
+		$text = new TTextWriter;
+		$writer = new THtmlWriter($text);
+		$hi = $this->getTextHighlighter();
+		if($hi->getControls()->getCount() > 0)
+			$hi->getControls()->removeAt(0);
+		$hi->addParsedObject(html_entity_decode($matches[2]));
+		$hi->setLanguage($matches[1]);
+		$hi->render($writer);
+		return $text->flush();
+	}
+
+	/**
+	 * Registers css style for the highlighted result.
+	 * This method overrides parent implementation.
+	 * @param THtmlWriter writer
+	 */
+	public function onPreRender($writer)
+	{
+		parent::onPreRender($writer);
+		$hi = $this->getTextHighlighter();
+		$this->getControls()->insertAt(0,$hi);
+		$hi->onPreRender($writer);
+		$this->getControls()->removeAt(0);
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/framework/Web/UI/WebControls/TRepeater.php b/framework/Web/UI/WebControls/TRepeater.php
index 1acdc766..9aa7af8d 100644
--- a/framework/Web/UI/WebControls/TRepeater.php
+++ b/framework/Web/UI/WebControls/TRepeater.php
@@ -11,9 +11,10 @@
  */
 
 /**
- * Using TDataBoundControl cass
+ * Using TDataBoundControl and TDataFieldAccessor cass
  */
 Prado::using('System.Web.UI.WebControls.TDataBoundControl');
+Prado::using('System.Util.TDataFieldAccessor');
 
 /**
  * TRepeater class
diff --git a/framework/Web/UI/WebControls/TValidationSummary.php b/framework/Web/UI/WebControls/TValidationSummary.php
index 8148036b..cfb57c5b 100644
--- a/framework/Web/UI/WebControls/TValidationSummary.php
+++ b/framework/Web/UI/WebControls/TValidationSummary.php
@@ -223,9 +223,24 @@ class TValidationSummary extends TWebControl
 	{
 		if(!$this->getEnabled(true) || !$this->getEnableClientScript())
 			return;
+		$cs = $this->getPage()->getClientScript();
+		$cs->registerPradoScript('validator');
+
+		//need to register the validation manager is validation summary is alone.
+		$formID=$this->getPage()->getForm()->getClientID();
+		$scriptKey = "TBaseValidator:$formID";
+		if($this->getEnableClientScript() && !$cs->isEndScriptRegistered($scriptKey))
+		{
+			$manager['FormID'] = $formID;
+			$options = TJavaScript::encode($manager); 
+			$cs->registerPradoScript('validator');
+			$cs->registerEndScript($scriptKey, "new Prado.ValidationManager({$options});");
+		}
+
+
 		$options=TJavaScript::encode($this->getClientScriptOptions());
 		$script = "new Prado.WebUI.TValidationSummary({$options});";
-		$this->getPage()->getClientScript()->registerEndScript($this->getClientID(), $script);
+		$cs->registerEndScript($this->getClientID(), $script);
 	}
 
 	/**
diff --git a/framework/Web/UI/WebControls/TWizard.php b/framework/Web/UI/WebControls/TWizard.php
index 2d2815ba..811c4e76 100644
--- a/framework/Web/UI/WebControls/TWizard.php
+++ b/framework/Web/UI/WebControls/TWizard.php
@@ -622,7 +622,7 @@ class TWizard extends TWebControl implements INamingContainer
 	}
 
 	/**
-	 * @var TWizardNavigationContainer container of the start navigation
+	 * @return TWizardNavigationContainer container of the start navigation
 	 */
 	public function getStartNavigation()
 	{
@@ -630,7 +630,7 @@ class TWizard extends TWebControl implements INamingContainer
 	}
 
 	/**
-	 * @var TWizardNavigationContainer container of the step navigation
+	 * @return TWizardNavigationContainer container of the step navigation
 	 */
 	public function getStepNavigation()
 	{
@@ -638,7 +638,7 @@ class TWizard extends TWebControl implements INamingContainer
 	}
 
 	/**
-	 * @var TWizardNavigationContainer container of the finish navigation
+	 * @return TWizardNavigationContainer container of the finish navigation
 	 */
 	public function getFinishNavigation()
 	{
diff --git a/tests/FunctionalTests/quickstart/Controls/ListBoxTestCase.php b/tests/FunctionalTests/quickstart/Controls/ListBoxTestCase.php
index c031c5fd..7ed2b10f 100644
--- a/tests/FunctionalTests/quickstart/Controls/ListBoxTestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/ListBoxTestCase.php
@@ -42,12 +42,13 @@ class ListBoxTestCase extends SeleniumTestCase
 		$this->verifySelectOptions("ctl0\$body\$ctl7[]","item 1,item 2,item 3,item 4");
 
 		// multiselection list box's behavior upon postback
-		$this->select("ctl0\$body\$ListBox2[]", "label=item 3");
+		$this->addSelection("ctl0\$body\$ListBox2[]", "label=item 3");
 		$this->clickAndWait("name=ctl0\$body\$ctl8", "");
 		$this->verifyText("ctl0_body_MultiSelectionResult2","Your selection is: (Index: 1, Value: value 2, Text: item 2)(Index: 2, Value: value 3, Text: item 3)(Index: 3, Value: value 4, Text: item 4)");
 
 		// Auto postback multiselection list box
-		$this->selectAndWait("ctl0\$body\$ctl9[]", "label=item 1");
+		$this->addSelection("ctl0\$body\$ctl9[]", "label=item 1");
+		$this->waitForPageToLoad(1000);
 		$this->verifyText("ctl0_body_MultiSelectionResult","Your selection is: (Index: 0, Value: value 1, Text: item 1)(Index: 1, Value: value 2, Text: item 2)(Index: 3, Value: value 4, Text: item 4)");
 
 		// Databind to an integer-indexed array
@@ -73,7 +74,6 @@ class ListBoxTestCase extends SeleniumTestCase
 		// List box causing validation
 		$this->verifyNotVisible('ctl0_body_ctl12');
 		$this->select("ctl0\$body\$VListBox2", "label=Agree");
-//		$this->pause(1000);
 		$this->verifyVisible('ctl0_body_ctl12');
 		$this->type("ctl0\$body\$TextBox", "test");
 		$this->selectAndWait("ctl0\$body\$VListBox2", "label=Disagree");
diff --git a/tests/FunctionalTests/quickstart/Controls/MultiViewTestCase.php b/tests/FunctionalTests/quickstart/Controls/MultiViewTestCase.php
index c94a325c..90f67901 100644
--- a/tests/FunctionalTests/quickstart/Controls/MultiViewTestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/MultiViewTestCase.php
@@ -9,8 +9,8 @@ class MultiViewTestCase extends SeleniumTestCase
 		$this->verifyTitle("PRADO QuickStart Sample", "");
 
 		// view 1 : type in a string
-		$this->verifyNotVisible('ctl0_body_Result1');
-		$this->verifyNotVisible('ctl0_body_Result2');
+		$this->verifyElementNotPresent('ctl0_body_Result1');
+		$this->verifyElementNotPresent('ctl0_body_Result2');
 		$this->type('ctl0_body_Memo','test');
 		$this->clickAndWait('ctl0$body$ctl1');
 
@@ -20,8 +20,8 @@ class MultiViewTestCase extends SeleniumTestCase
 		$this->clickAndWait('ctl0$body$ctl7');
 
 		// view 2 : update dropdownlist
-		$this->verifyNotVisible('ctl0_body_Result1');
-		$this->verifyNotVisible('ctl0_body_Result2');
+		$this->verifyElementNotPresent('ctl0_body_Result1');
+		$this->verifyElementNotPresent('ctl0_body_Result2');
 		$this->select('ctl0$body$DropDownList', "label=Blue");
 		$this->clickAndWait('ctl0$body$ctl4');
 
diff --git a/tests/FunctionalTests/selenium/SeleneseRunner.html b/tests/FunctionalTests/selenium/SeleneseRunner.html
deleted file mode 100644
index 4ace34c7..00000000
--- a/tests/FunctionalTests/selenium/SeleneseRunner.html
+++ /dev/null
@@ -1,97 +0,0 @@
-
-
-
-
-Selenium Functional Test Runner
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  
-    
-    
-  
-  
-    
-  
-
    
-      
-      
-        
-        
-      
-      
    
-          
-        
-          
    Selenium Functional Testing for Web Apps
    
-          Open Source From ThoughtWorks, Inc and Friends
-          
    
-          
    Slow Mode: 
-
-          
    
-            Tools
-
-            
-            
-          
    
-
-          
    
-
-        
    
-      
    
-        
-      
    
-        		
-      Last Four Commands
    
-      
    
-    
    
-      
-    
    
-
-
-
-
diff --git a/tests/FunctionalTests/selenium/SeleniumLog.html b/tests/FunctionalTests/selenium/SeleniumLog.html
deleted file mode 100644
index 01a5a9fe..00000000
--- a/tests/FunctionalTests/selenium/SeleniumLog.html
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-
-Selenium Log Console
-
-
-
-
-
-
-
-
-
-
      
-
-
-
diff --git a/tests/FunctionalTests/selenium/TestRunner-splash.html b/tests/FunctionalTests/selenium/TestRunner-splash.html
deleted file mode 100644
index 3abd1ec8..00000000
--- a/tests/FunctionalTests/selenium/TestRunner-splash.html
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-
-
-
-
-
-
-  
-  
-  
-
-
-  
-  
-  
-
-
-
-
-
-
-
-
-
      ↑↑↑
      Test SuiteCurrent TestControl Panel
       
      
-
-
-
-
      Selenium
      
-
      by ThoughtWorks and friends
      
-
-
      
-For more information on Selenium, visit
-
-
      -    http://selenium.thoughtworks.com
-
      
-
-
      
-
-
diff --git a/tests/FunctionalTests/selenium/TestRunner.hta b/tests/FunctionalTests/selenium/TestRunner.hta
deleted file mode 100644
index e4516243..00000000
--- a/tests/FunctionalTests/selenium/TestRunner.hta
+++ /dev/null
@@ -1,146 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-Selenium Functional Test Runner
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    
-    
-
-      
-
-      
-        
-        
-        
-      
-
-      
-        
-      
-
-      
-
-      
-        
-      
-    
-    
      
-          
      Selenium TestRunner
      
-        
      
-
-          
      
-            Execute Tests
-            
-            
      
-              
-              
-              
-            
      
-            
-            
      
-              
-              
-              
-            
      
-            
-          
      
-
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-              
-              
-            
-            
-              
-              
-              
-              
-            
-            
-              
-              
-              
-            
-          
      Elapsed:00.00
      TestsCommands
      0run0passed
      0failed0failed
      0incomplete
      
-
-          
      
-            Tools
-
-            
-            
-
-          
      
-
-        
      
-
-
-
diff --git a/tests/FunctionalTests/selenium/TestRunner.html b/tests/FunctionalTests/selenium/TestRunner.html
deleted file mode 100644
index c476f25e..00000000
--- a/tests/FunctionalTests/selenium/TestRunner.html
+++ /dev/null
@@ -1,146 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-Selenium Functional Test Runner
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    
-    
-
-      
-
-      
-        
-        
-        
-      
-
-      
-        
-      
-
-      
-
-      
-        
-      
-    
-    
      
-          
      Selenium TestRunner
      
-        
      
-
-          
      
-            Execute Tests
-            
-            
      
-              
-              
-              
-            
      
-            
-            
      
-              
-              
-              
-            
      
-            
-          
      
-
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-              
-              
-            
-            
-              
-              
-              
-              
-            
-            
-              
-              
-              
-            
-          
      Elapsed:00.00
      TestsCommands
      0run0passed
      0failed0failed
      0incomplete
      
-
-          
      
-            Tools
-
-            
-            
-
-          
      
-
-        
      
-
-
-
diff --git a/tests/FunctionalTests/selenium/VERSION.txt b/tests/FunctionalTests/selenium/VERSION.txt
deleted file mode 100644
index 2d589f48..00000000
--- a/tests/FunctionalTests/selenium/VERSION.txt
+++ /dev/null
@@ -1 +0,0 @@
-trunk (SVN/UNRELEASED)
\ No newline at end of file
diff --git a/tests/FunctionalTests/selenium/build.xml b/tests/FunctionalTests/selenium/build.xml
deleted file mode 100644
index 73376a1e..00000000
--- a/tests/FunctionalTests/selenium/build.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-
-
-    
-
-    
-    
-     
-
-    
-        
-            
-        
-        
-            
-        
-    
-
-
-    
-    
-        
-        
-            
-        
-        
-    
-
-    
-        
-    
-
-    
-
-        
-
-        
-        
-
-        
-        
-
-        
-        
-
-        
-            
-            
-            
-            
-            
-            
-        
-    
-
-    
-        
-    
-
-    
-    
-
-    
-    
-
-    
-
-            
-
-        Create a TestSuite.html page, and a number of test pages here. Read the docs!
-
-        
-            
-                            
-            
-            
-                            
-                            
-                            
-                            
-                
-                            
-                            
-                            
-            
-        
-
-        
-            
-                            
-                
-            
-        
-        
-  
-    
-    
-    
-        
-        
-
-    
-
-
-
diff --git a/tests/FunctionalTests/selenium/core/SeleneseRunner.html b/tests/FunctionalTests/selenium/core/SeleneseRunner.html
new file mode 100755
index 00000000..49eef6f6
--- /dev/null
+++ b/tests/FunctionalTests/selenium/core/SeleneseRunner.html
@@ -0,0 +1,111 @@
+
+	
+
+
+
+
+Selenium Functional Test Runner
+
+
+
+
+
+ 
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  
+    
+    
+  
+  
+    
+  
+
      
+      
+      
+        
+        
+      
+      
      
+          
+        
+          
      Selenium Functional Testing for Web Apps
      
+          Open Source From ThoughtWorks, Inc and Friends
+          
      
+          
      Slow Mode: 
+
+          
      
+            Tools
+
+            
+            
+          
      
+
+          
      
+
+        
      
+      
      
+        
+      
      
+          		
+      Last Four Test Commands:
      
+      
      
+    
      
+      
+    
      
+
+
+
+
diff --git a/tests/FunctionalTests/selenium/core/SeleniumLog.html b/tests/FunctionalTests/selenium/core/SeleniumLog.html
new file mode 100755
index 00000000..291e1f77
--- /dev/null
+++ b/tests/FunctionalTests/selenium/core/SeleniumLog.html
@@ -0,0 +1,79 @@
+
+
+
+Selenium Log Console
+
+
+
+
+
+
+
+
+
+
        
+
+
+
diff --git a/tests/FunctionalTests/selenium/core/TestPrompt.html b/tests/FunctionalTests/selenium/core/TestPrompt.html
new file mode 100755
index 00000000..f62bad87
--- /dev/null
+++ b/tests/FunctionalTests/selenium/core/TestPrompt.html
@@ -0,0 +1,93 @@
+
+
+
+
+
+Select a Test Suite
+
+
+
+
+
        
+
        Select an HTML test suite:
        
+
+
        
+
        
+
        
+
        
+
+
\ No newline at end of file
diff --git a/tests/FunctionalTests/selenium/core/TestRunner-splash.html b/tests/FunctionalTests/selenium/core/TestRunner-splash.html
new file mode 100755
index 00000000..da2acdce
--- /dev/null
+++ b/tests/FunctionalTests/selenium/core/TestRunner-splash.html
@@ -0,0 +1,55 @@
+
+
+
+
+
+
+
+
+  
+  
+  
+
+
+  
+  
+  
+
+
+
+
+
+
+
+
+
        ↑↑↑
        Test SuiteCurrent TestControl Panel
         
        
+
+
+
+
        Selenium
        
+
        by ThoughtWorks and friends
        
+
+
        
+For more information on Selenium, visit
+
+
        +    http://selenium.openqa.org
+
        
+
+
        
+
+
diff --git a/tests/FunctionalTests/selenium/core/TestRunner.html b/tests/FunctionalTests/selenium/core/TestRunner.html
new file mode 100755
index 00000000..f933ab9f
--- /dev/null
+++ b/tests/FunctionalTests/selenium/core/TestRunner.html
@@ -0,0 +1,157 @@
+
+
+
+
+
+
+
+
+
+
+Selenium Functional Test Runner
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    
+    
+
+      
+
+      
+        
+        
+
+		
+	  
+
+      
+
+      
+        
+      
+    
+    
                
+		
+		  
+			
+		  
+		  
+			
+		  
+		  
        
+			  
        Selenium TestRunner
        
+			
        
+	
+			  
        
+				Execute Tests
+				
+				
        
+				  
+				  
+				  
+				
        
+				
+				
        
+				  
+				  
+				  
+				
        
+				
+			  
        
+	
+			  
+				
+				  
+				  
+				
+				
+				  
+				  
+				
+				
+				  
+				  
+				  
+				  
+				
+				
+				  
+				  
+				  
+				  
+				
+				
+				  
+				  
+				  
+				
+			  
        Elapsed:00.00
        TestsCommands
        0run0passed
        0failed0failed
        0incomplete
        
+	
+			  
        
+				Tools
+	
+				
+				
+	
+			  
        
+	
+			
        
+		  
        
+
+
+
diff --git a/tests/FunctionalTests/selenium/core/domviewer/butmin.gif b/tests/FunctionalTests/selenium/core/domviewer/butmin.gif
new file mode 100755
index 00000000..7b7cefd5
Binary files /dev/null and b/tests/FunctionalTests/selenium/core/domviewer/butmin.gif differ
diff --git a/tests/FunctionalTests/selenium/core/domviewer/butplus.gif b/tests/FunctionalTests/selenium/core/domviewer/butplus.gif
new file mode 100755
index 00000000..6d68cfa9
Binary files /dev/null and b/tests/FunctionalTests/selenium/core/domviewer/butplus.gif differ
diff --git a/tests/FunctionalTests/selenium/core/domviewer/domviewer.css b/tests/FunctionalTests/selenium/core/domviewer/domviewer.css
new file mode 100755
index 00000000..b64b2435
--- /dev/null
+++ b/tests/FunctionalTests/selenium/core/domviewer/domviewer.css
@@ -0,0 +1,298 @@
+/******************************************************************************
+* Defines default styles for site pages.                                      *
+******************************************************************************/
+.hidden {
+	display: none;
+}
+
+img{
+    display: inline;
+	border: none;
+}
+
+.box{
+	background: #fcfcfc;
+    border: 1px solid #000;
+	border-color: blue;
+    color: #000000;
+	margin: 10px auto;
+    padding: 3px;
+	vertical-align: bottom;
+}
+a {
+  text-decoration: none;
+}
+
+body {
+  background-color: #ffffff;
+  color: #000000;
+  font-family: Arial, Helvetica, sans-serif;
+  font-size: 10pt;
+}
+
+h2 {
+  font-size: 140%;
+}
+
+h3 {
+  font-size: 120%;
+}
+
+h4 {
+  font-size: 100%;
+}
+
+pre {
+  font-family: Courier New, Courier, monospace;
+  font-size: 80%;
+}
+
+td, th {
+  font-family: Arial, Helvetica, sans-serif;
+  font-size: 10pt;
+  text-align: left;
+  vertical-align: top;
+}
+
+th {
+  font-weight: bold;
+  vertical-align: bottom;
+}
+
+ul {
+  list-style-type: square;
+}
+
+#demoBox {
+  border-color: #000000;
+  border-style: solid;
+  border-width: 1px;
+  padding: 8px;
+  width: 24em;
+}
+
+.footer {
+  margin-bottom: 0px;
+  text-align: center;
+}
+
+/* Boxed table styles */
+
+table.boxed {
+  border-spacing: 2px;
+  empty-cells: hide;
+}
+
+td.boxed, th.boxed, th.boxedHeader {
+  background-color: #ffffff;
+  border-color: #000000;
+  border-style: solid;
+  border-width: 1px;
+  color: #000000;
+  padding: 2px;
+  padding-left: 8px;
+  padding-right: 8px;
+}
+
+th.boxed {
+  background-color: #c0c0c0;
+}
+
+th.boxedHeader {
+  background-color: #808080;
+  color: #ffffff;
+}
+
+a.object {
+  color: #0000ff;
+}
+
+li {
+  white-space: nowrap;
+}
+
+ul {
+  list-style-type: square;
+  margin-left: 0px;
+  padding-left: 1em;
+}
+
+.boxlevel1{
+	background: #FFD700;
+}
+
+.boxlevel2{
+	background: #D2691E;
+}
+
+.boxlevel3{
+	background: #DCDCDC;
+}
+
+.boxlevel4{
+	background: #F5F5F5;
+}
+
+.boxlevel5{
+	background: #BEBEBE;
+}
+
+.boxlevel6{
+	background: #D3D3D3;
+}
+
+.boxlevel7{
+	background: #A9A9A9;
+}
+
+.boxlevel8{
+	background: #191970;
+}
+
+.boxlevel9{
+	background: #000080;
+}
+
+.boxlevel10{
+	background: #6495ED;
+}
+
+.boxlevel11{
+	background: #483D8B;
+}
+
+.boxlevel12{
+	background: #6A5ACD;
+}
+
+.boxlevel13{
+	background: #7B68EE;
+}
+
+.boxlevel14{
+	background: #8470FF;
+}
+
+.boxlevel15{
+	background: #0000CD;
+}
+
+.boxlevel16{
+	background: #4169E1;
+}
+
+.boxlevel17{
+	background: #0000FF;
+}
+
+.boxlevel18{
+	background: #1E90FF;
+}
+
+.boxlevel19{
+	background: #00BFFF;
+}
+
+.boxlevel20{
+	background: #87CEEB;
+}
+
+.boxlevel21{
+	background: #B0C4DE;
+}
+
+.boxlevel22{
+	background: #ADD8E6;
+}
+
+.boxlevel23{
+	background: #00CED1;
+}
+
+.boxlevel24{
+	background: #48D1CC;
+}
+
+.boxlevel25{
+	background: #40E0D0;
+}
+
+.boxlevel26{
+	background: #008B8B;
+}
+
+.boxlevel27{
+	background: #00FFFF;
+}
+
+.boxlevel28{
+	background: #E0FFFF;
+}
+
+.boxlevel29{
+	background: #5F9EA0;
+}
+
+.boxlevel30{
+	background: #66CDAA;
+}
+
+.boxlevel31{
+	background: #7FFFD4;
+}
+
+.boxlevel32{
+	background: #006400;
+}
+
+.boxlevel33{
+	background: #556B2F;
+}
+
+.boxlevel34{
+	background: #8FBC8F;
+}
+
+.boxlevel35{
+	background: #2E8B57;
+}
+
+.boxlevel36{
+	background: #3CB371;
+}
+
+.boxlevel37{
+	background: #20B2AA;
+}
+
+.boxlevel38{
+	background: #00FF7F;
+}
+
+.boxlevel39{
+	background: #7CFC00;
+}
+
+.boxlevel40{
+	background: #90EE90;
+}
+
+.boxlevel41{
+	background: #00FF00;
+}
+
+.boxlevel41{
+	background: #7FFF00;
+}
+
+.boxlevel42{
+	background: #00FA9A;
+}
+
+.boxlevel43{
+	background: #ADFF2F;
+}
+
+.boxlevel44{
+	background: #32CD32;
+}
\ No newline at end of file
diff --git a/tests/FunctionalTests/selenium/core/domviewer/domviewer.html b/tests/FunctionalTests/selenium/core/domviewer/domviewer.html
new file mode 100755
index 00000000..9158a50f
--- /dev/null
+++ b/tests/FunctionalTests/selenium/core/domviewer/domviewer.html
@@ -0,0 +1,16 @@
+
+
+
+    
+        DOM Viewer
+        
+        
+        
+    
+	
+		
        DOM Viewer
        
+		
         This page is generated using JavaScript. If you see this text, your 
+			browser doesn't support JavaScript.
        
+	
+	
+
diff --git a/tests/FunctionalTests/selenium/core/domviewer/selenium-domviewer.js b/tests/FunctionalTests/selenium/core/domviewer/selenium-domviewer.js
new file mode 100755
index 00000000..941aab16
--- /dev/null
+++ b/tests/FunctionalTests/selenium/core/domviewer/selenium-domviewer.js
@@ -0,0 +1,205 @@
+var HIDDEN="hidden";
+var LEVEL = "level";
+var PLUS_SRC="butplus.gif";
+var MIN_SRC="butmin.gif";
+var newRoot;
+var maxColumns=1;
+
+function loadDomViewer() {
+    // See if the rootDocument variable has been set on this window.
+    var rootDocument = window.rootDocument;
+
+    // If not look to the opener for an explicity rootDocument variable, otherwise, use the opener document
+    if (!rootDocument && window.opener) {
+        rootDocument = window.opener.rootDocument || window.opener.document;
+    }
+
+    if (rootDocument) {
+        document.body.innerHTML = displayDOM(rootDocument);
+    }
+    else {
+        document.body.innerHTML = "Must specify rootDocument for window. This can be done by setting the rootDocument variable on this window, or on the opener window for a popup window.";
+    }
+}
+
+
+function displayDOM(root){
+    var str = "";
+    str+="";
+    str += treeTraversal(root,0);
+    // to make table columns work well.
+    str += "";
+    for (var i=0; i < maxColumns; i++) {
+        str+= "";
+    }
+    str += "";
+    str += "
            
        ";
+    return str;
+}
+
+function checkForChildren(element){
+    if(!element.hasChildNodes())
+        return false;
+    
+    var nodes = element.childNodes;
+    var size = nodes.length;
+    var count=0;
+    
+    for(var i=0; i< size; i++){
+        var node = nodes.item(i);
+        //if(node.toString()=="[object Text]"){
+        //this is equalent to the above
+        //but will work with more browsers
+        if(node.nodeType!=1){
+            count++;
+        }
+    }
+    
+    if(count == size)
+        return false;
+    else
+        return true;
+}
+
+function treeTraversal(root, level){
+    var str = "";
+    var nodes= null;
+    var size = null;
+    //it is supposed to show the last node, 
+    //but the last node is always nodeText type
+    //and we don't show it
+    if(!root.hasChildNodes())
+        return "";//displayNode(root,level,false);
+    
+    nodes = root.childNodes;
+    size = nodes.length;
+
+    for(var i=0; i< size; i++){
+        var element = nodes.item(i);
+        //if the node is textNode, don't display
+        if(element.nodeType==1){
+            str+= displayNode(element,level,checkForChildren(element));
+            str+=treeTraversal(element, level+1);	
+        }
+    }
+    return str;
+}
+
+function displayNode(element, level, isLink){
+    nodeContent = getNodeContent(element);
+    columns = Math.round((nodeContent.length / 12) + 0.5);
+    if (columns + level > maxColumns) {
+        maxColumns = columns + level;
+    }
+    var str ="";
+    for (var i=0; i < level; i++)
+        str+= " ";
+    str+="";
+    if(isLink){
+        str+='        ';
+        str+='';
+    }
+    str += nodeContent;
+    if(isLink)
+        str+="";
+    return str;
+}
+
+function getNodeContent(element) {
+
+    str = "";
+    id ="";
+    if (element.id != null && element.id != "") {
+        id = " ID(" + element.id +")";
+    }
+    name ="";
+    if (element.name != null && element.name != "") {
+        name = " NAME(" + element.name + ")";
+    }
+    value ="";
+    if (element.value != null && element.value != "") {
+        value = " VALUE(" + element.value + ")";
+    }
+    href ="";
+    if (element.href != null && element.href != "") {
+        href = " HREF(" + element.href + ")";
+    }
+    clazz = "";
+    if (element.className != null && element.className != "") {
+        clazz = " CLASS(" + element.className + ")";
+    }
+    src = "";
+    if (element.src != null && element.src != "") {
+        src = " SRC(" + element.src + ")";
+    }
+    alt = "";
+    if (element.alt != null && element.alt != "") {
+        alt = " ALT(" + element.alt + ")";
+    }
+    type = "";
+    if (element.type != null && element.type != "") {
+        type = " TYPE(" + element.type + ")";
+    }
+    text ="";
+    if (element.text != null && element.text != "" && element.text != "undefined") {
+        text = " #TEXT(" + trim(element.text) +")";
+    }
+    str+=" "+ element.nodeName + id + alt + type + clazz + name + value + href + src + text + "";
+    return str;
+
+}
+
+function trim(val) {
+    val2 = val.substring(0,40) + "                   ";
+    var spaceChr = String.fromCharCode(32);
+    var length = val2.length;
+    var retVal = "";
+    var ix = length -1;
+
+    while(ix > -1){
+        if(val2.charAt(ix) == spaceChr) {
+        } else {
+            retVal = val2.substring(0, ix +1);
+            break;
+        }
+        ix = ix-1;
+    }
+    if (val.length > 40) {
+        retVal += "...";
+    }
+    return retVal;
+}
+
+function hide(hlink){
+    var isHidden = false;
+    var image = hlink.firstChild;
+    if(image.src.toString().indexOf(MIN_SRC)!=-1){
+        image.src=PLUS_SRC;
+        isHidden=true;
+    }else{
+        image.src=MIN_SRC;
+    }
+    var rowObj= hlink.parentNode.parentNode;
+    var rowLevel = parseInt(rowObj.className.substring(LEVEL.length));
+	
+    var sibling = rowObj.nextSibling;
+    var siblingLevel = sibling.className.substring(LEVEL.length);
+    if(siblingLevel.indexOf(HIDDEN)!=-1){
+        siblingLevel = siblingLevel.substring(0,siblingLevel.length - HIDDEN.length-1);
+    }
+    siblingLevel=parseInt(siblingLevel);
+    while(sibling!=null && rowLevel= "1.5")
+    {
+        var dummyElement = element.cloneNode(true);
+        renderWhitespaceInTextContent(dummyElement);
+        text = dummyElement.textContent;
+    } else if (browserVersion.isOpera) {
+    	var dummyElement = element.cloneNode(true);
+        renderWhitespaceInTextContent(dummyElement);
+        text = dummyElement.innerText;
+        text = xmlDecode(text);
+    }
+    else if(element.textContent)
+    {
+        text = element.textContent;
+    }
+    else if(element.innerText)
+    {
+        text = element.innerText;
+    }
+
+    text = normalizeNewlines(text);
+    text = normalizeSpaces(text);
+
+    return text.trim();
+}
+
+function renderWhitespaceInTextContent(element) {
+    // Remove non-visible newlines in text nodes
+    if (element.nodeType == Node.TEXT_NODE)
+    {
+        element.data = element.data.replace(/\n|\r|\t/g, " ");
+        return;
+    }
+    
+    if (element.nodeType == Node.COMMENT_NODE)
+    {
+        element.data = "";
+        return;
+    }
+
+    // Don't modify PRE elements
+    if (element.tagName == "PRE")
+    {
+        return;
+    }
+
+    // Handle inline element that force newlines
+    if (tagIs(element, ["BR", "HR"]))
+    {
+        // Replace this element with a newline text element
+        element.parentNode.replaceChild(element.ownerDocument.createTextNode("\n"), element)
+    }
+
+    for (var i = 0; i < element.childNodes.length; i++)
+    {
+        var child = element.childNodes.item(i)
+        renderWhitespaceInTextContent(child);
+    }
+
+    // Handle block elements that introduce newlines
+// -- From HTML spec:
+//
+    if (tagIs(element, ["P", "DIV"]))
+    {
+        element.appendChild(element.ownerDocument.createTextNode("\n"), element)
+    }
+    
+}
+
+function tagIs(element, tags)
+{
+    var tag = element.tagName;
+    for (var i = 0; i < tags.length; i++)
+    {
+        if (tags[i] == tag)
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+/**
+ * Convert all newlines to \m
+ */
+function normalizeNewlines(text)
+{
+    return text.replace(/\r\n|\r/g, "\n");
+}
+
+/**
+ * Replace multiple sequential spaces with a single space, and then convert   to space.
+ */
+function normalizeSpaces(text)
+{
+    // IE has already done this conversion, so doing it again will remove multiple nbsp
+    if (browserVersion.isIE)
+    {
+        return text;
+    }
+
+    // Replace multiple spaces with a single space
+    // TODO - this shouldn't occur inside PRE elements
+    text = text.replace(/\ +/g, " ");
+
+    // Replace   with a space
+    var pat = String.fromCharCode(160); // Opera doesn't like /\240/g
+   	var re = new RegExp(pat, "g");
+    return text.replace(re, " ");
+}
+
+function xmlDecode(text) {
+	text = text.replace(/"/g, '"');
+	text = text.replace(/'/g, "'");
+	text = text.replace(/</g, "<");
+	text = text.replace(/>/g, ">");
+	text = text.replace(/&/g, "&");
+	return text;
+}
+
+// Sets the text in this element
+function setText(element, text) {
+    if(element.textContent) {
+        element.textContent = text;
+    } else if(element.innerText) {
+        element.innerText = text;
+    }
+}
+
+// Get the value of an  element
+function getInputValue(inputElement) {
+    if (inputElement.type.toUpperCase() == 'CHECKBOX' ||
+        inputElement.type.toUpperCase() == 'RADIO')
+    {
+        return (inputElement.checked ? 'on' : 'off');
+    }
+    return inputElement.value;
+}
+
+/* Fire an event in a browser-compatible manner */
+function triggerEvent(element, eventType, canBubble) {
+    canBubble = (typeof(canBubble) == undefined) ? true : canBubble;
+    if (element.fireEvent) {
+        element.fireEvent('on' + eventType);
+    }
+    else {
+        var evt = document.createEvent('HTMLEvents');
+        evt.initEvent(eventType, canBubble, true);
+        element.dispatchEvent(evt);
+    }
+}
+
+function triggerKeyEvent(element, eventType, keycode, canBubble) {
+    canBubble = (typeof(canBubble) == undefined) ? true : canBubble;
+    if (element.fireEvent) {
+		keyEvent = parent.frames['myiframe'].document.createEventObject();
+		keyEvent.keyCode=keycode;
+		element.fireEvent('on' + eventType, keyEvent);
+    }
+    else {
+    	var evt;
+    	if( window.KeyEvent ) {
+			evt = document.createEvent('KeyEvents');
+			evt.initKeyEvent(eventType, true, true, window, false, false, false, false, keycode, keycode);
+		} else {
+			evt = document.createEvent('UIEvents');
+			evt.initUIEvent( eventType, true, true, window, 1 );
+			evt.keyCode = keycode;
+		}
+        
+        element.dispatchEvent(evt);
+    }
+}
+
+/* Fire a mouse event in a browser-compatible manner */
+function triggerMouseEvent(element, eventType, canBubble) {
+    canBubble = (typeof(canBubble) == undefined) ? true : canBubble;
+    if (element.fireEvent) {
+        element.fireEvent('on' + eventType);
+    }
+    else {
+        var evt = document.createEvent('MouseEvents');
+        if (evt.initMouseEvent)
+        {
+            evt.initMouseEvent(eventType, canBubble, true, document.defaultView, 1, 0, 0, 0, 0, false, false, false, false, 0, null)
+        }
+        else
+        {
+            // Safari
+            // TODO we should be initialising other mouse-event related attributes here
+            evt.initEvent(eventType, canBubble, true);
+        }
+        element.dispatchEvent(evt);
+    }
+}
+
+function removeLoadListener(element, command) {
+    if (window.removeEventListener)
+        element.removeEventListener("load", command, true);
+    else if (window.detachEvent)
+        element.detachEvent("onload", command);
+}
+
+function addLoadListener(element, command) {
+    if (window.addEventListener && !browserVersion.isOpera)
+        element.addEventListener("load",command, true);
+    else if (window.attachEvent)
+        element.attachEvent("onload",command);
+}
+
+function addUnloadListener(element, command) {
+    if (window.addEventListener)
+        element.addEventListener("unload",command, true);
+    else if (window.attachEvent)
+        element.attachEvent("onunload",command);
+}
+
+/**
+ * Override the broken getFunctionName() method from JsUnit
+ * This file must be loaded _after_ the jsunitCore.js
+ */
+function getFunctionName(aFunction) {
+  var regexpResult = aFunction.toString().match(/function (\w*)/);
+  if (regexpResult && regexpResult[1]) {
+      return regexpResult[1];
+  }
+  return 'anonymous';
+}
+
+function getDocumentBase(doc) {
+	var bases = document.getElementsByTagName("base");
+	if (bases && bases.length && bases[0].href) {
+		return bases[0].href;
+	}
+	return "";
+}
+
+function describe(object, delimiter) {
+    var props = new Array();
+    for (var prop in object) {
+        props.push(prop + " -> " + object[prop]);
+    }
+    return props.join(delimiter || '\n');
+}
+
+var PatternMatcher = function(pattern) {
+    this.selectStrategy(pattern);
+};
+PatternMatcher.prototype = {
+
+    selectStrategy: function(pattern) {
+        this.pattern = pattern;
+        var strategyName = 'glob'; // by default
+        if (/^([a-z-]+):(.*)/.test(pattern)) {
+            strategyName = RegExp.$1;
+            pattern = RegExp.$2;
+        }
+        var matchStrategy = PatternMatcher.strategies[strategyName];
+        if (!matchStrategy) {
+            throw new SeleniumError("cannot find PatternMatcher.strategies." + strategyName);
+        }
+        this.strategy = matchStrategy;
+        this.matcher = new matchStrategy(pattern);
+    },
+
+    matches: function(actual) {
+        return this.matcher.matches(actual + '');
+        // Note: appending an empty string avoids a Konqueror bug
+    }
+
+};
+
+/**
+ * A "static" convenience method for easy matching
+ */
+PatternMatcher.matches = function(pattern, actual) {
+    return new PatternMatcher(pattern).matches(actual);
+};
+
+PatternMatcher.strategies = {
+
+    /**
+     * Exact matching, e.g. "exact:***"
+     */
+    exact: function(expected) {
+        this.expected = expected;
+        this.matches = function(actual) {
+            return actual == this.expected;
+        };
+    },
+
+    /**
+     * Match by regular expression, e.g. "regexp:^[0-9]+$"
+     */
+    regexp: function(regexpString) {
+        this.regexp = new RegExp(regexpString);
+        this.matches = function(actual) {
+            return this.regexp.test(actual);
+        };
+    },
+
+    /**
+     * "globContains" (aka "wildmat") patterns, e.g. "glob:one,two,*",
+     * but don't require a perfect match; instead succeed if actual
+     * contains something that matches globString.
+     * Making this distinction is motivated by a bug in IE6 which
+     * leads to the browser hanging if we implement *TextPresent tests
+     * by just matching against a regular expression beginning and
+     * ending with ".*".  The globcontains strategy allows us to satisfy
+     * the functional needs of the *TextPresent ops more efficiently
+     * and so avoid running into this IE6 freeze.
+     */
+    globContains: function(globString) {
+        this.regexp = new RegExp(PatternMatcher.regexpFromGlobContains(globString));
+        this.matches = function(actual) {
+            return this.regexp.test(actual);
+        };
+    },
+
+
+    /**
+     * "glob" (aka "wildmat") patterns, e.g. "glob:one,two,*"
+     */
+    glob: function(globString) {
+        this.regexp = new RegExp(PatternMatcher.regexpFromGlob(globString));
+        this.matches = function(actual) {
+            return this.regexp.test(actual);
+        };
+    }
+
+};
+
+PatternMatcher.convertGlobMetaCharsToRegexpMetaChars = function(glob) {
+    var re = glob;
+    re = re.replace(/([.^$+(){}\[\]\\|])/g, "\\$1");
+    re = re.replace(/\?/g, "(.|[\r\n])");
+    re = re.replace(/\*/g, "(.|[\r\n])*");
+    return re;
+};
+
+PatternMatcher.regexpFromGlobContains = function(globContains) {
+    return PatternMatcher.convertGlobMetaCharsToRegexpMetaChars(globContains);
+};
+
+PatternMatcher.regexpFromGlob = function(glob) {
+    return "^" + PatternMatcher.convertGlobMetaCharsToRegexpMetaChars(glob) + "$";
+};
+
+var Assert = {
+
+    fail: function(message) {
+        throw new AssertionFailedError(message);
+    },
+
+    /*
+     * Assert.equals(comment?, expected, actual)
+     */
+    equals: function() {
+        var args = new AssertionArguments(arguments);
+        if (args.expected === args.actual) {
+            return;
+        }
+        Assert.fail(args.comment +
+                    "Expected '" + args.expected +
+                    "' but was '" + args.actual + "'");
+    },
+
+    /*
+     * Assert.matches(comment?, pattern, actual)
+     */
+    matches: function() {
+        var args = new AssertionArguments(arguments);
+        if (PatternMatcher.matches(args.expected, args.actual)) {
+            return;
+        }
+        Assert.fail(args.comment +
+                    "Actual value '" + args.actual +
+                    "' did not match '" + args.expected + "'");
+    },
+
+    /*
+     * Assert.notMtches(comment?, pattern, actual)
+     */
+    notMatches: function() {
+        var args = new AssertionArguments(arguments);
+        if (!PatternMatcher.matches(args.expected, args.actual)) {
+            return;
+        }
+        Assert.fail(args.comment +
+                    "Actual value '" + args.actual +
+                    "' did match '" + args.expected + "'");
+    }
+
+};
+
+// Preprocess the arguments to allow for an optional comment.
+function AssertionArguments(args) {
+    if (args.length == 2) {
+        this.comment = "";
+        this.expected = args[0];
+        this.actual = args[1];
+    } else {
+        this.comment = args[0] + "; ";
+        this.expected = args[1];
+        this.actual = args[2];
+    }
+}
+
+
+
+function AssertionFailedError(message) {
+    this.isAssertionFailedError = true;
+    this.isSeleniumError = true;
+    this.message = message;
+    this.failureMessage = message;
+}
+
+function SeleniumError(message) {
+    var error = new Error(message);
+    error.isSeleniumError = true;
+    return error;
+};
diff --git a/tests/FunctionalTests/selenium/core/scripts/prototype-1.4.0.js b/tests/FunctionalTests/selenium/core/scripts/prototype-1.4.0.js
new file mode 100755
index 00000000..0e85338b
--- /dev/null
+++ b/tests/FunctionalTests/selenium/core/scripts/prototype-1.4.0.js
@@ -0,0 +1,1781 @@
+/*  Prototype JavaScript framework, version 1.4.0
+ *  (c) 2005 Sam Stephenson 
+ *
+ *  Prototype is freely distributable under the terms of an MIT-style license.
+ *  For details, see the Prototype web site: http://prototype.conio.net/
+ *
+/*--------------------------------------------------------------------------*/
+
+var Prototype = {
+  Version: '1.4.0',
+  ScriptFragment: '(?:)((\n|\r|.)*?)(?:<\/script>)',
+
+  emptyFunction: function() {},
+  K: function(x) {return x}
+}
+
+var Class = {
+  create: function() {
+    return function() {
+      this.initialize.apply(this, arguments);
+    }
+  }
+}
+
+var Abstract = new Object();
+
+Object.extend = function(destination, source) {
+  for (property in source) {
+    destination[property] = source[property];
+  }
+  return destination;
+}
+
+Object.inspect = function(object) {
+  try {
+    if (object == undefined) return 'undefined';
+    if (object == null) return 'null';
+    return object.inspect ? object.inspect() : object.toString();
+  } catch (e) {
+    if (e instanceof RangeError) return '...';
+    throw e;
+  }
+}
+
+Function.prototype.bind = function() {
+  var __method = this, args = $A(arguments), object = args.shift();
+  return function() {
+    return __method.apply(object, args.concat($A(arguments)));
+  }
+}
+
+Function.prototype.bindAsEventListener = function(object) {
+  var __method = this;
+  return function(event) {
+    return __method.call(object, event || window.event);
+  }
+}
+
+Object.extend(Number.prototype, {
+  toColorPart: function() {
+    var digits = this.toString(16);
+    if (this < 16) return '0' + digits;
+    return digits;
+  },
+
+  succ: function() {
+    return this + 1;
+  },
+
+  times: function(iterator) {
+    $R(0, this, true).each(iterator);
+    return this;
+  }
+});
+
+var Try = {
+  these: function() {
+    var returnValue;
+
+    for (var i = 0; i < arguments.length; i++) {
+      var lambda = arguments[i];
+      try {
+        returnValue = lambda();
+        break;
+      } catch (e) {}
+    }
+
+    return returnValue;
+  }
+}
+
+/*--------------------------------------------------------------------------*/
+
+var PeriodicalExecuter = Class.create();
+PeriodicalExecuter.prototype = {
+  initialize: function(callback, frequency) {
+    this.callback = callback;
+    this.frequency = frequency;
+    this.currentlyExecuting = false;
+
+    this.registerCallback();
+  },
+
+  registerCallback: function() {
+    setInterval(this.onTimerEvent.bind(this), this.frequency * 1000);
+  },
+
+  onTimerEvent: function() {
+    if (!this.currentlyExecuting) {
+      try {
+        this.currentlyExecuting = true;
+        this.callback();
+      } finally {
+        this.currentlyExecuting = false;
+      }
+    }
+  }
+}
+
+/*--------------------------------------------------------------------------*/
+
+function $() {
+  var elements = new Array();
+
+  for (var i = 0; i < arguments.length; i++) {
+    var element = arguments[i];
+    if (typeof element == 'string')
+      element = document.getElementById(element);
+
+    if (arguments.length == 1)
+      return element;
+
+    elements.push(element);
+  }
+
+  return elements;
+}
+Object.extend(String.prototype, {
+  stripTags: function() {
+    return this.replace(/<\/?[^>]+>/gi, '');
+  },
+
+  stripScripts: function() {
+    return this.replace(new RegExp(Prototype.ScriptFragment, 'img'), '');
+  },
+
+  extractScripts: function() {
+    var matchAll = new RegExp(Prototype.ScriptFragment, 'img');
+    var matchOne = new RegExp(Prototype.ScriptFragment, 'im');
+    return (this.match(matchAll) || []).map(function(scriptTag) {
+      return (scriptTag.match(matchOne) || ['', ''])[1];
+    });
+  },
+
+  evalScripts: function() {
+    return this.extractScripts().map(eval);
+  },
+
+  escapeHTML: function() {
+    var div = document.createElement('div');
+    var text = document.createTextNode(this);
+    div.appendChild(text);
+    return div.innerHTML;
+  },
+
+  unescapeHTML: function() {
+    var div = document.createElement('div');
+    div.innerHTML = this.stripTags();
+    return div.childNodes[0] ? div.childNodes[0].nodeValue : '';
+  },
+
+  toQueryParams: function() {
+    var pairs = this.match(/^\??(.*)$/)[1].split('&');
+    return pairs.inject({}, function(params, pairString) {
+      var pair = pairString.split('=');
+      params[pair[0]] = pair[1];
+      return params;
+    });
+  },
+
+  toArray: function() {
+    return this.split('');
+  },
+
+  camelize: function() {
+    var oStringList = this.split('-');
+    if (oStringList.length == 1) return oStringList[0];
+
+    var camelizedString = this.indexOf('-') == 0
+      ? oStringList[0].charAt(0).toUpperCase() + oStringList[0].substring(1)
+      : oStringList[0];
+
+    for (var i = 1, len = oStringList.length; i < len; i++) {
+      var s = oStringList[i];
+      camelizedString += s.charAt(0).toUpperCase() + s.substring(1);
+    }
+
+    return camelizedString;
+  },
+
+  inspect: function() {
+    return "'" + this.replace('\\', '\\\\').replace("'", '\\\'') + "'";
+  }
+});
+
+String.prototype.parseQuery = String.prototype.toQueryParams;
+
+var $break    = new Object();
+var $continue = new Object();
+
+var Enumerable = {
+  each: function(iterator) {
+    var index = 0;
+    try {
+      this._each(function(value) {
+        try {
+          iterator(value, index++);
+        } catch (e) {
+          if (e != $continue) throw e;
+        }
+      });
+    } catch (e) {
+      if (e != $break) throw e;
+    }
+  },
+
+  all: function(iterator) {
+    var result = true;
+    this.each(function(value, index) {
+      result = result && !!(iterator || Prototype.K)(value, index);
+      if (!result) throw $break;
+    });
+    return result;
+  },
+
+  any: function(iterator) {
+    var result = true;
+    this.each(function(value, index) {
+      if (result = !!(iterator || Prototype.K)(value, index))
+        throw $break;
+    });
+    return result;
+  },
+
+  collect: function(iterator) {
+    var results = [];
+    this.each(function(value, index) {
+      results.push(iterator(value, index));
+    });
+    return results;
+  },
+
+  detect: function (iterator) {
+    var result;
+    this.each(function(value, index) {
+      if (iterator(value, index)) {
+        result = value;
+        throw $break;
+      }
+    });
+    return result;
+  },
+
+  findAll: function(iterator) {
+    var results = [];
+    this.each(function(value, index) {
+      if (iterator(value, index))
+        results.push(value);
+    });
+    return results;
+  },
+
+  grep: function(pattern, iterator) {
+    var results = [];
+    this.each(function(value, index) {
+      var stringValue = value.toString();
+      if (stringValue.match(pattern))
+        results.push((iterator || Prototype.K)(value, index));
+    })
+    return results;
+  },
+
+  include: function(object) {
+    var found = false;
+    this.each(function(value) {
+      if (value == object) {
+        found = true;
+        throw $break;
+      }
+    });
+    return found;
+  },
+
+  inject: function(memo, iterator) {
+    this.each(function(value, index) {
+      memo = iterator(memo, value, index);
+    });
+    return memo;
+  },
+
+  invoke: function(method) {
+    var args = $A(arguments).slice(1);
+    return this.collect(function(value) {
+      return value[method].apply(value, args);
+    });
+  },
+
+  max: function(iterator) {
+    var result;
+    this.each(function(value, index) {
+      value = (iterator || Prototype.K)(value, index);
+      if (value >= (result || value))
+        result = value;
+    });
+    return result;
+  },
+
+  min: function(iterator) {
+    var result;
+    this.each(function(value, index) {
+      value = (iterator || Prototype.K)(value, index);
+      if (value <= (result || value))
+        result = value;
+    });
+    return result;
+  },
+
+  partition: function(iterator) {
+    var trues = [], falses = [];
+    this.each(function(value, index) {
+      ((iterator || Prototype.K)(value, index) ?
+        trues : falses).push(value);
+    });
+    return [trues, falses];
+  },
+
+  pluck: function(property) {
+    var results = [];
+    this.each(function(value, index) {
+      results.push(value[property]);
+    });
+    return results;
+  },
+
+  reject: function(iterator) {
+    var results = [];
+    this.each(function(value, index) {
+      if (!iterator(value, index))
+        results.push(value);
+    });
+    return results;
+  },
+
+  sortBy: function(iterator) {
+    return this.collect(function(value, index) {
+      return {value: value, criteria: iterator(value, index)};
+    }).sort(function(left, right) {
+      var a = left.criteria, b = right.criteria;
+      return a < b ? -1 : a > b ? 1 : 0;
+    }).pluck('value');
+  },
+
+  toArray: function() {
+    return this.collect(Prototype.K);
+  },
+
+  zip: function() {
+    var iterator = Prototype.K, args = $A(arguments);
+    if (typeof args.last() == 'function')
+      iterator = args.pop();
+
+    var collections = [this].concat(args).map($A);
+    return this.map(function(value, index) {
+      iterator(value = collections.pluck(index));
+      return value;
+    });
+  },
+
+  inspect: function() {
+    return '#';
+  }
+}
+
+Object.extend(Enumerable, {
+  map:     Enumerable.collect,
+  find:    Enumerable.detect,
+  select:  Enumerable.findAll,
+  member:  Enumerable.include,
+  entries: Enumerable.toArray
+});
+var $A = Array.from = function(iterable) {
+  if (!iterable) return [];
+  if (iterable.toArray) {
+    return iterable.toArray();
+  } else {
+    var results = [];
+    for (var i = 0; i < iterable.length; i++)
+      results.push(iterable[i]);
+    return results;
+  }
+}
+
+Object.extend(Array.prototype, Enumerable);
+
+Array.prototype._reverse = Array.prototype.reverse;
+
+Object.extend(Array.prototype, {
+  _each: function(iterator) {
+    for (var i = 0; i < this.length; i++)
+      iterator(this[i]);
+  },
+
+  clear: function() {
+    this.length = 0;
+    return this;
+  },
+
+  first: function() {
+    return this[0];
+  },
+
+  last: function() {
+    return this[this.length - 1];
+  },
+
+  compact: function() {
+    return this.select(function(value) {
+      return value != undefined || value != null;
+    });
+  },
+
+  flatten: function() {
+    return this.inject([], function(array, value) {
+      return array.concat(value.constructor == Array ?
+        value.flatten() : [value]);
+    });
+  },
+
+  without: function() {
+    var values = $A(arguments);
+    return this.select(function(value) {
+      return !values.include(value);
+    });
+  },
+
+  indexOf: function(object) {
+    for (var i = 0; i < this.length; i++)
+      if (this[i] == object) return i;
+    return -1;
+  },
+
+  reverse: function(inline) {
+    return (inline !== false ? this : this.toArray())._reverse();
+  },
+
+  shift: function() {
+    var result = this[0];
+    for (var i = 0; i < this.length - 1; i++)
+      this[i] = this[i + 1];
+    this.length--;
+    return result;
+  },
+
+  inspect: function() {
+    return '[' + this.map(Object.inspect).join(', ') + ']';
+  }
+});
+var Hash = {
+  _each: function(iterator) {
+    for (key in this) {
+      var value = this[key];
+      if (typeof value == 'function') continue;
+
+      var pair = [key, value];
+      pair.key = key;
+      pair.value = value;
+      iterator(pair);
+    }
+  },
+
+  keys: function() {
+    return this.pluck('key');
+  },
+
+  values: function() {
+    return this.pluck('value');
+  },
+
+  merge: function(hash) {
+    return $H(hash).inject($H(this), function(mergedHash, pair) {
+      mergedHash[pair.key] = pair.value;
+      return mergedHash;
+    });
+  },
+
+  toQueryString: function() {
+    return this.map(function(pair) {
+      return pair.map(encodeURIComponent).join('=');
+    }).join('&');
+  },
+
+  inspect: function() {
+    return '#';
+  }
+}
+
+function $H(object) {
+  var hash = Object.extend({}, object || {});
+  Object.extend(hash, Enumerable);
+  Object.extend(hash, Hash);
+  return hash;
+}
+ObjectRange = Class.create();
+Object.extend(ObjectRange.prototype, Enumerable);
+Object.extend(ObjectRange.prototype, {
+  initialize: function(start, end, exclusive) {
+    this.start = start;
+    this.end = end;
+    this.exclusive = exclusive;
+  },
+
+  _each: function(iterator) {
+    var value = this.start;
+    do {
+      iterator(value);
+      value = value.succ();
+    } while (this.include(value));
+  },
+
+  include: function(value) {
+    if (value < this.start)
+      return false;
+    if (this.exclusive)
+      return value < this.end;
+    return value <= this.end;
+  }
+});
+
+var $R = function(start, end, exclusive) {
+  return new ObjectRange(start, end, exclusive);
+}
+
+var Ajax = {
+  getTransport: function() {
+    return Try.these(
+      function() {return new ActiveXObject('Msxml2.XMLHTTP')},
+      function() {return new ActiveXObject('Microsoft.XMLHTTP')},
+      function() {return new XMLHttpRequest()}
+    ) || false;
+  },
+
+  activeRequestCount: 0
+}
+
+Ajax.Responders = {
+  responders: [],
+
+  _each: function(iterator) {
+    this.responders._each(iterator);
+  },
+
+  register: function(responderToAdd) {
+    if (!this.include(responderToAdd))
+      this.responders.push(responderToAdd);
+  },
+
+  unregister: function(responderToRemove) {
+    this.responders = this.responders.without(responderToRemove);
+  },
+
+  dispatch: function(callback, request, transport, json) {
+    this.each(function(responder) {
+      if (responder[callback] && typeof responder[callback] == 'function') {
+        try {
+          responder[callback].apply(responder, [request, transport, json]);
+        } catch (e) {}
+      }
+    });
+  }
+};
+
+Object.extend(Ajax.Responders, Enumerable);
+
+Ajax.Responders.register({
+  onCreate: function() {
+    Ajax.activeRequestCount++;
+  },
+
+  onComplete: function() {
+    Ajax.activeRequestCount--;
+  }
+});
+
+Ajax.Base = function() {};
+Ajax.Base.prototype = {
+  setOptions: function(options) {
+    this.options = {
+      method:       'post',
+      asynchronous: true,
+      parameters:   ''
+    }
+    Object.extend(this.options, options || {});
+  },
+
+  responseIsSuccess: function() {
+    return this.transport.status == undefined
+        || this.transport.status == 0
+        || (this.transport.status >= 200 && this.transport.status < 300);
+  },
+
+  responseIsFailure: function() {
+    return !this.responseIsSuccess();
+  }
+}
+
+Ajax.Request = Class.create();
+Ajax.Request.Events =
+  ['Uninitialized', 'Loading', 'Loaded', 'Interactive', 'Complete'];
+
+Ajax.Request.prototype = Object.extend(new Ajax.Base(), {
+  initialize: function(url, options) {
+    this.transport = Ajax.getTransport();
+    this.setOptions(options);
+    this.request(url);
+  },
+
+  request: function(url) {
+    var parameters = this.options.parameters || '';
+    if (parameters.length > 0) parameters += '&_=';
+
+    try {
+      this.url = url;
+      if (this.options.method == 'get' && parameters.length > 0)
+        this.url += (this.url.match(/\?/) ? '&' : '?') + parameters;
+
+      Ajax.Responders.dispatch('onCreate', this, this.transport);
+
+      this.transport.open(this.options.method, this.url,
+        this.options.asynchronous);
+
+      if (this.options.asynchronous) {
+        this.transport.onreadystatechange = this.onStateChange.bind(this);
+        setTimeout((function() {this.respondToReadyState(1)}).bind(this), 10);
+      }
+
+      this.setRequestHeaders();
+
+      var body = this.options.postBody ? this.options.postBody : parameters;
+      this.transport.send(this.options.method == 'post' ? body : null);
+
+    } catch (e) {
+      this.dispatchException(e);
+    }
+  },
+
+  setRequestHeaders: function() {
+    var requestHeaders =
+      ['X-Requested-With', 'XMLHttpRequest',
+       'X-Prototype-Version', Prototype.Version];
+
+    if (this.options.method == 'post') {
+      requestHeaders.push('Content-type',
+        'application/x-www-form-urlencoded');
+
+      /* Force "Connection: close" for Mozilla browsers to work around
+       * a bug where XMLHttpReqeuest sends an incorrect Content-length
+       * header. See Mozilla Bugzilla #246651.
+       */
+      if (this.transport.overrideMimeType)
+        requestHeaders.push('Connection', 'close');
+    }
+
+    if (this.options.requestHeaders)
+      requestHeaders.push.apply(requestHeaders, this.options.requestHeaders);
+
+    for (var i = 0; i < requestHeaders.length; i += 2)
+      this.transport.setRequestHeader(requestHeaders[i], requestHeaders[i+1]);
+  },
+
+  onStateChange: function() {
+    var readyState = this.transport.readyState;
+    if (readyState != 1)
+      this.respondToReadyState(this.transport.readyState);
+  },
+
+  header: function(name) {
+    try {
+      return this.transport.getResponseHeader(name);
+    } catch (e) {}
+  },
+
+  evalJSON: function() {
+    try {
+      return eval(this.header('X-JSON'));
+    } catch (e) {}
+  },
+
+  evalResponse: function() {
+    try {
+      return eval(this.transport.responseText);
+    } catch (e) {
+      this.dispatchException(e);
+    }
+  },
+
+  respondToReadyState: function(readyState) {
+    var event = Ajax.Request.Events[readyState];
+    var transport = this.transport, json = this.evalJSON();
+
+    if (event == 'Complete') {
+      try {
+        (this.options['on' + this.transport.status]
+         || this.options['on' + (this.responseIsSuccess() ? 'Success' : 'Failure')]
+         || Prototype.emptyFunction)(transport, json);
+      } catch (e) {
+        this.dispatchException(e);
+      }
+
+      if ((this.header('Content-type') || '').match(/^text\/javascript/i))
+        this.evalResponse();
+    }
+
+    try {
+      (this.options['on' + event] || Prototype.emptyFunction)(transport, json);
+      Ajax.Responders.dispatch('on' + event, this, transport, json);
+    } catch (e) {
+      this.dispatchException(e);
+    }
+
+    /* Avoid memory leak in MSIE: clean up the oncomplete event handler */
+    if (event == 'Complete')
+      this.transport.onreadystatechange = Prototype.emptyFunction;
+  },
+
+  dispatchException: function(exception) {
+    (this.options.onException || Prototype.emptyFunction)(this, exception);
+    Ajax.Responders.dispatch('onException', this, exception);
+  }
+});
+
+Ajax.Updater = Class.create();
+
+Object.extend(Object.extend(Ajax.Updater.prototype, Ajax.Request.prototype), {
+  initialize: function(container, url, options) {
+    this.containers = {
+      success: container.success ? $(container.success) : $(container),
+      failure: container.failure ? $(container.failure) :
+        (container.success ? null : $(container))
+    }
+
+    this.transport = Ajax.getTransport();
+    this.setOptions(options);
+
+    var onComplete = this.options.onComplete || Prototype.emptyFunction;
+    this.options.onComplete = (function(transport, object) {
+      this.updateContent();
+      onComplete(transport, object);
+    }).bind(this);
+
+    this.request(url);
+  },
+
+  updateContent: function() {
+    var receiver = this.responseIsSuccess() ?
+      this.containers.success : this.containers.failure;
+    var response = this.transport.responseText;
+
+    if (!this.options.evalScripts)
+      response = response.stripScripts();
+
+    if (receiver) {
+      if (this.options.insertion) {
+        new this.options.insertion(receiver, response);
+      } else {
+        Element.update(receiver, response);
+      }
+    }
+
+    if (this.responseIsSuccess()) {
+      if (this.onComplete)
+        setTimeout(this.onComplete.bind(this), 10);
+    }
+  }
+});
+
+Ajax.PeriodicalUpdater = Class.create();
+Ajax.PeriodicalUpdater.prototype = Object.extend(new Ajax.Base(), {
+  initialize: function(container, url, options) {
+    this.setOptions(options);
+    this.onComplete = this.options.onComplete;
+
+    this.frequency = (this.options.frequency || 2);
+    this.decay = (this.options.decay || 1);
+
+    this.updater = {};
+    this.container = container;
+    this.url = url;
+
+    this.start();
+  },
+
+  start: function() {
+    this.options.onComplete = this.updateComplete.bind(this);
+    this.onTimerEvent();
+  },
+
+  stop: function() {
+    this.updater.onComplete = undefined;
+    clearTimeout(this.timer);
+    (this.onComplete || Prototype.emptyFunction).apply(this, arguments);
+  },
+
+  updateComplete: function(request) {
+    if (this.options.decay) {
+      this.decay = (request.responseText == this.lastText ?
+        this.decay * this.options.decay : 1);
+
+      this.lastText = request.responseText;
+    }
+    this.timer = setTimeout(this.onTimerEvent.bind(this),
+      this.decay * this.frequency * 1000);
+  },
+
+  onTimerEvent: function() {
+    this.updater = new Ajax.Updater(this.container, this.url, this.options);
+  }
+});
+document.getElementsByClassName = function(className, parentElement) {
+  var children = ($(parentElement) || document.body).getElementsByTagName('*');
+  return $A(children).inject([], function(elements, child) {
+    if (child.className.match(new RegExp("(^|\\s)" + className + "(\\s|$)")))
+      elements.push(child);
+    return elements;
+  });
+}
+
+/*--------------------------------------------------------------------------*/
+
+if (!window.Element) {
+  var Element = new Object();
+}
+
+Object.extend(Element, {
+  visible: function(element) {
+    return $(element).style.display != 'none';
+  },
+
+  toggle: function() {
+    for (var i = 0; i < arguments.length; i++) {
+      var element = $(arguments[i]);
+      Element[Element.visible(element) ? 'hide' : 'show'](element);
+    }
+  },
+
+  hide: function() {
+    for (var i = 0; i < arguments.length; i++) {
+      var element = $(arguments[i]);
+      element.style.display = 'none';
+    }
+  },
+
+  show: function() {
+    for (var i = 0; i < arguments.length; i++) {
+      var element = $(arguments[i]);
+      element.style.display = '';
+    }
+  },
+
+  remove: function(element) {
+    element = $(element);
+    element.parentNode.removeChild(element);
+  },
+
+  update: function(element, html) {
+    $(element).innerHTML = html.stripScripts();
+    setTimeout(function() {html.evalScripts()}, 10);
+  },
+
+  getHeight: function(element) {
+    element = $(element);
+    return element.offsetHeight;
+  },
+
+  classNames: function(element) {
+    return new Element.ClassNames(element);
+  },
+
+  hasClassName: function(element, className) {
+    if (!(element = $(element))) return;
+    return Element.classNames(element).include(className);
+  },
+
+  addClassName: function(element, className) {
+    if (!(element = $(element))) return;
+    return Element.classNames(element).add(className);
+  },
+
+  removeClassName: function(element, className) {
+    if (!(element = $(element))) return;
+    return Element.classNames(element).remove(className);
+  },
+
+  // removes whitespace-only text node children
+  cleanWhitespace: function(element) {
+    element = $(element);
+    for (var i = 0; i < element.childNodes.length; i++) {
+      var node = element.childNodes[i];
+      if (node.nodeType == 3 && !/\S/.test(node.nodeValue))
+        Element.remove(node);
+    }
+  },
+
+  empty: function(element) {
+    return $(element).innerHTML.match(/^\s*$/);
+  },
+
+  scrollTo: function(element) {
+    element = $(element);
+    var x = element.x ? element.x : element.offsetLeft,
+        y = element.y ? element.y : element.offsetTop;
+    window.scrollTo(x, y);
+  },
+
+  getStyle: function(element, style) {
+    element = $(element);
+    var value = element.style[style.camelize()];
+    if (!value) {
+      if (document.defaultView && document.defaultView.getComputedStyle) {
+        var css = document.defaultView.getComputedStyle(element, null);
+        value = css ? css.getPropertyValue(style) : null;
+      } else if (element.currentStyle) {
+        value = element.currentStyle[style.camelize()];
+      }
+    }
+
+    if (window.opera && ['left', 'top', 'right', 'bottom'].include(style))
+      if (Element.getStyle(element, 'position') == 'static') value = 'auto';
+
+    return value == 'auto' ? null : value;
+  },
+
+  setStyle: function(element, style) {
+    element = $(element);
+    for (name in style)
+      element.style[name.camelize()] = style[name];
+  },
+
+  getDimensions: function(element) {
+    element = $(element);
+    if (Element.getStyle(element, 'display') != 'none')
+      return {width: element.offsetWidth, height: element.offsetHeight};
+
+    // All *Width and *Height properties give 0 on elements with display none,
+    // so enable the element temporarily
+    var els = element.style;
+    var originalVisibility = els.visibility;
+    var originalPosition = els.position;
+    els.visibility = 'hidden';
+    els.position = 'absolute';
+    els.display = '';
+    var originalWidth = element.clientWidth;
+    var originalHeight = element.clientHeight;
+    els.display = 'none';
+    els.position = originalPosition;
+    els.visibility = originalVisibility;
+    return {width: originalWidth, height: originalHeight};
+  },
+
+  makePositioned: function(element) {
+    element = $(element);
+    var pos = Element.getStyle(element, 'position');
+    if (pos == 'static' || !pos) {
+      element._madePositioned = true;
+      element.style.position = 'relative';
+      // Opera returns the offset relative to the positioning context, when an
+      // element is position relative but top and left have not been defined
+      if (window.opera) {
+        element.style.top = 0;
+        element.style.left = 0;
+      }
+    }
+  },
+
+  undoPositioned: function(element) {
+    element = $(element);
+    if (element._madePositioned) {
+      element._madePositioned = undefined;
+      element.style.position =
+        element.style.top =
+        element.style.left =
+        element.style.bottom =
+        element.style.right = '';
+    }
+  },
+
+  makeClipping: function(element) {
+    element = $(element);
+    if (element._overflow) return;
+    element._overflow = element.style.overflow;
+    if ((Element.getStyle(element, 'overflow') || 'visible') != 'hidden')
+      element.style.overflow = 'hidden';
+  },
+
+  undoClipping: function(element) {
+    element = $(element);
+    if (element._overflow) return;
+    element.style.overflow = element._overflow;
+    element._overflow = undefined;
+  }
+});
+
+var Toggle = new Object();
+Toggle.display = Element.toggle;
+
+/*--------------------------------------------------------------------------*/
+
+Abstract.Insertion = function(adjacency) {
+  this.adjacency = adjacency;
+}
+
+Abstract.Insertion.prototype = {
+  initialize: function(element, content) {
+    this.element = $(element);
+    this.content = content.stripScripts();
+
+    if (this.adjacency && this.element.insertAdjacentHTML) {
+      try {
+        this.element.insertAdjacentHTML(this.adjacency, this.content);
+      } catch (e) {
+        if (this.element.tagName.toLowerCase() == 'tbody') {
+          this.insertContent(this.contentFromAnonymousTable());
+        } else {
+          throw e;
+        }
+      }
+    } else {
+      this.range = this.element.ownerDocument.createRange();
+      if (this.initializeRange) this.initializeRange();
+      this.insertContent([this.range.createContextualFragment(this.content)]);
+    }
+
+    setTimeout(function() {content.evalScripts()}, 10);
+  },
+
+  contentFromAnonymousTable: function() {
+    var div = document.createElement('div');
+    div.innerHTML = '' + this.content + '
        ';
+    return $A(div.childNodes[0].childNodes[0].childNodes);
+  }
+}
+
+var Insertion = new Object();
+
+Insertion.Before = Class.create();
+Insertion.Before.prototype = Object.extend(new Abstract.Insertion('beforeBegin'), {
+  initializeRange: function() {
+    this.range.setStartBefore(this.element);
+  },
+
+  insertContent: function(fragments) {
+    fragments.each((function(fragment) {
+      this.element.parentNode.insertBefore(fragment, this.element);
+    }).bind(this));
+  }
+});
+
+Insertion.Top = Class.create();
+Insertion.Top.prototype = Object.extend(new Abstract.Insertion('afterBegin'), {
+  initializeRange: function() {
+    this.range.selectNodeContents(this.element);
+    this.range.collapse(true);
+  },
+
+  insertContent: function(fragments) {
+    fragments.reverse(false).each((function(fragment) {
+      this.element.insertBefore(fragment, this.element.firstChild);
+    }).bind(this));
+  }
+});
+
+Insertion.Bottom = Class.create();
+Insertion.Bottom.prototype = Object.extend(new Abstract.Insertion('beforeEnd'), {
+  initializeRange: function() {
+    this.range.selectNodeContents(this.element);
+    this.range.collapse(this.element);
+  },
+
+  insertContent: function(fragments) {
+    fragments.each((function(fragment) {
+      this.element.appendChild(fragment);
+    }).bind(this));
+  }
+});
+
+Insertion.After = Class.create();
+Insertion.After.prototype = Object.extend(new Abstract.Insertion('afterEnd'), {
+  initializeRange: function() {
+    this.range.setStartAfter(this.element);
+  },
+
+  insertContent: function(fragments) {
+    fragments.each((function(fragment) {
+      this.element.parentNode.insertBefore(fragment,
+        this.element.nextSibling);
+    }).bind(this));
+  }
+});
+
+/*--------------------------------------------------------------------------*/
+
+Element.ClassNames = Class.create();
+Element.ClassNames.prototype = {
+  initialize: function(element) {
+    this.element = $(element);
+  },
+
+  _each: function(iterator) {
+    this.element.className.split(/\s+/).select(function(name) {
+      return name.length > 0;
+    })._each(iterator);
+  },
+
+  set: function(className) {
+    this.element.className = className;
+  },
+
+  add: function(classNameToAdd) {
+    if (this.include(classNameToAdd)) return;
+    this.set(this.toArray().concat(classNameToAdd).join(' '));
+  },
+
+  remove: function(classNameToRemove) {
+    if (!this.include(classNameToRemove)) return;
+    this.set(this.select(function(className) {
+      return className != classNameToRemove;
+    }).join(' '));
+  },
+
+  toString: function() {
+    return this.toArray().join(' ');
+  }
+}
+
+Object.extend(Element.ClassNames.prototype, Enumerable);
+var Field = {
+  clear: function() {
+    for (var i = 0; i < arguments.length; i++)
+      $(arguments[i]).value = '';
+  },
+
+  focus: function(element) {
+    $(element).focus();
+  },
+
+  present: function() {
+    for (var i = 0; i < arguments.length; i++)
+      if ($(arguments[i]).value == '') return false;
+    return true;
+  },
+
+  select: function(element) {
+    $(element).select();
+  },
+
+  activate: function(element) {
+    element = $(element);
+    element.focus();
+    if (element.select)
+      element.select();
+  }
+}
+
+/*--------------------------------------------------------------------------*/
+
+var Form = {
+  serialize: function(form) {
+    var elements = Form.getElements($(form));
+    var queryComponents = new Array();
+
+    for (var i = 0; i < elements.length; i++) {
+      var queryComponent = Form.Element.serialize(elements[i]);
+      if (queryComponent)
+        queryComponents.push(queryComponent);
+    }
+
+    return queryComponents.join('&');
+  },
+
+  getElements: function(form) {
+    form = $(form);
+    var elements = new Array();
+
+    for (tagName in Form.Element.Serializers) {
+      var tagElements = form.getElementsByTagName(tagName);
+      for (var j = 0; j < tagElements.length; j++)
+        elements.push(tagElements[j]);
+    }
+    return elements;
+  },
+
+  getInputs: function(form, typeName, name) {
+    form = $(form);
+    var inputs = form.getElementsByTagName('input');
+
+    if (!typeName && !name)
+      return inputs;
+
+    var matchingInputs = new Array();
+    for (var i = 0; i < inputs.length; i++) {
+      var input = inputs[i];
+      if ((typeName && input.type != typeName) ||
+          (name && input.name != name))
+        continue;
+      matchingInputs.push(input);
+    }
+
+    return matchingInputs;
+  },
+
+  disable: function(form) {
+    var elements = Form.getElements(form);
+    for (var i = 0; i < elements.length; i++) {
+      var element = elements[i];
+      element.blur();
+      element.disabled = 'true';
+    }
+  },
+
+  enable: function(form) {
+    var elements = Form.getElements(form);
+    for (var i = 0; i < elements.length; i++) {
+      var element = elements[i];
+      element.disabled = '';
+    }
+  },
+
+  findFirstElement: function(form) {
+    return Form.getElements(form).find(function(element) {
+      return element.type != 'hidden' && !element.disabled &&
+        ['input', 'select', 'textarea'].include(element.tagName.toLowerCase());
+    });
+  },
+
+  focusFirstElement: function(form) {
+    Field.activate(Form.findFirstElement(form));
+  },
+
+  reset: function(form) {
+    $(form).reset();
+  }
+}
+
+Form.Element = {
+  serialize: function(element) {
+    element = $(element);
+    var method = element.tagName.toLowerCase();
+    var parameter = Form.Element.Serializers[method](element);
+
+    if (parameter) {
+      var key = encodeURIComponent(parameter[0]);
+      if (key.length == 0) return;
+
+      if (parameter[1].constructor != Array)
+        parameter[1] = [parameter[1]];
+
+      return parameter[1].map(function(value) {
+        return key + '=' + encodeURIComponent(value);
+      }).join('&');
+    }
+  },
+
+  getValue: function(element) {
+    element = $(element);
+    var method = element.tagName.toLowerCase();
+    var parameter = Form.Element.Serializers[method](element);
+
+    if (parameter)
+      return parameter[1];
+  }
+}
+
+Form.Element.Serializers = {
+  input: function(element) {
+    switch (element.type.toLowerCase()) {
+      case 'submit':
+      case 'hidden':
+      case 'password':
+      case 'text':
+        return Form.Element.Serializers.textarea(element);
+      case 'checkbox':
+      case 'radio':
+        return Form.Element.Serializers.inputSelector(element);
+    }
+    return false;
+  },
+
+  inputSelector: function(element) {
+    if (element.checked)
+      return [element.name, element.value];
+  },
+
+  textarea: function(element) {
+    return [element.name, element.value];
+  },
+
+  select: function(element) {
+    return Form.Element.Serializers[element.type == 'select-one' ?
+      'selectOne' : 'selectMany'](element);
+  },
+
+  selectOne: function(element) {
+    var value = '', opt, index = element.selectedIndex;
+    if (index >= 0) {
+      opt = element.options[index];
+      value = opt.value;
+      if (!value && !('value' in opt))
+        value = opt.text;
+    }
+    return [element.name, value];
+  },
+
+  selectMany: function(element) {
+    var value = new Array();
+    for (var i = 0; i < element.length; i++) {
+      var opt = element.options[i];
+      if (opt.selected) {
+        var optValue = opt.value;
+        if (!optValue && !('value' in opt))
+          optValue = opt.text;
+        value.push(optValue);
+      }
+    }
+    return [element.name, value];
+  }
+}
+
+/*--------------------------------------------------------------------------*/
+
+var $F = Form.Element.getValue;
+
+/*--------------------------------------------------------------------------*/
+
+Abstract.TimedObserver = function() {}
+Abstract.TimedObserver.prototype = {
+  initialize: function(element, frequency, callback) {
+    this.frequency = frequency;
+    this.element   = $(element);
+    this.callback  = callback;
+
+    this.lastValue = this.getValue();
+    this.registerCallback();
+  },
+
+  registerCallback: function() {
+    setInterval(this.onTimerEvent.bind(this), this.frequency * 1000);
+  },
+
+  onTimerEvent: function() {
+    var value = this.getValue();
+    if (this.lastValue != value) {
+      this.callback(this.element, value);
+      this.lastValue = value;
+    }
+  }
+}
+
+Form.Element.Observer = Class.create();
+Form.Element.Observer.prototype = Object.extend(new Abstract.TimedObserver(), {
+  getValue: function() {
+    return Form.Element.getValue(this.element);
+  }
+});
+
+Form.Observer = Class.create();
+Form.Observer.prototype = Object.extend(new Abstract.TimedObserver(), {
+  getValue: function() {
+    return Form.serialize(this.element);
+  }
+});
+
+/*--------------------------------------------------------------------------*/
+
+Abstract.EventObserver = function() {}
+Abstract.EventObserver.prototype = {
+  initialize: function(element, callback) {
+    this.element  = $(element);
+    this.callback = callback;
+
+    this.lastValue = this.getValue();
+    if (this.element.tagName.toLowerCase() == 'form')
+      this.registerFormCallbacks();
+    else
+      this.registerCallback(this.element);
+  },
+
+  onElementEvent: function() {
+    var value = this.getValue();
+    if (this.lastValue != value) {
+      this.callback(this.element, value);
+      this.lastValue = value;
+    }
+  },
+
+  registerFormCallbacks: function() {
+    var elements = Form.getElements(this.element);
+    for (var i = 0; i < elements.length; i++)
+      this.registerCallback(elements[i]);
+  },
+
+  registerCallback: function(element) {
+    if (element.type) {
+      switch (element.type.toLowerCase()) {
+        case 'checkbox':
+        case 'radio':
+          Event.observe(element, 'click', this.onElementEvent.bind(this));
+          break;
+        case 'password':
+        case 'text':
+        case 'textarea':
+        case 'select-one':
+        case 'select-multiple':
+          Event.observe(element, 'change', this.onElementEvent.bind(this));
+          break;
+      }
+    }
+  }
+}
+
+Form.Element.EventObserver = Class.create();
+Form.Element.EventObserver.prototype = Object.extend(new Abstract.EventObserver(), {
+  getValue: function() {
+    return Form.Element.getValue(this.element);
+  }
+});
+
+Form.EventObserver = Class.create();
+Form.EventObserver.prototype = Object.extend(new Abstract.EventObserver(), {
+  getValue: function() {
+    return Form.serialize(this.element);
+  }
+});
+if (!window.Event) {
+  var Event = new Object();
+}
+
+Object.extend(Event, {
+  KEY_BACKSPACE: 8,
+  KEY_TAB:       9,
+  KEY_RETURN:   13,
+  KEY_ESC:      27,
+  KEY_LEFT:     37,
+  KEY_UP:       38,
+  KEY_RIGHT:    39,
+  KEY_DOWN:     40,
+  KEY_DELETE:   46,
+
+  element: function(event) {
+    return event.target || event.srcElement;
+  },
+
+  isLeftClick: function(event) {
+    return (((event.which) && (event.which == 1)) ||
+            ((event.button) && (event.button == 1)));
+  },
+
+  pointerX: function(event) {
+    return event.pageX || (event.clientX +
+      (document.documentElement.scrollLeft || document.body.scrollLeft));
+  },
+
+  pointerY: function(event) {
+    return event.pageY || (event.clientY +
+      (document.documentElement.scrollTop || document.body.scrollTop));
+  },
+
+  stop: function(event) {
+    if (event.preventDefault) {
+      event.preventDefault();
+      event.stopPropagation();
+    } else {
+      event.returnValue = false;
+      event.cancelBubble = true;
+    }
+  },
+
+  // find the first node with the given tagName, starting from the
+  // node the event was triggered on; traverses the DOM upwards
+  findElement: function(event, tagName) {
+    var element = Event.element(event);
+    while (element.parentNode && (!element.tagName ||
+        (element.tagName.toUpperCase() != tagName.toUpperCase())))
+      element = element.parentNode;
+    return element;
+  },
+
+  observers: false,
+
+  _observeAndCache: function(element, name, observer, useCapture) {
+    if (!this.observers) this.observers = [];
+    if (element.addEventListener) {
+      this.observers.push([element, name, observer, useCapture]);
+      element.addEventListener(name, observer, useCapture);
+    } else if (element.attachEvent) {
+      this.observers.push([element, name, observer, useCapture]);
+      element.attachEvent('on' + name, observer);
+    }
+  },
+
+  unloadCache: function() {
+    if (!Event.observers) return;
+    for (var i = 0; i < Event.observers.length; i++) {
+      Event.stopObserving.apply(this, Event.observers[i]);
+      Event.observers[i][0] = null;
+    }
+    Event.observers = false;
+  },
+
+  observe: function(element, name, observer, useCapture) {
+    var element = $(element);
+    useCapture = useCapture || false;
+
+    if (name == 'keypress' &&
+        (navigator.appVersion.match(/Konqueror|Safari|KHTML/)
+        || element.attachEvent))
+      name = 'keydown';
+
+    this._observeAndCache(element, name, observer, useCapture);
+  },
+
+  stopObserving: function(element, name, observer, useCapture) {
+    var element = $(element);
+    useCapture = useCapture || false;
+
+    if (name == 'keypress' &&
+        (navigator.appVersion.match(/Konqueror|Safari|KHTML/)
+        || element.detachEvent))
+      name = 'keydown';
+
+    if (element.removeEventListener) {
+      element.removeEventListener(name, observer, useCapture);
+    } else if (element.detachEvent) {
+      element.detachEvent('on' + name, observer);
+    }
+  }
+});
+
+/* prevent memory leaks in IE */
+Event.observe(window, 'unload', Event.unloadCache, false);
+var Position = {
+  // set to true if needed, warning: firefox performance problems
+  // NOT neeeded for page scrolling, only if draggable contained in
+  // scrollable elements
+  includeScrollOffsets: false,
+
+  // must be called before calling withinIncludingScrolloffset, every time the
+  // page is scrolled
+  prepare: function() {
+    this.deltaX =  window.pageXOffset
+                || document.documentElement.scrollLeft
+                || document.body.scrollLeft
+                || 0;
+    this.deltaY =  window.pageYOffset
+                || document.documentElement.scrollTop
+                || document.body.scrollTop
+                || 0;
+  },
+
+  realOffset: function(element) {
+    var valueT = 0, valueL = 0;
+    do {
+      valueT += element.scrollTop  || 0;
+      valueL += element.scrollLeft || 0;
+      element = element.parentNode;
+    } while (element);
+    return [valueL, valueT];
+  },
+
+  cumulativeOffset: function(element) {
+    var valueT = 0, valueL = 0;
+    do {
+      valueT += element.offsetTop  || 0;
+      valueL += element.offsetLeft || 0;
+      element = element.offsetParent;
+    } while (element);
+    return [valueL, valueT];
+  },
+
+  positionedOffset: function(element) {
+    var valueT = 0, valueL = 0;
+    do {
+      valueT += element.offsetTop  || 0;
+      valueL += element.offsetLeft || 0;
+      element = element.offsetParent;
+      if (element) {
+        p = Element.getStyle(element, 'position');
+        if (p == 'relative' || p == 'absolute') break;
+      }
+    } while (element);
+    return [valueL, valueT];
+  },
+
+  offsetParent: function(element) {
+    if (element.offsetParent) return element.offsetParent;
+    if (element == document.body) return element;
+
+    while ((element = element.parentNode) && element != document.body)
+      if (Element.getStyle(element, 'position') != 'static')
+        return element;
+
+    return document.body;
+  },
+
+  // caches x/y coordinate pair to use with overlap
+  within: function(element, x, y) {
+    if (this.includeScrollOffsets)
+      return this.withinIncludingScrolloffsets(element, x, y);
+    this.xcomp = x;
+    this.ycomp = y;
+    this.offset = this.cumulativeOffset(element);
+
+    return (y >= this.offset[1] &&
+            y <  this.offset[1] + element.offsetHeight &&
+            x >= this.offset[0] &&
+            x <  this.offset[0] + element.offsetWidth);
+  },
+
+  withinIncludingScrolloffsets: function(element, x, y) {
+    var offsetcache = this.realOffset(element);
+
+    this.xcomp = x + offsetcache[0] - this.deltaX;
+    this.ycomp = y + offsetcache[1] - this.deltaY;
+    this.offset = this.cumulativeOffset(element);
+
+    return (this.ycomp >= this.offset[1] &&
+            this.ycomp <  this.offset[1] + element.offsetHeight &&
+            this.xcomp >= this.offset[0] &&
+            this.xcomp <  this.offset[0] + element.offsetWidth);
+  },
+
+  // within must be called directly before
+  overlap: function(mode, element) {
+    if (!mode) return 0;
+    if (mode == 'vertical')
+      return ((this.offset[1] + element.offsetHeight) - this.ycomp) /
+        element.offsetHeight;
+    if (mode == 'horizontal')
+      return ((this.offset[0] + element.offsetWidth) - this.xcomp) /
+        element.offsetWidth;
+  },
+
+  clone: function(source, target) {
+    source = $(source);
+    target = $(target);
+    target.style.position = 'absolute';
+    var offsets = this.cumulativeOffset(source);
+    target.style.top    = offsets[1] + 'px';
+    target.style.left   = offsets[0] + 'px';
+    target.style.width  = source.offsetWidth + 'px';
+    target.style.height = source.offsetHeight + 'px';
+  },
+
+  page: function(forElement) {
+    var valueT = 0, valueL = 0;
+
+    var element = forElement;
+    do {
+      valueT += element.offsetTop  || 0;
+      valueL += element.offsetLeft || 0;
+
+      // Safari fix
+      if (element.offsetParent==document.body)
+        if (Element.getStyle(element,'position')=='absolute') break;
+
+    } while (element = element.offsetParent);
+
+    element = forElement;
+    do {
+      valueT -= element.scrollTop  || 0;
+      valueL -= element.scrollLeft || 0;
+    } while (element = element.parentNode);
+
+    return [valueL, valueT];
+  },
+
+  clone: function(source, target) {
+    var options = Object.extend({
+      setLeft:    true,
+      setTop:     true,
+      setWidth:   true,
+      setHeight:  true,
+      offsetTop:  0,
+      offsetLeft: 0
+    }, arguments[2] || {})
+
+    // find page position of source
+    source = $(source);
+    var p = Position.page(source);
+
+    // find coordinate system to use
+    target = $(target);
+    var delta = [0, 0];
+    var parent = null;
+    // delta [0,0] will do fine with position: fixed elements,
+    // position:absolute needs offsetParent deltas
+    if (Element.getStyle(target,'position') == 'absolute') {
+      parent = Position.offsetParent(target);
+      delta = Position.page(parent);
+    }
+
+    // correct by body offsets (fixes Safari)
+    if (parent == document.body) {
+      delta[0] -= document.body.offsetLeft;
+      delta[1] -= document.body.offsetTop;
+    }
+
+    // set position
+    if(options.setLeft)   target.style.left  = (p[0] - delta[0] + options.offsetLeft) + 'px';
+    if(options.setTop)    target.style.top   = (p[1] - delta[1] + options.offsetTop) + 'px';
+    if(options.setWidth)  target.style.width = source.offsetWidth + 'px';
+    if(options.setHeight) target.style.height = source.offsetHeight + 'px';
+  },
+
+  absolutize: function(element) {
+    element = $(element);
+    if (element.style.position == 'absolute') return;
+    Position.prepare();
+
+    var offsets = Position.positionedOffset(element);
+    var top     = offsets[1];
+    var left    = offsets[0];
+    var width   = element.clientWidth;
+    var height  = element.clientHeight;
+
+    element._originalLeft   = left - parseFloat(element.style.left  || 0);
+    element._originalTop    = top  - parseFloat(element.style.top || 0);
+    element._originalWidth  = element.style.width;
+    element._originalHeight = element.style.height;
+
+    element.style.position = 'absolute';
+    element.style.top    = top + 'px';;
+    element.style.left   = left + 'px';;
+    element.style.width  = width + 'px';;
+    element.style.height = height + 'px';;
+  },
+
+  relativize: function(element) {
+    element = $(element);
+    if (element.style.position == 'relative') return;
+    Position.prepare();
+
+    element.style.position = 'relative';
+    var top  = parseFloat(element.style.top  || 0) - (element._originalTop || 0);
+    var left = parseFloat(element.style.left || 0) - (element._originalLeft || 0);
+
+    element.style.top    = top + 'px';
+    element.style.left   = left + 'px';
+    element.style.height = element._originalHeight;
+    element.style.width  = element._originalWidth;
+  }
+}
+
+// Safari returns margins on body which is incorrect if the child is absolutely
+// positioned.  For performance reasons, redefine Position.cumulativeOffset for
+// KHTML/WebKit only.
+if (/Konqueror|Safari|KHTML/.test(navigator.userAgent)) {
+  Position.cumulativeOffset = function(element) {
+    var valueT = 0, valueL = 0;
+    do {
+      valueT += element.offsetTop  || 0;
+      valueL += element.offsetLeft || 0;
+      if (element.offsetParent == document.body)
+        if (Element.getStyle(element, 'position') == 'absolute') break;
+
+      element = element.offsetParent;
+    } while (element);
+
+    return [valueL, valueT];
+  }
+}
\ No newline at end of file
diff --git a/tests/FunctionalTests/selenium/core/scripts/selenium-api.js b/tests/FunctionalTests/selenium/core/scripts/selenium-api.js
new file mode 100755
index 00000000..ad0509ee
--- /dev/null
+++ b/tests/FunctionalTests/selenium/core/scripts/selenium-api.js
@@ -0,0 +1,1402 @@
+/*
+ * Copyright 2004 ThoughtWorks, Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+var storedVars = new Object();
+
+function Selenium(browserbot) {
+	/**
+	 * Defines an object that runs Selenium commands.
+	 * 
+	 * 
        Element Locators
        
+	 * 
        
+	 * Element Locators tell Selenium which HTML element a command refers to.
+	 * The format of a locator is:
        
+	 * 
        
+	 * locatorType=argument
+	 * 
        
+	 * 
+	 * 
        
+	 * We support the following strategies for locating elements:
+	 * 
        
+	 * 
        
+	 * 
        
+	 * 
        identifier=id
        
+	 * 
        Select the element with the specified @id attribute. If no match is
+	 * found, select the first element whose @name attribute is id.
+	 * (This is normally the default; see below.)
        
+	 * 
        id=id
        
+	 * 
        Select the element with the specified @id attribute.
        
+	 * 
+	 * 
        name=name
        
+	 * 
        Select the first element with the specified @name attribute.
        
+	 * 
          
+	 * 
        • username
          • 
+	 * 
        • name=username
          • 
+	 * 
        
+	 * 
        
+	 * 
        The name may optionally be followed by one or more element-filters, separated from the name by whitespace.  If the filterType is not specified, value is assumed.
        
+	 * 
+	 * 
          
+	 * 
        • name=flavour value=chocolate
          • 
+	 * 
        
+	 * 
        
+	 * 
        dom=javascriptExpression
        
+	 * 
+	 * 
        
+	 * 
+	 * 
        Find an element using JavaScript traversal of the HTML Document Object
+	 * Model. DOM locators must begin with "document.".
+	 * 
          
+	 * 
        • dom=document.forms['myForm'].myDropdown
          • 
+	 * 
        • dom=document.images[56]
          • 
+	 * 
        
+	 * 
        
+	 * 
+	 * 
+	 * 
+	 * 
        xpath=xpathExpression
        
+	 * 
        Locate an element using an XPath expression.
+	 * 
          
+	 * 
        • xpath=//img[@alt='The image alt text']
          • 
+	 * 
        • xpath=//table[@id='table1']//tr[4]/td[2]
          • 
+	 * 
+	 * 
        
+	 * 
        
+	 * 
        link=textPattern
        
+	 * 
        Select the link (anchor) element which contains text matching the
+	 * specified pattern.
+	 * 
          
+	 * 
        • link=The link text
          • 
+	 * 
        
+	 * 
+	 * 
        
+	 * 
        
+	 * 
        
+	 * 
        
+	 * Without an explicit locator prefix, Selenium uses the following default
+	 * strategies:
+	 * 
        
+	 * 
+	 * 
          
+	 * 
        • dom, for locators starting with "document."
          • 
+	 * 
        • xpath, for locators starting with "//"
          • 
+	 * 
        • identifier, otherwise
          • 
+	 * 
        
+	 *
+	 * 
        Element Filters
        
+	 * 
        
+	 * 
        Element filters can be used with a locator to refine a list of candidate elements.  They are currently used only in the 'name' element-locator.
        
+	 * 
        Filters look much like locators, ie.
        
+	 * 
        
+	 * filterType=argument
        
+	 * 
+	 * 
        Supported element-filters are:
        
+	 * 
        value=valuePattern
        
+	 * 
        
+	 * Matches elements based on their values.  This is particularly useful for refining a list of similarly-named toggle-buttons.
        
+	 * 
        index=index
        
+	 * 
        
+	 * Selects a single element based on its position in the list (offset from zero).
        
+	 * 
        
+	 *
+	 * 
        String-match Patterns
        
+	 * 
+	 * 
        
+	 * Various Pattern syntaxes are available for matching string values:
+	 * 
        
+	 * 
        
+	 * 
        
+	 * 
        glob:pattern
        
+	 * 
        Match a string against a "glob" (aka "wildmat") pattern. "Glob" is a
+	 * kind of limited regular-expression syntax typically used in command-line
+	 * shells. In a glob pattern, "*" represents any sequence of characters, and "?"
+	 * represents any single character. Glob patterns match against the entire
+	 * string.
        
+	 * 
        regexp:regexp
        
+	 * 
        Match a string using a regular-expression. The full power of JavaScript
+	 * regular-expressions is available.
        
+	 * 
        exact:string
        
+	 * 
+	 * 
        Match a string exactly, verbatim, without any of that fancy wildcard
+	 * stuff.
        
+	 * 
        
+	 * 
        
+	 * 
        
+	 * If no pattern prefix is specified, Selenium assumes that it's a "glob"
+	 * pattern.
+	 * 
        
+	 */
+    this.browserbot = browserbot;
+    this.optionLocatorFactory = new OptionLocatorFactory();
+    this.page = function() {
+        return browserbot.getCurrentPage();
+    };
+}
+
+Selenium.createForFrame = function(frame) {
+    return new Selenium(BrowserBot.createForFrame(frame));
+};
+
+Selenium.prototype.reset = function() {
+	/**
+   * Clear out all stored variables and select the null (starting) window
+   */
+    storedVars = new Object();
+    this.browserbot.selectWindow("null");
+};
+
+Selenium.prototype.doClick = function(locator) {
+	/**
+   * Clicks on a link, button, checkbox or radio button. If the click action
+   * causes a new page to load (like a link usually does), call
+   * waitForPageToLoad.
+   * 
+   * @param locator an element locator
+   * 
+   */
+    var element = this.page().findElement(locator);
+    this.page().clickElement(element);
+};
+
+Selenium.prototype.doFireEvent = function(locator, eventName) {
+	/**
+   * Explicitly simulate an event, to trigger the corresponding "onevent"
+   * handler.
+   *
+   * @param locator an element locator
+   * @param eventName the event name, e.g. "focus" or "blur"
+   */
+    var element = this.page().findElement(locator);
+    triggerEvent(element, eventName, false);
+};
+
+Selenium.prototype.doKeyPress = function(locator, keycode) {
+	/**
+   * Simulates a user pressing and releasing a key.
+   * 
+   * @param locator an element locator
+   * @param keycode the numeric keycode of the key to be pressed, normally the
+   *            ASCII value of that key.
+   */
+    var element = this.page().findElement(locator);
+    triggerKeyEvent(element, 'keypress', keycode, true);
+};
+
+Selenium.prototype.doKeyDown = function(locator, keycode) {
+	/**
+   * Simulates a user pressing a key (without releasing it yet).
+   * 
+   * @param locator an element locator
+   * @param keycode the numeric keycode of the key to be pressed, normally the
+   *            ASCII value of that key.
+   */
+    var element = this.page().findElement(locator);
+    triggerKeyEvent(element, 'keydown', keycode, true);
+};
+
+Selenium.prototype.doKeyUp = function(locator, keycode) {
+	/**
+   * Simulates a user releasing a key.
+   * 
+   * @param locator an element locator
+   * @param keycode the numeric keycode of the key to be released, normally the
+   *            ASCII value of that key.
+   */
+    var element = this.page().findElement(locator);
+    triggerKeyEvent(element, 'keyup', keycode, true);
+};
+
+Selenium.prototype.doMouseOver = function(locator) {
+	/**
+   * Simulates a user hovering a mouse over the specified element.
+   * 
+   * @param locator an element locator
+   */
+    var element = this.page().findElement(locator);
+    triggerMouseEvent(element, 'mouseover', true);
+};
+
+Selenium.prototype.doMouseDown = function(locator) {
+	/**
+   * Simulates a user pressing the mouse button (without releasing it yet) on
+   * the specified element.
+   * 
+   * @param locator an element locator
+   */
+    var element = this.page().findElement(locator);
+    triggerMouseEvent(element, 'mousedown', true);
+};
+
+Selenium.prototype.doType = function(locator, value) {
+	/**
+   * Sets the value of an input field, as though you typed it in.
+   * 
+   * 
        Can also be used to set the value of combo boxes, check boxes, etc. In these cases,
+   * value should be the value of the option selected, not the visible text.
        
+   * 
+   * @param locator an element locator
+   * @param value the value to type
+   */
+		// TODO fail if it can't be typed into.
+    var element = this.page().findElement(locator);
+    this.page().replaceText(element, value);
+};
+
+Selenium.prototype.findToggleButton = function(locator) {
+    var element = this.page().findElement(locator);
+    if (element.checked == null) {
+        Assert.fail("Element " + locator + " is not a toggle-button.");
+    }
+    return element;
+}
+
+Selenium.prototype.doCheck = function(locator) {
+	/**
+   * Check a toggle-button (checkbox/radio)
+   * 
+   * @param locator an element locator
+   */
+    this.findToggleButton(locator).checked = true;
+};
+
+Selenium.prototype.doUncheck = function(locator) {
+	/**
+   * Uncheck a toggle-button (checkbox/radio)
+   * 
+   * @param locator an element locator
+   */
+    this.findToggleButton(locator).checked = false;
+};
+
+Selenium.prototype.doSelect = function(selectLocator, optionLocator) {
+	/**
+   * Select an option from a drop-down using an option locator.
+   * 
+   * 
        
+   * Option locators provide different ways of specifying options of an HTML
+   * Select element (e.g. for selecting a specific option, or for asserting
+   * that the selected option satisfies a specification). There are several
+   * forms of Select Option Locator.
+   * 
        
+   * 
        
+   * 
        label=labelPattern
        
+   * 
        matches options based on their labels, i.e. the visible text. (This
+   * is the default.)
+   * 
          
+   * 
        • label=regexp:^[Oo]ther
          • 
+   * 
        
+   * 
        
+   * 
        value=valuePattern
        
+   * 
        matches options based on their values.
+   * 
          
+   * 
        • value=other
          • 
+   * 
        
+   * 
+   * 
+   * 
        
+   * 
        id=id
        
+   * 
+   * 
        matches options based on their ids.
+   * 
          
+   * 
        • id=option1
          • 
+   * 
        
+   * 
        
+   * 
        index=index
        
+   * 
        matches an option based on its index (offset from zero).
+   * 
          
+   * 
+   * 
        • index=2
          • 
+   * 
        
+   * 
        
+   * 
        
+   * 
        
+   * If no option locator prefix is provided, the default behaviour is to match on label.
+   * 
        
+   * 
+   * 
+   * @param selectLocator an element locator identifying a drop-down menu
+   * @param optionLocator an option locator (a label by default)
+   */
+    var element = this.page().findElement(selectLocator);
+    if (!("options" in element)) {
+        throw new SeleniumError("Specified element is not a Select (has no options)");
+    }
+    var locator = this.optionLocatorFactory.fromLocatorString(optionLocator);
+    var option = locator.findOption(element);
+    this.page().selectOption(element, option);
+};
+
+Selenium.prototype.doAddSelection = function(locator, optionLocator) {
+    /**
+   * Add a selection to the set of selected options in a multi-select element using an option locator.
+   *
+   * @see #doSelect for details of option locators
+   *
+   * @param locator an element locator identifying a multi-select box
+   * @param optionLocator an option locator (a label by default)
+   */
+    var element = this.page().findElement(locator);
+    if (!("options" in element)) {
+        throw new SeleniumError("Specified element is not a Select (has no options)");
+    }
+    var locator = this.optionLocatorFactory.fromLocatorString(optionLocator);
+    var option = locator.findOption(element);
+    this.page().addSelection(element, option);
+};
+
+Selenium.prototype.doRemoveSelection = function(locator, optionLocator) {
+    /**
+   * Remove a selection from the set of selected options in a multi-select element using an option locator.
+   *
+   * @see #doSelect for details of option locators
+   *
+   * @param locator an element locator identifying a multi-select box
+   * @param optionLocator an option locator (a label by default)
+   */
+
+    var element = this.page().findElement(locator);
+    if (!("options" in element)) {
+        throw new SeleniumError("Specified element is not a Select (has no options)");
+    }
+    var locator = this.optionLocatorFactory.fromLocatorString(optionLocator);
+    var option = locator.findOption(element);
+    this.page().removeSelection(element, option);
+};
+
+Selenium.prototype.doSubmit = function(formLocator) {
+	/**
+   * Submit the specified form. This is particularly useful for forms without
+   * submit buttons, e.g. single-input "Search" forms.
+   * 
+   * @param formLocator an element locator for the form you want to submit
+   */
+    var form = this.page().findElement(formLocator);
+    var actuallySubmit = true;
+    if (form.onsubmit) {
+    	// apply this to the correct window so alerts are properly handled, even in IE HTA mode
+    	actuallySubmit = form.onsubmit.apply(this.browserbot.getContentWindow());
+    }
+    if (actuallySubmit) {
+        form.submit();
+    }
+    
+};
+
+Selenium.prototype.doOpen = function(url) {
+	/**
+   * Opens an URL in the test frame. This accepts both relative and absolute
+   * URLs.
+   * 
+   * The "open" command waits for the page to load before proceeding,
+   * ie. the "AndWait" suffix is implicit.
+   *
+   * Note: The URL must be on the same domain as the runner HTML
+   * due to security restrictions in the browser (Same Origin Policy). If you
+   * need to open an URL on another domain, use the Selenium Server to start a
+   * new browser session on that domain.
+   * 
+   * @param url the URL to open; may be relative or absolute
+   */
+    this.browserbot.openLocation(url);
+    return SELENIUM_PROCESS_WAIT;
+};
+
+Selenium.prototype.doSelectWindow = function(windowID) {
+	/**
+   * Selects a popup window; once a popup window has been selected, all
+   * commands go to that window. To select the main window again, use "null"
+   * as the target.
+   * 
+   * @param windowID the JavaScript window ID of the window to select
+   */
+    this.browserbot.selectWindow(windowID);
+};
+
+Selenium.prototype.doWaitForPopUp = function(windowID, timeout) {
+	/**
+	* Waits for a popup window to appear and load up.
+	*
+	* @param windowID the JavaScript window ID of the window that will appear
+	* @param timeout a timeout in milliseconds, after which the action will return with an error
+	*/
+	if (isNaN(timeout)) {
+    	throw new SeleniumError("Timeout is not a number: " + timeout);
+    }
+    
+    testLoop.waitForCondition = function () {
+        var targetWindow = selenium.browserbot.getTargetWindow(windowID);
+        if (!targetWindow) return false;
+        if (!targetWindow.location) return false;
+        if ("about:blank" == targetWindow.location) return false;
+        if (!targetWindow.document) return false;
+        if (!targetWindow.document.readyState) return true;
+        if ('complete' != targetWindow.document.readyState) return false;
+        return true;
+    };
+    
+    testLoop.waitForConditionStart = new Date().getTime();
+    testLoop.waitForConditionTimeout = timeout;
+	
+}
+
+Selenium.prototype.doWaitForPopUp.dontCheckAlertsAndConfirms = true;
+
+Selenium.prototype.doChooseCancelOnNextConfirmation = function() {
+	/**
+   * By default, Selenium's overridden window.confirm() function will
+   * return true, as if the user had manually clicked OK.  After running
+   * this command, the next call to confirm() will return false, as if
+   * the user had clicked Cancel.
+   * 
+   */
+    this.browserbot.cancelNextConfirmation();
+};
+
+
+Selenium.prototype.doAnswerOnNextPrompt = function(answer) {
+	/**
+   * Instructs Selenium to return the specified answer string in response to
+   * the next JavaScript prompt [window.prompt()].
+   * 
+   * 
+   * @param answer the answer to give in response to the prompt pop-up
+   */
+    this.browserbot.setNextPromptResult(answer);
+};
+
+Selenium.prototype.doGoBack = function() {
+    /**
+     * Simulates the user clicking the "back" button on their browser.
+     * 
+     */
+    this.page().goBack();
+};
+
+Selenium.prototype.doRefresh = function() {
+    /**
+     * Simulates the user clicking the "Refresh" button on their browser.
+     * 
+     */
+    this.page().refresh();
+};
+
+Selenium.prototype.doClose = function() {
+	/**
+   * Simulates the user clicking the "close" button in the titlebar of a popup
+   * window or tab.
+   */
+    this.page().close();
+};
+
+Selenium.prototype.isAlertPresent = function() {
+   /**
+   * Has an alert occurred?
+   * 
+   * 
        
+   * This function never throws an exception
+   * 
        
+   * @return boolean true if there is an alert
+   */
+    return this.browserbot.hasAlerts();
+};
+Selenium.prototype.isPromptPresent = function() {
+   /**
+   * Has a prompt occurred?
+   * 
+   * 
        
+   * This function never throws an exception
+   * 
        
+   * @return boolean true if there is a pending prompt
+   */
+    return this.browserbot.hasPrompts();
+};
+Selenium.prototype.isConfirmationPresent = function() {
+   /**
+   * Has confirm() been called?
+   * 
+   * 
        
+   * This function never throws an exception
+   * 
        
+   * @return boolean true if there is a pending confirmation
+   */
+    return this.browserbot.hasConfirmations();
+};
+Selenium.prototype.getAlert = function() {
+	/**
+   * Retrieves the message of a JavaScript alert generated during the previous action, or fail if there were no alerts.
+   * 
+   * 
        Getting an alert has the same effect as manually clicking OK. If an
+   * alert is generated but you do not get/verify it, the next Selenium action
+   * will fail.
        
+   * 
+   * 
        NOTE: under Selenium, JavaScript alerts will NOT pop up a visible alert
+   * dialog.
        
+   * 
+   * 
        NOTE: Selenium does NOT support JavaScript alerts that are generated in a
+   * page's onload() event handler. In this case a visible dialog WILL be
+   * generated and Selenium will hang until someone manually clicks OK.
        
+   * @return string The message of the most recent JavaScript alert
+   */
+    if (!this.browserbot.hasAlerts()) {
+        Assert.fail("There were no alerts");
+    }
+    return this.browserbot.getNextAlert();
+};
+Selenium.prototype.getAlert.dontCheckAlertsAndConfirms = true;
+
+Selenium.prototype.getConfirmation = function() {
+	/**
+   * Retrieves the message of a JavaScript confirmation dialog generated during
+   * the previous action.
+   * 
+   * 
        
+   * By default, the confirm function will return true, having the same effect
+   * as manually clicking OK. This can be changed by prior execution of the
+   * chooseCancelOnNextConfirmation command. If an confirmation is generated
+   * but you do not get/verify it, the next Selenium action will fail.
+   * 
        
+   * 
+   * 
        
+   * NOTE: under Selenium, JavaScript confirmations will NOT pop up a visible
+   * dialog.
+   * 
        
+   * 
+   * 
        
+   * NOTE: Selenium does NOT support JavaScript confirmations that are
+   * generated in a page's onload() event handler. In this case a visible
+   * dialog WILL be generated and Selenium will hang until you manually click
+   * OK.
+   * 
        
+   * 
+   * @return string the message of the most recent JavaScript confirmation dialog
+   */
+    if (!this.browserbot.hasConfirmations()) {
+        Assert.fail("There were no confirmations");
+    }
+    return this.browserbot.getNextConfirmation();
+};
+Selenium.prototype.getConfirmation.dontCheckAlertsAndConfirms = true;
+ 
+Selenium.prototype.getPrompt = function() {
+	/**
+   * Retrieves the message of a JavaScript question prompt dialog generated during
+   * the previous action.
+   * 
+   * 
        Successful handling of the prompt requires prior execution of the
+   * answerOnNextPrompt command. If a prompt is generated but you
+   * do not get/verify it, the next Selenium action will fail.
        
+   * 
+   * 
        NOTE: under Selenium, JavaScript prompts will NOT pop up a visible
+   * dialog.
        
+   * 
+   * 
        NOTE: Selenium does NOT support JavaScript prompts that are generated in a
+   * page's onload() event handler. In this case a visible dialog WILL be
+   * generated and Selenium will hang until someone manually clicks OK.
        
+   * @return string the message of the most recent JavaScript question prompt
+   */
+    if (! this.browserbot.hasPrompts()) {
+        Assert.fail("There were no prompts");
+    }
+    return this.browserbot.getNextPrompt();
+};
+
+Selenium.prototype.getLocation = function() {
+	/** Gets the absolute URL of the current page.
+   * 
+   * @return string the absolute URL of the current page
+   */
+    return this.page().location;
+};
+
+Selenium.prototype.getTitle = function() {
+	/** Gets the title of the current page.
+   * 
+   * @return string the title of the current page
+   */
+    return this.page().title();
+};
+
+
+Selenium.prototype.getBodyText = function() {
+	/**
+	 * Gets the entire text of the page.
+	 * @return string the entire text of the page
+	 */
+    return this.page().bodyText();
+};
+
+
+Selenium.prototype.getValue = function(locator) {
+  /**
+   * Gets the (whitespace-trimmed) value of an input field (or anything else with a value parameter).
+   * For checkbox/radio elements, the value will be "on" or "off" depending on
+   * whether the element is checked or not.
+   * 
+   * @param locator an element locator
+   * @return string the element value, or "on/off" for checkbox/radio elements
+   */
+    var element = this.page().findElement(locator)
+    return getInputValue(element).trim();
+}
+
+Selenium.prototype.getText = function(locator) {
+	/**
+   * Gets the text of an element. This works for any element that contains
+   * text. This command uses either the textContent (Mozilla-like browsers) or
+   * the innerText (IE-like browsers) of the element, which is the rendered
+   * text shown to the user.
+   * 
+   * @param locator an element locator
+   * @return string the text of the element
+   */
+    var element = this.page().findElement(locator);
+    return getText(element).trim();
+};
+
+Selenium.prototype.getEval = function(script) {
+	/** Gets the result of evaluating the specified JavaScript snippet.  The snippet may 
+   * have multiple lines, but only the result of the last line will be returned.
+   * 
+   * 
        Note that, by default, the snippet will run in the context of the "selenium"
+   * object itself, so this will refer to the Selenium object, and window will
+   * refer to the top-level runner test window, not the window of your application.
        
+   *
+   * 
        If you need a reference to the window of your application, you can refer
+   * to this.browserbot.getCurrentWindow() and if you need to use
+   * a locator to refer to a single element in your application page, you can
+   * use this.page().findElement("foo") where "foo" is your locator.
        
+   * 
+   * @param script the JavaScript snippet to run
+   * @return string the results of evaluating the snippet
+   */
+    try {
+    	var result = eval(script);
+    	// Selenium RC doesn't allow returning null
+    	if (null == result) return "null";
+    	return result;
+    } catch (e) {
+    	throw new SeleniumError("Threw an exception: " + e.message);
+    }
+};
+
+Selenium.prototype.isChecked = function(locator) {
+	/**
+   * Gets whether a toggle-button (checkbox/radio) is checked.  Fails if the specified element doesn't exist or isn't a toggle-button.
+   * @param locator an element locator pointing to a checkbox or radio button
+   * @return string either "true" or "false" depending on whether the checkbox is checked
+   */
+    var element = this.page().findElement(locator);
+    if (element.checked == null) {
+        throw new SeleniumError("Element " + locator + " is not a toggle-button.");
+    }
+    return element.checked;
+};
+
+Selenium.prototype.getTable = function(tableCellAddress) {
+	/**
+   * Gets the text from a cell of a table. The cellAddress syntax
+   * tableLocator.row.column, where row and column start at 0.
+   * 
+   * @param tableCellAddress a cell address, e.g. "foo.1.4"
+   * @return string the text from the specified cell
+   */
+    // This regular expression matches "tableName.row.column"
+    // For example, "mytable.3.4"
+    pattern = /(.*)\.(\d+)\.(\d+)/;
+
+    if(!pattern.test(tableCellAddress)) {
+        throw new SeleniumError("Invalid target format. Correct format is tableName.rowNum.columnNum");
+    }
+
+    pieces = tableCellAddress.match(pattern);
+
+    tableName = pieces[1];
+    row = pieces[2];
+    col = pieces[3];
+
+    var table = this.page().findElement(tableName);
+    if (row > table.rows.length) {
+        Assert.fail("Cannot access row " + row + " - table has " + table.rows.length + " rows");
+    }
+    else if (col > table.rows[row].cells.length) {
+        Assert.fail("Cannot access column " + col + " - table row has " + table.rows[row].cells.length + " columns");
+    }
+    else {
+        actualContent = getText(table.rows[row].cells[col]);
+        return actualContent.trim();
+    }
+	return null;
+};
+
+Selenium.prototype.assertSelected = function(selectLocator, optionLocator) {
+	/**
+   * Verifies that the selected option of a drop-down satisfies the optionSpecifier.
+   * 
+   * 
        See the select command for more information about option locators.
        
+   * 
+   * @param selectLocator an element locator identifying a drop-down menu
+   * @param optionLocator an option locator, typically just an option label (e.g. "John Smith")
+   */
+    var element = this.page().findElement(selectLocator);
+    var locator = this.optionLocatorFactory.fromLocatorString(optionLocator);
+    if (element.selectedIndex == -1)
+    {
+        Assert.fail("No option selected");
+    }
+    locator.assertSelected(element);
+};
+
+Selenium.prototype.getSelectedLabels = function(selectLocator) {
+    /** Gets all option labels (visible text) for selected options in the specified select or multi-select element.
+   *
+   * @param selectLocator an element locator identifying a drop-down menu
+   * @return string[] an array of all selected option labels in the specified select drop-down
+   */
+    return this.findSelectedOptionProperties(selectLocator, "text").join(",");
+}
+
+Selenium.prototype.getSelectedLabel = function(selectLocator) {
+    /** Gets option label (visible text) for selected option in the specified select element.
+   *
+   * @param selectLocator an element locator identifying a drop-down menu
+   * @return string the selected option label in the specified select drop-down
+   */
+    return this.findSelectedOptionProperty(selectLocator, "text");
+}
+
+Selenium.prototype.getSelectedValues = function(selectLocator) {
+    /** Gets all option values (value attributes) for selected options in the specified select or multi-select element.
+   *
+   * @param selectLocator an element locator identifying a drop-down menu
+   * @return string[] an array of all selected option values in the specified select drop-down
+   */
+    return this.findSelectedOptionProperties(selectLocator, "value").join(",");
+}
+
+Selenium.prototype.getSelectedValue = function(selectLocator) {
+    /** Gets option value (value attribute) for selected option in the specified select element.
+   *
+   * @param selectLocator an element locator identifying a drop-down menu
+   * @return string the selected option value in the specified select drop-down
+   */
+    return this.findSelectedOptionProperty(selectLocator, "value");
+}
+
+Selenium.prototype.getSelectedIndexes = function(selectLocator) {
+    /** Gets all option indexes (option number, starting at 0) for selected options in the specified select or multi-select element.
+   *
+   * @param selectLocator an element locator identifying a drop-down menu
+   * @return string[] an array of all selected option indexes in the specified select drop-down
+   */
+    return this.findSelectedOptionProperties(selectLocator, "index").join(",");
+}
+
+Selenium.prototype.getSelectedIndex = function(selectLocator) {
+    /** Gets option index (option number, starting at 0) for selected option in the specified select element.
+   *
+   * @param selectLocator an element locator identifying a drop-down menu
+   * @return string the selected option index in the specified select drop-down
+   */
+    return this.findSelectedOptionProperty(selectLocator, "index");
+}
+
+Selenium.prototype.getSelectedIds = function(selectLocator) {
+    /** Gets all option element IDs for selected options in the specified select or multi-select element.
+   *
+   * @param selectLocator an element locator identifying a drop-down menu
+   * @return string[] an array of all selected option IDs in the specified select drop-down
+   */
+    return this.findSelectedOptionProperties(selectLocator, "id").join(",");
+}
+
+Selenium.prototype.getSelectedId = function(selectLocator) {
+    /** Gets option element ID for selected option in the specified select element.
+   *
+   * @param selectLocator an element locator identifying a drop-down menu
+   * @return string the selected option ID in the specified select drop-down
+   */
+    return this.findSelectedOptionProperty(selectLocator, "id");
+}
+
+Selenium.prototype.isSomethingSelected = function(selectLocator) {
+    /** Determines whether some option in a drop-down menu is selected.
+   *
+   * @param selectLocator an element locator identifying a drop-down menu
+   * @return boolean true if some option has been selected, false otherwise
+   */
+    var element = this.page().findElement(selectLocator);
+    if (!("options" in element)) {
+        throw new SeleniumError("Specified element is not a Select (has no options)");
+    }
+    
+    var selectedOptions = [];
+    
+    for (var i = 0; i < element.options.length; i++) {
+        if (element.options[i].selected)
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+Selenium.prototype.findSelectedOptionProperties = function(locator, property) {
+   var element = this.page().findElement(locator);
+   if (!("options" in element)) {
+        throw new SeleniumError("Specified element is not a Select (has no options)");
+    }
+
+	var selectedOptions = [];
+
+    for (var i = 0; i < element.options.length; i++) {
+        if (element.options[i].selected)
+        {
+            var propVal = element.options[i][property];
+            if (propVal.replace) {
+                propVal.replace(/,/g, "\\,");
+            }
+            selectedOptions.push(propVal);
+        }
+    }
+    if (selectedOptions.length == 0) Assert.fail("No option selected");
+    return selectedOptions;
+}
+
+Selenium.prototype.findSelectedOptionProperty = function(locator, property) {
+    var selectedOptions = this.findSelectedOptionProperties(locator, property);
+    if (selectedOptions.length > 1) {
+        Assert.fail("More than one selected option!");
+    }
+    return selectedOptions[0];
+}
+
+Selenium.prototype.getSelectOptions = function(selectLocator) {
+	/** Gets all option labels in the specified select drop-down.
+   * 
+   * @param selectLocator an element locator identifying a drop-down menu
+   * @return string[] an array of all option labels in the specified select drop-down
+   */
+    var element = this.page().findElement(selectLocator);
+
+    var selectOptions = [];
+
+    for (var i = 0; i < element.options.length; i++) {
+    	var option = element.options[i].text.replace(/,/g, "\\,");
+        selectOptions.push(option);
+    }
+    
+    return selectOptions.join(",");
+};
+
+
+Selenium.prototype.getAttribute = function(attributeLocator) {
+	/**
+   * Gets the value of an element attribute.
+   * @param attributeLocator an element locator followed by an @ sign and then the name of the attribute, e.g. "foo@bar"
+   * @return string the value of the specified attribute
+   */
+   var result = this.page().findAttribute(attributeLocator);
+   if (result == null) {
+   		throw new SeleniumError("Could not find element attribute: " + attributeLocator);
+	}
+    return result;
+};
+
+Selenium.prototype.isTextPresent = function(pattern) {
+	/**
+   * Verifies that the specified text pattern appears somewhere on the rendered page shown to the user.
+   * @param pattern a pattern to match with the text of the page
+   * @return boolean true if the pattern matches the text, false otherwise
+   */
+    var allText = this.page().bodyText();
+
+    if(allText == "") {
+        Assert.fail("Page text not found");
+    } else {
+    	var patternMatcher = new PatternMatcher(pattern);
+        if (patternMatcher.strategy == PatternMatcher.strategies.glob) {
+    		patternMatcher.matcher = new PatternMatcher.strategies.globContains(pattern);
+    	}
+    	return patternMatcher.matches(allText);
+    }
+};
+
+Selenium.prototype.isElementPresent = function(locator) {
+	/**
+   * Verifies that the specified element is somewhere on the page.
+   * @param locator an element locator
+   * @return boolean true if the element is present, false otherwise
+   */
+    try {
+        this.page().findElement(locator);
+    } catch (e) {
+        return false;
+    }
+    return true;
+};
+
+Selenium.prototype.isVisible = function(locator) {
+	/**
+   * Determines if the specified element is visible. An
+   * element can be rendered invisible by setting the CSS "visibility"
+   * property to "hidden", or the "display" property to "none", either for the
+   * element itself or one if its ancestors.  This method will fail if
+   * the element is not present.
+   * 
+   * @param locator an element locator
+   * @return boolean true if the specified element is visible, false otherwise
+   */
+    var element;
+    element = this.page().findElement(locator); 
+
+	if(/Konqueror|Safari|KHTML/.test(navigator.userAgent))
+		var visibility = element.style["visibility"];
+	else
+    	var visibility = this.findEffectiveStyleProperty(element, "visibility");
+
+   	var _isDisplayed = this._isDisplayed(element);
+    return (visibility != "hidden" && _isDisplayed);
+};
+
+Selenium.prototype.findEffectiveStyleProperty = function(element, property) {
+    var effectiveStyle = this.findEffectiveStyle(element);
+    var propertyValue = effectiveStyle[property];
+    if (propertyValue == 'inherit' && element.parentNode.style) {
+        return this.findEffectiveStyleProperty(element.parentNode, property);
+    }
+    return propertyValue;
+};
+
+Selenium.prototype._isDisplayed = function(element) {
+    if(/Konqueror|Safari|KHTML/.test(navigator.userAgent))
+		var display = element.style["display"];
+	else
+		var display = this.findEffectiveStyleProperty(element, "display");
+    if (display == "none") return false;
+    if (element.parentNode.style) {
+        return this._isDisplayed(element.parentNode);
+    }
+    return true;
+};
+
+Selenium.prototype.findEffectiveStyle = function(element) {
+    if (element.style == undefined) {
+        return undefined; // not a styled element
+    }
+    var window = this.browserbot.getContentWindow();
+    if (window.getComputedStyle) { 
+        // DOM-Level-2-CSS
+        return window.getComputedStyle(element, null);
+    }
+    if (element.currentStyle) {
+        // non-standard IE alternative
+        return element.currentStyle;
+        // TODO: this won't really work in a general sense, as
+        //   currentStyle is not identical to getComputedStyle()
+        //   ... but it's good enough for "visibility"
+    }
+    throw new SeleniumError("cannot determine effective stylesheet in this browser");
+};
+
+Selenium.prototype.isEditable = function(locator) {
+	/**
+   * Determines whether the specified input element is editable, ie hasn't been disabled.
+   * This method will fail if the specified element isn't an input element.
+   * 
+   * @param locator an element locator
+   * @return boolean true if the input element is editable, false otherwise
+   */
+    var element = this.page().findElement(locator);
+    if (element.value == undefined) {
+        Assert.fail("Element " + locator + " is not an input.");
+    }
+    return !element.disabled;
+};
+
+Selenium.prototype.getAllButtons = function() {
+	/** Returns the IDs of all buttons on the page.
+   * 
+   * 
        If a given button has no ID, it will appear as "" in this array.
        
+   * 
+   * @return string[] the IDs of all buttons on the page
+   */
+   return this.page().getAllButtons();
+};
+
+Selenium.prototype.getAllLinks = function() {
+	/** Returns the IDs of all links on the page.
+   * 
+   * 
        If a given link has no ID, it will appear as "" in this array.
        
+   * 
+   * @return string[] the IDs of all links on the page
+   */
+   return this.page().getAllLinks();
+};
+
+Selenium.prototype.getAllFields = function() {
+	/** Returns the IDs of all input fields on the page.
+   * 
+   * 
        If a given field has no ID, it will appear as "" in this array.
        
+   * 
+   * @return string[] the IDs of all field on the page
+   */
+   return this.page().getAllFields();
+};
+
+Selenium.prototype.getHtmlSource = function() {
+	/** Returns the entire HTML source between the opening and
+   * closing "html" tags.
+   *
+   * @return string the entire HTML source
+   */
+	return this.page().currentDocument.getElementsByTagName("html")[0].innerHTML;
+};
+
+Selenium.prototype.doSetCursorPosition = function(locator, position) {
+	/**
+   * Moves the text cursor to the specified position in the given input element or textarea.
+   * This method will fail if the specified element isn't an input element or textarea.
+   * 
+   * @param locator an element locator pointing to an input element or textarea
+   * @param position the numerical position of the cursor in the field; position should be 0 to move the position to the beginning of the field.  You can also set the cursor to -1 to move it to the end of the field.
+   */
+   var element = this.page().findElement(locator);
+    if (element.value == undefined) {
+        Assert.fail("Element " + locator + " is not an input.");
+    }
+    if (position == -1) {
+    	position = element.value.length;
+    }
+    
+   if( element.setSelectionRange && !browserVersion.isOpera) {
+   	element.focus();
+     element.setSelectionRange(/*start*/position,/*end*/position);
+   } 
+   else if( element.createTextRange ) {
+   		triggerEvent(element, 'focus', false);
+      var range = element.createTextRange();
+      range.collapse(true);
+      range.moveEnd('character',position);
+      range.moveStart('character',position);
+      range.select();
+   }
+}
+
+Selenium.prototype.getCursorPosition = function(locator) {
+	/**
+   * Retrieves the text cursor position in the given input element or textarea; beware, this may not work perfectly on all browsers.
+   * 
+   * 
        Specifically, if the cursor/selection has been cleared by JavaScript, this command will tend to
+   * return the position of the last location of the cursor, even though the cursor is now gone from the page.  This is filed as SEL-243.
        
+   * This method will fail if the specified element isn't an input element or textarea, or there is no cursor in the element.
+   * 
+   * @param locator an element locator pointing to an input element or textarea
+   * @return number the numerical position of the cursor in the field
+   */
+   var element = this.page().findElement(locator);
+   var doc = this.page().currentDocument;
+   var win = this.browserbot.getCurrentWindow();
+	if( doc.selection && !browserVersion.isOpera){
+		
+		var selectRange = doc.selection.createRange().duplicate();
+		var elementRange = element.createTextRange();
+		selectRange.move("character",0);
+		elementRange.move("character",0);
+		var inRange1 = selectRange.inRange(elementRange);
+		var inRange2 = elementRange.inRange(selectRange);
+		try {
+			elementRange.setEndPoint("EndToEnd", selectRange);
+		} catch (e) {
+			Assert.fail("There is no cursor on this page!");
+		}
+		var answer = String(elementRange.text).replace(/\r/g,"").length;
+		return answer;
+	} else {
+		if (typeof(element.selectionStart) != undefined) {
+			if (win.getSelection && typeof(win.getSelection().rangeCount) != undefined && win.getSelection().rangeCount == 0) {
+				Assert.fail("There is no cursor on this page!");
+			}
+			return element.selectionStart;
+		} 
+	}
+	throw new Error("Couldn't detect cursor position on this browser!");
+}
+   
+
+Selenium.prototype.doSetContext = function(context, logLevelThreshold) {
+	/**
+   * Writes a message to the status bar and adds a note to the browser-side
+   * log.
+   * 
+   * 
        If logLevelThreshold is specified, set the threshold for logging
+   * to that level (debug, info, warn, error).
        
+   * 
+   * 
        (Note that the browser-side logs will not be sent back to the
+   * server, and are invisible to the Client Driver.)
        
+   * 
+   * @param context
+   *            the message to be sent to the browser
+   * @param logLevelThreshold one of "debug", "info", "warn", "error", sets the threshold for browser-side logging
+   */
+    if  (logLevelThreshold==null || logLevelThreshold=="") {
+    	return this.page().setContext(context);
+    }
+    return this.page().setContext(context, logLevelThreshold);
+};
+
+Selenium.prototype.getExpression = function(expression) {
+	/**
+	 * Returns the specified expression.
+	 *
+	 * 
        This is useful because of JavaScript preprocessing.
+	 * It is used to generate commands like assertExpression and storeExpression.
        
+	 * 
+	 * @param expression the value to return
+	 * @return string the value passed in
+	 */
+	return expression;
+}
+
+Selenium.prototype.doWaitForCondition = function(script, timeout) {
+	/**
+   * Runs the specified JavaScript snippet repeatedly until it evaluates to "true".
+   * The snippet may have multiple lines, but only the result of the last line
+   * will be considered.
+   * 
+   * 
        Note that, by default, the snippet will be run in the runner's test window, not in the window
+   * of your application.  To get the window of your application, you can use
+   * the JavaScript snippet selenium.browserbot.getCurrentWindow(), and then
+   * run your JavaScript in there
        
+   * @param script the JavaScript snippet to run
+   * @param timeout a timeout in milliseconds, after which this command will return with an error
+   */
+    if (isNaN(timeout)) {
+    	throw new SeleniumError("Timeout is not a number: " + timeout);
+    }
+    
+    testLoop.waitForCondition = function () {
+        return eval(script);
+    };
+    
+    testLoop.waitForConditionStart = new Date().getTime();
+    testLoop.waitForConditionTimeout = timeout;
+};
+
+Selenium.prototype.doWaitForCondition.dontCheckAlertsAndConfirms = true;
+
+Selenium.prototype.doSetTimeout = function(timeout) {
+	/**
+	 * Specifies the amount of time that Selenium will wait for actions to complete.
+	 *
+	 * 
        Actions that require waiting include "open" and the "waitFor*" actions.
        
+	 * The default timeout is 30 seconds.
+	 * @param timeout a timeout in milliseconds, after which the action will return with an error
+	 */
+	testLoop.waitForConditionTimeout = timeout;
+}
+
+Selenium.prototype.doWaitForPageToLoad = function(timeout) {
+	/**
+   * Waits for a new page to load.
+   * 
+   * 
        You can use this command instead of the "AndWait" suffixes, "clickAndWait", "selectAndWait", "typeAndWait" etc.
+   * (which are only available in the JS API).
        
+   * 
+   * 
        Selenium constantly keeps track of new pages loading, and sets a "newPageLoaded"
+   * flag when it first notices a page load.  Running any other Selenium command after
+   * turns the flag to false.  Hence, if you want to wait for a page to load, you must
+   * wait immediately after a Selenium command that caused a page-load.
        
+   * @param timeout a timeout in milliseconds, after which this command will return with an error
+   */
+    this.doWaitForCondition("selenium.browserbot.isNewPageLoaded()", timeout);
+};
+
+Selenium.prototype.doWaitForPageToLoad.dontCheckAlertsAndConfirms = true;
+
+/**
+ * Evaluate a parameter, performing JavaScript evaluation and variable substitution.
+ * If the string matches the pattern "javascript{ ... }", evaluate the string between the braces.
+ */
+Selenium.prototype.preprocessParameter = function(value) {
+    var match = value.match(/^javascript\{((.|\r?\n)+)\}$/);
+    if (match && match[1]) {
+        return eval(match[1]).toString();
+    }
+    return this.replaceVariables(value);
+};
+
+/*
+ * Search through str and replace all variable references ${varName} with their
+ * value in storedVars.
+ */
+Selenium.prototype.replaceVariables = function(str) {
+    var stringResult = str;
+
+    // Find all of the matching variable references
+    var match = stringResult.match(/\$\{\w+\}/g);
+    if (!match) {
+        return stringResult;
+    }
+
+    // For each match, lookup the variable value, and replace if found
+    for (var i = 0; match && i < match.length; i++) {
+        var variable = match[i]; // The replacement variable, with ${}
+        var name = variable.substring(2, variable.length - 1); // The replacement variable without ${}
+        var replacement = storedVars[name];
+        if (replacement != undefined) {
+            stringResult = stringResult.replace(variable, replacement);
+        }
+    }
+    return stringResult;
+};
+
+
+/**
+ *  Factory for creating "Option Locators".
+ *  An OptionLocator is an object for dealing with Select options (e.g. for
+ *  finding a specified option, or asserting that the selected option of 
+ *  Select element matches some condition.
+ *  The type of locator returned by the factory depends on the locator string:
+ *     label=  (OptionLocatorByLabel)
+ *     value=  (OptionLocatorByValue)
+ *     index=  (OptionLocatorByIndex)
+ *     id=     (OptionLocatorById)
+ *      (default is OptionLocatorByLabel).
+ */
+function OptionLocatorFactory() {
+}
+
+OptionLocatorFactory.prototype.fromLocatorString = function(locatorString) {
+    var locatorType = 'label';
+    var locatorValue = locatorString;
+    // If there is a locator prefix, use the specified strategy
+    var result = locatorString.match(/^([a-zA-Z]+)=(.*)/);
+    if (result) {
+        locatorType = result[1];
+        locatorValue = result[2];
+    }
+    if (this.optionLocators == undefined) {
+        this.registerOptionLocators();
+    }
+    if (this.optionLocators[locatorType]) {
+        return new this.optionLocators[locatorType](locatorValue);
+    }
+    throw new SeleniumError("Unkown option locator type: " + locatorType);
+};
+
+/**
+ * To allow for easy extension, all of the option locators are found by
+ * searching for all methods of OptionLocatorFactory.prototype that start
+ * with "OptionLocatorBy".
+ * TODO: Consider using the term "Option Specifier" instead of "Option Locator".
+ */
+OptionLocatorFactory.prototype.registerOptionLocators = function() {
+    this.optionLocators={};
+    for (var functionName in this) {
+      var result = /OptionLocatorBy([A-Z].+)$/.exec(functionName);
+      if (result != null) {
+          var locatorName = result[1].lcfirst();
+          this.optionLocators[locatorName] = this[functionName];
+      }
+    }
+};
+
+/**
+ *  OptionLocator for options identified by their labels.
+ */
+OptionLocatorFactory.prototype.OptionLocatorByLabel = function(label) {
+    this.label = label;
+    this.labelMatcher = new PatternMatcher(this.label);
+    this.findOption = function(element) {
+        for (var i = 0; i < element.options.length; i++) {
+            if (this.labelMatcher.matches(element.options[i].text)) {
+                return element.options[i];
+            }
+        }
+        throw new SeleniumError("Option with label '" + this.label + "' not found");
+    };
+
+    this.assertSelected = function(element) {
+        var selectedLabel = element.options[element.selectedIndex].text;
+        Assert.matches(this.label, selectedLabel)
+    };
+};
+
+/**
+ *  OptionLocator for options identified by their values.
+ */
+OptionLocatorFactory.prototype.OptionLocatorByValue = function(value) {
+    this.value = value;
+    this.valueMatcher = new PatternMatcher(this.value);
+    this.findOption = function(element) {
+        for (var i = 0; i < element.options.length; i++) {
+            if (this.valueMatcher.matches(element.options[i].value)) {
+                return element.options[i];
+            }
+        }
+        throw new SeleniumError("Option with value '" + this.value + "' not found");
+    };
+
+    this.assertSelected = function(element) {
+        var selectedValue = element.options[element.selectedIndex].value;
+        Assert.matches(this.value, selectedValue)
+    };
+};
+
+/**
+ *  OptionLocator for options identified by their index.
+ */
+OptionLocatorFactory.prototype.OptionLocatorByIndex = function(index) {
+    this.index = Number(index);
+    if (isNaN(this.index) || this.index < 0) {
+        throw new SeleniumError("Illegal Index: " + index);
+    }
+
+    this.findOption = function(element) {
+        if (element.options.length <= this.index) {
+            throw new SeleniumError("Index out of range.  Only " + element.options.length + " options available");
+        }
+        return element.options[this.index];
+    };
+
+    this.assertSelected = function(element) {
+    	Assert.equals(this.index, element.selectedIndex);
+    };
+};
+
+/**
+ *  OptionLocator for options identified by their id.
+ */
+OptionLocatorFactory.prototype.OptionLocatorById = function(id) {
+    this.id = id;
+    this.idMatcher = new PatternMatcher(this.id);
+    this.findOption = function(element) {
+        for (var i = 0; i < element.options.length; i++) {
+            if (this.idMatcher.matches(element.options[i].id)) {
+                return element.options[i];
+            }
+        }
+        throw new SeleniumError("Option with id '" + this.id + "' not found");
+    };
+
+    this.assertSelected = function(element) {
+        var selectedId = element.options[element.selectedIndex].id;
+        Assert.matches(this.id, selectedId)
+    };
+};
+
+
diff --git a/tests/FunctionalTests/selenium/core/scripts/selenium-browserbot.js b/tests/FunctionalTests/selenium/core/scripts/selenium-browserbot.js
new file mode 100755
index 00000000..8df46865
--- /dev/null
+++ b/tests/FunctionalTests/selenium/core/scripts/selenium-browserbot.js
@@ -0,0 +1,1114 @@
+/*
+* Copyright 2004 ThoughtWorks, Inc
+*
+*  Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*
+*/
+
+/*
+* This script provides the Javascript API to drive the test application contained within
+* a Browser Window.
+* TODO:
+*    Add support for more events (keyboard and mouse)
+*    Allow to switch "user-entry" mode from mouse-based to keyboard-based, firing different
+*          events in different modes.
+*/
+
+// The window to which the commands will be sent.  For example, to click on a
+// popup window, first select that window, and then do a normal click command.
+
+var BrowserBot = function(frame) {
+    this.frame = frame;
+    this.currentPage = null;
+    this.currentWindowName = null;
+
+    this.modalDialogTest = null;
+    this.recordedAlerts = new Array();
+    this.recordedConfirmations = new Array();
+    this.recordedPrompts = new Array();
+    this.openedWindows = {};
+    this.nextConfirmResult = true;
+    this.nextPromptResult = '';
+    this.newPageLoaded = false;
+    this.pageLoadError = null;
+
+    var self = this;
+    this.recordPageLoad = function() {
+    	LOG.debug("Page load detected");
+        try {
+        	LOG.debug("Page load location=" + self.getCurrentWindow().location);
+        } catch (e) {
+        	self.pageLoadError = e;
+        	return;
+        }
+        self.currentPage = null;
+        self.newPageLoaded = true;
+    };
+
+    this.isNewPageLoaded = function() {
+    	if (this.pageLoadError) throw this.pageLoadError;
+        return self.newPageLoaded;
+    };
+};
+
+BrowserBot.createForFrame = function(frame) {
+    var browserbot;
+    LOG.debug("browserName: " + browserVersion.name);
+    LOG.debug("userAgent: " + navigator.userAgent);
+    if (browserVersion.isIE) {
+        browserbot = new IEBrowserBot(frame);
+    }
+    else if (browserVersion.isKonqueror) {
+        browserbot = new KonquerorBrowserBot(frame);
+    }
+    else if (browserVersion.isSafari) {
+        browserbot = new SafariBrowserBot(frame);
+    }
+    else {
+        LOG.info("Using MozillaBrowserBot")
+        // Use mozilla by default
+        browserbot = new MozillaBrowserBot(frame);
+    }
+
+    // Modify the test IFrame so that page loads are detected.
+    addLoadListener(browserbot.getFrame(), browserbot.recordPageLoad);
+    return browserbot;
+};
+
+BrowserBot.prototype.doModalDialogTest = function(test) {
+    this.modalDialogTest = test;
+};
+
+BrowserBot.prototype.cancelNextConfirmation = function() {
+    this.nextConfirmResult = false;
+};
+
+BrowserBot.prototype.setNextPromptResult = function(result) {
+    this.nextPromptResult = result;
+};
+
+BrowserBot.prototype.hasAlerts = function() {
+    return (this.recordedAlerts.length > 0) ;
+};
+
+BrowserBot.prototype.getNextAlert = function() {
+    return this.recordedAlerts.shift();
+};
+
+BrowserBot.prototype.hasConfirmations = function() {
+    return (this.recordedConfirmations.length > 0) ;
+};
+
+BrowserBot.prototype.getNextConfirmation = function() {
+    return this.recordedConfirmations.shift();
+};
+
+BrowserBot.prototype.hasPrompts = function() {
+    return (this.recordedPrompts.length > 0) ;
+};
+
+BrowserBot.prototype.getNextPrompt = function() {
+    return this.recordedPrompts.shift();
+};
+
+BrowserBot.prototype.getFrame = function() {
+    return this.frame;
+};
+
+BrowserBot.prototype.selectWindow = function(target) {
+    // we've moved to a new page - clear the current one
+    this.currentPage = null;
+    this.currentWindowName = null;
+    if (target && target != "null") {
+        // If window exists
+        if (this.getTargetWindow(target)) {
+            this.currentWindowName = target;
+        }
+    }
+};
+
+BrowserBot.prototype.openLocation = function(target) {
+    // We're moving to a new page - clear the current one
+    this.currentPage = null;
+    this.newPageLoaded = false;
+
+    this.setOpenLocation(target);
+};
+
+BrowserBot.prototype.setIFrameLocation = function(iframe, location) {
+    iframe.src = location;
+};
+
+BrowserBot.prototype.setOpenLocation = function(location) {
+    this.getCurrentWindow().location.href = location;
+};
+
+BrowserBot.prototype.getCurrentPage = function() {
+    if (this.currentPage == null) {
+        var testWindow = this.getCurrentWindow();
+        this.modifyWindowToRecordPopUpDialogs(testWindow, this);
+        this.modifySeparateTestWindowToDetectPageLoads(testWindow);
+        this.currentPage = PageBot.createForWindow(testWindow);
+        this.newPageLoaded = false;
+    }
+
+    return this.currentPage;
+};
+
+BrowserBot.prototype.modifyWindowToRecordPopUpDialogs = function(windowToModify, browserBot) {
+    windowToModify.alert = function(alert) {
+        browserBot.recordedAlerts.push(alert);
+    };
+
+    windowToModify.confirm = function(message) {
+        browserBot.recordedConfirmations.push(message);
+        var result = browserBot.nextConfirmResult;
+        browserBot.nextConfirmResult = true;
+        return result;
+    };
+
+    windowToModify.prompt = function(message) {
+        browserBot.recordedPrompts.push(message);
+        var result = !browserBot.nextConfirmResult ? null : browserBot.nextPromptResult;
+        browserBot.nextConfirmResult = true;
+        browserBot.nextPromptResult = '';
+        return result;
+    };
+
+    // Keep a reference to all popup windows by name
+    // note that in IE the "windowName" argument must be a valid javascript identifier, it seems.
+    var originalOpen = windowToModify.open;
+    windowToModify.open = function(url, windowName, windowFeatures, replaceFlag) {
+        var openedWindow = originalOpen(url, windowName, windowFeatures, replaceFlag);
+        selenium.browserbot.openedWindows[windowName] = openedWindow;
+        return openedWindow;
+    };
+};
+
+/**
+ * The main IFrame has a single, long-lived onload handler that clears
+ * Browserbot.currentPage and sets the "newPageLoaded" flag. For separate
+ * windows, we need to attach a handler each time. This uses the
+ * "callOnWindowPageTransition" mechanism, which is implemented differently
+ * for different browsers.
+ */
+BrowserBot.prototype.modifySeparateTestWindowToDetectPageLoads = function(windowToModify) {
+    if (this.currentWindowName != null) {
+        this.callOnWindowPageTransition(this.recordPageLoad, windowToModify);
+    }
+};
+
+/**
+ * Call the supplied function when a the current page unloads and a new one loads.
+ * This is done by polling continuously until the document changes and is fully loaded.
+ */
+BrowserBot.prototype.callOnWindowPageTransition = function(loadFunction, windowObject) {
+    // Since the unload event doesn't fire in Safari 1.3, we start polling immediately
+    if (windowObject && !windowObject.closed) {
+        LOG.debug("Starting pollForLoad: " + windowObject.document.location);
+        this.pollingForLoad = true;
+        this.pollForLoad(loadFunction, windowObject, windowObject.location, windowObject.location.href);
+    }
+};
+
+/**
+ * Set up a polling timer that will keep checking the readyState of the document until it's complete.
+ * Since we might call this before the original page is unloaded, we first check to see that the current location
+ * or href is different from the original one.
+ */
+BrowserBot.prototype.pollForLoad = function(loadFunction, windowObject, originalLocation, originalHref) {
+    var windowClosed = true;
+    try {
+    	windowClosed = windowObject.closed;
+    } catch (e) {
+    	LOG.debug("exception detecting closed window (I guess it must be closed)");
+    	LOG.exception(e);
+    	// swallow exceptions which may occur in HTA mode when the window is closed
+    }
+    if (null == windowClosed) windowClosed = true;
+    if (windowClosed) {
+    	this.pollingForLoad = false;
+        return;
+    }
+
+    LOG.debug("pollForLoad original: " + originalHref);
+    try {
+
+	    var currentLocation = windowObject.location;
+	    var currentHref = currentLocation.href
+
+	    var sameLoc = (originalLocation === currentLocation);
+	    var sameHref = (originalHref === currentHref);
+	    var rs = windowObject.document.readyState;
+
+		if (rs == null) rs = 'complete';
+
+	    if (!(sameLoc && sameHref) && rs == 'complete') {
+	        LOG.debug("pollForLoad complete: " + rs + " (" + currentHref + ")");
+	        loadFunction();
+	        this.pollingForLoad = false;
+	        return;
+	    }
+	    var self = this;
+	    LOG.debug("pollForLoad continue: " + currentHref);
+	    window.setTimeout(function() {self.pollForLoad(loadFunction, windowObject, originalLocation, originalHref);}, 500);
+	} catch (e) {
+		LOG.error("Exception during pollForLoad; this should get noticed soon!");
+		LOG.exception(e);
+		this.pageLoadError = e;
+	}
+};
+
+
+BrowserBot.prototype.getContentWindow = function() {
+    return this.getFrame().contentWindow || frames[this.getFrame().id];
+};
+
+BrowserBot.prototype.getTargetWindow = function(windowName) {
+    LOG.debug("getTargetWindow(" + windowName + ")");
+    // First look in the map of opened windows
+    var targetWindow = this.openedWindows[windowName];
+    if (!targetWindow) {
+        var evalString = "this.getContentWindow().window." + windowName;
+        targetWindow = eval(evalString);
+    }
+    if (!targetWindow) {
+        throw new SeleniumError("Window does not exist");
+    }
+    return targetWindow;
+};
+
+BrowserBot.prototype.getCurrentWindow = function() {
+    var testWindow = this.getContentWindow().window;
+    if (this.currentWindowName != null) {
+        testWindow = this.getTargetWindow(this.currentWindowName);
+    }
+    return testWindow;
+};
+
+function MozillaBrowserBot(frame) {
+    BrowserBot.call(this, frame);
+}
+MozillaBrowserBot.prototype = new BrowserBot;
+
+function KonquerorBrowserBot(frame) {
+    BrowserBot.call(this, frame);
+}
+KonquerorBrowserBot.prototype = new BrowserBot;
+
+KonquerorBrowserBot.prototype.setIFrameLocation = function(iframe, location) {
+    // Window doesn't fire onload event when setting src to the current value,
+    // so we set it to blank first.
+    iframe.src = "about:blank";
+    iframe.src = location;
+};
+
+KonquerorBrowserBot.prototype.setOpenLocation = function(location) {
+    // Window doesn't fire onload event when setting src to the current value,
+    // so we set it to blank first.
+    this.getCurrentWindow().location.href = "about:blank";
+    this.getCurrentWindow().location.href = location;
+};
+
+function SafariBrowserBot(frame) {
+    BrowserBot.call(this, frame);
+}
+SafariBrowserBot.prototype = new BrowserBot;
+
+SafariBrowserBot.prototype.setIFrameLocation = KonquerorBrowserBot.prototype.setIFrameLocation;
+
+function IEBrowserBot(frame) {
+    BrowserBot.call(this, frame);
+}
+IEBrowserBot.prototype = new BrowserBot;
+
+IEBrowserBot.prototype.modifyWindowToRecordPopUpDialogs = function(windowToModify, browserBot) {
+    BrowserBot.prototype.modifyWindowToRecordPopUpDialogs(windowToModify, browserBot);
+
+    // we will call the previous version of this method from within our own interception
+    oldShowModalDialog = windowToModify.showModalDialog;
+
+    windowToModify.showModalDialog = function(url, args, features) {
+        // Get relative directory to where TestRunner.html lives
+        // A risky assumption is that the user's TestRunner is named TestRunner.html
+        var doc_location = document.location.toString();
+        var end_of_base_ref = doc_location.indexOf('TestRunner.html');
+        var base_ref = doc_location.substring(0, end_of_base_ref);
+
+        var fullURL = base_ref + "TestRunner.html?singletest=" + escape(browserBot.modalDialogTest) + "&autoURL=" + escape(url) + "&runInterval=" + runInterval;
+        browserBot.modalDialogTest = null;
+
+        var returnValue = oldShowModalDialog(fullURL, args, features);
+        return returnValue;
+    };
+};
+
+SafariBrowserBot.prototype.modifyWindowToRecordPopUpDialogs = function(windowToModify, browserBot) {
+    BrowserBot.prototype.modifyWindowToRecordPopUpDialogs(windowToModify, browserBot);
+
+    var originalOpen = windowToModify.open;
+    /*
+     * Safari seems to be broken, so that when we manually trigger the onclick method
+     * of a button/href, any window.open calls aren't resolved relative to the app location.
+     * So here we replace the open() method with one that does resolve the url correctly.
+     */
+    windowToModify.open = function(url, windowName, windowFeatures, replaceFlag) {
+
+        if (url.startsWith("http://") || url.startsWith("https://") || url.startsWith("/")) {
+            return originalOpen(url, windowName, windowFeatures, replaceFlag);
+        }
+
+        // Reduce the current path to the directory
+        var currentPath = windowToModify.location.pathname || "/";
+        currentPath = currentPath.replace(/\/[^\/]*$/, "/");
+
+        // Remove any leading "./" from the new url.
+        url = url.replace(/^\.\//, "");
+
+        newUrl = currentPath + url;
+
+        return originalOpen(newUrl, windowName, windowFeatures, replaceFlag);
+    };
+};
+
+var PageBot = function(pageWindow) {
+    if (pageWindow) {
+        this.currentWindow = pageWindow;
+        this.currentDocument = pageWindow.document;
+        this.location = pageWindow.location;
+        this.title = function() {return this.currentDocument.title;};
+    }
+
+    // Register all locateElementBy* functions
+    // TODO - don't do this in the constructor - only needed once ever
+    this.locationStrategies = {};
+    for (var functionName in this) {
+        var result = /^locateElementBy([A-Z].+)$/.exec(functionName);
+        if (result != null) {
+            var locatorFunction = this[functionName];
+            if (typeof(locatorFunction) != 'function') {
+                continue;
+            }
+            // Use a specified prefix in preference to one generated from
+            // the function name
+            var locatorPrefix = locatorFunction.prefix || result[1].toLowerCase();
+            this.locationStrategies[locatorPrefix] = locatorFunction;
+        }
+    }
+
+    /**
+     * Find a locator based on a prefix.
+     */
+    this.findElementBy = function(locatorType, locator, inDocument) {
+        var locatorFunction = this.locationStrategies[locatorType];        
+        if (! locatorFunction) {
+            throw new SeleniumError("Unrecognised locator type: '" + locatorType + "'");
+        }
+        return locatorFunction.call(this, locator, inDocument);
+    };
+
+    /**
+     * The implicit locator, that is used when no prefix is supplied.
+     */
+    this.locationStrategies['implicit'] = function(locator, inDocument) {
+        if (locator.startsWith('//')) {
+            return this.locateElementByXPath(locator, inDocument);
+        }
+        if (locator.startsWith('document.')) {
+            return this.locateElementByDomTraversal(locator, inDocument);
+        }
+        return this.locateElementByIdentifier(locator, inDocument);
+    };
+
+};
+
+PageBot.createForWindow = function(windowObject) {
+    if (browserVersion.isIE) {
+        return new IEPageBot(windowObject);
+    }
+    else if (browserVersion.isKonqueror) {
+        return new KonquerorPageBot(windowObject);
+    }
+    else if (browserVersion.isSafari) {
+        return new SafariPageBot(windowObject);
+    }
+    else if (browserVersion.isOpera) {
+        return new OperaPageBot(windowObject);
+    }
+    else {
+        LOG.info("Using MozillaPageBot")
+        // Use mozilla by default
+        return new MozillaPageBot(windowObject);
+    }
+};
+
+var MozillaPageBot = function(pageWindow) {
+    PageBot.call(this, pageWindow);
+};
+MozillaPageBot.prototype = new PageBot();
+
+var KonquerorPageBot = function(pageWindow) {
+    PageBot.call(this, pageWindow);
+};
+KonquerorPageBot.prototype = new PageBot();
+
+var SafariPageBot = function(pageWindow) {
+    PageBot.call(this, pageWindow);
+};
+SafariPageBot.prototype = new PageBot();
+
+var IEPageBot = function(pageWindow) {
+    PageBot.call(this, pageWindow);
+};
+IEPageBot.prototype = new PageBot();
+
+OperaPageBot = function(pageWindow) {
+    PageBot.call(this, pageWindow);
+};
+OperaPageBot.prototype = new PageBot();
+
+/*
+* Finds an element on the current page, using various lookup protocols
+*/
+PageBot.prototype.findElement = function(locator) {
+    var locatorType = 'implicit';
+    var locatorString = locator;
+
+    // If there is a locator prefix, use the specified strategy
+    var result = locator.match(/^([A-Za-z]+)=(.+)/);
+    if (result) {
+        locatorType = result[1].toLowerCase();
+        locatorString = result[2];
+    }
+
+    var element = this.findElementBy(locatorType, locatorString, this.currentDocument);
+    if (element != null) {
+        return element;
+    }
+    for (var i = 0; i < this.currentWindow.frames.length; i++) {
+        element = this.findElementBy(locatorType, locatorString, this.currentWindow.frames[i].document);
+        if (element != null) {
+            return element;
+        }
+    }
+
+    // Element was not found by any locator function.
+    throw new SeleniumError("Element " + locator + " not found");
+};
+
+/**
+ * In non-IE browsers, getElementById() does not search by name.  Instead, we
+ * we search separately by id and name.
+ */
+PageBot.prototype.locateElementByIdentifier = function(identifier, inDocument) {
+    return PageBot.prototype.locateElementById(identifier, inDocument)
+            || PageBot.prototype.locateElementByName(identifier, inDocument)
+            || null;
+};
+
+/**
+ * In IE, getElementById() also searches by name - this is an optimisation for IE.
+ */
+IEPageBot.prototype.locateElementByIdentifer = function(identifier, inDocument) {
+    return inDocument.getElementById(identifier);
+};
+
+/**
+ * Find the element with id - can't rely on getElementById, coz it returns by name as well in IE..
+ */
+PageBot.prototype.locateElementById = function(identifier, inDocument) {
+    var element = inDocument.getElementById(identifier);
+    if (element && element.id === identifier) {
+        return element;
+    }
+    else {
+        return null;
+    }
+};
+
+/**
+ * Find an element by name, refined by (optional) element-filter
+ * expressions.
+ */
+PageBot.prototype.locateElementByName = function(locator, document) {
+    var elements = document.getElementsByTagName("*");
+
+    var filters = locator.split(' ');
+    filters[0] = 'name=' + filters[0];
+
+    while (filters.length) {
+        var filter = filters.shift();
+        elements = this.selectElements(filter, elements, 'value');
+    }
+
+    if (elements.length > 0) {
+        return elements[0];
+    }
+    return null;
+};
+
+/**
+* Finds an element using by evaluating the "document.*" string against the
+* current document object. Dom expressions must begin with "document."
+*/
+PageBot.prototype.locateElementByDomTraversal = function(domTraversal, inDocument) {
+    if (domTraversal.indexOf("document.") != 0) {
+        return null;
+    }
+
+    // Trim the leading 'document'
+    domTraversal = domTraversal.substr(9);
+    var locatorScript = "inDocument." + domTraversal;
+    var element = eval(locatorScript);
+
+    if (!element) {
+        return null;
+    }
+
+    return element;
+};
+PageBot.prototype.locateElementByDomTraversal.prefix = "dom";
+
+/**
+* Finds an element identified by the xpath expression. Expressions _must_
+* begin with "//".
+*/
+PageBot.prototype.locateElementByXPath = function(xpath, inDocument) {
+
+    // Trim any trailing "/": not valid xpath, and remains from attribute
+    // locator.
+    if (xpath.charAt(xpath.length - 1) == '/') {
+        xpath = xpath.slice(0, -1);
+    }
+
+    // Handle //tag
+    var match = xpath.match(/^\/\/(\w+|\*)$/);
+    if (match) {
+        var elements = inDocument.getElementsByTagName(match[1].toUpperCase());
+        if (elements == null) return null;
+        return elements[0];
+    }
+
+    // Handle //tag[@attr='value']
+    var match = xpath.match(/^\/\/(\w+|\*)\[@(\w+)=('([^\']+)'|"([^\"]+)")\]$/);
+    if (match) {
+        return this.findElementByTagNameAndAttributeValue(
+            inDocument,
+            match[1].toUpperCase(),
+            match[2].toLowerCase(),
+            match[3].slice(1, -1)
+        );
+    }
+
+    // Handle //tag[text()='value']
+    var match = xpath.match(/^\/\/(\w+|\*)\[text\(\)=('([^\']+)'|"([^\"]+)")\]$/);
+    if (match) {
+        return this.findElementByTagNameAndText(
+            inDocument,
+            match[1].toUpperCase(),
+            match[2].slice(1, -1)
+        );
+    }
+
+    return this.findElementUsingFullXPath(xpath, inDocument);
+};
+
+PageBot.prototype.findElementByTagNameAndAttributeValue = function(
+    inDocument, tagName, attributeName, attributeValue
+) {
+    if (browserVersion.isIE && attributeName == "class") {
+        attributeName = "className";
+    }
+    var elements = inDocument.getElementsByTagName(tagName);
+    for (var i = 0; i < elements.length; i++) {
+        var elementAttr = elements[i].getAttribute(attributeName);
+        if (elementAttr == attributeValue) {
+            return elements[i];
+        }
+    }
+    return null;
+};
+
+PageBot.prototype.findElementByTagNameAndText = function(
+    inDocument, tagName, text
+) {
+    var elements = inDocument.getElementsByTagName(tagName);
+    for (var i = 0; i < elements.length; i++) {
+        if (getText(elements[i]) == text) {
+            return elements[i];
+        }
+    }
+    return null;
+};
+
+PageBot.prototype.findElementUsingFullXPath = function(xpath, inDocument) {
+    // Use document.evaluate() if it's available
+    if (inDocument.evaluate) {
+        return inDocument.evaluate(xpath, inDocument, null, 0, null).iterateNext();
+    }
+
+    // If not, fall back to slower JavaScript implementation
+    var context = new ExprContext(inDocument);
+    var xpathObj = xpathParse(xpath);
+    var xpathResult = xpathObj.evaluate(context);
+    if (xpathResult && xpathResult.value) {
+        return xpathResult.value[0];
+    }
+    return null;
+};
+
+/**
+* Finds a link element with text matching the expression supplied. Expressions must
+* begin with "link:".
+*/
+PageBot.prototype.locateElementByLinkText = function(linkText, inDocument) {
+    var links = inDocument.getElementsByTagName('a');
+    for (var i = 0; i < links.length; i++) {
+        var element = links[i];
+        if (PatternMatcher.matches(linkText, getText(element))) {
+            return element;
+        }
+    }
+    return null;
+};
+PageBot.prototype.locateElementByLinkText.prefix = "link";
+
+/**
+* Returns an attribute based on an attribute locator. This is made up of an element locator
+* suffixed with @attribute-name.
+*/
+PageBot.prototype.findAttribute = function(locator) {
+    // Split into locator + attributeName
+    var attributePos = locator.lastIndexOf("@");
+    var elementLocator = locator.slice(0, attributePos);
+    var attributeName = locator.slice(attributePos + 1);
+
+    // Find the element.
+    var element = this.findElement(elementLocator);
+
+    // Handle missing "class" attribute in IE.
+    if (browserVersion.isIE && attributeName == "class") {
+        attributeName = "className";
+    }
+
+    // Get the attribute value.
+    var attributeValue = element.getAttribute(attributeName);
+
+    return attributeValue ? attributeValue.toString() : null;
+};
+
+/*
+* Select the specified option and trigger the relevant events of the element.
+*/
+PageBot.prototype.selectOption = function(element, optionToSelect) {
+    triggerEvent(element, 'focus', false);
+    var changed = false;
+    for (var i = 0; i < element.options.length; i++) {
+        var option = element.options[i];
+        if (option.selected && option != optionToSelect) {
+            option.selected = false;
+            changed = true;
+        }
+        else if (!option.selected && option == optionToSelect) {
+            option.selected = true;
+            changed = true;
+        }
+    }
+
+    if (changed) {
+        triggerEvent(element, 'change', true);
+    }
+    triggerEvent(element, 'blur', false);
+};
+
+/*
+* Select the specified option and trigger the relevant events of the element.
+*/
+PageBot.prototype.addSelection = function(element, option) {
+    this.checkMultiselect(element);
+    triggerEvent(element, 'focus', false);
+    if (!option.selected) {
+        option.selected = true;
+        triggerEvent(element, 'change', true);
+    }
+    triggerEvent(element, 'blur', false);
+};
+
+/*
+* Select the specified option and trigger the relevant events of the element.
+*/
+PageBot.prototype.removeSelection = function(element, option) {
+    this.checkMultiselect(element);
+    triggerEvent(element, 'focus', false);
+    if (option.selected) {
+        option.selected = false;
+        triggerEvent(element, 'change', true);
+    }
+    triggerEvent(element, 'blur', false);
+};
+
+PageBot.prototype.checkMultiselect = function(element) {
+    if (!element.multiple)
+    {
+        throw new SeleniumError("Not a multi-select");
+    }
+
+};
+
+PageBot.prototype.replaceText = function(element, stringValue) {
+    triggerEvent(element, 'focus', false);
+    triggerEvent(element, 'select', true);
+    element.value=stringValue;
+    if (!browserVersion.isChrome) {
+        // In chrome URL, The change event is already fired by setting the value.
+        triggerEvent(element, 'change', true);
+    }
+    triggerEvent(element, 'blur', false);
+};
+
+MozillaPageBot.prototype.clickElement = function(element) {
+
+    triggerEvent(element, 'focus', false);
+
+    // Add an event listener that detects if the default action has been prevented.
+    // (This is caused by a javascript onclick handler returning false)
+    var preventDefault = false;
+    
+    element.addEventListener("click", function(evt) {preventDefault = evt.getPreventDefault();}, false);
+    
+    // Trigger the click event.
+    triggerMouseEvent(element, 'click', true);
+
+    // Perform the link action if preventDefault was set.
+    // In chrome URL, the link action is already executed by triggerMouseEvent.
+    if (!browserVersion.isChrome && !preventDefault) {
+        // Try the element itself, as well as it's parent - this handles clicking images inside links.
+        if (element.href) {
+            this.currentWindow.location.href = element.href;
+        }
+        else if (element.parentNode && element.parentNode.href) {
+            this.currentWindow.location.href = element.parentNode.href;
+        }
+    }
+
+    if (this.windowClosed()) {
+        return;
+    }
+
+    triggerEvent(element, 'blur', false);
+};
+
+OperaPageBot.prototype.clickElement = function(element) {
+
+    triggerEvent(element, 'focus', false);
+
+    // Trigger the click event.
+    triggerMouseEvent(element, 'click', true);
+    
+    if (isDefined(element.checked)) {
+    	// In Opera, clicking won't check/uncheck
+    	if (element.type == "checkbox") {
+    		element.checked = !element.checked;
+    	} else {
+    		element.checked = true;
+    	}
+    }
+    
+    if (this.windowClosed()) {
+        return;
+    }
+
+    triggerEvent(element, 'blur', false);
+};
+
+
+KonquerorPageBot.prototype.clickElement = function(element) {
+
+    triggerEvent(element, 'focus', false);
+
+    if (element.click) {
+        element.click();
+    }
+    else {
+        triggerMouseEvent(element, 'click', true);
+    }
+
+    if (this.windowClosed()) {
+        return;
+    }
+
+    triggerEvent(element, 'blur', false);
+};
+
+SafariPageBot.prototype.clickElement = function(element) {
+
+    triggerEvent(element, 'focus', false);
+
+    var wasChecked = element.checked;
+
+    // For form element it is simple.
+    if (element.click) {
+        element.click();
+    }
+    // For links and other elements, event emulation is required.
+    else {
+        triggerMouseEvent(element, 'click', true);
+
+        // Unfortunately, triggering the event doesn't seem to activate onclick handlers.
+        // We currently call onclick for the link, but I'm guessing that the onclick for containing
+        // elements is not being called.
+        var success = true;
+        if (element.onclick) {
+            var evt = document.createEvent('HTMLEvents');
+            evt.initEvent('click', true, true);
+            var onclickResult = element.onclick(evt);
+            if (onclickResult === false) {
+                success = false;
+            }
+        }
+
+        if (success) {
+            // Try the element itself, as well as it's parent - this handles clicking images inside links.
+            if (element.href) {
+                this.currentWindow.location.href = element.href;
+            }
+            else if (element.parentNode.href) {
+                this.currentWindow.location.href = element.parentNode.href;
+            } else {
+                // This is true for buttons outside of forms, and maybe others.
+                LOG.warn("Ignoring 'click' call for button outside form, or link without href."
+                        + "Using buttons without an enclosing form can cause wierd problems with URL resolution in Safari." );
+                // I implemented special handling for window.open, but unfortunately this behaviour is also displayed
+                // when we have a button without an enclosing form that sets document.location in the onclick handler.
+                // The solution is to always use an enclosing form for a button.
+            }
+        }
+    }
+
+    if (this.windowClosed()) {
+        return;
+    }
+
+    triggerEvent(element, 'blur', false);
+};
+
+IEPageBot.prototype.clickElement = function(element) {
+
+    triggerEvent(element, 'focus', false);
+
+    var wasChecked = element.checked;
+
+    // Set a flag that records if the page will unload - this isn't always accurate, because
+    //  triggers the onbeforeunload event, even thought the page won't unload
+    var pageUnloading = false;
+    var pageUnloadDetector = function() {pageUnloading = true;};
+    this.currentWindow.attachEvent("onbeforeunload", pageUnloadDetector);
+
+    element.click();
+
+    // If the page is going to unload - still attempt to fire any subsequent events.
+    // However, we can't guarantee that the page won't unload half way through, so we need to handle exceptions.
+    try {
+        this.currentWindow.detachEvent("onbeforeunload", pageUnloadDetector);
+
+        if (this.windowClosed()) {
+            return;
+        }
+
+        // Onchange event is not triggered automatically in IE.
+        if (isDefined(element.checked) && wasChecked != element.checked) {
+            triggerEvent(element, 'change', true);
+        }
+
+        triggerEvent(element, 'blur', false);
+    }
+    catch (e) {
+        // If the page is unloading, we may get a "Permission denied" or "Unspecified error".
+        // Just ignore it, because the document may have unloaded.
+        if (pageUnloading) {
+            LOG.warn("Caught exception when firing events on unloading page: " + e.message);
+            return;
+        }
+        throw e;
+    }
+};
+
+PageBot.prototype.windowClosed = function(element) {
+    return this.currentWindow.closed;
+};
+
+PageBot.prototype.bodyText = function() {
+    return getText(this.currentDocument.body);
+};
+
+PageBot.prototype.getAllButtons = function() {
+    var elements = this.currentDocument.getElementsByTagName('input');
+    var result = '';
+
+    for (var i = 0; i < elements.length; i++) {
+        if (elements[i].type == 'button' || elements[i].type == 'submit' || elements[i].type == 'reset') {
+            result += elements[i].id;
+
+            result += ',';
+        }
+    }
+
+    return result;
+};
+
+
+PageBot.prototype.getAllFields = function() {
+    var elements = this.currentDocument.getElementsByTagName('input');
+    var result = '';
+
+    for (var i = 0; i < elements.length; i++) {
+        if (elements[i].type == 'text') {
+            result += elements[i].id;
+
+            result += ',';
+        }
+    }
+
+    return result;
+};
+
+PageBot.prototype.getAllLinks = function() {
+    var elements = this.currentDocument.getElementsByTagName('a');
+    var result = '';
+
+    for (var i = 0; i < elements.length; i++) {
+        result += elements[i].id;
+
+        result += ',';
+    }
+
+    return result;
+};
+
+PageBot.prototype.setContext = function(strContext, logLevel) {
+     //set the current test title
+    document.getElementById("context").innerHTML=strContext;
+    if (logLevel!=null) {
+    	LOG.setLogLevelThreshold(logLevel);
+    }
+};
+
+function isDefined(value) {
+    return typeof(value) != undefined;
+}
+
+PageBot.prototype.goBack = function() {
+    this.currentWindow.history.back();
+    if (browserVersion.isOpera && !selenium.browserbot.pollingForLoad) {
+    	// DGF On Opera, goBack doesn't re-trigger a load event, so we have to poll for it
+        selenium.browserbot.callOnWindowPageTransition(selenium.browserbot.recordPageLoad, this.currentWindow);
+    }
+};
+
+PageBot.prototype.goForward = function() {
+    this.currentWindow.history.forward();
+};
+
+PageBot.prototype.close = function() {
+	if (browserVersion.isChrome) {
+		this.currentWindow.close();
+	} else {
+	    this.currentWindow.eval("window.close();");
+	}
+};
+
+PageBot.prototype.refresh = function() {
+    this.currentWindow.location.reload(true);
+};
+
+/**
+ * Refine a list of elements using a filter.
+ */
+PageBot.prototype.selectElementsBy = function(filterType, filter, elements) {
+    var filterFunction = PageBot.filterFunctions[filterType];
+    if (! filterFunction) {
+        throw new SeleniumError("Unrecognised element-filter type: '" + filterType + "'");
+    }
+
+    return filterFunction(filter, elements);
+};
+
+PageBot.filterFunctions = {}; 
+
+PageBot.filterFunctions.name = function(name, elements) {
+    var selectedElements = [];
+    for (var i = 0; i < elements.length; i++) {
+        if (elements[i].name === name) {
+            selectedElements.push(elements[i]);
+        }
+    }
+    return selectedElements;
+};
+
+PageBot.filterFunctions.value = function(value, elements) {
+    var selectedElements = [];
+    for (var i = 0; i < elements.length; i++) {
+        if (elements[i].value === value) {
+            selectedElements.push(elements[i]);
+        }
+    }
+    return selectedElements;
+};
+
+PageBot.filterFunctions.index = function(index, elements) {
+    index = Number(index);
+    if (isNaN(index) || index < 0) {
+        throw new SeleniumError("Illegal Index: " + index);
+    }
+    if (elements.length <= index) {
+        throw new SeleniumError("Index out of range: " + index);
+    }
+    return [elements[index]];
+};
+
+PageBot.prototype.selectElements = function(filterExpr, elements, defaultFilterType) {    
+
+    var filterType = (defaultFilterType || 'value');
+    
+    // If there is a filter prefix, use the specified strategy
+    var result = filterExpr.match(/^([A-Za-z]+)=(.+)/);
+    if (result) {
+        filterType = result[1].toLowerCase();
+        filterExpr = result[2];
+    }
+
+    return this.selectElementsBy(filterType, filterExpr, elements);
+};
+
+/**
+ * Find an element by class
+ */
+PageBot.prototype.locateElementByClass = function(locator, document) {
+    return Element.findFirstMatchingChild(document, 
+	    function(element) { 
+		    return element.className == locator
+		}
+    );
+}
+
+/**
+ * Find an element by alt
+ */
+PageBot.prototype.locateElementByAlt = function(locator, document) {
+    return Element.findFirstMatchingChild(document,
+	    function(element) {
+		    return element.alt == locator
+		}
+    );
+}
+
diff --git a/tests/FunctionalTests/selenium/core/scripts/selenium-browserdetect.js b/tests/FunctionalTests/selenium/core/scripts/selenium-browserdetect.js
new file mode 100755
index 00000000..137a1518
--- /dev/null
+++ b/tests/FunctionalTests/selenium/core/scripts/selenium-browserdetect.js
@@ -0,0 +1,115 @@
+/*
+* Copyright 2004 ThoughtWorks, Inc
+*
+*  Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*
+*/
+
+// Although it's generally better web development practice not to use browser-detection
+// (feature detection is better), the subtle browser differences that Selenium has to
+// work around seem to make it necessary. Maybe as we learn more about what we need,
+// we can do this in a more "feature-centric" rather than "browser-centric" way.
+
+BrowserVersion = function() {
+    this.name = navigator.appName;
+
+    if (window.opera != null)
+    {
+        this.browser = BrowserVersion.OPERA;
+        this.isOpera = true;
+        return;
+    }
+    
+    var self = this;
+    
+    var checkChrome = function() {
+    	var loc = window.document.location.href;
+    	try {
+    		loc = window.top.document.location.href;
+    	} catch (e) {
+    		// can't see the top (that means we might be chrome, but it's impossible to be sure)
+    		self.isChromeDetectable = "no, top location couldn't be read in this window";
+    	}
+    	
+    	if (/^chrome:\/\//.test(loc)) {
+    		self.isChrome = true;
+    	} else {
+    		self.isChrome = false;
+    	}
+    }
+
+    if (this.name == "Microsoft Internet Explorer")
+    {
+        this.browser = BrowserVersion.IE;
+        this.isIE = true;
+        if (window.top.SeleniumHTARunner && window.top.document.location.pathname.match(/.hta$/i)) {
+        	this.isHTA = true;
+        }
+        if ("0" == navigator.appMinorVersion) {
+        	this.preSV1 = true;
+        }
+        return;
+    }
+
+    if (navigator.userAgent.indexOf('Safari') != -1)
+    {
+        this.browser = BrowserVersion.SAFARI;
+        this.isSafari = true;
+        this.khtml = true;
+        return;
+    }
+
+    if (navigator.userAgent.indexOf('Konqueror') != -1)
+    {
+        this.browser = BrowserVersion.KONQUEROR;
+        this.isKonqueror = true;
+        this.khtml = true;
+        return;
+    }
+
+    if (navigator.userAgent.indexOf('Firefox') != -1)
+    {
+        this.browser = BrowserVersion.FIREFOX;
+        this.isFirefox = true;
+        this.isGecko = true;
+        var result = /.*Firefox\/([\d\.]+).*/.exec(navigator.userAgent);
+        if (result)
+        {
+            this.firefoxVersion = result[1];
+        }
+        checkChrome();
+        return;
+    }
+
+    if (navigator.userAgent.indexOf('Gecko') != -1)
+    {
+        this.browser = BrowserVersion.MOZILLA;
+        this.isMozilla = true;
+        this.isGecko = true;
+        checkChrome();
+        return;
+    }
+
+    this.browser = BrowserVersion.UNKNOWN;
+}
+
+BrowserVersion.OPERA = "Opera";
+BrowserVersion.IE = "IE";
+BrowserVersion.KONQUEROR = "Konqueror";
+BrowserVersion.SAFARI = "Safari";
+BrowserVersion.FIREFOX = "Firefox";
+BrowserVersion.MOZILLA = "Mozilla";
+BrowserVersion.UNKNOWN = "Unknown";
+
+browserVersion = new BrowserVersion();
+
diff --git a/tests/FunctionalTests/selenium/core/scripts/selenium-commandhandlers.js b/tests/FunctionalTests/selenium/core/scripts/selenium-commandhandlers.js
new file mode 100755
index 00000000..ee01ea76
--- /dev/null
+++ b/tests/FunctionalTests/selenium/core/scripts/selenium-commandhandlers.js
@@ -0,0 +1,371 @@
+/*
+* Copyright 2004 ThoughtWorks, Inc
+*
+*  Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*
+*/
+function CommandHandlerFactory() {
+    this.actions = {};
+    this.asserts = {};
+    this.accessors = {};
+
+    var self = this;
+
+    this.registerAction = function(name, action, wait, dontCheckAlertsAndConfirms) {
+        var handler = new ActionHandler(action, wait, dontCheckAlertsAndConfirms);
+        this.actions[name] = handler;
+    };
+
+    this.registerAccessor = function(name, accessor) {
+        var handler = new AccessorHandler(accessor);
+        this.accessors[name] = handler;
+    };
+
+    this.registerAssert = function(name, assertion, haltOnFailure) {
+        var handler = new AssertHandler(assertion, haltOnFailure);
+        this.asserts[name] = handler;
+    };
+    
+    this.getCommandHandler = function(name) {
+        return this.actions[name] || this.accessors[name] || this.asserts[name] || null;
+    };
+
+    this.registerAll = function(commandObject) {
+        registerAllAccessors(commandObject);
+        registerAllActions(commandObject);
+        registerAllAsserts(commandObject);
+    };
+
+    var registerAllActions = function(commandObject) {
+        for (var functionName in commandObject) {
+            var result = /^do([A-Z].+)$/.exec(functionName);
+            if (result != null) {
+                var actionName = result[1].lcfirst();
+
+                // Register the action without the wait flag.
+                var action = commandObject[functionName];
+                self.registerAction(actionName, action, false, action.dontCheckAlertsAndConfirms);
+
+                // Register actionName + "AndWait" with the wait flag;
+                var waitActionName = actionName + "AndWait";
+                self.registerAction(waitActionName, action, true, action.dontCheckAlertsAndConfirms);
+            }
+        }
+    };
+
+ 
+    var registerAllAsserts = function(commandObject) {
+        for (var functionName in commandObject) {
+            var result = /^assert([A-Z].+)$/.exec(functionName);
+            if (result != null) {
+                var assert = commandObject[functionName];
+
+                // Register the assert with the "assert" prefix, and halt on failure.
+                var assertName = functionName;
+                self.registerAssert(assertName, assert, true);
+
+                // Register the assert with the "verify" prefix, and do not halt on failure.
+                var verifyName = "verify" + result[1];
+                self.registerAssert(verifyName, assert, false);
+            }
+        }
+    };
+
+    
+    // Given an accessor function getBlah(target),
+    // return a "predicate" equivalient to isBlah(target, value) that
+    // is true when the value returned by the accessor matches the specified value.
+    this.createPredicateFromSingleArgAccessor = function(accessor) {
+        return function(target, value) {
+            var accessorResult = accessor.call(this, target);
+            if (PatternMatcher.matches(value, accessorResult)) {
+                return new PredicateResult(true, "Actual value '" + accessorResult + "' did match '" + value + "'");
+            } else {
+                return new PredicateResult(false, "Actual value '" + accessorResult + "' did not match '" + value + "'");
+            }
+        };
+    };
+    
+    // Given a (no-arg) accessor function getBlah(),
+    // return a "predicate" equivalient to isBlah(value) that
+    // is true when the value returned by the accessor matches the specified value.
+    this.createPredicateFromNoArgAccessor = function(accessor) {
+        return function(value) {
+            var accessorResult = accessor.call(this);
+            if (PatternMatcher.matches(value, accessorResult)) {
+                return new PredicateResult(true, "Actual value '" + accessorResult + "' did match '" + value + "'");
+            } else {
+                return new PredicateResult(false, "Actual value '" + accessorResult + "' did not match '" + value + "'");
+            }
+        };
+    };
+        
+    // Given a boolean accessor function isBlah(),
+    // return a "predicate" equivalient to isBlah() that
+    // returns an appropriate PredicateResult value.
+    this.createPredicateFromBooleanAccessor = function(accessor) {
+        return function() {
+        	var accessorResult;
+        	if (arguments.length > 2) throw new SeleniumError("Too many arguments! " + arguments.length);
+        	if (arguments.length == 2) {
+            	accessorResult = accessor.call(this, arguments[0], arguments[1]);
+            } else if (arguments.length == 1) {
+            	accessorResult = accessor.call(this, arguments[0]);
+            } else {
+            	accessorResult = accessor.call(this);
+            }
+            if (accessorResult) {
+                return new PredicateResult(true, "true");
+            } else {
+                return new PredicateResult(false, "false");
+            }
+        };
+    };
+    
+    // Given an accessor fuction getBlah([target])  (target is optional)
+    // return a predicate equivalent to isBlah([target,] value) that
+    // is true when the value returned by the accessor matches the specified value.
+    this.createPredicateFromAccessor = function(accessor) {
+		if (accessor.length == 0) {
+            return self.createPredicateFromNoArgAccessor(accessor);
+        }
+        return self.createPredicateFromSingleArgAccessor(accessor);
+    };
+    
+    // Given a predicate, return the negation of that predicate.
+    // Leaves the message unchanged.
+    // Used to create assertNot, verifyNot, and waitForNot commands.
+    this.invertPredicate = function(predicate) {
+        return function(target, value) {
+            var result = predicate.call(this, target, value);
+            result.isTrue = ! result.isTrue;
+            return result;
+        };
+    };
+    
+    // Convert an isBlahBlah(target, value) function into an assertBlahBlah(target, value) function.
+    this.createAssertionFromPredicate = function(predicate) {
+    	return function(target, value) {
+    		var result = predicate.call(this, target, value);
+    		if (!result.isTrue) {
+    			Assert.fail(result.message);
+    		}
+    	};
+    };
+    
+    // Register an assertion, a verification, a negative assertion,
+    // and a negative verification based on the specified accessor.
+    this.registerAssertionsBasedOnAccessor = function(accessor, baseName, predicate) {
+        if (predicate==null) {
+            predicate = self.createPredicateFromAccessor(accessor);
+        }
+        var assertion = self.createAssertionFromPredicate(predicate);
+        // Register an assert with the "assert" prefix, and halt on failure.
+        self.registerAssert("assert" + baseName, assertion, true);
+        // Register a verify with the "verify" prefix, and do not halt on failure.
+        self.registerAssert("verify" + baseName, assertion, false);
+        
+        var invertedPredicate = self.invertPredicate(predicate);
+        var negativeAssertion = self.createAssertionFromPredicate(invertedPredicate);
+        
+        var result = /^(.*)Present$/.exec(baseName);
+        if (result==null) {
+            // Register an assertNot with the "assertNot" prefix, and halt on failure.
+            self.registerAssert("assertNot"+baseName, negativeAssertion, true);
+            // Register a verifyNot with the "verifyNot" prefix, and do not halt on failure.
+            self.registerAssert("verifyNot"+baseName, negativeAssertion, false);
+        }
+        else {
+            var invertedBaseName = result[1] + "NotPresent";
+        
+            // Register an assertNot ending w/ "NotPresent", and halt on failure.
+            self.registerAssert("assert"+invertedBaseName, negativeAssertion, true);
+            // Register an assertNot ending w/ "NotPresent", and do not halt on failure.
+            self.registerAssert("verify"+invertedBaseName, negativeAssertion, false);
+        }
+    };
+    
+    
+    // Convert an isBlahBlah(target, value) function into a waitForBlahBlah(target, value) function.
+    this.createWaitForActionFromPredicate = function(predicate) {
+    	var action = function(target, value) {
+    		var seleniumApi = this;
+		    testLoop.waitForCondition = function () {
+		    	try {
+				    return predicate.call(seleniumApi, target, value).isTrue;
+				} catch (e) {
+					// Treat exceptions as meaning the condition is not yet met.
+					// Useful, for example, for waitForValue when the element has
+					// not even been created yet.
+					// TODO: possibly should rethrow some types of exception.
+					return false;
+				}
+		    };
+    	};
+    	return action;
+    };
+    
+    // Register a waitForBlahBlah and waitForNotBlahBlah based on the specified accessor.
+    this.registerWaitForCommandsBasedOnAccessor = function(accessor, baseName, predicate) {
+        if (predicate==null) {
+            predicate = self.createPredicateFromAccessor(accessor);
+        }
+        var waitForAction = self.createWaitForActionFromPredicate(predicate);
+    	self.registerAction("waitFor"+baseName, waitForAction, false, true);
+        var invertedPredicate = self.invertPredicate(predicate);
+        var waitForNotAction = self.createWaitForActionFromPredicate(invertedPredicate);
+	   	self.registerAction("waitForNot"+baseName, waitForNotAction, false, true);
+	}
+	
+	// Register a storeBlahBlah based on the specified accessor.
+    this.registerStoreCommandBasedOnAccessor = function(accessor, baseName) {
+        var action;
+        if (accessor.length == 1) {
+	    	action = function(target, varName) {
+			    storedVars[varName] = accessor.call(this, target);
+	    	};
+	    } else {
+	    	action = function(varName) {
+			    storedVars[varName] = accessor.call(this);
+	    	};
+	    }
+    	self.registerAction("store"+baseName, action, false, accessor.dontCheckAlertsAndConfirms);
+    };
+        
+    // Methods of the form getFoo(target) result in commands:
+    // getFoo, assertFoo, verifyFoo, assertNotFoo, verifyNotFoo
+    // storeFoo, waitForFoo, and waitForNotFoo.
+    var registerAllAccessors = function(commandObject) {
+        for (var functionName in commandObject) {
+            var match = /^get([A-Z].+)$/.exec(functionName);
+            if (match != null) {
+                var accessor = commandObject[functionName];
+                var baseName = match[1];
+                self.registerAccessor(functionName, accessor);
+                self.registerAssertionsBasedOnAccessor(accessor, baseName);
+                self.registerStoreCommandBasedOnAccessor(accessor, baseName);
+                self.registerWaitForCommandsBasedOnAccessor(accessor, baseName);
+            }
+            var match = /^is([A-Z].+)$/.exec(functionName);
+            if (match != null) {
+                var accessor = commandObject[functionName];
+                var baseName = match[1];
+                var predicate = self.createPredicateFromBooleanAccessor(accessor);
+                self.registerAccessor(functionName, accessor);
+                self.registerAssertionsBasedOnAccessor(accessor, baseName, predicate);
+                self.registerStoreCommandBasedOnAccessor(accessor, baseName);
+                self.registerWaitForCommandsBasedOnAccessor(accessor, baseName, predicate);
+            }
+        }
+    };
+    
+    
+}
+
+function PredicateResult(isTrue, message) {
+    this.isTrue = isTrue;
+    this.message = message;
+}
+
+// NOTE: The CommandHandler is effectively an abstract base for
+// various handlers including ActionHandler, AccessorHandler and AssertHandler.
+// Subclasses need to implement an execute(seleniumApi, command) function,
+// where seleniumApi is the Selenium object, and command a SeleniumCommand object.
+function CommandHandler(type, haltOnFailure, executor) {
+    this.type = type;
+    this.haltOnFailure = haltOnFailure;
+    this.executor = executor;
+}
+
+// An ActionHandler is a command handler that executes the sepcified action,
+// possibly checking for alerts and confirmations (if checkAlerts is set), and
+// possibly waiting for a page load if wait is set.
+function ActionHandler(action, wait, dontCheckAlerts) {
+    CommandHandler.call(this, "action", true, action);
+    if (wait) {
+        this.wait = true;
+    }
+    // note that dontCheckAlerts could be undefined!!!
+    this.checkAlerts = (dontCheckAlerts) ? false : true;
+}
+ActionHandler.prototype = new CommandHandler;
+ActionHandler.prototype.execute = function(seleniumApi, command) {
+    if (this.checkAlerts && (null==/(Alert|Confirmation)(Not)?Present/.exec(command.command))) {
+	this.checkForAlerts(seleniumApi);
+    }
+    var processState = this.executor.call(seleniumApi, command.target, command.value);
+    // If the handler didn't return a wait flag, check to see if the
+    // handler was registered with the wait flag.
+    if (processState == undefined && this.wait) {
+        processState = SELENIUM_PROCESS_WAIT;
+    }
+    return new CommandResult(processState);
+};
+ActionHandler.prototype.checkForAlerts = function(seleniumApi) {
+    if ( seleniumApi.browserbot.hasAlerts() ) {
+        throw new SeleniumError("There was an unexpected Alert! [" + seleniumApi.browserbot.getNextAlert() + "]");
+    }
+    if ( seleniumApi.browserbot.hasConfirmations() ) {
+        throw new SeleniumError("There was an unexpected Confirmation! [" + seleniumApi.browserbot.getNextConfirmation() + "]");
+    }
+};
+
+function AccessorHandler(accessor) {
+    CommandHandler.call(this, "accessor", true, accessor);
+}
+AccessorHandler.prototype = new CommandHandler;
+AccessorHandler.prototype.execute = function(seleniumApi, command) {
+    var returnValue = this.executor.call(seleniumApi, command.target, command.value);
+    var result = new CommandResult();
+    result.result = returnValue;
+    return result;
+};
+
+/**
+ * Handler for assertions and verifications.
+ */
+function AssertHandler(assertion, haltOnFailure) {
+    CommandHandler.call(this, "assert", haltOnFailure || false, assertion);
+}
+AssertHandler.prototype = new CommandHandler;
+AssertHandler.prototype.execute = function(seleniumApi, command) {
+    var result = new CommandResult();
+    try {
+        this.executor.call(seleniumApi, command.target, command.value);
+        result.passed = true;
+    } catch (e) {
+        // If this is not a AssertionFailedError, or we should haltOnFailure, rethrow.
+        if (!e.isAssertionFailedError) {
+            throw e;
+        }
+        if (this.haltOnFailure) {
+            var error = new SeleniumError(e.failureMessage);
+            throw error;
+        }
+        result.failed = true;
+        result.failureMessage = e.failureMessage;
+    }
+    return result;
+};
+
+
+function CommandResult(processState) {
+    this.processState = processState;
+    this.result = null;
+}
+
+function SeleniumCommand(command, target, value) {
+    this.command = command;
+    this.target = target;
+    this.value = value;
+}
diff --git a/tests/FunctionalTests/selenium/core/scripts/selenium-executionloop.js b/tests/FunctionalTests/selenium/core/scripts/selenium-executionloop.js
new file mode 100755
index 00000000..14c1a07a
--- /dev/null
+++ b/tests/FunctionalTests/selenium/core/scripts/selenium-executionloop.js
@@ -0,0 +1,266 @@
+/*
+* Copyright 2004 ThoughtWorks, Inc
+*
+*  Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*/
+
+SELENIUM_PROCESS_WAIT = "wait";
+
+function TestLoop(commandFactory) {
+
+    this.commandFactory = commandFactory;
+    this.waitForConditionTimeout = 30 * 1000; // 30 seconds
+
+    this.start = function() {
+        selenium.reset();
+        LOG.debug("testLoop.start()");
+        this.continueTest();
+    };
+
+    /**
+     * Select the next command and continue the test.
+     */
+    this.continueTest = function() {
+    	LOG.debug("testLoop.continueTest() - acquire the next command");
+        if (! this.aborted) {
+            this.currentCommand = this.nextCommand();
+        }
+        if (! this.requiresCallBack) {
+        	this.beginNextTest();
+        } // otherwise, just finish and let the callback invoke beginNextTest()
+    };
+    
+    this.beginNextTest = function() {
+    	LOG.debug("testLoop.beginNextTest()");
+    	if (this.currentCommand) {
+            // TODO: rename commandStarted to commandSelected, OR roll it into nextCommand
+            this.commandStarted(this.currentCommand);
+            this.resumeAfterDelay();
+        } else {
+            this.testComplete();
+        }
+    }
+    
+    /**
+     * Pause, then execute the current command.
+     */
+    this.resumeAfterDelay = function() {
+
+        // Get the command delay. If a pauseInterval is set, use it once
+        // and reset it.  Otherwise, use the defined command-interval.
+        var delay = this.pauseInterval || this.getCommandInterval();
+        this.pauseInterval = undefined;
+
+        if (delay < 0) {
+            // Pause: enable the "next/continue" button
+            this.pause();
+        } else {
+            window.setTimeout("testLoop.resume()", delay);
+        }
+    };
+
+    /**
+     * Select the next command and continue the test.
+     */
+    this.resume = function() {
+    	LOG.debug("testLoop.resume() - actually execute");
+        try {
+            this.executeCurrentCommand();
+            this.waitForConditionStart = new Date().getTime();
+            this.continueTestWhenConditionIsTrue();
+        } catch (e) {
+            this.handleCommandError(e);
+            this.testComplete();
+            return;
+        }
+    };
+
+    /**
+     * Execute the current command.  
+     * 
+     * The return value, if not null, should be a function which will be
+     * used to determine when execution can continue.
+     */
+    this.executeCurrentCommand = function() {
+
+        var command = this.currentCommand;
+        LOG.info("Executing: |" + command.command + " | " + command.target + " | " + command.value + " |");
+        
+        var handler = this.commandFactory.getCommandHandler(command.command);
+        if (handler == null) {
+            throw new SeleniumError("Unknown command: '" + command.command + "'");
+        }
+        
+        command.target = selenium.preprocessParameter(command.target);
+        command.value = selenium.preprocessParameter(command.value);
+        LOG.debug("Command found, going to execute " + command.command);
+        var result = handler.execute(selenium, command);
+		LOG.debug("Command complete");
+        this.commandComplete(result);
+
+        if (result.processState == SELENIUM_PROCESS_WAIT) {
+            this.waitForCondition = function() {
+            	LOG.debug("Checking condition: isNewPageLoaded?");
+                return selenium.browserbot.isNewPageLoaded();
+            };
+        }
+    };
+    
+    this.handleCommandError = function(e) {
+       if (!e.isSeleniumError) {
+            LOG.exception(e);
+            var msg = "Selenium failure. Please report to selenium-dev@openqa.org, with error details from the log window.";
+            if (e.message) {
+               msg += "  The error message is: " + e.message;
+            }
+            this.commandError(msg);
+        } else {
+            LOG.error(e.message);
+            this.commandError(e.message);
+        }
+    };
+
+    /**
+     * Busy wait for waitForCondition() to become true, and then carry on
+     * with test.  Fail the current test if there's a timeout or an exception.
+     */
+    this.continueTestWhenConditionIsTrue = function () {
+    	LOG.debug("testLoop.continueTestWhenConditionIsTrue()");
+        try {
+            if (this.waitForCondition == null || this.waitForCondition()) {
+            	LOG.debug("condition satisfied; let's continueTest()");
+	            this.waitForCondition = null;
+	            this.waitForConditionStart = null;
+	            this.continueTest();
+	        } else {
+	        	LOG.debug("waitForCondition was false; keep waiting!");
+	        	if (this.waitForConditionTimeout != null) {
+		        	var now = new Date();
+		        	if ((now - this.waitForConditionStart) > this.waitForConditionTimeout) {
+		        		throw new SeleniumError("Timed out after " + this.waitForConditionTimeout + "ms");
+		        	}
+		        }
+	            window.setTimeout("testLoop.continueTestWhenConditionIsTrue()", 10);
+	        }
+	    } catch (e) {
+	    	var lastResult = new CommandResult();
+    		lastResult.failed = true;
+    		lastResult.failureMessage = e.message;
+	    	this.commandComplete(lastResult);
+	    	this.testComplete();
+	    }
+    };
+
+}
+
+/** The default is not to have any interval between commands. */
+TestLoop.prototype.getCommandInterval = function() {
+    return 0;
+};
+
+TestLoop.prototype.nextCommand = noop;
+
+TestLoop.prototype.commandStarted = noop;
+
+TestLoop.prototype.commandError = noop;
+
+TestLoop.prototype.commandComplete = noop;
+
+TestLoop.prototype.testComplete = noop;
+
+TestLoop.prototype.pause = noop;
+
+function noop() {
+
+};
+
+/**
+ * Tell Selenium to expect a failure on the next command execution. This
+ * command temporarily installs a CommandFactory that generates
+ * CommandHandlers that expect a failure.
+ */
+Selenium.prototype.assertFailureOnNext = function(message) {
+    if (!message) {
+        throw new Error("Message must be provided");
+    }
+
+    var expectFailureCommandFactory =
+        new ExpectFailureCommandFactory(testLoop.commandFactory, message, "failure");
+    expectFailureCommandFactory.baseExecutor = executeCommandAndReturnFailureMessage;
+    testLoop.commandFactory = expectFailureCommandFactory;
+};
+
+/**
+ * Tell Selenium to expect an error on the next command execution. This
+ * command temporarily installs a CommandFactory that generates
+ * CommandHandlers that expect a failure.
+ */
+Selenium.prototype.assertErrorOnNext = function(message) {
+    if (!message) {
+        throw new Error("Message must be provided");
+    }
+
+    var expectFailureCommandFactory =
+        new ExpectFailureCommandFactory(testLoop.commandFactory, message, "error");
+    expectFailureCommandFactory.baseExecutor = executeCommandAndReturnErrorMessage;
+    testLoop.commandFactory = expectFailureCommandFactory;
+};
+
+function ExpectFailureCommandFactory(originalCommandFactory, expectedErrorMessage, errorType) {
+    this.getCommandHandler = function(name) {
+        var baseHandler = originalCommandFactory.getCommandHandler(name);
+        var baseExecutor = this.baseExecutor;
+        var expectFailureCommand = {};
+        expectFailureCommand.execute = function() {
+            var baseFailureMessage = baseExecutor(baseHandler, arguments);
+            var result = new CommandResult();
+            if (!baseFailureMessage) {
+                result.failed = true;
+                result.failureMessage = "Expected " + errorType + " did not occur.";
+            }
+            else {
+                if (! PatternMatcher.matches(expectedErrorMessage, baseFailureMessage)) {
+                    result.failed = true;
+                    result.failureMessage = "Expected " + errorType + " message '" + expectedErrorMessage
+                                            + "' but was '" + baseFailureMessage + "'";
+                }
+                else {
+                    result.passed = true;
+                    result.result = baseFailureMessage;
+                }
+            }
+            testLoop.commandFactory = originalCommandFactory;
+            return result;
+        };
+        return expectFailureCommand;
+    };
+};
+
+function executeCommandAndReturnFailureMessage(baseHandler, originalArguments) {
+    var baseResult = baseHandler.execute.apply(baseHandler, originalArguments);
+    if (baseResult.passed) {
+        return null;
+    }
+    return baseResult.failureMessage;
+};
+
+function executeCommandAndReturnErrorMessage(baseHandler, originalArguments) {
+    try {
+        baseHandler.execute.apply(baseHandler, originalArguments);
+        return null;
+    }
+    catch (expected) {
+        return expected.message;
+    }
+};
+
diff --git a/tests/FunctionalTests/selenium/core/scripts/selenium-logging.js b/tests/FunctionalTests/selenium/core/scripts/selenium-logging.js
new file mode 100755
index 00000000..b0fc67e4
--- /dev/null
+++ b/tests/FunctionalTests/selenium/core/scripts/selenium-logging.js
@@ -0,0 +1,112 @@
+/*
+* Copyright 2004 ThoughtWorks, Inc
+*
+*  Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*/
+
+var Logger = function() {
+    this.logWindow = null;
+}
+Logger.prototype = {
+
+    setLogLevelThreshold: function(logLevel) {
+    	this.pendingLogLevelThreshold = logLevel;
+        this.show();
+        //
+        // The following message does not show up in the log -- _unless_ I step along w/ the debugger
+        // down to the append call.  I believe this is because the new log window has not yet loaded,
+        // and therefore the log msg is discarded; but if I step through the debugger, this changes
+        // the scheduling so as to load that window and make it ready.
+        // this.info("Log level programmatically set to " + logLevel + " (presumably by driven-mode test code)");
+    },
+
+    getLogWindow: function() {
+        if (this.logWindow && this.logWindow.closed) {
+            this.logWindow = null;
+        }
+        if (this.logWindow && this.pendingLogLevelThreshold && this.logWindow.setThresholdLevel) {
+            this.logWindow.setThresholdLevel(this.pendingLogLevelThreshold);
+            
+            // can't just directly log because that action would loop back to this code infinitely
+            this.pendingInfoMessage = "Log level programmatically set to " + this.pendingLogLevelThreshold + " (presumably by driven-mode test code)";
+            
+            this.pendingLogLevelThreshold = null;	// let's only go this way one time
+        }
+
+        return this.logWindow;
+    },
+    
+    openLogWindow: function() {
+        this.logWindow = window.open(
+            getDocumentBase(document) + "SeleniumLog.html", "SeleniumLog",
+            "width=600,height=250,bottom=0,right=0,status,scrollbars,resizable"
+        );
+        return this.logWindow;
+    },
+    
+    show: function() {
+        if (! this.getLogWindow()) {
+            this.openLogWindow();
+        }
+    },
+
+    log: function(message, className) {
+        var logWindow = this.getLogWindow();
+        if (logWindow) {
+            if (logWindow.append) {
+            	if (this.pendingInfoMessage) {
+ 		    logWindow.append("info: " + this.pendingInfoMessage, "info");
+                    this.pendingInfoMessage = null;
+                }
+                logWindow.append(className + ": " + message, className);
+            }
+        }
+    },
+
+    close: function(message) {
+    	if (this.logWindow != null) {
+        	try {
+        		this.logWindow.close();
+        	} catch (e) {
+        		// swallow exception
+        		// the window is probably closed if we get an exception here
+        	}
+        	this.logWindow = null;
+        }
+    },
+
+    debug: function(message) {
+        this.log(message, "debug");
+    },
+
+    info: function(message) {
+        this.log(message, "info");
+    },
+
+    warn: function(message) {
+        this.log(message, "warn");
+    },
+
+    error: function(message) {
+        this.log(message, "error");
+    },
+
+    exception: function(exception) {
+        var msg = "Unexpected Exception: " + describe(exception, ', ');
+        this.error(msg);
+    }
+
+};
+
+var LOG = new Logger();
+
diff --git a/tests/FunctionalTests/selenium/core/scripts/selenium-seleneserunner.js b/tests/FunctionalTests/selenium/core/scripts/selenium-seleneserunner.js
new file mode 100755
index 00000000..041b3bf9
--- /dev/null
+++ b/tests/FunctionalTests/selenium/core/scripts/selenium-seleneserunner.js
@@ -0,0 +1,300 @@
+/*
+* Copyright 2005 ThoughtWorks, Inc
+*
+*  Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*
+*/
+
+passColor = "#cfffcf";
+failColor = "#ffcfcf";
+errorColor = "#ffffff";
+workingColor = "#DEE7EC";
+doneColor = "#FFFFCC";
+
+slowMode = false;
+
+var cmd1 = document.createElement("div");
+var cmd2 = document.createElement("div");
+var cmd3 = document.createElement("div");
+var cmd4 = document.createElement("div");
+
+var postResult = "START";
+
+queryString = null;
+
+function runTest() {
+    var testAppFrame = document.getElementById('myiframe');
+    selenium = Selenium.createForFrame(testAppFrame);
+
+    commandFactory = new CommandHandlerFactory();
+    commandFactory.registerAll(selenium);
+
+    testLoop = new TestLoop(commandFactory);
+
+    testLoop.nextCommand = nextCommand;
+    testLoop.commandStarted = commandStarted;
+    testLoop.commandComplete = commandComplete;
+    testLoop.commandError = commandError;
+    testLoop.requiresCallBack = true;
+    testLoop.testComplete = function() {
+    	window.status = "Selenium Tests Complete, for this Test"
+    	// Continue checking for new results
+    	testLoop.continueTest();
+    	postResult = "START";
+    };
+
+    document.getElementById("commandList").appendChild(cmd4);
+    document.getElementById("commandList").appendChild(cmd3);
+    document.getElementById("commandList").appendChild(cmd2);
+    document.getElementById("commandList").appendChild(cmd1);
+    
+    var doContinue = getQueryVariable("continue");
+	if (doContinue != null) postResult = "OK";
+
+    testLoop.start();
+}
+
+function getQueryString() {
+	if (queryString != null) return queryString;
+	if (browserVersion.isHTA) {
+		var args = extractArgs();
+		if (args.length < 2) return null;
+		queryString = args[1];
+		return queryString;
+	} else {
+		return location.search.substr(1);
+	}
+}
+
+function extractArgs() {
+	var str = SeleniumHTARunner.commandLine;
+	if (str == null || str == "") return new Array();
+    var matches = str.match(/(?:"([^"]+)"|(?!"([^"]+)")(\S+))/g);
+    // We either want non quote stuff ([^"]+) surrounded by quotes
+    // or we want to look-ahead, see that the next character isn't
+    // a quoted argument, and then grab all the non-space stuff
+    // this will return for the line: "foo" bar
+    // the results "\"foo\"" and "bar"
+
+    // So, let's unquote the quoted arguments:
+    var args = new Array;
+    for (var i = 0; i < matches.length; i++) {
+        args[i] = matches[i];
+        args[i] = args[i].replace(/^"(.*)"$/, "$1");
+    }
+    return args;
+}
+
+function getQueryVariable(variable) {
+    var query = getQueryString();
+    if (query == null) return null;
+    var vars = query.split("&");
+    for (var i=0;i " + e[key] + "\n"
+        }
+        LOG.error(s);
+        return null;
+    }
+    return null;
+}
+
+ function handleHttpResponse() {
+ 	if (xmlHttp.readyState == 4) {
+ 		if (xmlHttp.status == 200) {
+ 			var command = extractCommand(xmlHttp);
+ 			testLoop.currentCommand = command;
+ 			testLoop.beginNextTest();
+ 		} else {
+ 			var s = 'xmlHttp returned: ' + xmlHttp.status + ": " + xmlHttp.statusText;
+ 			LOG.error(s);
+ 			testLoop.currentCommand = null;
+ 			setTimeout("testLoop.beginNextTest();", 2000);
+ 		}
+ 		
+ 	}
+ }
+
+
+function extractCommand(xmlHttp) {
+    if (slowMode) {
+        delay(2000);
+    }
+
+    var command;
+    try {
+        command = xmlHttp.responseText;
+    } catch (e) {
+        alert('could not get responseText: ' + e.message);
+    }
+    if (command.substr(0,'|testComplete'.length)=='|testComplete') {
+        return null;
+    }
+
+    return createCommandFromRequest(command);
+}
+
+function commandStarted(command) {
+    commandNode = document.createElement("div");
+    innerHTML = command.command + '(';
+    if (command.target != null && command.target != "") {
+        innerHTML += command.target;
+        if (command.value != null && command.value != "") {
+            innerHTML += ', ' + command.value;
+        }
+    }
+    innerHTML += ")";
+    commandNode.innerHTML = innerHTML;
+    commandNode.style.backgroundColor = workingColor;
+    document.getElementById("commandList").removeChild(cmd1);
+    document.getElementById("commandList").removeChild(cmd2);
+    document.getElementById("commandList").removeChild(cmd3);
+    document.getElementById("commandList").removeChild(cmd4);
+    cmd4 = cmd3;
+    cmd3 = cmd2;
+    cmd2 = cmd1;
+    cmd1 = commandNode;
+    document.getElementById("commandList").appendChild(cmd4);
+    document.getElementById("commandList").appendChild(cmd3);
+    document.getElementById("commandList").appendChild(cmd2);
+    document.getElementById("commandList").appendChild(cmd1);
+}
+
+function commandComplete(result) {
+    if (result.failed) {
+    	if (postResult == "CONTINUATION") {
+    		testLoop.aborted = true;
+    	}
+        postResult = result.failureMessage;
+        commandNode.title = result.failureMessage;
+        commandNode.style.backgroundColor = failColor;
+    } else if (result.passed) {
+        postResult = "OK";
+        commandNode.style.backgroundColor = passColor;
+    } else {
+    	if (result.result == null) {
+    		postResult = "OK";
+    	} else {
+    		postResult = "OK," + result.result;
+    	}
+        commandNode.style.backgroundColor = doneColor;
+    }
+}
+
+function commandError(message) {
+    postResult = "ERROR: " + message;
+    commandNode.style.backgroundColor = errorColor;
+    commandNode.title = message;
+}
+
+function slowClicked() {
+    slowMode = !slowMode;
+}
+
+function delay(millis) {
+    startMillis = new Date();
+    while (true) {
+        milli = new Date();
+        if (milli-startMillis > millis) {
+            break;
+        }
+    }
+}
+
+function getIframeDocument(iframe) {
+    if (iframe.contentDocument) {
+        return iframe.contentDocument;
+    }
+    else {
+        return iframe.contentWindow.document;
+    }
+}
+
+// Parses a URI query string into a SeleniumCommand object
+function createCommandFromRequest(commandRequest) {
+	//decodeURIComponent doesn't strip plus signs
+	var processed = commandRequest.replace(/\+/g, "%20");
+	// strip trailing spaces
+	var processed = processed.replace(/\s+$/, "");
+    var vars = processed.split("&");
+    var cmdArgs = new Object();
+    for (var i=0;i= 3) {
+                    this.addCommandRow(candidateRows[j]);
+                }
+            }
+        }
+    },
+
+    addCommandRow: function(row) {
+        if (row.cells[2] && row.cells[2].originalHTML) {
+            row.cells[2].innerHTML = row.cells[2].originalHTML;
+        }
+        row.bgColor = "";
+        this.commandRows.push(row);
+    },
+
+    nextCommand: function() {
+        if (this.commandRows.length > 0) {
+            this.currentRow = this.commandRows.shift();
+        } else {
+            this.currentRow = null;
+        }
+        return this.currentRow;
+    }
+
+};
+
+function startTestSuite() {
+    resetMetrics();
+    currentRowInSuite = 0;
+    runAllTests = true;
+    suiteFailed = false;
+
+    runNextTest();
+}
+
+function runNextTest() {
+    if (!runAllTests)
+            return;
+
+    suiteTable = getIframeDocument(getSuiteFrame()).getElementsByTagName("table")[0];
+
+    // Do not change the row color of the first row
+    if (currentRowInSuite > 0) {
+        // Provide test-status feedback
+        if (testFailed) {
+            setCellColor(suiteTable.rows, currentRowInSuite, 0, failColor);
+        } else {
+            setCellColor(suiteTable.rows, currentRowInSuite, 0, passColor);
+        }
+
+        // Set the results from the previous test run
+        setResultsData(suiteTable, currentRowInSuite);
+    }
+
+    currentRowInSuite++;
+
+    // If we are done with all of the tests, set the title bar as pass or fail
+    if (currentRowInSuite >= suiteTable.rows.length) {
+        if (suiteFailed) {
+            setCellColor(suiteTable.rows, 0, 0, failColor);
+        } else {
+            setCellColor(suiteTable.rows, 0, 0, passColor);
+        }
+
+        // If this is an automated run (i.e., build script), then submit
+        // the test results by posting to a form
+        if (isAutomatedRun())
+                postTestResults(suiteFailed, suiteTable);
+    }
+
+    else {
+        // Make the current row blue
+        setCellColor(suiteTable.rows, currentRowInSuite, 0, workingColor);
+
+        testLink = suiteTable.rows[currentRowInSuite].cells[0].getElementsByTagName("a")[0];
+        testLink.focus();
+
+        var testFrame = getTestFrame();
+        addLoadListener(testFrame, startTest);
+
+        selenium.browserbot.setIFrameLocation(testFrame, testLink.href);
+    }
+}
+
+function setCellColor(tableRows, row, col, colorStr) {
+    tableRows[row].cells[col].bgColor = colorStr;
+}
+
+// Sets the results from a test into a hidden column on the suite table.  So,
+// for each tests, the second column is set to the HTML from the test table.
+function setResultsData(suiteTable, row) {
+    // Create a text node of the test table
+    var resultTable = getIframeDocument(getTestFrame()).body.innerHTML;
+    if (!resultTable) return;
+
+    var tableNode = suiteTable.ownerDocument.createElement("div");
+    tableNode.innerHTML = resultTable;
+
+    var new_column = suiteTable.ownerDocument.createElement("td");
+    new_column.appendChild(tableNode);
+
+    // Set the column to be invisible
+    new_column.style.display = "none";
+
+    // Add the invisible column
+    suiteTable.rows[row].appendChild(new_column);
+}
+
+// Post the results to a servlet, CGI-script, etc.  The URL of the
+// results-handler defaults to "/postResults", but an alternative location
+// can be specified by providing a "resultsUrl" query parameter.
+//
+// Parameters passed to the results-handler are:
+//      result:         passed/failed depending on whether the suite passed or failed
+//      totalTime:      the total running time in seconds for the suite.
+//
+//      numTestPasses:  the total number of tests which passed.
+//      numTestFailures: the total number of tests which failed.
+//
+//      numCommandPasses: the total number of commands which passed.
+//      numCommandFailures: the total number of commands which failed.
+//      numCommandErrors: the total number of commands which errored.
+//
+//      suite:      the suite table, including the hidden column of test results
+//      testTable.1 to testTable.N: the individual test tables
+//
+function postTestResults(suiteFailed, suiteTable) {
+
+    form = document.createElement("form");
+    document.body.appendChild(form);
+
+    form.id = "resultsForm";
+    form.method="post";
+    form.target="myiframe";
+
+    var resultsUrl = getQueryParameter("resultsUrl");
+    if (!resultsUrl) {
+        resultsUrl = "./postResults";
+    }
+
+    var actionAndParameters = resultsUrl.split('?',2);
+    form.action = actionAndParameters[0];
+    var resultsUrlQueryString = actionAndParameters[1];
+
+    form.createHiddenField = function(name, value) {
+        input = document.createElement("input");
+        input.type = "hidden";
+        input.name = name;
+        input.value = value;
+        this.appendChild(input);
+    };
+
+    if (resultsUrlQueryString) {
+        var clauses = resultsUrlQueryString.split('&');
+        for (var i = 0; i < clauses.length; i++) {
+            var keyValuePair = clauses[i].split('=',2);
+            var key = unescape(keyValuePair[0]);
+            var value = unescape(keyValuePair[1]);
+            form.createHiddenField(key, value);
+        }
+    }
+
+    form.createHiddenField("selenium.version", Selenium.version);
+    form.createHiddenField("selenium.revision", Selenium.revision);
+    
+    form.createHiddenField("result", suiteFailed == true ? "failed" : "passed");
+
+    form.createHiddenField("totalTime", Math.floor((currentTime - startTime) / 1000));
+    form.createHiddenField("numTestPasses", numTestPasses);
+    form.createHiddenField("numTestFailures", numTestFailures);
+    form.createHiddenField("numCommandPasses", numCommandPasses);
+    form.createHiddenField("numCommandFailures", numCommandFailures);
+    form.createHiddenField("numCommandErrors", numCommandErrors);
+
+    // Create an input for each test table.  The inputs are named
+    // testTable.1, testTable.2, etc.
+    for (rowNum = 1; rowNum < suiteTable.rows.length;rowNum++) {
+        // If there is a second column, then add a new input
+        if (suiteTable.rows[rowNum].cells.length > 1) {
+            var resultCell = suiteTable.rows[rowNum].cells[1];
+            form.createHiddenField("testTable." + rowNum, resultCell.innerHTML);
+            // remove the resultCell, so it's not included in the suite HTML
+            resultCell.parentNode.removeChild(resultCell); 
+        }
+    }
+    
+    form.createHiddenField("numTestTotal", rowNum);
+
+    // Add HTML for the suite itself
+    form.createHiddenField("suite", suiteTable.parentNode.innerHTML);
+
+	if (isQueryParameterTrue("save")) {
+		saveToFile(resultsUrl, form);
+	} else {
+    	form.submit();
+    }
+    document.body.removeChild(form);
+	if (isQueryParameterTrue("close")) {
+    	window.top.close();
+    }
+}
+
+function saveToFile(fileName, form) {
+	// This only works when run as an IE HTA
+	var inputs = new Object();
+	for (var i = 0; i < form.elements.length; i++) {
+		inputs[form.elements[i].name] = form.elements[i].value;
+	}
+	var objFSO = new ActiveXObject("Scripting.FileSystemObject")
+	var scriptFile = objFSO.CreateTextFile(fileName);
+	scriptFile.WriteLine("\n
        Test suite results 
        " +
+            "\n\n\n\n\n\n" +
+            "\n\n\n\n\n" +
+            "\n\n\n\n" +
+            "\n\n\n\n" +
+            "\n\n\n\n" +
+            "\n\n\n\n" +
+            "\n\n\n\n" +
+            "\n\n\n");
+    var testNum = inputs["numTestTotal"];
+    for (var rowNum = 1; rowNum < testNum; rowNum++) {
+    	scriptFile.WriteLine("\n\n\n");
+    }
+    scriptFile.WriteLine("
        result:" + inputs["result"] + "
        totalTime:" + inputs["totalTime"] + "
        numTestPasses:" + inputs["numTestPasses"] + "
        numTestFailures:" + inputs["numTestFailures"] + "
        numCommandPasses:" + inputs["numCommandPasses"] + "
        numCommandFailures:" + inputs["numCommandFailures"] + "
        numCommandErrors:" + inputs["numCommandErrors"] + "
        " + inputs["suite"] + " 
        " + inputs["testTable." + rowNum] + " 
        ");
+    scriptFile.Close();
+}
+
+function printMetrics() {
+    setText(document.getElementById("commandPasses"), numCommandPasses);
+    setText(document.getElementById("commandFailures"), numCommandFailures);
+    setText(document.getElementById("commandErrors"), numCommandErrors);
+    setText(document.getElementById("testRuns"), numTestPasses + numTestFailures);
+    setText(document.getElementById("testFailures"), numTestFailures);
+
+    currentTime = new Date().getTime();
+
+    timeDiff = currentTime - startTime;
+    totalSecs = Math.floor(timeDiff / 1000);
+
+    minutes = Math.floor(totalSecs / 60);
+    seconds = totalSecs % 60;
+
+    setText(document.getElementById("elapsedTime"), pad(minutes)+":"+pad(seconds));
+}
+
+// Puts a leading 0 on num if it is less than 10
+function pad (num) {
+    return (num > 9) ? num : "0" + num;
+}
+
+/*
+ * Register all of the built-in command handlers with the CommandHandlerFactory.
+ * TODO work out an easy way for people to register handlers without modifying the Selenium sources.
+ */
+function registerCommandHandlers() {
+    commandFactory = new CommandHandlerFactory();
+    commandFactory.registerAll(selenium);
+
+}
+
+function initialiseTestLoop() {
+    testLoop = new TestLoop(commandFactory);
+
+    testLoop.getCommandInterval = function() { return runInterval; };
+    testLoop.nextCommand = nextCommand;
+    testLoop.commandStarted = commandStarted;
+    testLoop.commandComplete = commandComplete;
+    testLoop.commandError = commandError;
+    testLoop.testComplete = testComplete;
+    testLoop.pause = function() {
+        document.getElementById('continueTest').disabled = false;
+    };
+    return testLoop;
+}
+
+function nextCommand() {
+    var row = currentTest.nextCommand();
+    if (row == null) {
+        return null;
+    }
+    row.cells[2].originalHTML = row.cells[2].innerHTML;
+    return new SeleniumCommand(getText(row.cells[0]), 
+                               getText(row.cells[1]),
+                               getText(row.cells[2]));
+}
+
+function removeNbsp(value) {
+    return value.replace(/\240/g, "");
+}
+
+function scrollIntoView(element) {
+    if (element.scrollIntoView) {
+        element.scrollIntoView(false);
+        return;
+    }
+    // TODO: work out how to scroll browsers that don't support
+    // scrollIntoView (like Konqueror)
+}
+
+function commandStarted() {
+    currentTest.currentRow.bgColor = workingColor;
+    scrollIntoView(currentTest.currentRow.cells[0]);
+    printMetrics();
+}
+
+function commandComplete(result) {
+    if (result.failed) {
+        numCommandFailures += 1;
+        recordFailure(result.failureMessage);
+    } else if (result.passed) {
+        numCommandPasses += 1;
+        currentTest.currentRow.bgColor = passColor;
+    } else {
+        currentTest.currentRow.bgColor = doneColor;
+    }
+}
+
+function commandError(errorMessage) {
+    numCommandErrors += 1;
+    recordFailure(errorMessage);
+}
+
+function recordFailure(errorMsg) {
+    LOG.warn("recordFailure: " + errorMsg);
+    // Set cell background to red
+    currentTest.currentRow.bgColor = failColor;
+
+    // Set error message
+    currentTest.currentRow.cells[2].innerHTML = errorMsg;
+    currentTest.currentRow.title = errorMsg;
+    testFailed = true;
+    suiteFailed = true;
+}
+
+function testComplete() {
+    var resultColor = passColor;
+    if (testFailed) {
+        resultColor = failColor;
+        numTestFailures += 1;
+    } else {
+        numTestPasses += 1;
+    }
+
+    if (currentTest.headerRow) {
+        currentTest.headerRow.bgColor = resultColor;
+    }
+    
+    printMetrics();
+
+    window.setTimeout("runNextTest()", 1);
+}
+
+Selenium.prototype.doPause = function(waitTime) {
+    testLoop.pauseInterval = waitTime;
+};
+
+Selenium.prototype.doPause.dontCheckAlertsAndConfirms = true;
+
+Selenium.prototype.doBreak = function() {
+    document.getElementById('modeStep').checked = true;
+    runInterval = -1;
+};
+
+/*
+ * Click on the located element, and attach a callback to notify
+ * when the page is reloaded.
+ */
+Selenium.prototype.doModalDialogTest = function(returnValue) {
+    this.browserbot.doModalDialogTest(returnValue);
+};
+
+/*
+ * Store the value of a form input in a variable
+ */
+Selenium.prototype.doStoreValue = function(target, varName) {
+    if (!varName) {
+        // Backward compatibility mode: read the ENTIRE text of the page
+        // and stores it in a variable with the name of the target
+        value = this.page().bodyText();
+        storedVars[target] = value;
+        return;
+    }
+    var element = this.page().findElement(target);
+    storedVars[varName] = getInputValue(element);
+};
+
+/*
+ * Store the text of an element in a variable
+ */
+Selenium.prototype.doStoreText = function(target, varName) {
+    var element = this.page().findElement(target);
+    storedVars[varName] = getText(element);
+};
+
+/*
+ * Store the value of an element attribute in a variable
+ */
+Selenium.prototype.doStoreAttribute = function(target, varName) {
+    storedVars[varName] = this.page().findAttribute(target);
+};
+
+/*
+ * Store the result of a literal value
+ */
+Selenium.prototype.doStore = function(value, varName) {
+    storedVars[varName] = value;
+};
+
+Selenium.prototype.doEcho = function(msg) {
+	currentTest.currentRow.cells[2].innerHTML = msg;
+}
diff --git a/tests/FunctionalTests/selenium/core/scripts/selenium-version.js b/tests/FunctionalTests/selenium/core/scripts/selenium-version.js
new file mode 100755
index 00000000..1fee837b
--- /dev/null
+++ b/tests/FunctionalTests/selenium/core/scripts/selenium-version.js
@@ -0,0 +1,5 @@
+Selenium.version = "@VERSION@";
+Selenium.revision = "@REVISION@";
+
+window.top.document.title += " v" + Selenium.version + " [" + Selenium.revision + "]";
+
diff --git a/tests/FunctionalTests/selenium/core/scripts/user-extensions.js.sample b/tests/FunctionalTests/selenium/core/scripts/user-extensions.js.sample
new file mode 100755
index 00000000..0f0ca840
--- /dev/null
+++ b/tests/FunctionalTests/selenium/core/scripts/user-extensions.js.sample
@@ -0,0 +1,75 @@
+/*
+ * By default, Selenium looks for a file called "user-extensions.js", and loads and javascript
+ * code found in that file. This file is a sample of what that file could look like.
+ *
+ * user-extensions.js provides a convenient location for adding extensions to Selenium, like
+ * new actions, checks and locator-strategies.
+ * By default, this file does not exist. Users can create this file and place their extension code
+ * in this common location, removing the need to modify the Selenium sources, and hopefully assisting
+ * with the upgrade process.
+ *
+ * You can find contributed extensions at http://wiki.openqa.org/display/SEL/Contributed%20User-Extensions
+ */
+
+// The following examples try to give an indication of how Selenium can be extended with javascript.
+
+// All do* methods on the Selenium prototype are added as actions.
+// Eg add a typeRepeated action to Selenium, which types the text twice into a text box.
+// The typeTwiceAndWait command will be available automatically
+Selenium.prototype.doTypeRepeated = function(locator, text) {
+    // All locator-strategies are automatically handled by "findElement"
+    var element = this.page().findElement(locator);
+
+    // Create the text to type
+    var valueToType = text + text;
+
+    // Replace the element text with the new text
+    this.page().replaceText(element, valueToType);
+};
+
+// All assert* methods on the Selenium prototype are added as checks.
+// Eg add a assertValueRepeated check, that makes sure that the element value
+// consists of the supplied text repeated.
+// The verify version will be available automatically.
+Selenium.prototype.assertValueRepeated = function(locator, text) {
+    // All locator-strategies are automatically handled by "findElement"
+    var element = this.page().findElement(locator);
+
+    // Create the text to verify
+    var expectedValue = text + text;
+
+    // Get the actual element value
+    var actualValue = element.value;
+
+    // Make sure the actual value matches the expected
+    Assert.matches(expectedValue, actualValue);
+};
+
+// All get* methods on the Selenium prototype result in
+// store, assert, assertNot, verify, verifyNot, waitFor, and waitForNot commands.
+// E.g. add a getTextLength method that returns the length of the text
+// of a specified element.
+// Will result in support for storeTextLength, assertTextLength, etc.
+Selenium.prototype.getTextLength = function(locator) {
+	return this.getText(locator).length;
+};
+
+// All locateElementBy* methods are added as locator-strategies.
+// Eg add a "valuerepeated=" locator, that finds the first element with the supplied value, repeated.
+// The "inDocument" is a the document you are searching.
+PageBot.prototype.locateElementByValueRepeated = function(text, inDocument) {
+    // Create the text to search for
+    var expectedValue = text + text;
+
+    // Loop through all elements, looking for ones that have a value === our expected value
+    var allElements = inDocument.getElementsByTagName("*");
+    for (var i = 0; i < allElements.length; i++) {
+        var testElement = allElements[i];
+        if (testElement.value && testElement.value === expectedValue) {
+            return testElement;
+        }
+    }
+    return null;
+};
+
+
diff --git a/tests/FunctionalTests/selenium/core/scripts/xmlextras.js b/tests/FunctionalTests/selenium/core/scripts/xmlextras.js
new file mode 100755
index 00000000..267aa058
--- /dev/null
+++ b/tests/FunctionalTests/selenium/core/scripts/xmlextras.js
@@ -0,0 +1,153 @@
+// This is a third party JavaScript library from
+// http://webfx.eae.net/dhtml/xmlextras/xmlextras.html
+// i.e. This has not been written by ThoughtWorks.
+
+//
-    
-	
-		
        DOM Viewer
        
-		
         This page is generated using JavaScript. If you see this text, your 
-			browser doesn't support JavaScript.
        
-	
-	
-
diff --git a/tests/FunctionalTests/selenium/html-xpath/carnation.jpg b/tests/FunctionalTests/selenium/html-xpath/carnation.jpg
deleted file mode 100644
index 6b1e16b3..00000000
Binary files a/tests/FunctionalTests/selenium/html-xpath/carnation.jpg and /dev/null differ
diff --git a/tests/FunctionalTests/selenium/html-xpath/example.html b/tests/FunctionalTests/selenium/html-xpath/example.html
deleted file mode 100644
index 3d7c62af..00000000
--- a/tests/FunctionalTests/selenium/html-xpath/example.html
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-	DOM Level 3 XPath Example
-	
-
-
-
        
-	Test Node 1
-
        
-
-
-	
        
-		
        
-			Test Node 2
-			
        Test Node 3: Unclosed Paragraph tag
-			
        
-				Test Node 4: Nesting
-			
        
-			Something I found in my backyard
-			Carnation
-		
        
-	
        
-        
-
-
-
-
-
-
diff --git a/tests/FunctionalTests/selenium/html-xpath/html-xpath-patched.js b/tests/FunctionalTests/selenium/html-xpath/html-xpath-patched.js
deleted file mode 100644
index d135e879..00000000
--- a/tests/FunctionalTests/selenium/html-xpath/html-xpath-patched.js
+++ /dev/null
@@ -1,657 +0,0 @@
-/*
-	html-xpath, an implementation of DOM Level 3 XPath for Internet Explorer 5+
-	Copyright (C) 2004 Dimitri Glazkov
-
-	This library is free software; you can redistribute it and/or
-	modify it under the terms of the GNU Lesser General Public
-	License as published by the Free Software Foundation; either
-	version 2.1 of the License, or (at your option) any later version.
-
-	This library is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-	Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public
-	License along with this library; if not, write to the Free Software
-
-*/
-
-/** SELENIUM:PATCH TO ALLOW USE WITH DOCUMENTS FROM OTHER WINDOWS: 2004-11-24
-    TODO resubmit this to http://sf.net/projects/html-xpath */
-function addXPathSupport(document) {
-/** END SELENIUM:PATCH */
-
-var isIe = /MSIE [56789]/.test(navigator.userAgent) && (navigator.platform == "Win32");
-
-// Mozilla has support by default, we don't have an implementation for the rest
-if (isIe)
-{
-	// release number
-	document.DomL3XPathRelease = "0.0.3.0";
-	
-	// XPathException
-	// An Error object will be thrown, this is just a handler to instantiate that object
-	var XPathException = new _XPathExceptionHandler();
-	function _XPathExceptionHandler()
-	{
-		this.INVALID_EXPRESSION_ERR = 51;
-		this.TYPE_ERR = 52;
-		this.NOT_IMPLEMENTED_ERR = -1;
-		this.RUNTIME_ERR = -2;
-		
-		this.ThrowNotImplemented = function(message)
-		{
-			ThrowError(this.NOT_IMPLEMENTED_ERR, "This functionality is not implemented.", message);
-		}
-		
-		this.ThrowInvalidExpression = function(message)
-		{
-			ThrowError(this.INVALID_EXPRESSION_ERR, "Invalid expression", message);
-		}
-		
-		this.ThrowType = function(message)
-		{
-			ThrowError(this.TYPE_ERR, "Type error", message);
-		}
-		
-		this.Throw = function(message)
-		{
-			ThrowError(this.RUNTIME_ERR, "Run-time error", message);
-		}
-		
-		function ThrowError(code, description, message)
-		{
-			var error = new Error(code, "DOM-L3-XPath " + document.DomL3XPathRelease + ": " + description + (message ? ", \"" + message  + "\"": ""));
-			error.code = code;
-			error.name = "XPathException";
-			throw error;
-		}
-	}
-	
-	// DOMException
-	// An Error object will be thrown, this is just a handler to instantiate that object
-	var DOMException = new _DOMExceptionHandler();
-	function _DOMExceptionHandler()
-	{
-		this.ThrowInvalidState = function(message)
-		{
-			ThrowError(13, "The state of the object is no longer valid", message);
-		}
-
-		function ThrowError(code, description, message)
-		{
-			var error = new Error(code, "DOM : " + description + (message ? ", \"" + message  + "\"": ""));
-			error.code = code;
-			error.name = "DOMException";
-			throw error;
-		}
-	}
-
-	// XPathEvaluator 
-	// implemented as document object methods
-	
-	// XPathExpression createExpression(String expression, XPathNSResolver resolver)
-	document.createExpression = function
-		(
-		expression,		// String
-		resolver		// XPathNSResolver
-		)
-	{
-		// returns XPathExpression object
-		return new XPathExpression(expression, resolver);
-	}
-
-	// XPathNSResolver createNSResolver(nodeResolver)
-	document.createNSResolver = function
-		(
-		nodeResolver	// Node
-		)
-	{
-		// returns XPathNSResolver
-		return new XPathNSResolver(nodeResolver);
-	}
-
-	// XPathResult evaluate(String expresison, Node contextNode, XPathNSResolver resolver, Number type, XPathResult result)
-	document.evaluate = function
-		(
-		expression,		// String
-		contextNode,	// Node
-		resolver,		// XPathNSResolver
-		type,			// Number
-		result			// XPathResult
-		)
-		// can raise XPathException, DOMException
-	{
-		// return XPathResult
-		return document.createExpression(expression, resolver).evaluate(contextNode, type, result);
-	}
-
-	// XPathExpression
-	function XPathExpression
-	(
-		expression, // String
-		resolver // XPathNSResolver
-	)
-	{
-		this.expressionString = expression;
-		this.resolver = resolver;
-
-		// XPathResult evaluate(Node contextNode, Number type, XPathResult result)
-		this.evaluate = function
-		(
-			contextNode, // Node
-			type, // Number
-			result // XPathResult		
-		)
-			// raises XPathException, DOMException
-		{
-			// return XPathResult
-			return (result && result.constructor == XPathResult ? result.initialize(this, contextNode, resolver, type) : new XPathResult(this, contextNode, resolver, type));
-		}
-		
-		this.toString = function()
-		{
-			return "[XPathExpression]";
-		}
-	}
-
-	// XPathNSResolver
-	function XPathNSResolver(node)
-	{
-		this.node = node;
-	
-		// String lookupNamespaceURI(String prefix)
-		this.lookupNamespaceURI = function
-			(
-			prefix			// String
-			)
-		{
-			XPathException.ThrowNotImplemented();
-			// return String
-			return null;
-		}
-
-		this.toString = function()
-		{
-			return "[XPathNSResolver]";
-		}
-	}
-
-	// XPathResult
-	XPathResult.ANY_TYPE = 0;
-	XPathResult.NUMBER_TYPE = 1;
-	XPathResult.STRING_TYPE = 2;
-	XPathResult.BOOLEAN_TYPE = 3;
-	XPathResult.UNORDERED_NODE_ITERATOR_TYPE = 4;
-	XPathResult.ORDERED_NODE_ITERATOR_TYPE = 5;
-	XPathResult.UNORDERED_SNAPSHOT_TYPE = 6;
-	XPathResult.ORDERED_SNAPSHOT_TYPE = 7;
-	XPathResult.ANY_UNORDERED_NODE_TYPE = 8;
-	XPathResult.FIRST_ORDERED_NODE_TYPE = 9;
-	
-	function XPathResult
-			(
-			expression,		// XPathExpression
-			contextNode,	// Node
-			resolver,		// XPathNSResolver
-			type			// Number
-			)
-	{
-		this.initialize = function(expression, contextNode, resolver, type)
-		{
-			this._domResult = null;
-			this._expression = expression;
-			this._contextNode = contextNode;
-			this._resolver = resolver;
-			if (type)
-			{
-				this.resultType = type;
-				this._isIterator = (type == XPathResult.UNORDERED_NODE_ITERATOR_TYPE || 
-					type == XPathResult.ORDERED_NODE_ITERATOR_TYPE || 
-					type == XPathResult.ANY_TYPE);
-				this._isSnapshot = (type == XPathResult.UNORDERED_SNAPSHOT_TYPE || type == XPathResult.ORDERED_SNAPSHOT_TYPE);
-				this._isNodeSet = type > XPathResult.BOOLEAN_TYPE;
-			}
-			else
-			{
-				this.resultType = XPathResult.ANY_TYPE;
-				this._isIterator = true;
-				this._isSnapshot = false;
-				this._isNodeSet = true;
-			}
-			return this;
-		}
-		
-		this.initialize(expression, contextNode, resolver, type);
-		
-		this.getInvalidIteratorState = function()
-		{
-			return documentChangeDetected() || !this._isIterator;
-		}
-		
-		this.getSnapshotLength = function()
-			// raises XPathException
-		{
-			if (!this._isSnapshot)
-			{
-				XPathException.ThrowType("Snapshot is not an expected result type");
-			}
-			activateResult(this);
-			// return Number
-			return this._domResult.length;
-		}
-		
-		// Node iterateNext()
-		this.iterateNext = function()
-			// raises XPathException, DOMException
-		{
-			if (!this._isIterator)
-			{
-				XPathException.ThrowType("Iterator is not an expected result type");
-			}
-			activateResult(this);
-			if (documentChangeDetected())
-			{
-				DOMException.ThrowInvalidState("iterateNext");
-			}
-			// return Node
-			return getNextNode(this);
-		}
-		
-		// Node snapshotItem(Number index)
-		this.snapshotItem = function(index)
-			// raises XPathException
-		{
-			if (!this._isSnapshot)
-			{
-				XPathException.ThrowType("Snapshot is not an expected result type");
-			}
-			// return Node
-			return getItemNode(this, index); 
-		}
-		
-		this.toString = function()
-		{
-			return "[XPathResult]";
-		}
-		
-		// returns string value of the result, if result type is STRING_TYPE
-		// otherwise throws an XPathException
-		this.getStringValue = function()
-		{
-			if (this.resultType != XPathResult.STRING_TYPE)
-			{
-				XPathException.ThrowType("The expression can not be converted to return String");
-			}
-			return getNodeText(this);
-		}
-		
-		// returns number value of the result, if the result is NUMBER_TYPE
-		// otherwise throws an XPathException
-		this.getNumberValue = function()
-		{
-			if (this.resultType != XPathResult.NUMBER_TYPE)
-			{
-				XPathException.ThrowType("The expression can not be converted to return Number");
-			}
-			var number = parseInt(getNodeText(this));
-			if (isNaN(number))
-			{
-				XPathException.ThrowType("The result can not be converted to Number");
-			}
-			return number;
-		}
-		
-		// returns boolean value of the result, if the result is BOOLEAN_TYPE
-		// otherwise throws an XPathException
-		this.getBooleanValue = function()
-		{
-			if (this.resultType != XPathResult.BOOLEAN_TYPE)
-			{
-				XPathException.ThrowType("The expression can not be converted to return Boolean");
-			}
-			
-			var	
-				text = getNodeText(this);
-				bool = (text ? text.toLowerCase() : null);
-			if (bool == "false" || bool == "true")
-			{
-				return bool;
-			}
-			XPathException.ThrowType("The result can not be converted to Boolean");
-		}
-		
-		// returns single node, if the result is ANY_UNORDERED_NODE_TYPE or FIRST_ORDERED_NODE_TYPE
-		// otherwise throws an XPathException
-		this.getSingleNodeValue = function()
-		{
-			if (this.resultType != XPathResult.ANY_UNORDERED_NODE_TYPE && 
-				this.resultType != XPathResult.FIRST_ORDERED_NODE_TYPE)
-			{
-				XPathException.ThrowType("The expression can not be converted to return single Node value");
-			}
-			return getSingleNode(this);
-		}
-		
-		function documentChangeDetected()
-		{
-			return document._XPathMsxmlDocumentHelper.documentChangeDetected();
-		}
-		
-		function getNodeText(result)
-		{
-			activateResult(result);
-			return result._textResult;
-//			return ((node = getSingleNode(result)) ? (node.nodeType == 1 ? node.innerText : node.nodeValue) : null);
-		}
-		
-		function findNode(result, current)
-		{
-			switch(current.nodeType)
-			{
-				case 1: // NODE_ELEMENT
-					var id = current.attributes.getNamedItem("id");
-					if (id)
-					{
-						return document.getElementById(id.value);
-					}
-					XPathException.Throw("unable to locate element in XML tree");
-				case 2: // NODE_ATTRIBUTE
-					var id = current.selectSingleNode("..").attributes.getNamedItem("id");
-					if (id)
-					{
-						var node = document.getElementById(id.text);
-						if (node)
-						{
-							return node.attributes.getNamedItem(current.nodeName);
-						}
-					}
-					XPathException.Throw("unable to locate attribute in XML tree");
-				case 3: // NODE_TEXT
-					var id = current.selectSingleNode("..").attributes.getNamedItem("id");
-					if (id)
-					{
-						var node = document.getElementById(id.value);
-						if (node)
-						{
-							for(child in node.childNodes)
-							{
-								if (child.nodeType == 3 && child.nodeValue == current.nodeValue)
-								{
-									return child;
-								}
-							}
-						}
-					}
-					XPathException.Throw("unable to locate text in XML tree");
-			}
-			XPathException.Throw("unknown node type");
-		}
-		
-		function activateResult(result)
-		{
-			if (!result._domResult)
-			{
-				try
-				{
-					var expression = result._expression.expressionString;
-					
-					// adjust expression if contextNode is not a document
-					if (result._contextNode != document && expression.indexOf("//") != 0)
-					{
-
-						expression = "//*[@id = '" + result._contextNode.id + "']" +
-							(expression.indexOf("/") == 0 ? "" : "/") + expression;
-					}
-					
-					if (result._isNodeSet)
-					{
-						result._domResult = document._XPathMsxmlDocumentHelper.getDom().selectNodes(expression);
-					}
-					else
-					{
-						result._domResult = true;
-						result._textResult = document._XPathMsxmlDocumentHelper.getTextResult(expression);
-					}
-					
-				}
-				catch(error)
-				{
-					alert(error.description);
-					XPathException.ThrowInvalidExpression(error.description);
-				}
-			}
-		}
-
-		function getSingleNode(result)
-		{
-			var node = getItemNode(result, 0);
-			result._domResult = null;
-			return node;
-		}
-		
-		function getItemNode(result, index)
-		{
-			activateResult(result);
-			var current = result._domResult.item(index);
-			return (current ? findNode(result, current) : null);
-		}
-		
-		function getNextNode(result)
-		{
-			var current = result._domResult.nextNode;
-			if (current)
-			{
-				return findNode(result, current);
-			}
-			result._domResult = null;
-			return null;
-		}
-	}
-	
-	document.reloadDom = function()
-	{
-		document._XPathMsxmlDocumentHelper.reset();
-	}
-
-	document._XPathMsxmlDocumentHelper = new _XPathMsxmlDocumentHelper();
-	function _XPathMsxmlDocumentHelper()
-	{
-		this.getDom = function()
-		{
-			activateDom(this);
-			return this.dom;
-		}
-		
-		this.getXml = function()
-		{
-			activateDom(this);
-			return this.dom.xml;
-		}
-		
-		this.getTextResult = function(expression)
-		{
-			expression = expression.replace(//g, ">").replace(/"/g, "\"");
-			var xslText = "" +
-				"" +
-				"";
-			var xsl = new ActiveXObject("Msxml2.DOMDocument");
-			xsl.loadXML(xslText);
-			try
-			{
-				var result = this.getDom().transformNode(xsl);
-			}
-			catch(error)
-			{
-				alert("Error: " + error.description);
-			}
-			return result;
-		}
-		
-		this.reset = function()
-		{
-			this.dom = null;
-		}
-		
-		function onPropertyChangeEventHandler()
-		{
-			document._propertyChangeDetected = true;
-		}
-		
-		this.documentChangeDetected = function()
-		{
-			return (document.ignoreDocumentChanges ? false : this._currentElementCount != document.all.length || document._propertyChangeDetected);
-		}
-		
-		function activateDom(helper)
-		{
-			if (!helper.dom)
-			{
-				var dom = new ActiveXObject("Msxml2.DOMDocument");
-/** SELENIUM:PATCH TO ALLOW PROVIDE FULL XPATH SUPPORT */
-				dom.setProperty("SelectionLanguage", "XPath");
-/** END SELENIUM:PATCH */
-				dom.async = false;
-				dom.resolveExternals = false;
-				loadDocument(dom, helper);
-				helper.dom = dom;
-				helper._currentElementCount = document.all.length;
-				document._propertyChangeDetected = false;
-			}
-			else
-			{
-				if (helper.documentChangeDetected())
-				{
-					var dom = helper.dom;
-					dom.load("");
-					loadDocument(dom, helper);
-					helper._currentElementCount = document.all.length;
-					document._propertyChangeDetected = false;
-				}
-			}
-		}
-		
-		function loadDocument(dom, helper)
-		{
-			return loadNode(dom, dom, document.body, helper);
-		}
-			
-
-/** SELENIUM:PATCH for loadNode() - see SEL-68 */
-		function loadNode(dom, domParentNode, node, helper)
-		{
-			// Bad node scenarios
-			// 1. If the node contains a /, it's broken HTML
-			// 2. If the node doesn't have a name (typically from broken HTML), the node can't be loaded
-			// 3. Node types we can't deal with
-			//
-			// In all scenarios, we just skip the node. We won't be able to
-			// query on these nodes, but they're broken anyway.
-			if (node.nodeName.indexOf("/") > -1
-			    || node.nodeName == ""
-			    || node.nodeName == "#document"
-			    || node.nodeName == "#document-fragment"
-			    || node.nodeName == "#cdata-section"
-			    || node.nodeName == "#xml-declaration"
-			    || node.nodeName == "#whitespace"
-			    || node.nodeName == "#significat-whitespace"
-			   )
-			{
-				return;
-			}
-			
-			// #comment is a , which must be created with createComment()
-			if (node.nodeName == "#comment")
-			{
-				try
-				{
-					domParentNode.appendChild(dom.createComment(node.nodeValue));
-				}
-				catch (ex)
-				{
-					// it's just a comment, we don't care
-				}
-			}
-			else if (node.nodeType == 3)
-			{
-				domParentNode.appendChild(dom.createTextNode(node.nodeValue));
-			}
-			else
-			{
-				var domNode = dom.createElement(node.nodeName.toLowerCase());
-				if (!node.id)
-				{
-					node.id = node.uniqueID;
-				}
-				domParentNode.appendChild(domNode);
-				loadAttributes(dom, domNode, node);
-				var length = node.childNodes.length;
-				for(var i = 0; i < length; i ++ )
-				{
-					loadNode(dom, domNode, node.childNodes[i], helper);
-				}
-				node.attachEvent("onpropertychange", onPropertyChangeEventHandler);
-			}
-		}
-/** END SELENIUM:PATCH */
-
-		function loadAttributes(dom, domParentNode, node)
-		{
-			for (var i = 0; i < node.attributes.length; i ++ )
-			{
-				var attribute = node.attributes[i];
-				var attributeValue = attribute.nodeValue;
-				if (attributeValue && (attribute.specified || attribute.nodeName == 'value'))
-				{
-					var domAttribute = dom.createAttribute(attribute.nodeName);
-					domAttribute.value = attributeValue;
-					domParentNode.setAttributeNode(domAttribute);				
-				}
-			}
-		}
-	
-	}
-}
-else
-{
-	document.reloadDom = function() {}
-	XPathResult.prototype.getStringValue = function()
-	{
-		return this.stringValue;
-	}
-	
-	XPathResult.prototype.getNumberValue = function()
-	{
-		return this.numberValue;
-	}
-	
-	XPathResult.prototype.getBooleanValue = function()
-	{
-		return this.booleanValue;
-	}
-	
-	XPathResult.prototype.getSingleNodeValue = function()
-	{
-		return this.singleNodeValue;	
-	}
-	
-	XPathResult.prototype.getInvalidIteratorState = function()
-	{
-		return this.invalidIteratorState;
-	}
-	
-	XPathResult.prototype.getSnapshotLength = function()
-	{
-		return this.snapshotLength;
-	}
-	
-	XPathResult.prototype.getResultType = function()
-	{
-		return this.resultType;
-	}
-}
-/** SELENIUM:PATCH TO ALLOW USE WITH CONTAINED DOCUMENTS */
-}
-/** END SELENIUM:PATCH */
-
diff --git a/tests/FunctionalTests/selenium/html-xpath/html-xpath.js b/tests/FunctionalTests/selenium/html-xpath/html-xpath.js
deleted file mode 100644
index acad8b93..00000000
--- a/tests/FunctionalTests/selenium/html-xpath/html-xpath.js
+++ /dev/null
@@ -1,610 +0,0 @@
-/*
-	html-xpath, an implementation of DOM Level 3 XPath for Internet Explorer 5+
-	Copyright (C) 2004 Dimitri Glazkov
-
-	This library is free software; you can redistribute it and/or
-	modify it under the terms of the GNU Lesser General Public
-	License as published by the Free Software Foundation; either
-	version 2.1 of the License, or (at your option) any later version.
-
-	This library is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-	Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public
-	License along with this library; if not, write to the Free Software
-
-*/
-
-var isIe = /MSIE [56789]/.test(navigator.userAgent) && (navigator.platform == "Win32");
-
-// Mozilla has support by default, we don't have an implementation for the rest
-if (isIe)
-{
-	// release number
-	document.DomL3XPathRelease = "0.0.3.0";
-	
-	// XPathException
-	// An Error object will be thrown, this is just a handler to instantiate that object
-	var XPathException = new _XPathExceptionHandler();
-	function _XPathExceptionHandler()
-	{
-		this.INVALID_EXPRESSION_ERR = 51;
-		this.TYPE_ERR = 52;
-		this.NOT_IMPLEMENTED_ERR = -1;
-		this.RUNTIME_ERR = -2;
-		
-		this.ThrowNotImplemented = function(message)
-		{
-			ThrowError(this.NOT_IMPLEMENTED_ERR, "This functionality is not implemented.", message);
-		}
-		
-		this.ThrowInvalidExpression = function(message)
-		{
-			ThrowError(this.INVALID_EXPRESSION_ERR, "Invalid expression", message);
-		}
-		
-		this.ThrowType = function(message)
-		{
-			ThrowError(this.TYPE_ERR, "Type error", message);
-		}
-		
-		this.Throw = function(message)
-		{
-			ThrowError(this.RUNTIME_ERR, "Run-time error", message);
-		}
-		
-		function ThrowError(code, description, message)
-		{
-			var error = new Error(code, "DOM-L3-XPath " + document.DomL3XPathRelease + ": " + description + (message ? ", \"" + message  + "\"": ""));
-			error.code = code;
-			error.name = "XPathException";
-			throw error;
-		}
-	}
-	
-	// DOMException
-	// An Error object will be thrown, this is just a handler to instantiate that object
-	var DOMException = new _DOMExceptionHandler();
-	function _DOMExceptionHandler()
-	{
-		this.ThrowInvalidState = function(message)
-		{
-			ThrowError(13, "The state of the object is no longer valid", message);
-		}
-
-		function ThrowError(code, description, message)
-		{
-			var error = new Error(code, "DOM : " + description + (message ? ", \"" + message  + "\"": ""));
-			error.code = code;
-			error.name = "DOMException";
-			throw error;
-		}
-	}
-
-	// XPathEvaluator 
-	// implemented as document object methods
-	
-	// XPathExpression createExpression(String expression, XPathNSResolver resolver)
-	document.createExpression = function
-		(
-		expression,		// String
-		resolver		// XPathNSResolver
-		)
-	{
-		// returns XPathExpression object
-		return new XPathExpression(expression, resolver);
-	}
-
-	// XPathNSResolver createNSResolver(nodeResolver)
-	document.createNSResolver = function
-		(
-		nodeResolver	// Node
-		)
-	{
-		// returns XPathNSResolver
-		return new XPathNSResolver(nodeResolver);
-	}
-
-	// XPathResult evaluate(String expresison, Node contextNode, XPathNSResolver resolver, Number type, XPathResult result)
-	document.evaluate = function
-		(
-		expression,		// String
-		contextNode,	// Node
-		resolver,		// XPathNSResolver
-		type,			// Number
-		result			// XPathResult
-		)
-		// can raise XPathException, DOMException
-	{
-		// return XPathResult
-		return document.createExpression(expression, resolver).evaluate(contextNode, type, result);
-	}
-
-	// XPathExpression
-	function XPathExpression
-	(
-		expression, // String
-		resolver // XPathNSResolver
-	)
-	{
-		this.expressionString = expression;
-		this.resolver = resolver;
-
-		// XPathResult evaluate(Node contextNode, Number type, XPathResult result)
-		this.evaluate = function
-		(
-			contextNode, // Node
-			type, // Number
-			result // XPathResult		
-		)
-			// raises XPathException, DOMException
-		{
-			// return XPathResult
-			return (result && result.constructor == XPathResult ? result.initialize(this, contextNode, resolver, type) : new XPathResult(this, contextNode, resolver, type));
-		}
-		
-		this.toString = function()
-		{
-			return "[XPathExpression]";
-		}
-	}
-
-	// XPathNSResolver
-	function XPathNSResolver(node)
-	{
-		this.node = node;
-	
-		// String lookupNamespaceURI(String prefix)
-		this.lookupNamespaceURI = function
-			(
-			prefix			// String
-			)
-		{
-			XPathException.ThrowNotImplemented();
-			// return String
-			return null;
-		}
-
-		this.toString = function()
-		{
-			return "[XPathNSResolver]";
-		}
-	}
-
-	// XPathResult
-	XPathResult.ANY_TYPE = 0;
-	XPathResult.NUMBER_TYPE = 1;
-	XPathResult.STRING_TYPE = 2;
-	XPathResult.BOOLEAN_TYPE = 3;
-	XPathResult.UNORDERED_NODE_ITERATOR_TYPE = 4;
-	XPathResult.ORDERED_NODE_ITERATOR_TYPE = 5;
-	XPathResult.UNORDERED_SNAPSHOT_TYPE = 6;
-	XPathResult.ORDERED_SNAPSHOT_TYPE = 7;
-	XPathResult.ANY_UNORDERED_NODE_TYPE = 8;
-	XPathResult.FIRST_ORDERED_NODE_TYPE = 9;
-	
-	function XPathResult
-			(
-			expression,		// XPathExpression
-			contextNode,	// Node
-			resolver,		// XPathNSResolver
-			type			// Number
-			)
-	{
-		this.initialize = function(expression, contextNode, resolver, type)
-		{
-			this._domResult = null;
-			this._expression = expression;
-			this._contextNode = contextNode;
-			this._resolver = resolver;
-			if (type)
-			{
-				this.resultType = type;
-				this._isIterator = (type == XPathResult.UNORDERED_NODE_ITERATOR_TYPE || 
-					type == XPathResult.ORDERED_NODE_ITERATOR_TYPE || 
-					type == XPathResult.ANY_TYPE);
-				this._isSnapshot = (type == XPathResult.UNORDERED_SNAPSHOT_TYPE || type == XPathResult.ORDERED_SNAPSHOT_TYPE);
-				this._isNodeSet = type > XPathResult.BOOLEAN_TYPE;
-			}
-			else
-			{
-				this.resultType = XPathResult.ANY_TYPE;
-				this._isIterator = true;
-				this._isSnapshot = false;
-				this._isNodeSet = true;
-			}
-			return this;
-		}
-		
-		this.initialize(expression, contextNode, resolver, type);
-		
-		this.getInvalidIteratorState = function()
-		{
-			return documentChangeDetected() || !this._isIterator;			
-		}
-		
-		this.getSnapshotLength = function()
-			// raises XPathException
-		{
-			if (!this._isSnapshot)
-			{
-				XPathException.ThrowType("Snapshot is not an expected result type");
-			}
-			activateResult(this);
-			// return Number
-			return this._domResult.length;
-		}
-		
-		// Node iterateNext()
-		this.iterateNext = function()
-			// raises XPathException, DOMException
-		{
-			if (!this._isIterator)
-			{
-				XPathException.ThrowType("Iterator is not an expected result type");
-			}
-			activateResult(this);
-			if (documentChangeDetected())
-			{
-				DOMException.ThrowInvalidState("iterateNext");
-			}
-			// return Node
-			return getNextNode(this);
-		}
-		
-		// Node snapshotItem(Number index)
-		this.snapshotItem = function(index)
-			// raises XPathException
-		{
-			if (!this._isSnapshot)
-			{
-				XPathException.ThrowType("Snapshot is not an expected result type");
-			}
-			// return Node
-			return getItemNode(this, index); 
-		}
-		
-		this.toString = function()
-		{
-			return "[XPathResult]";
-		}
-		
-		// returns string value of the result, if result type is STRING_TYPE
-		// otherwise throws an XPathException
-		this.getStringValue = function()
-		{
-			if (this.resultType != XPathResult.STRING_TYPE)
-			{
-				XPathException.ThrowType("The expression can not be converted to return String");
-			}
-			return getNodeText(this);
-		}
-		
-		// returns number value of the result, if the result is NUMBER_TYPE
-		// otherwise throws an XPathException
-		this.getNumberValue = function()
-		{
-			if (this.resultType != XPathResult.NUMBER_TYPE)
-			{
-				XPathException.ThrowType("The expression can not be converted to return Number");
-			}
-			var number = parseInt(getNodeText(this));
-			if (isNaN(number))
-			{
-				XPathException.ThrowType("The result can not be converted to Number");
-			}
-			return number;
-		}
-		
-		// returns boolean value of the result, if the result is BOOLEAN_TYPE
-		// otherwise throws an XPathException
-		this.getBooleanValue = function()
-		{
-			if (this.resultType != XPathResult.BOOLEAN_TYPE)
-			{
-				XPathException.ThrowType("The expression can not be converted to return Boolean");
-			}
-			
-			var	
-				text = getNodeText(this);
-				bool = (text ? text.toLowerCase() : null);
-			if (bool == "false" || bool == "true")
-			{
-				return bool;
-			}
-			XPathException.ThrowType("The result can not be converted to Boolean");
-		}
-		
-		// returns single node, if the result is ANY_UNORDERED_NODE_TYPE or FIRST_ORDERED_NODE_TYPE
-		// otherwise throws an XPathException
-		this.getSingleNodeValue = function()
-		{
-			if (this.resultType != XPathResult.ANY_UNORDERED_NODE_TYPE && 
-				this.resultType != XPathResult.FIRST_ORDERED_NODE_TYPE)
-			{
-				XPathException.ThrowType("The expression can not be converted to return single Node value");
-			}
-			return getSingleNode(this);
-		}
-		
-		function documentChangeDetected()
-		{
-			return document._XPathMsxmlDocumentHelper.documentChangeDetected();
-		}
-		
-		function getNodeText(result)
-		{
-			activateResult(result);
-			return result._textResult;
-//			return ((node = getSingleNode(result)) ? (node.nodeType == 1 ? node.innerText : node.nodeValue) : null);
-		}
-		
-		function findNode(result, current)
-		{
-			switch(current.nodeType)
-			{
-				case 1: // NODE_ELEMENT
-					var id = current.attributes.getNamedItem("id");
-					if (id)
-					{
-						return document.getElementById(id.value);
-					}
-					XPathException.Throw("unable to locate element in XML tree");
-				case 2: // NODE_ATTRIBUTE
-					var id = current.selectSingleNode("..").attributes.getNamedItem("id");
-					if (id)
-					{
-						var node = document.getElementById(id.text);
-						if (node)
-						{
-							return node.attributes.getNamedItem(current.nodeName);
-						}
-					}
-					XPathException.Throw("unable to locate attribute in XML tree");
-				case 3: // NODE_TEXT
-					var id = current.selectSingleNode("..").attributes.getNamedItem("id");
-					if (id)
-					{
-						var node = document.getElementById(id.value);
-						if (node)
-						{
-							for(child in node.childNodes)
-							{
-								if (child.nodeType == 3 && child.nodeValue == current.nodeValue)
-								{
-									return child;
-								}
-							}
-						}
-					}
-					XPathException.Throw("unable to locate text in XML tree");
-			}
-			XPathException.Throw("unknown node type");
-		}
-		
-		function activateResult(result)
-		{
-			if (!result._domResult)
-			{
-				try
-				{
-					var expression = result._expression.expressionString;
-					
-					// adjust expression if contextNode is not a document
-					if (result._contextNode != document && expression.indexOf("//") != 0)
-					{
-						
-						expression = "//*[@id = '" + result._contextNode.id + "']" + 
-							(expression.indexOf("/") == 0 ? "" : "/") + expression;
-					}
-					
-					if (result._isNodeSet)
-					{
-						result._domResult = document._XPathMsxmlDocumentHelper.getDom().selectNodes(expression);
-					}
-					else
-					{
-						result._domResult = true;
-						result._textResult = document._XPathMsxmlDocumentHelper.getTextResult(expression);
-					}
-					
-				}
-				catch(error)
-				{
-					alert(error.description);
-					XPathException.ThrowInvalidExpression(error.description);
-				}
-			}
-		}
-
-		function getSingleNode(result)
-		{
-			var node = getItemNode(result, 0);
-			result._domResult = null;
-			return node;
-		}
-		
-		function getItemNode(result, index)
-		{
-			activateResult(result);
-			var current = result._domResult.item(index);
-			return (current ? findNode(result, current) : null);
-		}
-		
-		function getNextNode(result)
-		{
-			var current = result._domResult.nextNode;
-			if (current)
-			{
-				return findNode(result, current);
-			}
-			result._domResult = null;
-			return null;
-		}
-	}
-	
-	document.reloadDom = function()
-	{
-		document._XPathMsxmlDocumentHelper.reset();
-	}
-
-	document._XPathMsxmlDocumentHelper = new _XPathMsxmlDocumentHelper();
-	function _XPathMsxmlDocumentHelper()
-	{
-		this.getDom = function()
-		{
-			activateDom(this);
-			return this.dom;
-		}
-		
-		this.getXml = function()
-		{
-			activateDom(this);
-			return this.dom.xml;
-		}
-		
-		this.getTextResult = function(expression)
-		{
-			expression = expression.replace(//g, ">").replace(/"/g, "\"");
-			var xslText = "" +
-				"" +
-				"";
-			var xsl = new ActiveXObject("Msxml2.DOMDocument");
-			xsl.loadXML(xslText);
-			try
-			{
-				var result = this.getDom().transformNode(xsl);
-			}
-			catch(error)
-			{
-				alert("Error: " + error.description);
-			}
-			return result;
-		}
-		
-		this.reset = function()
-		{
-			this.dom = null;
-		}
-		
-		function onPropertyChangeEventHandler()
-		{
-			document._propertyChangeDetected = true;
-		}
-		
-		this.documentChangeDetected = function()
-		{
-			return (document.ignoreDocumentChanges ? false : this._currentElementCount != document.all.length || document._propertyChangeDetected);
-		}
-		
-		function activateDom(helper)
-		{
-			if (!helper.dom)
-			{
-				var dom = new ActiveXObject("Msxml2.DOMDocument");
-				dom.async = false;
-				dom.resolveExternals = false;
-				loadDocument(dom, helper);
-				helper.dom = dom;
-				helper._currentElementCount = document.all.length;
-				document._propertyChangeDetected = false;
-			}
-			else
-			{
-				if (helper.documentChangeDetected())
-				{
-					var dom = helper.dom;
-					dom.load("");
-					loadDocument(dom, helper);
-					helper._currentElementCount = document.all.length;
-					document._propertyChangeDetected = false;
-				}
-			}
-		}
-		
-		function loadDocument(dom, helper)
-		{
-			return loadNode(dom, dom, document.body, helper);		
-		}
-		
-		function loadNode(dom, domParentNode, node, helper)
-		{
-			if (node.nodeType == 3)
-			{			
-				domParentNode.appendChild(dom.createTextNode(node.nodeValue));
-			}
-			else
-			{
-				var domNode = dom.createElement(node.nodeName.toLowerCase());
-				if (!node.id)
-				{
-					node.id = node.uniqueID;
-				}
-				domParentNode.appendChild(domNode);
-				loadAttributes(dom, domNode, node);
-				var length = node.childNodes.length;
-				for(var i = 0; i < length; i ++ )
-				{
-					loadNode(dom, domNode, node.childNodes[i], helper);
-				}
-				node.attachEvent("onpropertychange", onPropertyChangeEventHandler);
-			}
-		}
-
-		function loadAttributes(dom, domParentNode, node)
-		{
-			for (var i = 0; i < node.attributes.length; i ++ )
-			{
-				var attribute = node.attributes[i];
-				var attributeValue = attribute.nodeValue;
-				if (attributeValue && attribute.specified)
-				{
-					var domAttribute = dom.createAttribute(attribute.nodeName);
-					domAttribute.value = attributeValue;
-					domParentNode.setAttributeNode(domAttribute);				
-				}
-			}
-		}
-	
-	}
-}
-else
-{
-	document.reloadDom = function() {}
-	XPathResult.prototype.getStringValue = function()
-	{
-		return this.stringValue;
-	}
-	
-	XPathResult.prototype.getNumberValue = function()
-	{
-		return this.numberValue;
-	}
-	
-	XPathResult.prototype.getBooleanValue = function()
-	{
-		return this.booleanValue;
-	}
-	
-	XPathResult.prototype.getSingleNodeValue = function()
-	{
-		return this.singleNodeValue;	
-	}
-	
-	XPathResult.prototype.getInvalidIteratorState = function()
-	{
-		return this.invalidIteratorState;
-	}
-	
-	XPathResult.prototype.getSnapshotLength = function()
-	{
-		return this.snapshotLength;
-	}
-	
-	XPathResult.prototype.getResultType = function()
-	{
-		return this.resultType;
-	}
-}
\ No newline at end of file
diff --git a/tests/FunctionalTests/selenium/html-xpath/license.txt b/tests/FunctionalTests/selenium/html-xpath/license.txt
deleted file mode 100644
index b1e3f5a2..00000000
--- a/tests/FunctionalTests/selenium/html-xpath/license.txt
+++ /dev/null
@@ -1,504 +0,0 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    
-    Copyright (C)   
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  , 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-
diff --git a/tests/FunctionalTests/selenium/html-xpath/rainbow.jpg b/tests/FunctionalTests/selenium/html-xpath/rainbow.jpg
deleted file mode 100644
index 757995b6..00000000
Binary files a/tests/FunctionalTests/selenium/html-xpath/rainbow.jpg and /dev/null differ
diff --git a/tests/FunctionalTests/selenium/htmlutils.js b/tests/FunctionalTests/selenium/htmlutils.js
deleted file mode 100644
index 73922b13..00000000
--- a/tests/FunctionalTests/selenium/htmlutils.js
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
- * Copyright 2004 ThoughtWorks, Inc
- *
- *  Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
- 
-// This script contains some HTML utility functions that
-// make it possible to handle elements in a way that is 
-// compatible with both IE-like and Mozilla-like browsers
-
-String.prototype.trim = function() {
-  var result = this.replace( /^\s+/g, "" );// strip leading
-  return result.replace( /\s+$/g, "" );// strip trailing
-};
-String.prototype.lcfirst = function() {
-   return this.charAt(0).toLowerCase() + this.substr(1);
-};
-String.prototype.ucfirst = function() {
-   return this.charAt(0).toUpperCase() + this.substr(1);
-};
-String.prototype.startsWith = function(str) {
-    return this.indexOf(str) == 0;
-};
-
-// Returns the text in this element
-function getText(element) {
-    text = "";
-
-    if(element.textContent) {
-        text = element.textContent;
-    } else if(element.innerText) {
-        text = element.innerText;
-    }
-    // Replace   with a space
-    // TODO - should this be in the match() code instead?
-    text = text.replace(/\240/g, " ");
-    return text.trim();
-}
-
-// Sets the text in this element
-function setText(element, text) {
-    if(element.textContent) {
-        element.textContent = text;
-    } else if(element.innerText) {
-        element.innerText = text;
-    }
-}
-
-// Get the value of an  element
-function getInputValue(inputElement) {
-    if (inputElement.type.toUpperCase() == 'CHECKBOX' || 
-        inputElement.type.toUpperCase() == 'RADIO') 
-    {
-        return (inputElement.checked ? 'on' : 'off');
-    }
-    return inputElement.value;
-}
-
-/* Fire an event in a browser-compatible manner */
-function triggerEvent(element, eventType, canBubble) {
-    canBubble = (typeof(canBubble) == undefined) ? true : canBubble;
-    if (element.fireEvent) {
-        element.fireEvent('on' + eventType);
-    }
-    else {
-        var evt = document.createEvent('HTMLEvents');
-        evt.initEvent(eventType, canBubble, true);
-        element.dispatchEvent(evt);
-    }
-}
-
-/* Fire a mouse event in a browser-compatible manner */
-function triggerMouseEvent(element, eventType, canBubble) {
-    canBubble = (typeof(canBubble) == undefined) ? true : canBubble;
-    if (element.fireEvent) {
-        element.fireEvent('on' + eventType);
-    }
-    else {
-        var evt = document.createEvent('MouseEvents');
-        evt.initMouseEvent(eventType, canBubble, true, document.defaultView, 1, 0, 0, 0, 0, false, false, false, false, 0, null);
-        element.dispatchEvent(evt);
-    }
-}
-
-function removeLoadListener(element, command) {
-    if (window.removeEventListener)
-        element.removeEventListener("load", command, true);
-    else if (window.detachEvent)
-        element.detachEvent("onload", command);
-}
-
-function addLoadListener(element, command) {
-    if (window.addEventListener)
-        element.addEventListener("load",command, true);
-    else if (window.attachEvent)
-        element.attachEvent("onload",command);
-}
-
-function addUnloadListener(element, command) {
-    if (window.addEventListener)
-        element.addEventListener("unload",command, true);
-    else if (window.attachEvent)
-        element.attachEvent("onunload",command);
-}
-
-/**
- * Override the broken getFunctionName() method from JsUnit
- * This file must be loaded _after_ the jsunitCore.js
- */
-function getFunctionName(aFunction) {
-  var regexpResult = aFunction.toString().match(/function (\w*)/);
-  if (regexpResult && regexpResult[1]) {
-      return regexpResult[1];
-  }
-  return 'anonymous';
-}
-
-function describe(object, delimiter) {
-    var props = new Array();
-    for (var prop in object) {
-        props.push(prop + " -> " + object[prop]);
-    }
-    return props.join(delimiter || '\n');
-}
-
-PatternMatcher = function(pattern) {
-    this.selectStrategy(pattern);
-};
-PatternMatcher.prototype = {
-    
-    selectStrategy: function(pattern) {
-        this.pattern = pattern;
-        var strategyName = 'glob'; // by default
-        if (/^([a-z-]+):(.*)/.test(pattern)) {
-            strategyName = RegExp.$1;
-            pattern = RegExp.$2;
-        }
-        var matchStrategy = PatternMatcher.strategies[strategyName];
-        if (!matchStrategy) {
-            throw new SeleniumError("cannot find PatternMatcher.strategies." + strategyName);
-        }
-        this.matcher = new matchStrategy(pattern);
-    },
-    
-    matches: function(actual) {
-        return this.matcher.matches(actual + '');
-        // Note: appending an empty string avoids a Konqueror bug
-    }
-
-};
-
-/**
- * A "static" convenience method for easy matching
- */
-PatternMatcher.matches = function(pattern, actual) {
-    return new PatternMatcher(pattern).matches(actual);
-};
-
-PatternMatcher.strategies = {
-
-    /**
-     * Exact matching, e.g. "exact:***"
-     */
-    exact: function(expected) {
-        this.expected = expected;
-        this.matches = function(actual) {
-            return actual == this.expected;
-        };
-    },
-
-    /**
-     * Match by regular expression, e.g. "regexp:^[0-9]+$"
-     */
-    regexp: function(regexpString) {
-        this.regexp = new RegExp(regexpString);
-        this.matches = function(actual) {
-            return this.regexp.test(actual);
-        };
-    },
-
-    /**
-     * "glob" (aka "wildmat") patterns, e.g. "glob:one,two,*"
-     */
-    glob: function(globString) {
-        this.regexp = new RegExp(PatternMatcher.regexpFromGlob(globString));
-        this.matches = function(actual) {
-            return this.regexp.test(actual);
-        };
-    }
-    
-};
-
-PatternMatcher.regexpFromGlob = function(glob) {
-    var re = glob;
-    re = re.replace(/([.^$+(){}\[\]\\|])/g, "\\$1");
-    re = re.replace(/\?/g, "(.|[\r\n])");
-    re = re.replace(/\*/g, "(.|[\r\n])*");
-    return "^" + re + "$";
-};
-
-var Assert = {
-
-    fail: function(message) {
-        throw new AssertionFailedError(message);
-    },
-
-    /*
-     * Assert.equals(comment?, expected, actual)
-     */
-    equals: function() {
-        var args = new AssertionArguments(arguments);
-        if (args.expected === args.actual) {
-            return;
-        }
-        Assert.fail(args.comment + 
-                    "Expected '" + args.expected + 
-                    "' but was '" + args.actual + "'");
-    },
-
-    /*
-     * Assert.matches(comment?, pattern, actual)
-     */
-    matches: function() {
-        var args = new AssertionArguments(arguments);
-        if (PatternMatcher.matches(args.expected, args.actual)) {
-            return;
-        }
-        Assert.fail(args.comment + 
-                    "Actual value '" + args.actual + 
-                    "' did not match '" + args.expected + "'");
-    },
-    
-    /*
-     * Assert.notMtches(comment?, pattern, actual)
-     */
-    notMatches: function() {
-        var args = new AssertionArguments(arguments);
-        if (!PatternMatcher.matches(args.expected, args.actual)) {
-            return;
-        }
-        Assert.fail(args.comment + 
-                    "Actual value '" + args.actual + 
-                    "' did match '" + args.expected + "'");
-    }
-
-};
-
-// Preprocess the arguments to allow for an optional comment.
-function AssertionArguments(args) {
-    if (args.length == 2) {
-        this.comment = "";
-        this.expected = args[0];
-        this.actual = args[1];
-    } else {
-        this.comment = args[0] + "; ";
-        this.expected = args[1];
-        this.actual = args[2];
-    }
-}
-
-
-
-function AssertionFailedError(message) {
-    this.isAssertionFailedError = true;
-    this.failureMessage = message;
-}
-
-function SeleniumError(message) {
-    var error = new Error(message);
-    error.isSeleniumError = true;
-    return error;
-};
diff --git a/tests/FunctionalTests/selenium/index.html b/tests/FunctionalTests/selenium/index.html
deleted file mode 100644
index eaaaa308..00000000
--- a/tests/FunctionalTests/selenium/index.html
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-Selenium starting points
-
-
-
-
-
-
        Selenium
        
-
-
        
-Acceptance tests: These test-suites demonstrate/exercise the
-functionality of Selenium.
-
        
-
-        
-
-
        Unit-tests: Use JsUnit to test Selenium internals.
        
-
-
-
-
-
diff --git a/tests/FunctionalTests/selenium/install-readme.txt b/tests/FunctionalTests/selenium/install-readme.txt
deleted file mode 100644
index 0946f4c4..00000000
--- a/tests/FunctionalTests/selenium/install-readme.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Copy the "selenium" folder to a web accessible directory in the same web server as the application you want to test.
-In Apache, this would mean a subdirectory of "htdocs".
-
-Because of javascript security settings standard in most browsers, Selenium needs to be available on the same host and port as your application.
-
-Once deployed to the server, to run Selenium's self-tests, check out:
-http://:/selenium/TestRunner.html
-
-Read the website for more details. (http://selenium.thoughtworks.com)
\ No newline at end of file
diff --git a/tests/FunctionalTests/selenium/jsmock/mock-tests.html b/tests/FunctionalTests/selenium/jsmock/mock-tests.html
deleted file mode 100644
index f0cc6758..00000000
--- a/tests/FunctionalTests/selenium/jsmock/mock-tests.html
+++ /dev/null
@@ -1,205 +0,0 @@
-
-
-
-
-  
-	
-    JsMock Tests
-    
-
-
-
-  
-
-  
-    
        JsMock Tests
        
-
-    
        This page contains tests for JsMock. To see them, take a look at the source. To run them, load this file via JsUnit's testRunner.html
        
-  
-
diff --git a/tests/FunctionalTests/selenium/jsmock/mock.js b/tests/FunctionalTests/selenium/jsmock/mock.js
deleted file mode 100644
index 8c0b4b9f..00000000
--- a/tests/FunctionalTests/selenium/jsmock/mock.js
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright 2004 ThoughtWorks, Inc
- *
- *  Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
- 
-// A simple mock library for Javascript
-//
-// Original code by Aslak Hellesoy and Ji Wang
-
-Mock = function() {
-    this.expectedInvocations = {};
-    this.expectedArgs = {};
-    this.returnValues = {};
-    this.attrs = [];
-    this.expectedProperties = {};
-    
-    this.expects = function() {
-        functionName = arguments[0];
-        this.expectedArgs[functionName] = [];
-        for(i = 1; i < arguments.length; i++) {
-            this.expectedArgs[functionName][i-1] = arguments[i];
-        }
-        javascriptCode = "this." + functionName + " = function() {\n" +
-            "  // mark this function as \"executed\"\n" +
-            "  this.expectedInvocations[\"" + functionName + "\"] = true;\n" +
-            "  assertEquals(\"" + functionName + ": Wrong number of arguments.\", " + this.expectedArgs[functionName].length + ", arguments.length);\n" +
-            "  for(i = 0; i < arguments.length; i++) {\n" +
-            "    assertEquals(this.expectedArgs[\"" + functionName + "\"][i], arguments[i]);\n" +
-            "  };\n" +
-            "  var returnValue = this.returnValues[\"" + functionName + "\"];\n" +
-            "  if (returnValue && returnValue.isMockError) { throw returnValue };\n" +
-            "  return returnValue;\n" +
-            "}";
-        eval(javascriptCode);
-        // initially mark this function as "not yet executed"
-        this.expectedInvocations[functionName] = false;
-        this.attrs[this.attrs.length] = "dummy";
-        return new Returner(this, functionName);
-    };
-    
-    this.expectsProperty = function() {
-        var propertyName = arguments[0];
-        if(arguments.length == 2) {
-            expectedPropertyValue = arguments[1];
-            this.expectedProperties[propertyName] = expectedPropertyValue;
-            this.attrs[this.attrs.length] = "dummy";
-        } else {
-            return new PropertySetter(this, propertyName);
-        }
-    };
-
-    this.verify = function() {
-        // loop over all expected invocations and see if they were called
-        for(var functionName in this.expectedInvocations) {
-            var wasCalled = this.expectedInvocations[functionName];
-            if(!wasCalled) {
-                fail("Expected function not called:" + functionName);
-            }
-        }
-        var currentAttrs = [];
-        var currentAttrCount = 0;
-        
-        // verify that all expected properties are set
-//        for(var attr in this) {
-//            currentAttrs[currentAttrCount] = attr;
-//            currentAttrCount++;
-//        }
-//        if(this.attrs.length < currentAttrCount) {
-//            unexpectedAttr = currentAttrs[this.attrs.length]
-//            fail("Unexpected property was set: " + unexpectedAttr + "=" + eval("this." + unexpectedAttr))
-//        }
-        
-        // verify that all expected properties are set with the right value
-//        for(var attr in this.expectedProperties) {
-//            if(this.expectedProperties[attr] != eval("this." + attr)) {
-//                fail("Expected property was not set: " + attr + "=" + this.expectedProperties[attr])
-//            }
-//        }
-    };
-
-    var attrCount = 0;
-    for(var attr in this) {
-        this.attrs[attrCount] = attr;
-        attrCount++;
-    }
-};
-
-Returner = function(mock, functionName) {
-    this.mock = mock;
-    this.functionName = functionName;
-};
-
-Returner.prototype.returns = function(returnValue) {
-    this.mock.returnValues[this.functionName] = returnValue;
-};
-
-Returner.prototype.andThrows = function(message) {
-    var error = new Error(message);
-    error.isMockError = true;
-    this.mock.returnValues[this.functionName] = error;
-};
-
-PropertySetter = function(mock, propertyName) {
-    this.mock = mock;
-    this.propertyName = propertyName;
-};
-
-PropertySetter.prototype.returns = function(returnValue) {
-    var ref = new Object();
-    ref.value = returnValue;
-    eval("this.mock." + this.propertyName + "=ref.value");
-};
diff --git a/tests/FunctionalTests/selenium/php/TestRunner.php b/tests/FunctionalTests/selenium/php/TestRunner.php
index fb3cefb3..9bb5ada3 100644
--- a/tests/FunctionalTests/selenium/php/TestRunner.php
+++ b/tests/FunctionalTests/selenium/php/TestRunner.php
@@ -1,7 +1,8 @@
-
+
 
+
 
-
+
 
 
@@ -24,40 +25,47 @@ Copyright 2004 ThoughtWorks, Inc
 -->
 
 
-Prado Functional Test Runner
-
-
-
-
-
-
-
-
-
-
+Selenium Functional Test Runner
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
 
-
+
 
     
@@ -65,92 +73,98 @@ Copyright 2004 ThoughtWorks, Inc
       
-        
-        
-        
-      
-
-      
-        
-      
+        
+        
+
+		
+	  
-        
+        
        
     
        
 
       
        
-          
        Selenium TestRunner
        
-        
        
-
-          
        
-            Execute Tests
-
-            
        
-              
-              
-              
-            
        
-
-            
        
-              
-              
-              
-            
        
-
-          
        
-
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-              
-              
-            
-            
-              
-              
-              
-              
-            
-            
-              
-              
-              
-            
-          
        Elapsed:00.00
        TestsCommands
        0run0passed
        0failed0failed
        0incomplete
        
-
-          
        
-            Tools
-
-            
-            
-
-          
        
-
-        
                
+		
+		  
+			
+		  
+		  
+			
+		  
+		  
        
+			  
        Selenium TestRunner
        
+			
        
+	
+			  
        
+				Execute Tests
+				
+				
        
+				  
+				  
+				  
+				
        
+				
+				
        
+				  
+				  
+				  
+				
        
+				
+			  
        
+	
+			  
+				
+				  
+				  
+				
+				
+				  
+				  
+				
+				
+				  
+				  
+				  
+				  
+				
+				
+				  
+				  
+				  
+				  
+				
+				
+				  
+				  
+				  
+				
+			  
        Elapsed:00.00
        TestsCommands
        0run0passed
        0failed0failed
        0incomplete
        
+	
+			  
        
+				Tools
+	
+				
+				
+	
+			  
        
+	
+			
        
+		  
        
 
       
 
       
        
       
        
     
     
        
 
 
-
+
\ No newline at end of file
diff --git a/tests/FunctionalTests/selenium/php/selenium.php b/tests/FunctionalTests/selenium/php/selenium.php
index 4a4c6e19..960791b8 100644
--- a/tests/FunctionalTests/selenium/php/selenium.php
+++ b/tests/FunctionalTests/selenium/php/selenium.php
@@ -112,15 +112,17 @@ class SeleneseInterpreter
 	public function __call($func, $args)
 	{
 		if($func{0} == '_') return;
+		
 		$ID = isset($args[0]) ? $args[0] : "";
-		//if($ID instanceof TControl)
-		//	$ID = $ID->ClientID;
 		$value = isset($args[1]) ? $args[1] : "";
 		if(strpos(strtolower($func),'htmlpresent') || strpos(strtolower($func),'htmlnotpresent'))
 			$ID = htmlspecialchars($ID);
-		//$command = "|{$func}|{$ID}|{$value}|";
 		$command = array($func, $ID, $value);
 		$trace = debug_backtrace();
+		
+		if(is_int(strpos(strtolower($func), 'visible')))
+			$this->addCommand(array('pause','500',''),$trace);
+		
 		return $this->addCommand($command, $trace);
 	}
 
diff --git a/tests/FunctionalTests/selenium/prado-functional-test.js b/tests/FunctionalTests/selenium/prado-functional-test.js
index be2ea795..f9889a72 100644
--- a/tests/FunctionalTests/selenium/prado-functional-test.js
+++ b/tests/FunctionalTests/selenium/prado-functional-test.js
@@ -1,4 +1,45 @@
 
+/**
+ * Override selenium implementation.
+ */
+Selenium.prototype.getAttribute = function(target) {
+    return this.page().findAttribute(target);
+};
+
+
+/**
+ * Override selenium implementation.
+ */
+Selenium.prototype.isVisible = function(locator) {
+    var element;
+    element = this.page().findElement(locator); 
+
+	if(/Konqueror|Safari|KHTML/.test(navigator.userAgent))
+		var visibility = element.style["visibility"];
+	else
+    	var visibility = this.findEffectiveStyleProperty(element, "visibility");
+
+   	var _isDisplayed = this._isDisplayed(element);
+    return (visibility != "hidden" && _isDisplayed);
+};
+
+
+/**
+ * Override selenium implementation.
+ */
+Selenium.prototype._isDisplayed = function(element) {
+    if(/Konqueror|Safari|KHTML/.test(navigator.userAgent))
+		var display = element.style["display"];
+	else
+		var display = this.findEffectiveStyleProperty(element, "display");
+    if (display == "none") return false;
+    if (element.parentNode.style) {
+        return this._isDisplayed(element.parentNode);
+    }
+    return true;
+};
+
+
 function runNextTest() {
     if (!runAllTests)
             return;
diff --git a/tests/FunctionalTests/selenium/readme-selenium-fitrunner.txt b/tests/FunctionalTests/selenium/readme-selenium-fitrunner.txt
deleted file mode 100644
index 7e13711e..00000000
--- a/tests/FunctionalTests/selenium/readme-selenium-fitrunner.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-Selenium Functional Testing Tool
-(c) ThoughtWorks, Inc., 2004
-- jrhuggins@thoughtworks.com
-
-To run a test suite with just a web browser (no server):
-
-    Open /javascript/TestRunner.html in your browser.
-    Example: file:///C:/selenium/javascript/TestRunner.html
-
-
-To run a test suite with simple web server:
-
-    1) Launch /javascript/startWebServer.bat
-        (An installation of Python is required. This works with 2.3.4, 
-        but hasn't been tested with older versions, yet.)
-
-    2) Open up your browser, then goto the URL: 
-        http://localhost:8000/TestRunner.html    
-        (If you don't want the web server to run on port 8000, modify
-        \javascript\tinyWebServer.py)
-
-To run a different test suite from the default, use the URL syntax:
-   ./TestRunner.html?test={my-test-suite}
-
-Supported Browsers:
-    Microsoft Internet Explorer 6.0+
-    Mozilla 1.6+
-    Mozilla Firefox 0.9.3+
-
-    Other browsers, I'd love to add support for, but havn't yet:
-    Opera, Konqueror, and Safari
-    
-Gotchas:
-1) The tinyWebServer included is not meant for production use. It is only
-provided to show a simple, working example of Selenium running from a web server.
-(TODO- provide instructions for installing in Apache or IIS)
-
-2) The tinyWebServer is only available from localhost (unless you hack the source).
-This was done as a security measure.
-
-3) The tests may not complete automatically the first time, because the browser may pop-up alert boxes:
-    a) Asking if you want to remember form values (click "No" or "Never for this site")
-    b) Warning about security implications about posting data unencrypted.
-
-4) You'll need to whitelist "localhost" in your pop-up blocker, if it is enabled.
-
diff --git a/tests/FunctionalTests/selenium/readme-selenium-rpcrunner.txt b/tests/FunctionalTests/selenium/readme-selenium-rpcrunner.txt
deleted file mode 100644
index cc4e9205..00000000
--- a/tests/FunctionalTests/selenium/readme-selenium-rpcrunner.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Selenium RPC runner currently consists of and XML-RPC binding between the browser
-and external processes. There is currently only support for Java.
-
-To run the tests - just cd to the java folder and execute
-
-ant -Dbrowser=firefox
-
-This will Run the Java Selenium RPC runner unit-and integration tests.
-The integration test will launch a browser that loads a JsUnit
-test suite, which will run the Selenium browser part of the unit tests
-and integration test.
-
-Prereqs:
-o JDK 1.4 installed
-o Ant 1.6.1 or later installed
-o Xalan and JUnit in $ANT_HOME/lib
-
diff --git a/tests/FunctionalTests/selenium/selenium-api.js b/tests/FunctionalTests/selenium/selenium-api.js
deleted file mode 100644
index 5d73e0fd..00000000
--- a/tests/FunctionalTests/selenium/selenium-api.js
+++ /dev/null
@@ -1,731 +0,0 @@
-/*
- * Copyright 2004 ThoughtWorks, Inc
- *
- *  Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-storedVars = new Object();
-
-function Selenium(browserbot) {
-    this.browserbot = browserbot;
-    this.optionLocatorFactory = new OptionLocatorFactory();
-    this.page = function() {
-        return browserbot.getCurrentPage();
-    };
-}
-
-Selenium.createForFrame = function(frame) {
-    return new Selenium(BrowserBot.createForFrame(frame));
-};
-
-/*
- * Reset the browserbot when an error occurs..
- */
-Selenium.prototype.reset = function() {
-    storedVars = new Object();
-    this.browserbot.selectWindow("null");
-};
-
-/*
- * Click on the located element, and attach a callback to notify
- * when the page is reloaded.
- */
-Selenium.prototype.doModalDialogTest = function(returnValue) {
-    this.browserbot.doModalDialogTest(returnValue);
-};
-
-/*
- * Click on the located element, and attach a callback to notify
- * when the page is reloaded.
- */
-Selenium.prototype.doClick = function(locator) {
-    var element = this.page().findElement(locator);
-    this.page().clickElement(element);
-};
-
-/**
- * Overwrite the text in the located text element.
- * TODO fail if it can't be typed into.
- */
-Selenium.prototype.doType = function(locator, newText) {
-    var element = this.page().findElement(locator);
-    this.page().replaceText(element, newText);
-};
-
-Selenium.prototype.findToggleButton = function(locator) {
-    var element = this.page().findElement(locator);
-    if (element.checked == null) {
-        Assert.fail("Element " + locator + " is not a toggle-button.");
-    }
-    return element;
-}
-
-/**
- * Check a toggle-button.
- */
-Selenium.prototype.doCheck = function(locator) {
-    this.findToggleButton(locator).checked = true;
-};
-
-/**
- * Uncheck a toggle-button.
- */
-Selenium.prototype.doUncheck = function(locator) {
-    this.findToggleButton(locator).checked = false;
-};
-
-/**
- * Select the option from the located select element.
- */
-Selenium.prototype.doSelect = function(locator, optionLocator) {
-    var element = this.page().findElement(locator);
-    if (!("options" in element)) {
-        throw new SeleniumError("Specified element is not a Select (has no options)");
-    }
-    var locator = this.optionLocatorFactory.fromLocatorString(optionLocator);
-    var option = locator.findOption(element);
-    this.page().selectOption(element, option);
-};
-
-/*
- * Open the browser to a new location.
- */
-Selenium.prototype.doOpen = function(newLocation) {
-    this.browserbot.openLocation(newLocation);
-    return SELENIUM_PROCESS_WAIT;
-};
-
-/*
- * Select the named window to be the active window.
- */
-Selenium.prototype.doSelectWindow = function(windowName) {
-    this.browserbot.selectWindow(windowName);
-};
-
-/*
- * Instruct Selenium to click Cancel on the next confirm dialog it encounters
- */
-Selenium.prototype.doChooseCancelOnNextConfirmation = function() {
-    this.browserbot.cancelNextConfirmation();
-};
-
-/*
- * Instruct Selenium what to answear on the next prompt dialog it encounters
- */
-Selenium.prototype.doAnswerOnNextPrompt = function(answer) {
-    this.browserbot.setNextPromptResult(answer);
-};
-
-/*
- * Simulate the browser back button
- */
-Selenium.prototype.doGoBack = function() {
-    this.page().goBack();
-};
-
-/*
- * Close the browser window or tab
- */
-Selenium.prototype.doClose = function() {
-    this.page().close();
-};
-
-/*
- * Explicitly fire an event
- */
-Selenium.prototype.doFireEvent = function(locator, event) {
-    var element = this.page().findElement(locator);
-    triggerEvent(element, event, false);
-};
-
-/*
- * Get an alert message, or fail if there were no alerts.
- */
-Selenium.prototype.getAlert = function() {
-    if (!this.browserbot.hasAlerts()) {
-        Assert.fail("There were no alerts");
-    }
-    return this.browserbot.getNextAlert();
-};
-
-/*
- * Get a confirmation message, or fail if there were no confirmations.
- */
-Selenium.prototype.getConfirmation = function() {
-    if (!this.browserbot.hasConfirmations()) {
-        Assert.fail("There were no confirmations");
-    }
-    return this.browserbot.getNextConfirmation();
-};
- 
-/*
- * Get a prompt message, or fail if there were no prompts.
- */
-Selenium.prototype.getPrompt = function() {
-    if (! this.browserbot.hasPrompts()) {
-        Assert.fail("There were no prompts");
-    }
-    return this.browserbot.getNextPrompt();
-};
-
-/*
- * Get the location of the current page.
- */
-Selenium.prototype.getAbsoluteLocation = function() {
-    return this.page().location;
-};
-
-/*
- * Verify the location of the current page ends with the expected location.
- * If a querystring is provided, this is checked as well.
- */
-Selenium.prototype.assertLocation = function(expectedLocation) {
-    var docLocation = this.page().location;
-    var searchPos = expectedLocation.lastIndexOf('?');
-
-    if (searchPos == -1) {
-        Assert.matches('*' + expectedLocation, docLocation.pathname);
-    }
-    else {
-        var expectedPath = expectedLocation.substring(0, searchPos);
-        Assert.matches('*' + expectedPath, docLocation.pathname);
-
-        var expectedQueryString = expectedLocation.substring(searchPos);
-        Assert.equals(expectedQueryString, docLocation.search);
-    }
-};
-
-/*
- * Get the title of the current page.
- */
-Selenium.prototype.getTitle = function() {
-    return this.page().title();
-};
-
-
-/*
- * Get the (trimmed) value of a form element.
- * This is used to generate assertValue, verifyValue, ...
- */
-Selenium.prototype.getValue = function(locator) {
-    var element = this.page().findElement(locator)
-    return getInputValue(element).trim();
-}
-
-/**
- * Get the (trimmed) text of a form element.
- * This is used to generate assertText, verifyText, ...
- */
-Selenium.prototype.getText = function(locator) {
-    var element = this.page().findElement(locator);
-    return getText(element).trim();
-};
-
-/**
- * Assert that a toggle-button is checked.
- */
-Selenium.prototype.assertChecked = function(locator) {
-    var element = this.page().findElement(locator);
-    if (element.checked == null) {
-        Assert.fail("Element " + locator + " is not a toggle-button.");
-    }
-    if (! element.checked) {
-        Assert.fail("Element " + locator + " is not checked.");
-    }
-};
-
-/**
- * Assert that a toggle-button is NOT checked.
- */
-Selenium.prototype.assertNotChecked = function(locator) {
-    var element = this.page().findElement(locator);
-    if (element.checked == null) {
-        Assert.fail("Element " + locator + " is not a toggle-button.");
-    }
-    if (element.checked) {
-        Assert.fail("Element " + locator + " is checked.");
-    }
-};
-
-/*
- * Return the text for a single cell within an HTML table.
- * The table locator syntax is table.row.column.
- */
-Selenium.prototype.getTable = function(tableLocator) {
-    // This regular expression matches "tableName.row.column"
-    // For example, "mytable.3.4"
-    pattern = /(.*)\.(\d+)\.(\d+)/;
-
-    if(!pattern.test(tableLocator)) {
-        throw new SeleniumError("Invalid target format. Correct format is tableName.rowNum.columnNum");
-    }
-
-    pieces = tableLocator.match(pattern);
-
-    tableName = pieces[1];
-    row = pieces[2];
-    col = pieces[3];
-
-    var table = this.page().findElement(tableName);
-    if (row > table.rows.length) {
-        Assert.fail("Cannot access row " + row + " - table has " + table.rows.length + " rows");
-    }
-    else if (col > table.rows[row].cells.length) {
-        Assert.fail("Cannot access column " + col + " - table row has " + table.rows[row].cells.length + " columns");
-    }
-    else {
-        actualContent = getText(table.rows[row].cells[col]);
-        return actualContent.trim();
-    }
-};
-
-/**
- * Verify that the selected option satisfies the option locator.
- */
-Selenium.prototype.assertSelected = function(target, optionLocator) {
-    var element = this.page().findElement(target);
-    var locator = this.optionLocatorFactory.fromLocatorString(optionLocator);
-    locator.assertSelected(element);
-};
-
-String.prototype.parseCSV = function() {
-    var values = this.replace(/\\,/g, "\n").split(",");
-    // Restore escaped commas
-    for (var i = 0; i < values.length; i++) {
-        values[i] = values[i].replace(/\n/g, ",").trim();
-    }
-    return values;
-};
-
-/**
- * Verify the label of all of the options in the drop=down.
- */
-Selenium.prototype.assertSelectOptions = function(target, options) {
-    var element = this.page().findElement(target);
-
-    var expectedOptionLabels = options.parseCSV();
-    Assert.equals("Wrong number of options", expectedOptionLabels.length, element.options.length);
-
-    for (var i = 0; i < element.options.length; i++) {
-        Assert.matches(expectedOptionLabels[i], element.options[i].text);
-    }
-};
-
-/**
- * Get the value of an element attribute. The syntax for returning an element attribute
- * is @attribute-name.  Used to generate assert, verify, assertNot...
- */
-Selenium.prototype.getAttribute = function(target) {
-    return this.page().findAttribute(target);
-};
-
-/*
- * Asserts that the specified text is present in the page content.
- */
-Selenium.prototype.assertTextPresent = function(expectedText) {
-    var allText = this.page().bodyText();
-
-    if(allText == "") {
-        Assert.fail("Page text not found");
-    } else if(allText.indexOf(expectedText) == -1) {
-        Assert.fail("'" + expectedText + "' not found in page text.");
-    }
-};
-
-/*
- * Asserts that the specified text is NOT present in the page content.
- */
-Selenium.prototype.assertTextNotPresent = function(unexpectedText) {
-    var allText = this.page().bodyText();
-
-    if(allText == "") {
-        Assert.fail("Page text not found");
-    } else if(allText.indexOf(unexpectedText) != -1) {
-        Assert.fail("'" + unexpectedText + "' was found in page text.");
-    }
-};
-
-/*
- * Asserts that the specified element can be found.
- */
-Selenium.prototype.assertElementPresent = function(locator) {
-    try {
-        this.page().findElement(locator);
-    } catch (e) {
-        Assert.fail("Element " + locator + " not found.");
-    }
-};
-
-/*
- * Asserts that the specified element cannot be found.
- */
-Selenium.prototype.assertElementNotPresent = function(locator) {
-    try {
-        this.page().findElement(locator);
-    }
-    catch (e) {
-        return;
-    }
-    Assert.fail("Element " + locator + " found.");
-};
-
-/*
- * Asserts that the specified element is visible
- */
-Selenium.prototype.assertVisible = function(locator) {
-    var element;
-    try {
-        element = this.page().findElement(locator);
-    } catch (e) {
-        Assert.fail("Element " + locator + " not present.");
-    }
-    if (! this.isVisible(element)) {
-        Assert.fail("Element " + locator + " not visible.");
-    }
-};
-
-/*
- * Asserts that the specified element is visible
- */
-Selenium.prototype.assertNotVisible = function(locator) {
-    var element;
-    try {
-        element = this.page().findElement(locator);
-    } catch (e) {
-        return;
-    }
-    if (this.isVisible(element)) {
-        Assert.fail("Element " + locator + " is visible.");
-    }
-};
-
-Selenium.prototype.isVisible = function(element) {
-    var visibility = this.getEffectiveStyleProperty(element, "visibility");
-    var isDisplayed = this.isDisplayed(element);
-    return (visibility != "hidden" && isDisplayed);
-};
-
-Selenium.prototype.getEffectiveStyleProperty = function(element, property) {
-    var effectiveStyle = this.getEffectiveStyle(element);
-    var propertyValue = effectiveStyle[property];
-    if (propertyValue == 'inherit' && element.parentNode.style) {
-        return this.getEffectiveStyleProperty(element.parentNode, property);
-    }
-    return propertyValue;
-};
-
-Selenium.prototype.isDisplayed = function(element) {
-    var display = this.getEffectiveStyleProperty(element, "display");
-    if (display == "none") return false;
-    if (element.parentNode.style) {
-        return this.isDisplayed(element.parentNode);
-    }
-    return true;
-};
-
-Selenium.prototype.getEffectiveStyle = function(element) {
-    if (element.style == undefined) {
-        return undefined; // not a styled element
-    }
-    var window = this.browserbot.getContentWindow();
-    if (window.getComputedStyle) { 
-        // DOM-Level-2-CSS
-        return window.getComputedStyle(element, null);
-    }
-    if (element.currentStyle) {
-        // non-standard IE alternative
-        return element.currentStyle;
-        // TODO: this won't really work in a general sense, as
-        //   currentStyle is not identical to getComputedStyle()
-        //   ... but it's good enough for "visibility"
-    }
-    throw new SeleniumError("cannot determine effective stylesheet in this browser");
-};
-
-/**
- * Asserts that the specified element accepts user input visible
- */
-Selenium.prototype.assertEditable = function(locator) {
-    var element = this.page().findElement(locator);
-    if (element.value == undefined) {
-        Assert.fail("Element " + locator + " is not an input.");
-    }
-    if (element.disabled) {
-        Assert.fail("Element " + locator + " is disabled.");
-    }
-};
-
-/**
- * Asserts that the specified element does not accept user input
- */
-Selenium.prototype.assertNotEditable = function(locator) {
-    var element = this.page().findElement(locator);
-    if (element.value == undefined) {
-        return; // not an input
-    }
-    if (element.disabled == false) {
-        Assert.fail("Element " + locator + " is editable.");
-    }
-};
-
- /*
-  * Return all buttons on the screen.
-  */
-Selenium.prototype.getAllButtons = function() {
-        return this.page().getAllButtons();
-};
-
- /*
-  * Return all links on the screen.
-  */
-Selenium.prototype.getAllLinks = function() {
-        return this.page().getAllLinks();
-};
-
- /*
-  * Return all fields on the screen.
-  */
-Selenium.prototype.getAllFields = function() {
-        return this.page().getAllFields();
-};
-
-/*
- * Set the context for the current Test
- */
-Selenium.prototype.doContext = function(context) {
-        return this.page().setContext(context);
-};
-
-/*
- * Store the value of a form input in a variable
- */
-Selenium.prototype.doStoreValue = function(target, varName) {
-    if (!varName) {
-        // Backward compatibility mode: read the ENTIRE text of the page
-        // and stores it in a variable with the name of the target
-        value = this.page().bodyText();
-        storedVars[target] = value;
-        return;
-    }
-    var element = this.page().findElement(target);
-    storedVars[varName] = getInputValue(element);
-};
-
-/*
- * Store the text of an element in a variable
- */
-Selenium.prototype.doStoreText = function(target, varName) {
-    var element = this.page().findElement(target);
-    storedVars[varName] = getText(element);
-};
-
-/*
- * Store the value of an element attribute in a variable
- */
-Selenium.prototype.doStoreAttribute = function(target, varName) {
-    storedVars[varName] = this.page().findAttribute(target);
-};
-
-/*
- * Store the result of a literal value
- */
-Selenium.prototype.doStore = function(value, varName) {
-    storedVars[varName] = value;
-};
-
-
-/*
- * Wait for the target to have the specified value by polling.
- * The polling is done in TestLoop.kickoffNextCommandExecution()
- */
-Selenium.prototype.doWaitForValue = function (target, value) {
-    var e = this.page().findElement(target);
-    testLoop.waitForCondition = function () {
-        return (e.value == value);
-    };
-};
-
-/**
- * Evaluate a parameter, performing javascript evaluation and variable substitution.
- * If the string matches the pattern "javascript{ ... }", evaluate the string between the braces.
- */
-Selenium.prototype.preprocessParameter = function(value) {
-    var match = value.match(/^javascript\{(.+)\}$/);
-    if (match && match[1]) {
-        return eval(match[1]).toString();
-    }
-    return this.replaceVariables(value);
-};
-
-/*
- * Search through str and replace all variable references ${varName} with their
- * value in storedVars.
- */
-Selenium.prototype.replaceVariables = function(str) {
-    var stringResult = str;
-
-    // Find all of the matching variable references
-    var match = stringResult.match(/\$\{\w+\}/g);
-    if (!match) {
-        return stringResult;
-    }
-
-    // For each match, lookup the variable value, and replace if found
-    for (var i = 0; match && i < match.length; i++) {
-        var variable = match[i]; // The replacement variable, with ${}
-        var name = variable.substring(2, variable.length - 1); // The replacement variable without ${}
-        var replacement = storedVars[name];
-        if (replacement != undefined) {
-            stringResult = stringResult.replace(variable, replacement);
-        }
-    }
-    return stringResult;
-};
-
-
-/**
- *  Factory for creating "Option Locators".
- *  An OptionLocator is an object for dealing with Select options (e.g. for
- *  finding a specified option, or asserting that the selected option of 
- *  Select element matches some condition.
- *  The type of locator returned by the factory depends on the locator string:
- *     label=  (OptionLocatorByLabel)
- *     value=  (OptionLocatorByValue)
- *     index=  (OptionLocatorByIndex)
- *     id=     (OptionLocatorById)
- *      (default is OptionLocatorByLabel).
- */
-function OptionLocatorFactory() {
-}
-
-OptionLocatorFactory.prototype.fromLocatorString = function(locatorString) {
-    var locatorType = 'label';
-    var locatorValue = locatorString;
-    // If there is a locator prefix, use the specified strategy
-    var result = locatorString.match(/^([a-zA-Z]+)=(.*)/);
-    if (result) {
-        locatorType = result[1];
-        locatorValue = result[2];
-    }
-    if (this.optionLocators == undefined) {
-        this.registerOptionLocators();
-    }
-    if (this.optionLocators[locatorType]) {
-        return new this.optionLocators[locatorType](locatorValue);
-    }
-    throw new SeleniumError("Unkown option locator type: " + locatorType);
-};
-
-/**
- * To allow for easy extension, all of the option locators are found by
- * searching for all methods of OptionLocatorFactory.prototype that start
- * with "OptionLocatorBy".
- * TODO: Consider using the term "Option Specifier" instead of "Option Locator".
- */
-OptionLocatorFactory.prototype.registerOptionLocators = function() {
-    this.optionLocators={};
-    for (var functionName in this) {
-      var result = /OptionLocatorBy([A-Z].+)$/.exec(functionName);
-      if (result != null) {
-          var locatorName = result[1].lcfirst();
-          this.optionLocators[locatorName] = this[functionName];
-      }
-    }
-};
-
-/**
- *  OptionLocator for options identified by their labels.
- */
-OptionLocatorFactory.prototype.OptionLocatorByLabel = function(label) {
-    this.label = label;
-    this.labelMatcher = new PatternMatcher(this.label);
-    this.findOption = function(element) {
-        for (var i = 0; i < element.options.length; i++) {
-            if (this.labelMatcher.matches(element.options[i].text)) {
-                return element.options[i];
-            }
-        }
-        throw new SeleniumError("Option with label '" + this.label + "' not found");
-    };
-
-    this.assertSelected = function(element) {
-        var selectedLabel = element.options[element.selectedIndex].text;
-        Assert.matches(this.label, selectedLabel);
-    };
-};
-
-/**
- *  OptionLocator for options identified by their values.
- */
-OptionLocatorFactory.prototype.OptionLocatorByValue = function(value) {
-    this.value = value;
-    this.valueMatcher = new PatternMatcher(this.value);
-    this.findOption = function(element) {
-        for (var i = 0; i < element.options.length; i++) {
-            if (this.valueMatcher.matches(element.options[i].value)) {
-                return element.options[i];
-            }
-        }
-        throw new SeleniumError("Option with value '" + this.value + "' not found");
-    };
-
-    this.assertSelected = function(element) {
-        var selectedValue = element.options[element.selectedIndex].value;
-        Assert.matches(this.value, selectedValue);
-    };
-};
-
-/**
- *  OptionLocator for options identified by their index.
- */
-OptionLocatorFactory.prototype.OptionLocatorByIndex = function(index) {
-    this.index = Number(index);
-    if (isNaN(this.index) || this.index < 0) {
-        throw new SeleniumError("Illegal Index: " + index);
-    }
-
-    this.findOption = function(element) {
-        if (element.options.length <= this.index) {
-            throw new SeleniumError("Index out of range.  Only " + element.options.length + " options available");
-        }
-        return element.options[this.index];
-    };
-
-    this.assertSelected = function(element) {
-        Assert.equals(this.index, element.selectedIndex);
-    };
-};
-
-/**
- *  OptionLocator for options identified by their id.
- */
-OptionLocatorFactory.prototype.OptionLocatorById = function(id) {
-    this.id = id;
-    this.idMatcher = new PatternMatcher(this.id);
-    this.findOption = function(element) {
-        for (var i = 0; i < element.options.length; i++) {
-            if (this.idMatcher.matches(element.options[i].id)) {
-                return element.options[i];
-            }
-        }
-        throw new SeleniumError("Option with id '" + this.id + "' not found");
-    };
-
-    this.assertSelected = function(element) {
-        var selectedId = element.options[element.selectedIndex].id;
-        Assert.matches(this.id, selectedId);
-    };
-};
-
-
diff --git a/tests/FunctionalTests/selenium/selenium-browserbot.js b/tests/FunctionalTests/selenium/selenium-browserbot.js
deleted file mode 100644
index bf605f01..00000000
--- a/tests/FunctionalTests/selenium/selenium-browserbot.js
+++ /dev/null
@@ -1,996 +0,0 @@
-/*
-* Copyright 2004 ThoughtWorks, Inc
-*
-*  Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*
-*/
-
-/*
-* This script provides the Javascript API to drive the test application contained within
-* a Browser Window.
-* TODO:
-*    Add support for more events (keyboard and mouse)
-*    Allow to switch "user-entry" mode from mouse-based to keyboard-based, firing different
-*          events in different modes.
-*/
-
-// The window to which the commands will be sent.  For example, to click on a
-// popup window, first select that window, and then do a normal click command.
-
-
-// Although it's generally better web development practice not to use browser-detection
-// (feature detection is better), the subtle browser differences that Selenium has to
-// work around seem to make it necessary. Maybe as we learn more about what we need,
-// we can do this in a more "feature-centric" rather than "browser-centric" way.
-// TODO we should probably reuse an available browser-detection library
-var browserName=navigator.appName;
-var isIE = (browserName =="Microsoft Internet Explorer");
-var isKonqueror = (browserName == "Konqueror");
-var isSafari = (navigator.userAgent.indexOf('Safari') != -1);
-
-// Get the Gecko version as an 8 digit date.
-var geckoResult = /^Mozilla\/5\.0 .*Gecko\/(\d{8}).*$/.exec(navigator.userAgent);
-var geckoVersion = geckoResult == null ? null : geckoResult[1];
-
-BrowserBot = function(frame) {
-    this.frame = frame;
-    this.currentPage = null;
-    this.currentWindowName = null;
-
-    this.modalDialogTest = null;
-    this.recordedAlerts = new Array();
-    this.recordedConfirmations = new Array();
-    this.recordedPrompts = new Array();
-    this.openedWindows = {};
-    this.nextConfirmResult = true;
-    this.nextPromptResult = '';
-    this.newPageLoaded = false;
-
-    var self = this;
-    this.recordPageLoad = function() {
-        LOG.debug("Page load detected, location=" + self.getCurrentWindow().location);
-        self.currentPage = null;
-        self.newPageLoaded = true;
-    };
-
-    this.isNewPageLoaded = function() {
-        return self.newPageLoaded;
-    };
-};
-
-BrowserBot.createForFrame = function(frame) {
-    var browserbot;
-    if (isIE) {
-        browserbot = new IEBrowserBot(frame);
-    }
-    else if (isKonqueror) {
-        browserbot = new KonquerorBrowserBot(frame);
-    }
-    else if (isSafari) {
-        browserbot = new SafariBrowserBot(frame);
-    }
-    else {
-        // Use mozilla by default
-        browserbot = new MozillaBrowserBot(frame);
-    }
-
-    // Modify the test IFrame so that page loads are detected.
-    addLoadListener(browserbot.getFrame(), browserbot.recordPageLoad);
-    return browserbot;
-};
-
-BrowserBot.prototype.doModalDialogTest = function(test) {
-    this.modalDialogTest = test;
-};
-
-BrowserBot.prototype.cancelNextConfirmation = function() {
-    this.nextConfirmResult = false;
-};
-
-BrowserBot.prototype.setNextPromptResult = function(result) {
-    this.nextPromptResult = result;
-};
-
-BrowserBot.prototype.hasAlerts = function() {
-    return (this.recordedAlerts.length > 0) ;
-};
-
-BrowserBot.prototype.getNextAlert = function() {
-    return this.recordedAlerts.shift();
-};
-
-BrowserBot.prototype.hasConfirmations = function() {
-    return (this.recordedConfirmations.length > 0) ;
-};
-
-BrowserBot.prototype.getNextConfirmation = function() {
-    return this.recordedConfirmations.shift();
-};
-
-BrowserBot.prototype.hasPrompts = function() {
-    return (this.recordedPrompts.length > 0) ;
-};
-
-BrowserBot.prototype.getNextPrompt = function() {
-    return this.recordedPrompts.shift();
-};
-
-BrowserBot.prototype.getFrame = function() {
-    return this.frame;
-};
-
-BrowserBot.prototype.selectWindow = function(target) {
-    // we've moved to a new page - clear the current one
-    this.currentPage = null;
-    this.currentWindowName = null;
-    if (target && target != "null") {
-        // If window exists
-        if (this.getTargetWindow(target)) {
-            this.currentWindowName = target;
-        }
-    }
-};
-
-BrowserBot.prototype.openLocation = function(target) {
-    // We're moving to a new page - clear the current one
-    this.currentPage = null;
-    this.newPageLoaded = false;
-
-    this.setIFrameLocation(this.getFrame(), target);
-};
-
-BrowserBot.prototype.setIFrameLocation = function(iframe, location) {
-    iframe.src = location;
-};
-
-BrowserBot.prototype.getCurrentPage = function() {
-    if (this.currentPage == null) {
-        var testWindow = this.getCurrentWindow();
-        this.modifyWindowToRecordPopUpDialogs(testWindow, this);
-        this.modifySeparateTestWindowToDetectPageLoads(testWindow);
-        this.currentPage = PageBot.createForWindow(testWindow);
-        this.newPageLoaded = false;
-    }
-
-    return this.currentPage;
-};
-
-BrowserBot.prototype.modifyWindowToRecordPopUpDialogs = function(windowToModify, browserBot) {
-    windowToModify.alert = function(alert) {
-        browserBot.recordedAlerts.push(alert);
-    };
-
-    windowToModify.confirm = function(message) {
-        browserBot.recordedConfirmations.push(message);
-        var result = browserBot.nextConfirmResult;
-        browserBot.nextConfirmResult = true;
-        return result;
-    };
-
-    windowToModify.prompt = function(message) {
-        browserBot.recordedPrompts.push(message);
-        var result = !browserBot.nextConfirmResult ? null : browserBot.nextPromptResult;
-        browserBot.nextConfirmResult = true;
-        browserBot.nextPromptResult = '';
-        return result;
-    };
-
-    // Keep a reference to all popup windows by name
-    // note that in IE the "windowName" argument must be a valid javascript identifier, it seems.
-    var originalOpen = windowToModify.open;
-    windowToModify.open = function(url, windowName, windowFeatures, replaceFlag) {
-        var openedWindow = originalOpen(url, windowName, windowFeatures, replaceFlag);
-        selenium.browserbot.openedWindows[windowName] = openedWindow;
-        return openedWindow;
-    };
-};
-
-/**
- * The main IFrame has a single, long-lived onload handler that clears
- * Browserbot.currentPage and sets the "newPageLoaded" flag. For separate
- * windows, we need to attach a handler each time. This uses the
- * "callOnWindowPageTransition" mechanism, which is implemented differently
- * for different browsers.
- */
-BrowserBot.prototype.modifySeparateTestWindowToDetectPageLoads = function(windowToModify) {
-    if (this.currentWindowName != null) {
-        this.callOnWindowPageTransition(this.recordPageLoad, windowToModify);
-    }
-};
-
-/**
- * Call the supplied function when a the current page unloads and a new one loads.
- * This is done with an "unload" handler which attaches a "load" handler.
- */
-BrowserBot.prototype.callOnWindowPageTransition = function(loadFunction, windowObject) {
-    var attachLoadListener = function() {
-        if (windowObject && !windowObject.closed) {
-            addLoadListener(windowObject, loadFunction);
-        }
-    };
-
-    var unloadFunction = function() {
-        window.setTimeout(attachLoadListener, 0);
-    };
-    addUnloadListener(windowObject, unloadFunction);
-};
-
-BrowserBot.prototype.getContentWindow = function() {
-    return this.getFrame().contentWindow || frames[this.getFrame().id];
-};
-
-BrowserBot.prototype.getTargetWindow = function(windowName) {
-    LOG.debug("getTargetWindow(" + windowName + ")");
-    // First look in the map of opened windows
-    var targetWindow = this.openedWindows[windowName];
-    if (!targetWindow) {
-        var evalString = "this.getContentWindow().window." + windowName;
-        targetWindow = eval(evalString);
-    }
-    if (!targetWindow) {
-        throw new SeleniumError("Window does not exist");
-    }
-    return targetWindow;
-};
-
-BrowserBot.prototype.getCurrentWindow = function() {
-    var testWindow = this.getContentWindow().window;
-    if (this.currentWindowName != null) {
-        testWindow = this.getTargetWindow(this.currentWindowName);
-    }
-    return testWindow;
-};
-
-function MozillaBrowserBot(frame) {
-    BrowserBot.call(this, frame);
-}
-MozillaBrowserBot.prototype = new BrowserBot;
-
-function KonquerorBrowserBot(frame) {
-    BrowserBot.call(this, frame);
-}
-KonquerorBrowserBot.prototype = new BrowserBot;
-
-KonquerorBrowserBot.prototype.setIFrameLocation = function(iframe, location) {
-    // Window doesn't fire onload event when setting src to the current value,
-    // so we set it to blank first.
-    iframe.src = "about:blank";
-    iframe.src = location;
-};
-
-/**
- * Call the supplied function when a the current page unloads and a new one loads.
- * This is done by polling continuously until the document changes and is fully loaded.
- */
-KonquerorBrowserBot.prototype.callOnWindowPageTransition = function(loadFunction, windowObject) {
-    // Since the unload event doesn't fire in Safari 1.3, we start polling immediately
-    // This works in Konqueror as well
-    if (windowObject && !windowObject.closed) {
-        LOG.debug("Starting pollForLoad");
-        this.pollForLoad(loadFunction, windowObject, windowObject.document);
-    }
-};
-
-/**
- * For Konqueror (and Safari), we can't catch the onload event for a separate window (as opposed to an IFrame)
- * So we set up a polling timer that will keep checking the readyState of the document until it's complete.
- * Since we might call this before the original page is unloaded, we check to see that the completed document
- * is different from the original one.
- */
-KonquerorBrowserBot.prototype.pollForLoad = function(loadFunction, windowObject, originalDocument) {
-    if (windowObject.closed) {
-        return;
-    }
-
-    var sameDoc = (originalDocument === windowObject.document);
-    var rs = windowObject.document.readyState;
-
-    if (!sameDoc && rs == 'complete') {
-        LOG.debug("pollForLoad complete: " + rs + " (" + sameDoc + ")");
-        loadFunction();
-        return;
-    }
-    var self = this;
-    LOG.debug("pollForLoad continue");
-    window.setTimeout(function() {self.pollForLoad(loadFunction, windowObject, originalDocument);}, 500);
-};
-
-function SafariBrowserBot(frame) {
-    BrowserBot.call(this, frame);
-}
-SafariBrowserBot.prototype = new BrowserBot;
-
-SafariBrowserBot.prototype.setIFrameLocation = KonquerorBrowserBot.prototype.setIFrameLocation;
-SafariBrowserBot.prototype.callOnWindowPageTransition = KonquerorBrowserBot.prototype.callOnWindowPageTransition;
-SafariBrowserBot.prototype.pollForLoad = KonquerorBrowserBot.prototype.pollForLoad;
-
-function IEBrowserBot(frame) {
-    BrowserBot.call(this, frame);
-}
-IEBrowserBot.prototype = new BrowserBot;
-IEBrowserBot.prototype.callOnWindowPageTransition = KonquerorBrowserBot.prototype.callOnWindowPageTransition;
-IEBrowserBot.prototype.pollForLoad = KonquerorBrowserBot.prototype.pollForLoad;
-
-IEBrowserBot.prototype.modifyWindowToRecordPopUpDialogs = function(windowToModify, browserBot) {
-    BrowserBot.prototype.modifyWindowToRecordPopUpDialogs(windowToModify, browserBot);
-
-    // we will call the previous version of this method from within our own interception
-    oldShowModalDialog = windowToModify.showModalDialog;
-
-    windowToModify.showModalDialog = function(url, args, features) {
-        // Get relative directory to where TestRunner.html lives
-        // A risky assumption is that the user's TestRunner is named TestRunner.html
-        var doc_location = document.location.toString();
-        var end_of_base_ref = doc_location.indexOf('TestRunner.html');
-        var base_ref = doc_location.substring(0, end_of_base_ref);
-
-        var fullURL = base_ref + "TestRunner.html?singletest=" + escape(browserBot.modalDialogTest) + "&autoURL=" + escape(url) + "&runInterval=" + runInterval;
-        browserBot.modalDialogTest = null;
-
-        var returnValue = oldShowModalDialog(fullURL, args, features);
-        return returnValue;
-    };
-};
-
-SafariBrowserBot.prototype.modifyWindowToRecordPopUpDialogs = function(windowToModify, browserBot) {
-    BrowserBot.prototype.modifyWindowToRecordPopUpDialogs(windowToModify, browserBot);
-
-    var originalOpen = windowToModify.open;
-    /*
-     * Safari seems to be broken, so that when we manually trigger the onclick method
-     * of a button/href, any window.open calls aren't resolved relative to the app location.
-     * So here we replace the open() method with one that does resolve the url correctly.
-     */
-    windowToModify.open = function(url, windowName, windowFeatures, replaceFlag) {
-
-        if (url.startsWith("http://") || url.startsWith("https://") || url.startsWith("/")) {
-            return originalOpen(url, windowName, windowFeatures, replaceFlag);
-        }
-
-        // Reduce the current path to the directory
-        var currentPath = windowToModify.location.pathname || "/";
-        currentPath = currentPath.replace(/\/[^\/]*$/, "/");
-
-        // Remove any leading "./" from the new url.
-        url = url.replace(/^\.\//, "");
-
-        newUrl = currentPath + url;
-
-        return originalOpen(newUrl, windowName, windowFeatures, replaceFlag);
-    };
-};
-
-PageBot = function(pageWindow) {
-    if (pageWindow) {
-        this.currentWindow = pageWindow;
-        this.currentDocument = pageWindow.document;
-        this.location = pageWindow.location;
-        this.title = function() {return this.currentDocument.title;};
-    }
-
-    // Register all locateElementBy* functions
-    // TODO - don't do this in the constructor - only needed once ever
-    this.locationStrategies = {};
-    for (var functionName in this) {
-        var result = /^locateElementBy([A-Z].+)$/.exec(functionName);
-        if (result != null) {
-            var locatorFunction = this[functionName];
-            if (typeof(locatorFunction) != 'function') {
-                continue;
-            }
-            // Use a specified prefix in preference to one generated from
-            // the function name
-            var locatorPrefix = locatorFunction.prefix || result[1].toLowerCase();
-            this.locationStrategies[locatorPrefix] = locatorFunction;
-        }
-    }
-
-    /**
-     * Find a locator based on a prefix.
-     */
-    this.findElementBy = function(locatorType, locator, inDocument) {
-        var locatorFunction = this.locationStrategies[locatorType];
-        if (! locatorFunction) {
-            throw new SeleniumError("Unrecognised locator type: '" + locatorType + "'");
-        }
-        return locatorFunction.call(this, locator, inDocument);
-    };
-
-    /**
-     * The implicit locator, that is used when no prefix is supplied.
-     */
-    this.locationStrategies['implicit'] = function(locator, inDocument) {
-        if (locator.startsWith('//')) {
-            return this.locateElementByXPath(locator, inDocument);
-        } 
-        if (locator.startsWith('document.')) {
-            return this.locateElementByDomTraversal(locator, inDocument);
-        }
-        return this.locateElementByIdentifier(locator, inDocument);
-    };
-    
-};
-
-PageBot.createForWindow = function(windowObject) {
-    if (isIE) {
-        return new IEPageBot(windowObject);
-    }
-    else if (isKonqueror) {
-        return new KonquerorPageBot(windowObject);
-    }
-    else if (isSafari) {
-        return new SafariPageBot(windowObject);
-    }
-    else {
-        // Use mozilla by default
-        return new MozillaPageBot(windowObject);
-    }
-};
-
-MozillaPageBot = function(pageWindow) {
-    PageBot.call(this, pageWindow);
-};
-MozillaPageBot.prototype = new PageBot();
-
-KonquerorPageBot = function(pageWindow) {
-    PageBot.call(this, pageWindow);
-};
-KonquerorPageBot.prototype = new PageBot();
-
-SafariPageBot = function(pageWindow) {
-    PageBot.call(this, pageWindow);
-};
-SafariPageBot.prototype = new PageBot();
-
-IEPageBot = function(pageWindow) {
-    PageBot.call(this, pageWindow);
-};
-IEPageBot.prototype = new PageBot();
-
-/*
-* Finds an element on the current page, using various lookup protocols
-*/
-PageBot.prototype.findElement = function(locator) {
-    var locatorType = 'implicit';
-    var locatorString = locator;
-    
-    // If there is a locator prefix, use the specified strategy
-    var result = locator.match(/^([A-Za-z]+)=(.+)/);
-    if (result) {
-        locatorType = result[1].toLowerCase();
-        locatorString = result[2];
-    }
-
-    var element = this.findElementBy(locatorType, locatorString, this.currentDocument);
-    if (element != null) {
-        return element;
-    }
-    for (var i = 0; i < this.currentWindow.frames.length; i++) {
-        element = this.findElementBy(locatorType, locatorString, this.currentWindow.frames[i].document);
-        if (element != null) {
-            return element;
-        }
-    }
-
-    // Element was not found by any locator function.
-    throw new SeleniumError("Element " + locator + " not found");
-};
-
-/**
- * In non-IE browsers, getElementById() does not search by name.  Instead, we
- * we search separately by id and name.
- */
-PageBot.prototype.locateElementByIdentifier = function(identifier, inDocument) {
-    return PageBot.prototype.locateElementById(identifier, inDocument)
-            || PageBot.prototype.locateElementByName(identifier, inDocument)
-            || null;
-};
-
-/**
- * In IE, getElementById() also searches by name - this is an optimisation for IE.
- */
-IEPageBot.prototype.locateElementByIdentifer = function(identifier, inDocument) {
-    return inDocument.getElementById(identifier);
-};
-
-/**
- * Find the element with id - can't rely on getElementById, coz it returns by name as well in IE..
- */
-PageBot.prototype.locateElementById = function(identifier, inDocument) {
-    var element = inDocument.getElementById(identifier);
-    if (element && element.id === identifier) {
-        return element;
-    }
-    else {
-        return null;
-    }
-};
-
-/**
- * Find an element by name, refined by (optional) element-filter
- * expressions.
- */
-PageBot.prototype.locateElementByName = function(locator, document) {
-    var elements = document.getElementsByTagName("*");
-
-    var filters = locator.split(' ');
-    filters[0] = 'name=' + filters[0];
-
-    while (filters.length) {
-        var filter = filters.shift();
-        elements = this.selectElements(filter, elements, 'value');
-    }
-
-    if (elements.length > 0) {
-        return elements[0];
-    }
-    return null;
-};
-
-/**
-* Finds an element using by evaluating the "document.*" string against the
-* current document object. Dom expressions must begin with "document."
-*/
-PageBot.prototype.locateElementByDomTraversal = function(domTraversal, inDocument) {
-    if (domTraversal.indexOf("document.") != 0) {
-        return null;
-    }
-
-    // Trim the leading 'document'
-    domTraversal = domTraversal.substr(9);
-    var locatorScript = "inDocument." + domTraversal;
-    var element = eval(locatorScript);
-
-    if (!element) {
-        return null;
-    }
-
-    return element;
-};
-PageBot.prototype.locateElementByDomTraversal.prefix = "dom";
-
-/**
-* Finds an element identified by the xpath expression. Expressions _must_
-* begin with "//".
-*/
-PageBot.prototype.locateElementByXPath = function(xpath, inDocument) {
-
-    // Trim any trailing "/": not valid xpath, and remains from attribute
-    // locator.
-    if (xpath.charAt(xpath.length - 1) == '/') {
-        xpath = xpath.slice(0, -1);
-    }
-
-    // Handle //tag
-    var match = xpath.match(/^\/\/(\w+|\*)$/); 
-    if (match) {
-        var elements = inDocument.getElementsByTagName(match[1].toUpperCase()); 
-        if (elements == null) return null;
-        return elements[0];
-    }
-
-    // Handle //tag[@attr='value']
-    var match = xpath.match(/^\/\/(\w+|\*)\[@(\w+)=('([^\']+)'|"([^\"]+)")\]$/); 
-    if (match) {
-        return this.findElementByTagNameAndAttributeValue(
-            inDocument,
-            match[1].toUpperCase(),
-            match[2].toLowerCase(),
-            match[3].slice(1, -1)
-        );
-    }
-
-    // Handle //tag[text()='value']
-    var match = xpath.match(/^\/\/(\w+|\*)\[text\(\)=('([^\']+)'|"([^\"]+)")\]$/); 
-    if (match) {
-        return this.findElementByTagNameAndText(
-            inDocument,
-            match[1].toUpperCase(),
-            match[2].slice(1, -1)
-        );
-    }
-
-    return this.findElementUsingFullXPath(xpath, inDocument);
-};
-
-PageBot.prototype.findElementByTagNameAndAttributeValue = function(
-    inDocument, tagName, attributeName, attributeValue
-) {
-    if (isIE && attributeName == "class") {
-        attributeName = "className";
-    }
-    var elements = inDocument.getElementsByTagName(tagName); 
-    for (var i = 0; i < elements.length; i++) { 
-        var elementAttr = elements[i].getAttribute(attributeName); 
-        if (elementAttr == attributeValue) { 
-            return elements[i]; 
-        } 
-    } 
-    return null;
-};
-
-PageBot.prototype.findElementByTagNameAndText = function(
-    inDocument, tagName, text
-) {
-    var elements = inDocument.getElementsByTagName(tagName); 
-    for (var i = 0; i < elements.length; i++) { 
-        if (getText(elements[i]) == text) { 
-            return elements[i]; 
-        } 
-    } 
-    return null;
-};
-
-PageBot.prototype.findElementUsingFullXPath = function(xpath, inDocument) {
-    if (isIE && !inDocument.evaluate) {
-        addXPathSupport(inDocument);
-    }
-
-    // Use document.evaluate() if it's available
-    if (inDocument.evaluate) {
-        return inDocument.evaluate(xpath, inDocument, null, 0, null).iterateNext();
-    }
-
-    // If not, fall back to slower JavaScript implementation
-    var context = new XPathContext();
-    context.expressionContextNode = inDocument;
-    var xpathResult = new XPathParser().parse(xpath).evaluate(context);
-    if (xpathResult && xpathResult.toArray) {
-        return xpathResult.toArray()[0];
-    }
-    return null;
-};
-
-/**
-* Finds a link element with text matching the expression supplied. Expressions must
-* begin with "link:".
-*/
-PageBot.prototype.locateElementByLinkText = function(linkText, inDocument) {
-    var links = inDocument.getElementsByTagName('a');
-    for (var i = 0; i < links.length; i++) {
-        var element = links[i];
-        if (PatternMatcher.matches(linkText, getText(element))) {
-            return element;
-        }
-    }
-    return null;
-};
-PageBot.prototype.locateElementByLinkText.prefix = "link";
-
-/**
-* Returns an attribute based on an attribute locator. This is made up of an element locator
-* suffixed with @attribute-name.
-*/
-PageBot.prototype.findAttribute = function(locator) {
-    // Split into locator + attributeName
-    var attributePos = locator.lastIndexOf("@");
-    var elementLocator = locator.slice(0, attributePos);
-    var attributeName = locator.slice(attributePos + 1);
-
-    // Find the element.
-    var element = this.findElement(elementLocator);
-
-    // Handle missing "class" attribute in IE.
-    if (isIE && attributeName == "class") {
-        attributeName = "className";
-    }
-
-    // Get the attribute value.
-    var attributeValue = element.getAttribute(attributeName);
-
-    return attributeValue ? attributeValue.toString() : null;
-};
-
-/*
-* Select the specified option and trigger the relevant events of the element.
-*/
-PageBot.prototype.selectOption = function(element, option) {
-    triggerEvent(element, 'focus', false);
-    if (!option.selected) {
-        option.selected = true;
-        triggerEvent(element, 'change', true);
-    }
-    triggerEvent(element, 'blur', false);
-};
-
-PageBot.prototype.replaceText = function(element, stringValue) {
-    triggerEvent(element, 'focus', false);
-    triggerEvent(element, 'select', true);
-    element.value=stringValue;
-    triggerEvent(element, 'change', true);
-    triggerEvent(element, 'blur', false);
-};
-
-MozillaPageBot.prototype.clickElement = function(element) {
-
-    triggerEvent(element, 'focus', false);
-
-    // Add an event listener that detects if the default action has been prevented.
-    // (This is caused by a javascript onclick handler returning false)
-    var preventDefault = false;
-    if (geckoVersion) {
-        element.addEventListener("click", function(evt) {preventDefault = evt.getPreventDefault();}, false);
-    }
-
-    // Trigger the click event.
-    triggerMouseEvent(element, 'click', true);
-
-    // In FireFox < 1.0 Final, and Mozilla <= 1.7.3, just sending the click event is enough.
-    // But in newer versions, we need to do it ourselves.
-    var needsProgrammaticClick = (geckoVersion > '20041025');
-    // Perform the link action if preventDefault was set.
-    if (needsProgrammaticClick && !preventDefault) {
-        // Try the element itself, as well as it's parent - this handles clicking images inside links.
-        if (element.href) {
-            this.currentWindow.location.href = element.href;
-        }
-        else if (element.parentNode && element.parentNode.href) {
-            this.currentWindow.location.href = element.parentNode.href;
-        }
-    }
-
-    if (this.windowClosed()) {
-        return;
-    }
-
-    triggerEvent(element, 'blur', false);
-};
-
-KonquerorPageBot.prototype.clickElement = function(element) {
-
-    triggerEvent(element, 'focus', false);
-
-    if (element.click) {
-        element.click();
-    }
-    else {
-        triggerMouseEvent(element, 'click', true);
-    }
-
-    if (this.windowClosed()) {
-        return;
-    }
-
-    triggerEvent(element, 'blur', false);
-};
-
-SafariPageBot.prototype.clickElement = function(element) {
-
-    triggerEvent(element, 'focus', false);
-
-    var wasChecked = element.checked;
-    
-    // For form element it is simple.
-    if (element.click) {
-        element.click();
-    }
-    // For links and other elements, event emulation is required.
-    else {
-        triggerEvent(element, 'click', true);
-
-        // Unfortunately, triggering the event doesn't seem to activate onclick handlers.
-        // We currently call onclick for the link, but I'm guessing that the onclick for containing
-        // elements is not being called.
-        var success = true;
-        if (element.onclick) {
-            var evt = document.createEvent('HTMLEvents');
-            evt.initEvent('click', true, true);
-            var onclickResult = element.onclick(evt);
-            if (onclickResult === false) {
-                success = false;
-            }
-        }
-
-        if (success) {
-            // Try the element itself, as well as it's parent - this handles clicking images inside links.
-            if (element.href) {
-                this.currentWindow.location.href = element.href;
-            }
-            else if (element.parentNode.href) {
-                this.currentWindow.location.href = element.parentNode.href;
-            } else {
-                // This is true for buttons outside of forms, and maybe others.
-                LOG.warn("Ignoring 'click' call for button outside form, or link without href."
-                        + "Using buttons without an enclosing form can cause wierd problems with URL resolution in Safari." );
-                // I implemented special handling for window.open, but unfortunately this behaviour is also displayed
-                // when we have a button without an enclosing form that sets document.location in the onclick handler.
-                // The solution is to always use an enclosing form for a button.
-            }
-        }
-    }
-
-    // Onchange event is not triggered automatically in Safari.
-    if (isDefined(element.checked) && wasChecked != element.checked) {
-        triggerEvent(element, 'change', true);
-    }
-
-    if (this.windowClosed()) {
-        return;
-    }
-
-    triggerEvent(element, 'blur', false);
-};
-
-IEPageBot.prototype.clickElement = function(element) {
-
-    triggerEvent(element, 'focus', false);
-
-    var wasChecked = element.checked;
-
-    // Set a flag that records if the page will unload - this isn't always accurate, because
-    //  triggers the onbeforeunload event, even thought the page won't unload
-    var pageUnloading = false;
-    var pageUnloadDetector = function() {pageUnloading = true;};
-    this.currentWindow.attachEvent("onbeforeunload", pageUnloadDetector);
-
-    element.click();
-
-    // If the page is going to unload - still attempt to fire any subsequent events.
-    // However, we can't guarantee that the page won't unload half way through, so we need to handle exceptions.
-    try {
-        this.currentWindow.detachEvent("onbeforeunload", pageUnloadDetector);
-
-        if (this.windowClosed()) {
-            return;
-        }
-
-        // Onchange event is not triggered automatically in IE.
-        if (isDefined(element.checked) && wasChecked != element.checked) {
-            triggerEvent(element, 'change', true);
-        }
-
-        triggerEvent(element, 'blur', false);
-    }
-    catch (e) {
-        // If the page is unloading, we may get a "Permission denied" or "Unspecified error".
-        // Just ignore it, because the document may have unloaded.
-        if (pageUnloading) {
-            LOG.warn("Caught exception when firing events on unloading page: " + e.message);
-            return;
-        }
-        throw e;
-    }
-};
-
-PageBot.prototype.windowClosed = function(element) {
-    return this.currentWindow.closed;
-};
-
-PageBot.prototype.bodyText = function() {
-    return getText(this.currentDocument.body);
-};
-
-PageBot.prototype.getAllButtons = function() {
-    var elements = this.currentDocument.getElementsByTagName('input');
-    var result = '';
-
-    for (var i = 0; i < elements.length; i++) {
-        if (elements[i].type == 'button' || elements[i].type == 'submit' || elements[i].type == 'reset') {
-            result += elements[i].id;
-
-            result += ',';
-        }
-    }
-
-    return result;
-};
-
-
-PageBot.prototype.getAllFields = function() {
-    var elements = this.currentDocument.getElementsByTagName('input');
-    var result = '';
-
-    for (var i = 0; i < elements.length; i++) {
-        if (elements[i].type == 'text') {
-            result += elements[i].id;
-
-            result += ',';
-        }
-    }
-
-    return result;
-};
-
-PageBot.prototype.getAllLinks = function() {
-    var elements = this.currentDocument.getElementsByTagName('a');
-    var result = '';
-
-    for (var i = 0; i < elements.length; i++) {
-        result += elements[i].id;
-
-        result += ',';
-    }
-
-    return result;
-};
-
-PageBot.prototype.setContext = function(strContext) {
-     //set the current test title
-    context.innerHTML=strContext;
-};
-
-function isDefined(value) {
-    return typeof(value) != undefined;
-}
-
-PageBot.prototype.goBack = function() {
-    this.currentWindow.history.back();
-};
-
-PageBot.prototype.goForward = function() {
-    this.currentWindow.history.forward();
-};
-
-PageBot.prototype.close = function() {
-    this.currentWindow.close();
-};
-
-/**
- * Refine a list of elements using a filter.
- */
-PageBot.prototype.selectElementsBy = function(filterType, filter, elements) {
-    var filterFunction = PageBot.filterFunctions[filterType];
-    if (! filterFunction) {
-        throw new SeleniumError("Unrecognised element-filter type: '" + filterType + "'");
-    }
-
-    return filterFunction(filter, elements);
-};
-
-PageBot.filterFunctions = {}; 
-
-PageBot.filterFunctions.name = function(name, elements) {
-    var selectedElements = [];
-    for (var i = 0; i < elements.length; i++) {
-        if (elements[i].name === name) {
-            selectedElements.push(elements[i]);
-        }
-    }
-    return selectedElements;
-};
-
-PageBot.filterFunctions.value = function(value, elements) {
-    var selectedElements = [];
-    for (var i = 0; i < elements.length; i++) {
-        if (elements[i].value === value) {
-            selectedElements.push(elements[i]);
-        }
-    }
-    return selectedElements;
-};
-
-PageBot.filterFunctions.index = function(index, elements) {
-    index = Number(index);
-    if (isNaN(index) || index < 0) {
-        throw new SeleniumError("Illegal Index: " + index);
-    }
-    if (elements.length <= index) {
-        throw new SeleniumError("Index out of range: " + index);
-    }
-    return [elements[index]];
-};
-
-PageBot.prototype.selectElements = function(filterExpr, elements, defaultFilterType) {    
-
-    var filterType = (defaultFilterType || 'value');
-    
-    // If there is a filter prefix, use the specified strategy
-    var result = filterExpr.match(/^([A-Za-z]+)=(.+)/);
-    if (result) {
-        filterType = result[1].toLowerCase();
-        filterExpr = result[2];
-    }
-
-    return this.selectElementsBy(filterType, filterExpr, elements);
-};
-
diff --git a/tests/FunctionalTests/selenium/selenium-commandhandlers.js b/tests/FunctionalTests/selenium/selenium-commandhandlers.js
deleted file mode 100644
index 10e2a518..00000000
--- a/tests/FunctionalTests/selenium/selenium-commandhandlers.js
+++ /dev/null
@@ -1,291 +0,0 @@
-/*
-* Copyright 2004 ThoughtWorks, Inc
-*
-*  Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*
-*/
-function CommandHandlerFactory() {
-    this.actions = {};
-    this.asserts = {};
-    this.accessors = {};
-
-    var self = this;
-
-    this.registerAction = function(name, action, wait) {
-        var handler = new ActionHandler(action, wait);
-        this.actions[name] = handler;
-    };
-
-    this.registerAccessor = function(name, accessor) {
-        var handler = new AccessorHandler(accessor);
-        this.accessors[name] = handler;
-    };
-
-    this.registerAssert = function(name, assertion, haltOnFailure) {
-        var handler = new AssertHandler(assertion, haltOnFailure);
-        this.asserts[name] = handler;
-    };
-    
-    this.registerAssertUsingMatcherHandler = function(name, matcherHandler, haltOnFailure) {
-        var handler = new AssertUsingMatcherHandler(matcherHandler, haltOnFailure);
-        this.asserts[name] = handler;
-    }
-
-    this.getCommandHandler = function(name) {
-        return this.actions[name] || this.accessors[name] || this.asserts[name] || null;
-    };
-
-    this.registerAll = function(commandObject) {
-        registerAllActions(commandObject);
-        registerAllAsserts(commandObject);
-        registerAllAccessors(commandObject);
-    };
-
-    var registerAllActions = function(commandObject) {
-        for (var functionName in commandObject) {
-            var result = /^do([A-Z].+)$/.exec(functionName);
-            if (result != null) {
-                var actionName = result[1].lcfirst();
-
-                // Register the action without the wait flag.
-                var action = commandObject[functionName];
-                self.registerAction(actionName, action, false);
-
-                // Register actionName + "AndWait" with the wait flag;
-                var waitActionName = actionName + "AndWait";
-                self.registerAction(waitActionName, action, true);
-            }
-        }
-    };
-
-    var registerAllAsserts = function(commandObject) {
-        for (var functionName in commandObject) {
-            var result = /^assert([A-Z].+)$/.exec(functionName);
-            if (result != null) {
-                var assert = commandObject[functionName];
-
-                // Register the assert with the "assert" prefix, and halt on failure.
-                var assertName = functionName;
-                self.registerAssert(assertName, assert, true);
-
-                // Register the assert with the "verify" prefix, and do not halt on failure.
-                var verifyName = "verify" + result[1];
-                self.registerAssert(verifyName, assert, false);
-            }
-        }
-    };
-
-    // Given an accessor function, return a function that matches against the command.value
-    // the value returned by the accessor when applied to a command.target.
-    // Used by commands that take a target and a value (e.g. assertValue | target | value)
-    this.createMatcherHandlerFromSingleArgAccessor = function(accessor) {
-        return function(seleniumApi, command) {
-            var accessorResult = accessor.call(seleniumApi, command.target);
-            if (PatternMatcher.matches(command.value, accessorResult)) {
-                return new MatcherHandlerResult(true, "Actual value '" + accessorResult + "' did match '" + command.value + "'");
-            } else {
-                return new MatcherHandlerResult(false, "Actual value '" + accessorResult + "' did not match '" + command.value + "'");
-            }
-        };
-    };
-    
-    // Given an accessor function, return a function that matches against the command.target
-    // the value returned by the (no-arg) accessor returns a value that matches against the command.target
-    // Used by commands that only take a target (e.g. assertTitle | target |  )
-    this.createMatcherHandlerFromNoArgAccessor = function(accessor) {
-        return function(seleniumApi, command) {
-            var accessorResult = accessor.call(seleniumApi);
-            if (PatternMatcher.matches(command.target, accessorResult)) {
-                return new MatcherHandlerResult(true, "Actual value '" + accessorResult + "' did match '" + command.target + "'");
-            } else {
-                return new MatcherHandlerResult(false, "Actual value '" + accessorResult + "' did not match '" + command.target + "'");
-            }
-        };
-    };
-    
-    // Given a matcherHandler function, return a function that returns the same result
-    // as the matcherHandler, but with the result negated.
-    // Used to create assertNot and verifyNot commands (and soon hopefully waitForNot commands).
-    this.createMatcherHandlerNegator = function(matcherHandler) {
-        return function(seleniumApi, command) {
-            var result = matcherHandler(seleniumApi, command);
-            result.didMatch = ! result.didMatch;
-            return result;
-        };
-    };
-    
-    // Register an assertion, a verification, a negative assertion,
-    // and a negative verification based on the specified accessor.
-    this.registerAssertionsBasedOnAccessor = function(accessor, baseName) {
-        if (accessor.length > 1) {
-            return;
-        }
-        var matcherHandler;
-        if (accessor.length == 1) {
-            matcherHandler = self.createMatcherHandlerFromSingleArgAccessor(accessor);
-        } else {
-            matcherHandler = self.createMatcherHandlerFromNoArgAccessor(accessor);
-        }
-        // Register an assert with the "assert" prefix, and halt on failure.
-        self.registerAssertUsingMatcherHandler("assert" + baseName, matcherHandler, true);
-        // Register a verify with the "verify" prefix, and do not halt on failure.
-        self.registerAssertUsingMatcherHandler("verify" + baseName, matcherHandler, false);
-        
-        var negativeMatcherHandler = self.createMatcherHandlerNegator(matcherHandler);
-        // Register an assertNot with the "assertNot" prefix, and halt on failure.
-        self.registerAssertUsingMatcherHandler("assertNot"+baseName, negativeMatcherHandler, true);
-        // Register a verifyNot with the "verifyNot" prefix, and do not halt on failure.
-        self.registerAssertUsingMatcherHandler("verifyNot"+baseName, negativeMatcherHandler, false);
-    };
-
-    // Methods of the form getFoo(target) result in commands:
-    // getFoo, assertFoo, verifyFoo, assertNotFoo, verifyNotFoo
-    var registerAllAccessors = function(commandObject) {
-        for (var functionName in commandObject) {
-            var match = /^get([A-Z].+)$/.exec(functionName);
-            if (match != null) {
-                var accessor = commandObject[functionName];
-                var baseName = match[1];
-                self.registerAccessor(functionName, accessor);
-                self.registerAssertionsBasedOnAccessor(accessor, baseName);
-            }
-        }
-    };
-    
-    
-}
-
-function MatcherHandlerResult(didMatch, message) {
-    this.didMatch = didMatch;
-    this.message = message;
-}
-
-// NOTE: The CommandHandler is effectively an abstract base for ActionHandler,
-//      AccessorHandler and AssertHandler.
-function CommandHandler(type, haltOnFailure, executor) {
-    this.type = type;
-    this.haltOnFailure = haltOnFailure;
-    this.executor = executor;
-}
-CommandHandler.prototype.execute = function(seleniumApi, command) {
-    return new CommandResult(this.executor.call(seleniumApi, command.target, command.value));
-};
-
-function ActionHandler(action, wait) {
-    CommandHandler.call(this, "action", true, action);
-    if (wait) {
-        this.wait = true;
-    }
-}
-ActionHandler.prototype = new CommandHandler;
-ActionHandler.prototype.execute = function(seleniumApi, command) {
-    if ( seleniumApi.browserbot.hasAlerts() ) {
-        throw new SeleniumCommandError("There was an unexpected Alert! [" + seleniumApi.browserbot.getNextAlert() + "]");
-    }
-    if ( seleniumApi.browserbot.hasConfirmations() ) {
-        throw new SeleniumCommandError("There was an unexpected Confirmation! [" + seleniumApi.browserbot.getNextConfirmation() + "]");
-    }
-    var processState = this.executor.call(seleniumApi, command.target, command.value);
-    // If the handler didn't return a wait flag, check to see if the
-    // handler was registered with the wait flag.
-    if (processState == undefined && this.wait) {
-        processState = SELENIUM_PROCESS_WAIT;
-    }
-    return new CommandResult(processState);
-};
-
-function AccessorHandler(accessor) {
-    CommandHandler.call(this, "accessor", true, accessor);
-}
-AccessorHandler.prototype = new CommandHandler;
-AccessorHandler.prototype.execute = function(seleniumApi, command) {
-    var returnValue = this.executor.call(seleniumApi, command.target, command.value);
-    var result = new CommandResult();
-    result.result = returnValue;
-    return result;
-};
-
-/**
- * Abstract handler for assertions and verifications.
- * Subclasses need to override executeAssertion() which in turn
- * should throw an AssertFailedError if the assertion is to fail. 
- */
-function AbstractAssertHandler(assertion, haltOnFailure) {
-    CommandHandler.call(this, "assert", haltOnFailure || false, assertion);
-}
-AbstractAssertHandler.prototype = new CommandHandler;
-AbstractAssertHandler.prototype.execute = function(seleniumApi, command) {
-    var result = new CommandResult();
-    try {
-        this.executeAssertion(seleniumApi, command);
-        result.passed = true;
-    } catch (e) {
-        // If this is not a AssertionFailedError, or we should haltOnFailure, rethrow.
-        if (!e.isAssertionFailedError) {
-            throw e;
-        }
-        if (this.haltOnFailure) {
-            var error = new SeleniumCommandError(e.failureMessage);
-            throw error;
-        }
-        result.failed = true;
-        result.failureMessage = e.failureMessage;
-    }
-    return result;
-};
-
-/**
- * Simple assertion handler whose command is expected to do the actual assertion.
- */
-function AssertHandler(assertion, haltOnFailure) {
-    CommandHandler.call(this, "assert", haltOnFailure || false, assertion);
-};
-AssertHandler.prototype = new AbstractAssertHandler;
-AssertHandler.prototype.executeAssertion = function(seleniumApi, command) {
-        this.executor.call(seleniumApi, command.target, command.value);
-};
-
-/**
- * Assertion handler whose command is expected to be a matcher-handler
- */
-function AssertUsingMatcherHandler(matcherHandler, haltOnFailure) {
-    CommandHandler.call(this, "assert", haltOnFailure || false, matcherHandler);
-};
-AssertUsingMatcherHandler.prototype = new AbstractAssertHandler;
-AssertUsingMatcherHandler.prototype.executeAssertion = function(seleniumApi, command) {
-        var matcherResult = this.executor(seleniumApi, command);
-        if (!matcherResult.didMatch) {
-            Assert.fail(matcherResult.message);
-        }
-};
-
-
-function CommandResult(processState) {
-    this.processState = processState;
-    this.result = "OK";
-}
-
-function SeleniumCommand(command, target, value) {
-    this.command = command;
-    this.target = target;
-    this.value = value;
-}
-
-// TODO: dkemp - This is the same as SeleniumError as defined in selenium-browserbot.js
-// I defined a new error simply to avoid creating a new dependency.
-// Need to revisit to avoid this duplication.
-function SeleniumCommandError(message) {
-    var error = new Error(message);
-    error.isSeleniumError = true;
-    return error;
-};
diff --git a/tests/FunctionalTests/selenium/selenium-domviewer.js b/tests/FunctionalTests/selenium/selenium-domviewer.js
deleted file mode 100644
index 01a384f5..00000000
--- a/tests/FunctionalTests/selenium/selenium-domviewer.js
+++ /dev/null
@@ -1,188 +0,0 @@
-var HIDDEN="hidden";
-var LEVEL = "level";
-var PLUS_SRC="dom-images/butplus.gif";
-var MIN_SRC="dom-images/butmin.gif";
-var newRoot;
-var maxColumns=1;
-
-function loadDomViewer() {
-    // See if the rootDocument variable has been set on this window.
-    var rootDocument = window.rootDocument;
-
-    // If not look to the opener for an explicity rootDocument variable, otherwise, use the opener document
-    if (!rootDocument && window.opener) {
-        rootDocument = window.opener.rootDocument || window.opener.document;
-    }
-
-    if (rootDocument) {
-        document.body.innerHTML = displayDOM(rootDocument);
-    }
-    else {
-        document.body.innerHTML = "Must specify rootDocument for window. This can be done by setting the rootDocument variable on this window, or on the opener window for a popup window.";
-    }
-}
-
-
-function displayDOM(root){
-    var str = "";
-    str+="";
-    str += treeTraversal(root,0);
-    // to make table columns work well.
-    str += "";
-    for (var i=0; i < maxColumns; i++) {
-        str+= "";
-    }
-    str += "";
-    str += "
            
        ";
-    return str;
-}
-
-function checkForChildren(element){
-    if(!element.hasChildNodes())
-        return false;
-    
-    var nodes = element.childNodes;
-    var size = nodes.length;
-    var count=0;
-    
-    for(var i=0; i< size; i++){
-        var node = nodes.item(i);
-        //if(node.toString()=="[object Text]"){
-        //this is equalent to the above
-        //but will work with more browsers
-        if(node.nodeType!=1){
-            count++;
-        }
-    }
-    
-    if(count == size)
-        return false;
-    else
-        return true;
-}
-
-function treeTraversal(root, level){
-    var str = "";
-    var nodes= null;
-    var size = null;
-    //it is supposed to show the last node, 
-    //but the last node is always nodeText type
-    //and we don't show it
-    if(!root.hasChildNodes())
-        return "";//displayNode(root,level,false);
-    
-    nodes = root.childNodes;
-    size = nodes.length;
-
-    for(var i=0; i< size; i++){
-        var element = nodes.item(i);
-        //if the node is textNode, don't display
-        if(element.nodeType==1){
-            str+= displayNode(element,level,checkForChildren(element));
-            str+=treeTraversal(element, level+1);	
-        }
-    }
-    return str;
-}
-
-function displayNode(element, level, isLink){
-    nodeContent = getNodeContent(element);
-    columns = Math.round((nodeContent.length / 12) + 0.5);
-    if (columns + level > maxColumns) {
-        maxColumns = columns + level;
-    }
-    var str ="";
-    for (var i=0; i < level; i++)
-        str+= " ";
-    str+="";
-    if(isLink){
-        str+='        ';
-        str+='';
-    }
-    str += nodeContent;
-    if(isLink)
-        str+="";
-    return str;
-}
-
-function getNodeContent(element) {
-    str = "";
-    id ="";
-    if (element.id != null && element.id != "") {
-        id = " ID(" + element.id +")";
-    }
-    name ="";
-    if (element.name != null && element.name != "") {
-        name = " NAME(" + element.name + ")";
-    }
-    value ="";
-    if (element.value != null && element.value != "") {
-        value = " VALUE(" + element.value + ")";
-    }
-    href ="";
-    if (element.href != null && element.href != "") {
-        href = " HREF(" + element.href + ")";
-    }
-    text ="";
-    if (element.text != null && element.text != "" && element.text != "undefined") {
-        text = " #TEXT(" + trim(element.text) +")";
-    }
-    str+=" "+ element.nodeName + id + name + value + href + text + "";	
-    return str;
-
-}
-
-function trim(val) {
-    val2 = val.substring(0,20) + "                   ";
-    var spaceChr = String.fromCharCode(32);
-    var length = val2.length;
-    var retVal = "";
-    var ix = length -1;
-
-    while(ix > -1){
-        if(val2.charAt(ix) == spaceChr) {
-        } else {
-            retVal = val2.substring(0, ix +1);
-            break;
-        }
-        ix = ix-1;
-    }
-    if (val.length > 20) {
-        retVal += "...";
-    }
-    return retVal;
-}
-
-function hide(hlink){
-    var isHidden = false;
-    var image = hlink.firstChild;
-    if(image.src.toString().indexOf(MIN_SRC)!=-1){
-        image.src=PLUS_SRC;
-        isHidden=true;
-    }else{
-        image.src=MIN_SRC;
-    }
-    var rowObj= hlink.parentNode.parentNode;
-    var rowLevel = parseInt(rowObj.className.substring(LEVEL.length));
-	
-    var sibling = rowObj.nextSibling;
-    var siblingLevel = sibling.className.substring(LEVEL.length);
-    if(siblingLevel.indexOf(HIDDEN)!=-1){
-        siblingLevel = siblingLevel.substring(0,siblingLevel.length - HIDDEN.length-1);
-    }
-    siblingLevel=parseInt(siblingLevel);
-    while(sibling!=null && rowLevel 0) {
-        // Make the previous row green or red depending if the test passed or failed
-        if(testFailed)
-                setCellColor(suiteTable.rows, currentTestRow, 0, failColor);
-        else
-                setCellColor(suiteTable.rows, currentTestRow, 0, passColor);
-
-        // Set the results from the previous test run
-        setResultsData(suiteTable, currentTestRow);
-    }
-
-    currentTestRow++;
-
-    // If we are done with all of the tests, set the title bar as pass or fail
-    if(currentTestRow >= suiteTable.rows.length) {
-        if(suiteFailed)
-                setCellColor(suiteTable.rows, 0, 0, failColor);
-        else
-                setCellColor(suiteTable.rows, 0, 0, passColor);
-
-        // If this is an automated run (i.e., build script), then submit
-        // the test results by posting to a form
-        if (isAutomatedRun())
-                postTestResults(suiteFailed, suiteTable);
-    }
-
-    else {
-        // Make the current row blue
-        setCellColor(suiteTable.rows, currentTestRow, 0, workingColor);
-
-        testLink = suiteTable.rows[currentTestRow].cells[0].getElementsByTagName("a")[0];
-        testLink.focus();
-
-        var testFrame = getTestFrame();
-        addLoadListener(testFrame, startTest);
-
-        selenium.browserbot.setIFrameLocation(testFrame, testLink.href);
-    }
-}
-
-function setCellColor(tableRows, row, col, colorStr) {
-    tableRows[row].cells[col].bgColor = colorStr;
-}
-
-// Sets the results from a test into a hidden column on the suite table.  So,
-// for each tests, the second column is set to the HTML from the test table.
-function setResultsData(suiteTable, row) {
-    // Create a text node of the test table
-    var resultTable = getIframeDocument(getTestFrame()).body.innerHTML;
-    if (!resultTable) return;
-
-    var tableNode = suiteTable.ownerDocument.createElement("div");
-    tableNode.innerHTML = resultTable;
-
-    var new_column = suiteTable.ownerDocument.createElement("td");
-    new_column.appendChild(tableNode);
-
-    // Set the column to be invisible
-    new_column.style.cssText = "display: none;";
-
-    // Add the invisible column
-    suiteTable.rows[row].appendChild(new_column);
-}
-
-// Post the results to a servlet, CGI-script, etc.  The URL of the
-// results-handler defaults to "/postResults", but an alternative location
-// can be specified by providing a "resultsUrl" query parameter.
-//
-// Parameters passed to the results-handler are:
-//      result:         passed/failed depending on whether the suite passed or failed
-//      totalTime:      the total running time in seconds for the suite.
-//
-//      numTestPasses:  the total number of tests which passed.
-//      numTestFailures: the total number of tests which failed.
-//
-//      numCommandPasses: the total number of commands which passed.
-//      numCommandFailures: the total number of commands which failed.
-//      numCommandErrors: the total number of commands which errored.
-//
-//      suite:      the suite table, including the hidden column of test results
-//      testTable.1 to testTable.N: the individual test tables
-//
-function postTestResults(suiteFailed, suiteTable) {
-
-    form = document.createElement("form");
-    document.body.appendChild(form);
-
-    form.id = "resultsForm";
-    form.method="post";
-    form.target="myiframe";
-
-    var resultsUrl = getQueryParameter("resultsUrl");
-    if (!resultsUrl) {
-        resultsUrl = "./postResults";
-    }
-
-    var actionAndParameters = resultsUrl.split('?',2);
-    form.action = actionAndParameters[0];
-    var resultsUrlQueryString = actionAndParameters[1];
-
-    form.createHiddenField = function(name, value) {
-        input = document.createElement("input");
-        input.type = "hidden";
-        input.name = name;
-        input.value = value;
-        this.appendChild(input);
-    };
-
-    if (resultsUrlQueryString) {
-        var clauses = resultsUrlQueryString.split('&');
-        for (var i = 0; i < clauses.length; i++) {
-            var keyValuePair = clauses[i].split('=',2);
-            var key = unescape(keyValuePair[0]);
-            var value = unescape(keyValuePair[1]);
-            form.createHiddenField(key, value);
-        }
-    }
-
-    form.createHiddenField("result", suiteFailed == true ? "failed" : "passed");
-
-    form.createHiddenField("totalTime", Math.floor((currentTime - startTime) / 1000));
-    form.createHiddenField("numTestPasses", numTestPasses);
-    form.createHiddenField("numTestFailures", numTestFailures);
-    form.createHiddenField("numCommandPasses", numCommandPasses);
-    form.createHiddenField("numCommandFailures", numCommandFailures);
-    form.createHiddenField("numCommandErrors", numCommandErrors);
-
-    // Create an input for each test table.  The inputs are named
-    // testTable.1, testTable.2, etc.
-    for (rowNum = 1; rowNum < suiteTable.rows.length;rowNum++) {
-        // If there is a second column, then add a new input
-        if (suiteTable.rows[rowNum].cells.length > 1) {
-            var resultCell = suiteTable.rows[rowNum].cells[1];
-            form.createHiddenField("testTable." + rowNum, resultCell.innerHTML);
-            // remove the resultCell, so it's not included in the suite HTML
-            resultCell.parentNode.removeChild(resultCell); 
-        }
-    }
-
-    // Add HTML for the suite itself
-    form.createHiddenField("suite", suiteTable.parentNode.innerHTML);
-
-    form.submit();
-    document.body.removeChild(form);
-
-}
-
-function printMetrics() {
-    setText(document.getElementById("commandPasses"), numCommandPasses);
-    setText(document.getElementById("commandFailures"), numCommandFailures);
-    setText(document.getElementById("commandErrors"), numCommandErrors);
-    setText(document.getElementById("testRuns"), numTestPasses + numTestFailures);
-    setText(document.getElementById("testFailures"), numTestFailures);
-
-    currentTime = new Date().getTime();
-
-    timeDiff = currentTime - startTime;
-    totalSecs = Math.floor(timeDiff / 1000);
-
-    minutes = Math.floor(totalSecs / 60);
-    seconds = totalSecs % 60;
-
-    setText(document.getElementById("elapsedTime"), pad(minutes)+":"+pad(seconds));
-}
-
-// Puts a leading 0 on num if it is less than 10
-function pad (num) {
-    return (num > 9) ? num : "0" + num;
-}
-
-/*
- * Register all of the built-in command handlers with the CommandHandlerFactory.
- * TODO work out an easy way for people to register handlers without modifying the Selenium sources.
- */
-function registerCommandHandlers() {
-    commandFactory = new CommandHandlerFactory();
-    commandFactory.registerAll(selenium);
-
-}
-
-function initialiseTestLoop() {
-    testLoop = new TestLoop(commandFactory);
-
-    testLoop.getCommandInterval = function() { return runInterval; };
-    testLoop.firstCommand = nextCommand;
-    testLoop.nextCommand = nextCommand;
-    testLoop.commandStarted = commandStarted;
-    testLoop.commandComplete = commandComplete;
-    testLoop.commandError = commandError;
-    testLoop.testComplete = testComplete;
-    testLoop.pause = function() {
-        document.getElementById('continueTest').disabled = false;
-    };
-    return testLoop;
-}
-
-function nextCommand() {
-    if (currentCommandRow >= inputTableRows.length - 1) {
-        return null;
-    }
-
-    currentCommandRow++;
-
-    var commandName = getCellText(currentCommandRow, 0);
-    var target = getCellText(currentCommandRow, 1);
-    var value = getCellText(currentCommandRow, 2);
-
-    var command = new SeleniumCommand(commandName, target, removeNbsp(value));
-    return command;
-}
-
-function removeNbsp(value)
-{
-    return value.replace(/\240/g, "");
-}
-
-function scrollIntoView(element) {
-    if (element.scrollIntoView) {
-        element.scrollIntoView(false);
-        return;
-    }
-    // TODO: work out how to scroll browsers that don't support
-    // scrollIntoView (like Konqueror)
-}
-
-function commandStarted() {
-    inputTableRows[currentCommandRow].bgColor = workingColor;
-    scrollIntoView(inputTableRows[currentCommandRow].cells[0]);
-    printMetrics();
-}
-
-function commandComplete(result) {
-    if (result.failed) {
-        setRowFailed(result.failureMessage, FAILURE);
-    } else if (result.passed) {
-        setRowPassed();
-    } else {
-        setRowWhite();
-    }
-}
-
-function commandError(errorMessage) {
-    setRowFailed(errorMessage, ERROR);
-}
-
-function setRowWhite() {
-    inputTableRows[currentCommandRow].bgColor = "white";
-}
-
-function setRowPassed() {
-    numCommandPasses += 1;
-
-    // Set cell background to green
-    inputTableRows[currentCommandRow].bgColor = passColor;
-}
-
-function setRowFailed(errorMsg, failureType) {
-    if (failureType == ERROR)
-            numCommandErrors += 1;
-    else if (failureType == FAILURE)
-            numCommandFailures += 1;
-
-    // Set cell background to red
-    inputTableRows[currentCommandRow].bgColor = failColor;
-
-    // Set error message
-    inputTableRows[currentCommandRow].cells[2].innerHTML = errorMsg;
-    inputTableRows[currentCommandRow].title = errorMsg;
-    testFailed = true;
-    suiteFailed = true;
-}
-
-function testComplete() {
-    if(testFailed) {
-        inputTableRows[0].bgColor = failColor;
-        numTestFailures += 1;
-    }
-    else {
-        inputTableRows[0].bgColor = passColor;
-        numTestPasses += 1;
-    }
-
-    printMetrics();
-
-    window.setTimeout("runNextTest()", 1);
-}
-
-function getCellText(rowNumber, columnNumber) {
-    var cell = inputTableRows[rowNumber].cells[columnNumber];
-    if (! cell.cachedText) {
-        cell.cachedText = getText(cell);
-    }
-    return cell.cachedText;
-}
-
-Selenium.prototype.doPause = function(waitTime) {
-    testLoop.pauseInterval = waitTime;
-};
diff --git a/tests/FunctionalTests/selenium/selenium-logging.js b/tests/FunctionalTests/selenium/selenium-logging.js
deleted file mode 100644
index d0305c08..00000000
--- a/tests/FunctionalTests/selenium/selenium-logging.js
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-* Copyright 2004 ThoughtWorks, Inc
-*
-*  Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
-
-var Logger = function() {
-    this.logWindow = null;
-}
-Logger.prototype = {
-
-    getLogWindow: function() {
-        if (this.logWindow && this.logWindow.closed) {
-            this.logWindow = null;
-        }
-        return this.logWindow;
-    },
-    
-    openLogWindow: function() {
-        this.logWindow = window.open(
-            "SeleniumLog.html", "SeleniumLog",
-            "width=600,height=250,bottom=0,right=0,status,scrollbars,resizable"
-        );
-        return this.logWindow;
-    },
-    
-    show: function() {
-        if (! this.getLogWindow()) {
-            this.openLogWindow();
-        }
-    },
-
-    log: function(message, className) {
-        var logWindow = this.getLogWindow();
-        if (logWindow) {
-            if (logWindow.append) {
-                logWindow.append(message, className);
-            }
-        }
-    },
-
-    debug: function(message) {
-        this.log(message, "debug");
-    },
-
-    info: function(message) {
-        this.log(message, "info");
-    },
-
-    warn: function(message) {
-        this.log(message, "warn");
-    },
-
-    error: function(message) {
-        this.log(message, "error");
-    },
-
-    exception: function(exception) {
-        var msg = "Unexpected Exception: " + describe(exception, ', ');
-        this.error(msg);
-    }
-
-};
-
-var LOG = new Logger();
-
-function noop() {};
-
-var DummyLogger = function() {};
-DummyLogger.prototype = {
-    show: noop,
-    log: noop,
-    debug: noop,
-    info: noop,
-    warn: noop,
-    error: noop
-};
-
diff --git a/tests/FunctionalTests/selenium/selenium-logo.graffle b/tests/FunctionalTests/selenium/selenium-logo.graffle
deleted file mode 100644
index e605f4da..00000000
--- a/tests/FunctionalTests/selenium/selenium-logo.graffle
+++ /dev/null
@@ -1,509 +0,0 @@
-
-
-
-
-	CanvasColor
-	
-		w
-		1
-	
-	ColumnAlign
-	1
-	ColumnSpacing
-	36
-	CreationDate
-	2005-04-17 21:44:18 -0500
-	Creator
-	Paul Hammant
-	GraphDocumentVersion
-	4
-	GraphicsList
-	
-		
-			Bounds
-			{{54, 96}, {84, 57}}
-			Class
-			ShapedGraphic
-			ID
-			6
-			Shape
-			Rectangle
-			Style
-			
-				fill
-				
-					Draws
-					NO
-				
-				stroke
-				
-					Color
-					
-						b
-						1
-						g
-						1
-						r
-						1
-					
-				
-			
-		
-		
-			Bounds
-			{{55, 135.875}, {42, 14}}
-			Class
-			ShapedGraphic
-			FitText
-			YES
-			Flow
-			Resize
-			ID
-			5
-			Shape
-			Rectangle
-			Style
-			
-				fill
-				
-					Draws
-					NO
-				
-				shadow
-				
-					Draws
-					NO
-				
-				stroke
-				
-					Draws
-					NO
-				
-			
-			Text
-			
-				Text
-				{\rtf1\mac\ansicpg10000\cocoartf102
-{\fonttbl\f0\fswiss\fcharset77 Helvetica;}
-{\colortbl;\red255\green255\blue255;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
-
-\f0\fs24 \cf2 78.96}
-			
-			Wrap
-			NO
-		
-		
-			Bounds
-			{{55, 109}, {84, 22}}
-			Class
-			ShapedGraphic
-			FitText
-			YES
-			Flow
-			Resize
-			FontInfo
-			
-				Font
-				Helvetica
-				Size
-				12
-			
-			HFlip
-			YES
-			ID
-			4
-			Shape
-			Rectangle
-			Style
-			
-				fill
-				
-					Draws
-					NO
-				
-				shadow
-				
-					Draws
-					NO
-				
-				stroke
-				
-					Draws
-					NO
-				
-			
-			Text
-			
-				Text
-				{\rtf1\mac\ansicpg10000\cocoartf102
-{\fonttbl\f0\fswiss\fcharset77 Helvetica;}
-{\colortbl;\red255\green255\blue255;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
-
-\f0\fs36 \cf2 selenium}
-			
-			Wrap
-			NO
-		
-		
-			Bounds
-			{{115, 98.125}, {25, 14}}
-			Class
-			ShapedGraphic
-			FitText
-			YES
-			Flow
-			Resize
-			ID
-			3
-			Shape
-			Rectangle
-			Style
-			
-				fill
-				
-					Draws
-					NO
-				
-				shadow
-				
-					Draws
-					NO
-				
-				stroke
-				
-					Draws
-					NO
-				
-			
-			Text
-			
-				Text
-				{\rtf1\mac\ansicpg10000\cocoartf102
-{\fonttbl\f0\fswiss\fcharset77 Helvetica;}
-{\colortbl;\red255\green255\blue255;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
-
-\f0\fs24 \cf2 34}
-			
-			Wrap
-			NO
-		
-		
-			Bounds
-			{{56, 93.625}, {30, 23}}
-			Class
-			ShapedGraphic
-			FitText
-			YES
-			Flow
-			Resize
-			FontInfo
-			
-				Font
-				LucidaBlackletter
-				Size
-				18
-			
-			ID
-			2
-			Shape
-			Rectangle
-			Style
-			
-				fill
-				
-					Draws
-					NO
-				
-				shadow
-				
-					Draws
-					NO
-				
-				stroke
-				
-					Draws
-					NO
-				
-			
-			Text
-			
-				Text
-				{\rtf1\mac\ansicpg10000\cocoartf102
-{\fonttbl\f0\fnil\fcharset77 LucidaBlackletter;}
-{\colortbl;\red255\green255\blue255;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
-
-\f0\b\fs36 \cf2 Se}
-			
-			Wrap
-			NO
-		
-		
-			Bounds
-			{{50, 91}, {92, 67}}
-			Class
-			ShapedGraphic
-			ID
-			1
-			Shape
-			Rectangle
-			Style
-			
-				fill
-				
-					Color
-					
-						b
-						0.0556939
-						g
-						0.0239689
-						r
-						0.614286
-					
-				
-			
-		
-	
-	GridInfo
-	
-	GuidesLocked
-	NO
-	GuidesVisible
-	YES
-	HPages
-	1
-	ImageCounter
-	1
-	IsPalette
-	NO
-	Layers
-	
-		
-			Lock
-			NO
-			Name
-			Layer 1
-			Print
-			YES
-			View
-			YES
-		
-	
-	LayoutInfo
-	
-	LinksVisible
-	NO
-	MagnetsVisible
-	NO
-	ModificationDate
-	2005-04-17 21:58:24 -0500
-	Modifier
-	Paul Hammant
-	Orientation
-	2
-	PageBreaks
-	YES
-	PageSetup
-	
-	BAt0eXBlZHN0cmVhbYED6IQBQISEhAtOU1ByaW50SW5mbwGEhAhOU09iamVjdACFkoSE
-	hBNOU011dGFibGVEaWN0aW9uYXJ5AISEDE5TRGljdGlvbmFyeQCUhAFpFJKEhIQITlNT
-	dHJpbmcBlIQBKxBOU0pvYkRpc3Bvc2l0aW9uhpKEmZkPTlNQcmludFNwb29sSm9ihpKE
-	mZkLTlNQYXBlclNpemWGkoSEhAdOU1ZhbHVlAJSEASqEhAx7X05TU2l6ZT1mZn2cgQJk
-	gQMYhpKEmZkZTlNQcmludFJldmVyc2VPcmllbnRhdGlvboaShISECE5TTnVtYmVyAJ2b
-	hJeXAIaShJmZFE5TVmVydGljYWxQYWdpbmF0aW9uhpKEoZuilwCGkoSZmRROU1ZlcnRp
-	Y2FsbHlDZW50ZXJlZIaShKGbopcBhpKEmZkOTlNQTVBhZ2VGb3JtYXSGkoSEhAZOU0Rh
-	dGEAlJeBHa2EB1s3NTk3Y108P3htbCB2ZXJzaW9uPSIxLjAiIGVuY29kaW5nPSJVVEYt
-	OCI/Pgo8IURPQ1RZUEUgcGxpc3QgUFVCTElDICItLy9BcHBsZSBDb21wdXRlci8vRFRE
-	IFBMSVNUIDEuMC8vRU4iICJodHRwOi8vd3d3LmFwcGxlLmNvbS9EVERzL1Byb3BlcnR5
-	TGlzdC0xLjAuZHRkIj4KPHBsaXN0IHZlcnNpb249IjEuMCI+CjxkaWN0PgoJPGtleT5j
-	b20uYXBwbGUucHJpbnQuUGFnZUZvcm1hdC5QTUhvcml6b250YWxSZXM8L2tleT4KCTxk
-	aWN0PgoJCTxrZXk+Y29tLmFwcGxlLnByaW50LnRpY2tldC5jcmVhdG9yPC9rZXk+CgkJ
-	PHN0cmluZz5jb20uYXBwbGUucHJpbnRpbmdtYW5hZ2VyPC9zdHJpbmc+CgkJPGtleT5j
-	b20uYXBwbGUucHJpbnQudGlja2V0Lml0ZW1BcnJheTwva2V5PgoJCTxhcnJheT4KCQkJ
-	PGRpY3Q+CgkJCQk8a2V5PmNvbS5hcHBsZS5wcmludC5QYWdlRm9ybWF0LlBNSG9yaXpv
-	bnRhbFJlczwva2V5PgoJCQkJPHJlYWw+NzI8L3JlYWw+CgkJCQk8a2V5PmNvbS5hcHBs
-	ZS5wcmludC50aWNrZXQuY2xpZW50PC9rZXk+CgkJCQk8c3RyaW5nPmNvbS5hcHBsZS5w
-	cmludGluZ21hbmFnZXI8L3N0cmluZz4KCQkJCTxrZXk+Y29tLmFwcGxlLnByaW50LnRp
-	Y2tldC5tb2REYXRlPC9rZXk+CgkJCQk8ZGF0ZT4yMDAzLTAxLTI0VDE2OjI4OjU0Wjwv
-	ZGF0ZT4KCQkJCTxrZXk+Y29tLmFwcGxlLnByaW50LnRpY2tldC5zdGF0ZUZsYWc8L2tl
-	eT4KCQkJCTxpbnRlZ2VyPjA8L2ludGVnZXI+CgkJCTwvZGljdD4KCQk8L2FycmF5PgoJ
-	PC9kaWN0PgoJPGtleT5jb20uYXBwbGUucHJpbnQuUGFnZUZvcm1hdC5QTU9yaWVudGF0
-	aW9uPC9rZXk+Cgk8ZGljdD4KCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuY3Jl
-	YXRvcjwva2V5PgoJCTxzdHJpbmc+Y29tLmFwcGxlLnByaW50aW5nbWFuYWdlcjwvc3Ry
-	aW5nPgoJCTxrZXk+Y29tLmFwcGxlLnByaW50LnRpY2tldC5pdGVtQXJyYXk8L2tleT4K
-	CQk8YXJyYXk+CgkJCTxkaWN0PgoJCQkJPGtleT5jb20uYXBwbGUucHJpbnQuUGFnZUZv
-	cm1hdC5QTU9yaWVudGF0aW9uPC9rZXk+CgkJCQk8aW50ZWdlcj4xPC9pbnRlZ2VyPgoJ
-	CQkJPGtleT5jb20uYXBwbGUucHJpbnQudGlja2V0LmNsaWVudDwva2V5PgoJCQkJPHN0
-	cmluZz5jb20uYXBwbGUucHJpbnRpbmdtYW5hZ2VyPC9zdHJpbmc+CgkJCQk8a2V5PmNv
-	bS5hcHBsZS5wcmludC50aWNrZXQubW9kRGF0ZTwva2V5PgoJCQkJPGRhdGU+MjAwMy0w
-	MS0yNFQxNjoyODo1NFo8L2RhdGU+CgkJCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNr
-	ZXQuc3RhdGVGbGFnPC9rZXk+CgkJCQk8aW50ZWdlcj4wPC9pbnRlZ2VyPgoJCQk8L2Rp
-	Y3Q+CgkJPC9hcnJheT4KCTwvZGljdD4KCTxrZXk+Y29tLmFwcGxlLnByaW50LlBhZ2VG
-	b3JtYXQuUE1TY2FsaW5nPC9rZXk+Cgk8ZGljdD4KCQk8a2V5PmNvbS5hcHBsZS5wcmlu
-	dC50aWNrZXQuY3JlYXRvcjwva2V5PgoJCTxzdHJpbmc+Y29tLmFwcGxlLnByaW50aW5n
-	bWFuYWdlcjwvc3RyaW5nPgoJCTxrZXk+Y29tLmFwcGxlLnByaW50LnRpY2tldC5pdGVt
-	QXJyYXk8L2tleT4KCQk8YXJyYXk+CgkJCTxkaWN0PgoJCQkJPGtleT5jb20uYXBwbGUu
-	cHJpbnQuUGFnZUZvcm1hdC5QTVNjYWxpbmc8L2tleT4KCQkJCTxyZWFsPjE8L3JlYWw+
-	CgkJCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuY2xpZW50PC9rZXk+CgkJCQk8
-	c3RyaW5nPmNvbS5hcHBsZS5wcmludGluZ21hbmFnZXI8L3N0cmluZz4KCQkJCTxrZXk+
-	Y29tLmFwcGxlLnByaW50LnRpY2tldC5tb2REYXRlPC9rZXk+CgkJCQk8ZGF0ZT4yMDAz
-	LTAxLTI0VDE2OjI4OjU0WjwvZGF0ZT4KCQkJCTxrZXk+Y29tLmFwcGxlLnByaW50LnRp
-	Y2tldC5zdGF0ZUZsYWc8L2tleT4KCQkJCTxpbnRlZ2VyPjA8L2ludGVnZXI+CgkJCTwv
-	ZGljdD4KCQk8L2FycmF5PgoJPC9kaWN0PgoJPGtleT5jb20uYXBwbGUucHJpbnQuUGFn
-	ZUZvcm1hdC5QTVZlcnRpY2FsUmVzPC9rZXk+Cgk8ZGljdD4KCQk8a2V5PmNvbS5hcHBs
-	ZS5wcmludC50aWNrZXQuY3JlYXRvcjwva2V5PgoJCTxzdHJpbmc+Y29tLmFwcGxlLnBy
-	aW50aW5nbWFuYWdlcjwvc3RyaW5nPgoJCTxrZXk+Y29tLmFwcGxlLnByaW50LnRpY2tl
-	dC5pdGVtQXJyYXk8L2tleT4KCQk8YXJyYXk+CgkJCTxkaWN0PgoJCQkJPGtleT5jb20u
-	YXBwbGUucHJpbnQuUGFnZUZvcm1hdC5QTVZlcnRpY2FsUmVzPC9rZXk+CgkJCQk8cmVh
-	bD43MjwvcmVhbD4KCQkJCTxrZXk+Y29tLmFwcGxlLnByaW50LnRpY2tldC5jbGllbnQ8
-	L2tleT4KCQkJCTxzdHJpbmc+Y29tLmFwcGxlLnByaW50aW5nbWFuYWdlcjwvc3RyaW5n
-	PgoJCQkJPGtleT5jb20uYXBwbGUucHJpbnQudGlja2V0Lm1vZERhdGU8L2tleT4KCQkJ
-	CTxkYXRlPjIwMDMtMDEtMjRUMTY6Mjg6NTRaPC9kYXRlPgoJCQkJPGtleT5jb20uYXBw
-	bGUucHJpbnQudGlja2V0LnN0YXRlRmxhZzwva2V5PgoJCQkJPGludGVnZXI+MDwvaW50
-	ZWdlcj4KCQkJPC9kaWN0PgoJCTwvYXJyYXk+Cgk8L2RpY3Q+Cgk8a2V5PmNvbS5hcHBs
-	ZS5wcmludC5QYWdlRm9ybWF0LlBNVmVydGljYWxTY2FsaW5nPC9rZXk+Cgk8ZGljdD4K
-	CQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuY3JlYXRvcjwva2V5PgoJCTxzdHJp
-	bmc+Y29tLmFwcGxlLnByaW50aW5nbWFuYWdlcjwvc3RyaW5nPgoJCTxrZXk+Y29tLmFw
-	cGxlLnByaW50LnRpY2tldC5pdGVtQXJyYXk8L2tleT4KCQk8YXJyYXk+CgkJCTxkaWN0
-	PgoJCQkJPGtleT5jb20uYXBwbGUucHJpbnQuUGFnZUZvcm1hdC5QTVZlcnRpY2FsU2Nh
-	bGluZzwva2V5PgoJCQkJPHJlYWw+MTwvcmVhbD4KCQkJCTxrZXk+Y29tLmFwcGxlLnBy
-	aW50LnRpY2tldC5jbGllbnQ8L2tleT4KCQkJCTxzdHJpbmc+Y29tLmFwcGxlLnByaW50
-	aW5nbWFuYWdlcjwvc3RyaW5nPgoJCQkJPGtleT5jb20uYXBwbGUucHJpbnQudGlja2V0
-	Lm1vZERhdGU8L2tleT4KCQkJCTxkYXRlPjIwMDMtMDEtMjRUMTY6Mjg6NTRaPC9kYXRl
-	PgoJCQkJPGtleT5jb20uYXBwbGUucHJpbnQudGlja2V0LnN0YXRlRmxhZzwva2V5PgoJ
-	CQkJPGludGVnZXI+MDwvaW50ZWdlcj4KCQkJPC9kaWN0PgoJCTwvYXJyYXk+Cgk8L2Rp
-	Y3Q+Cgk8a2V5PmNvbS5hcHBsZS5wcmludC5zdWJUaWNrZXQucGFwZXJfaW5mb190aWNr
-	ZXQ8L2tleT4KCTxkaWN0PgoJCTxrZXk+Y29tLmFwcGxlLnByaW50LlBhZ2VGb3JtYXQu
-	UE1BZGp1c3RlZFBhZ2VSZWN0PC9rZXk+CgkJPGRpY3Q+CgkJCTxrZXk+Y29tLmFwcGxl
-	LnByaW50LnRpY2tldC5jcmVhdG9yPC9rZXk+CgkJCTxzdHJpbmc+Y29tLmFwcGxlLnBy
-	aW50aW5nbWFuYWdlcjwvc3RyaW5nPgoJCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNr
-	ZXQuaXRlbUFycmF5PC9rZXk+CgkJCTxhcnJheT4KCQkJCTxkaWN0PgoJCQkJCTxrZXk+
-	Y29tLmFwcGxlLnByaW50LlBhZ2VGb3JtYXQuUE1BZGp1c3RlZFBhZ2VSZWN0PC9rZXk+
-	CgkJCQkJPGFycmF5PgoJCQkJCQk8cmVhbD4wLjA8L3JlYWw+CgkJCQkJCTxyZWFsPjAu
-	MDwvcmVhbD4KCQkJCQkJPHJlYWw+NzM0PC9yZWFsPgoJCQkJCQk8cmVhbD41NzY8L3Jl
-	YWw+CgkJCQkJPC9hcnJheT4KCQkJCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQu
-	Y2xpZW50PC9rZXk+CgkJCQkJPHN0cmluZz5jb20uYXBwbGUucHJpbnRpbmdtYW5hZ2Vy
-	PC9zdHJpbmc+CgkJCQkJPGtleT5jb20uYXBwbGUucHJpbnQudGlja2V0Lm1vZERhdGU8
-	L2tleT4KCQkJCQk8ZGF0ZT4yMDA1LTA0LTE4VDAyOjQ0OjE4WjwvZGF0ZT4KCQkJCQk8
-	a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuc3RhdGVGbGFnPC9rZXk+CgkJCQkJPGlu
-	dGVnZXI+MDwvaW50ZWdlcj4KCQkJCTwvZGljdD4KCQkJPC9hcnJheT4KCQk8L2RpY3Q+
-	CgkJPGtleT5jb20uYXBwbGUucHJpbnQuUGFnZUZvcm1hdC5QTUFkanVzdGVkUGFwZXJS
-	ZWN0PC9rZXk+CgkJPGRpY3Q+CgkJCTxrZXk+Y29tLmFwcGxlLnByaW50LnRpY2tldC5j
-	cmVhdG9yPC9rZXk+CgkJCTxzdHJpbmc+Y29tLmFwcGxlLnByaW50aW5nbWFuYWdlcjwv
-	c3RyaW5nPgoJCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuaXRlbUFycmF5PC9r
-	ZXk+CgkJCTxhcnJheT4KCQkJCTxkaWN0PgoJCQkJCTxrZXk+Y29tLmFwcGxlLnByaW50
-	LlBhZ2VGb3JtYXQuUE1BZGp1c3RlZFBhcGVyUmVjdDwva2V5PgoJCQkJCTxhcnJheT4K
-	CQkJCQkJPHJlYWw+LTE4PC9yZWFsPgoJCQkJCQk8cmVhbD4tMTg8L3JlYWw+CgkJCQkJ
-	CTxyZWFsPjc3NDwvcmVhbD4KCQkJCQkJPHJlYWw+NTk0PC9yZWFsPgoJCQkJCTwvYXJy
-	YXk+CgkJCQkJPGtleT5jb20uYXBwbGUucHJpbnQudGlja2V0LmNsaWVudDwva2V5PgoJ
-	CQkJCTxzdHJpbmc+Y29tLmFwcGxlLnByaW50aW5nbWFuYWdlcjwvc3RyaW5nPgoJCQkJ
-	CTxrZXk+Y29tLmFwcGxlLnByaW50LnRpY2tldC5tb2REYXRlPC9rZXk+CgkJCQkJPGRh
-	dGU+MjAwNS0wNC0xOFQwMjo0NDoxOFo8L2RhdGU+CgkJCQkJPGtleT5jb20uYXBwbGUu
-	cHJpbnQudGlja2V0LnN0YXRlRmxhZzwva2V5PgoJCQkJCTxpbnRlZ2VyPjA8L2ludGVn
-	ZXI+CgkJCQk8L2RpY3Q+CgkJCTwvYXJyYXk+CgkJPC9kaWN0PgoJCTxrZXk+Y29tLmFw
-	cGxlLnByaW50LlBhcGVySW5mby5QTVBhcGVyTmFtZTwva2V5PgoJCTxkaWN0PgoJCQk8
-	a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuY3JlYXRvcjwva2V5PgoJCQk8c3RyaW5n
-	PmNvbS5hcHBsZS5wcmludC5wbS5Qb3N0U2NyaXB0PC9zdHJpbmc+CgkJCTxrZXk+Y29t
-	LmFwcGxlLnByaW50LnRpY2tldC5pdGVtQXJyYXk8L2tleT4KCQkJPGFycmF5PgoJCQkJ
-	PGRpY3Q+CgkJCQkJPGtleT5jb20uYXBwbGUucHJpbnQuUGFwZXJJbmZvLlBNUGFwZXJO
-	YW1lPC9rZXk+CgkJCQkJPHN0cmluZz5uYS1sZXR0ZXI8L3N0cmluZz4KCQkJCQk8a2V5
-	PmNvbS5hcHBsZS5wcmludC50aWNrZXQuY2xpZW50PC9rZXk+CgkJCQkJPHN0cmluZz5j
-	b20uYXBwbGUucHJpbnQucG0uUG9zdFNjcmlwdDwvc3RyaW5nPgoJCQkJCTxrZXk+Y29t
-	LmFwcGxlLnByaW50LnRpY2tldC5tb2REYXRlPC9rZXk+CgkJCQkJPGRhdGU+MjAwMC0w
-	Ny0yOFQyMjo1NzowNFo8L2RhdGU+CgkJCQkJPGtleT5jb20uYXBwbGUucHJpbnQudGlj
-	a2V0LnN0YXRlRmxhZzwva2V5PgoJCQkJCTxpbnRlZ2VyPjE8L2ludGVnZXI+CgkJCQk8
-	L2RpY3Q+CgkJCTwvYXJyYXk+CgkJPC9kaWN0PgoJCTxrZXk+Y29tLmFwcGxlLnByaW50
-	LlBhcGVySW5mby5QTVVuYWRqdXN0ZWRQYWdlUmVjdDwva2V5PgoJCTxkaWN0PgoJCQk8
-	a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuY3JlYXRvcjwva2V5PgoJCQk8c3RyaW5n
-	PmNvbS5hcHBsZS5wcmludC5wbS5Qb3N0U2NyaXB0PC9zdHJpbmc+CgkJCTxrZXk+Y29t
-	LmFwcGxlLnByaW50LnRpY2tldC5pdGVtQXJyYXk8L2tleT4KCQkJPGFycmF5PgoJCQkJ
-	PGRpY3Q+CgkJCQkJPGtleT5jb20uYXBwbGUucHJpbnQuUGFwZXJJbmZvLlBNVW5hZGp1
-	c3RlZFBhZ2VSZWN0PC9rZXk+CgkJCQkJPGFycmF5PgoJCQkJCQk8cmVhbD4wLjA8L3Jl
-	YWw+CgkJCQkJCTxyZWFsPjAuMDwvcmVhbD4KCQkJCQkJPHJlYWw+NzM0PC9yZWFsPgoJ
-	CQkJCQk8cmVhbD41NzY8L3JlYWw+CgkJCQkJPC9hcnJheT4KCQkJCQk8a2V5PmNvbS5h
-	cHBsZS5wcmludC50aWNrZXQuY2xpZW50PC9rZXk+CgkJCQkJPHN0cmluZz5jb20uYXBw
-	bGUucHJpbnRpbmdtYW5hZ2VyPC9zdHJpbmc+CgkJCQkJPGtleT5jb20uYXBwbGUucHJp
-	bnQudGlja2V0Lm1vZERhdGU8L2tleT4KCQkJCQk8ZGF0ZT4yMDAzLTAxLTI0VDE2OjI4
-	OjU0WjwvZGF0ZT4KCQkJCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuc3RhdGVG
-	bGFnPC9rZXk+CgkJCQkJPGludGVnZXI+MDwvaW50ZWdlcj4KCQkJCTwvZGljdD4KCQkJ
-	PC9hcnJheT4KCQk8L2RpY3Q+CgkJPGtleT5jb20uYXBwbGUucHJpbnQuUGFwZXJJbmZv
-	LlBNVW5hZGp1c3RlZFBhcGVyUmVjdDwva2V5PgoJCTxkaWN0PgoJCQk8a2V5PmNvbS5h
-	cHBsZS5wcmludC50aWNrZXQuY3JlYXRvcjwva2V5PgoJCQk8c3RyaW5nPmNvbS5hcHBs
-	ZS5wcmludC5wbS5Qb3N0U2NyaXB0PC9zdHJpbmc+CgkJCTxrZXk+Y29tLmFwcGxlLnBy
-	aW50LnRpY2tldC5pdGVtQXJyYXk8L2tleT4KCQkJPGFycmF5PgoJCQkJPGRpY3Q+CgkJ
-	CQkJPGtleT5jb20uYXBwbGUucHJpbnQuUGFwZXJJbmZvLlBNVW5hZGp1c3RlZFBhcGVy
-	UmVjdDwva2V5PgoJCQkJCTxhcnJheT4KCQkJCQkJPHJlYWw+LTE4PC9yZWFsPgoJCQkJ
-	CQk8cmVhbD4tMTg8L3JlYWw+CgkJCQkJCTxyZWFsPjc3NDwvcmVhbD4KCQkJCQkJPHJl
-	YWw+NTk0PC9yZWFsPgoJCQkJCTwvYXJyYXk+CgkJCQkJPGtleT5jb20uYXBwbGUucHJp
-	bnQudGlja2V0LmNsaWVudDwva2V5PgoJCQkJCTxzdHJpbmc+Y29tLmFwcGxlLnByaW50
-	aW5nbWFuYWdlcjwvc3RyaW5nPgoJCQkJCTxrZXk+Y29tLmFwcGxlLnByaW50LnRpY2tl
-	dC5tb2REYXRlPC9rZXk+CgkJCQkJPGRhdGU+MjAwMy0wMS0yNFQxNjoyODo1NFo8L2Rh
-	dGU+CgkJCQkJPGtleT5jb20uYXBwbGUucHJpbnQudGlja2V0LnN0YXRlRmxhZzwva2V5
-	PgoJCQkJCTxpbnRlZ2VyPjA8L2ludGVnZXI+CgkJCQk8L2RpY3Q+CgkJCTwvYXJyYXk+
-	CgkJPC9kaWN0PgoJCTxrZXk+Y29tLmFwcGxlLnByaW50LlBhcGVySW5mby5wcGQuUE1Q
-	YXBlck5hbWU8L2tleT4KCQk8ZGljdD4KCQkJPGtleT5jb20uYXBwbGUucHJpbnQudGlj
-	a2V0LmNyZWF0b3I8L2tleT4KCQkJPHN0cmluZz5jb20uYXBwbGUucHJpbnQucG0uUG9z
-	dFNjcmlwdDwvc3RyaW5nPgoJCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuaXRl
-	bUFycmF5PC9rZXk+CgkJCTxhcnJheT4KCQkJCTxkaWN0PgoJCQkJCTxrZXk+Y29tLmFw
-	cGxlLnByaW50LlBhcGVySW5mby5wcGQuUE1QYXBlck5hbWU8L2tleT4KCQkJCQk8c3Ry
-	aW5nPkxldHRlcjwvc3RyaW5nPgoJCQkJCTxrZXk+Y29tLmFwcGxlLnByaW50LnRpY2tl
-	dC5jbGllbnQ8L2tleT4KCQkJCQk8c3RyaW5nPmNvbS5hcHBsZS5wcmludC5wbS5Qb3N0
-	U2NyaXB0PC9zdHJpbmc+CgkJCQkJPGtleT5jb20uYXBwbGUucHJpbnQudGlja2V0Lm1v
-	ZERhdGU8L2tleT4KCQkJCQk8ZGF0ZT4yMDAwLTA3LTI4VDIyOjU3OjA0WjwvZGF0ZT4K
-	CQkJCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuc3RhdGVGbGFnPC9rZXk+CgkJ
-	CQkJPGludGVnZXI+MTwvaW50ZWdlcj4KCQkJCTwvZGljdD4KCQkJPC9hcnJheT4KCQk8
-	L2RpY3Q+CgkJPGtleT5jb20uYXBwbGUucHJpbnQudGlja2V0LkFQSVZlcnNpb248L2tl
-	eT4KCQk8c3RyaW5nPjAwLjIwPC9zdHJpbmc+CgkJPGtleT5jb20uYXBwbGUucHJpbnQu
-	dGlja2V0LnByaXZhdGVMb2NrPC9rZXk+CgkJPGZhbHNlLz4KCQk8a2V5PmNvbS5hcHBs
-	ZS5wcmludC50aWNrZXQudHlwZTwva2V5PgoJCTxzdHJpbmc+Y29tLmFwcGxlLnByaW50
-	LlBhcGVySW5mb1RpY2tldDwvc3RyaW5nPgoJPC9kaWN0PgoJPGtleT5jb20uYXBwbGUu
-	cHJpbnQudGlja2V0LkFQSVZlcnNpb248L2tleT4KCTxzdHJpbmc+MDAuMjA8L3N0cmlu
-	Zz4KCTxrZXk+Y29tLmFwcGxlLnByaW50LnRpY2tldC5wcml2YXRlTG9jazwva2V5PgoJ
-	PGZhbHNlLz4KCTxrZXk+Y29tLmFwcGxlLnByaW50LnRpY2tldC50eXBlPC9rZXk+Cgk8
-	c3RyaW5nPmNvbS5hcHBsZS5wcmludC5QYWdlRm9ybWF0VGlja2V0PC9zdHJpbmc+Cjwv
-	ZGljdD4KPC9wbGlzdD4KhpKEmZkPTlNQcmludEFsbFBhZ2VzhpKgkoSZmQtOU1BhcGVy
-	TmFtZYaShJmZBkxldHRlcoaShJmZFU5TSG9yaXpvbmFsUGFnaW5hdGlvboaShKGbopcA
-	hpKEmZkWTlNIb3Jpem9udGFsbHlDZW50ZXJlZIaSppKEmZkJTlNQcmludGVyhpKEhIQJ
-	TlNQcmludGVyAJSShJmZFFRXIENoaWNhZ28gNnRoIGZsb29yhoaShJmZCE5TQ29waWVz
-	hpKEoZuilwGGkoSZmQ9OU1NjYWxpbmdGYWN0b3KGkoShm4SEAWahAYaShJmZDU5TUmln
-	aHRNYXJnaW6GkoShm7ihAIaShJmZDk5TQm90dG9tTWFyZ2luhpKEoZu4oQCGkoSZmQxO
-	U0xlZnRNYXJnaW6GkoShm7ihAIaShJmZC05TVG9wTWFyZ2luhpKEoZu4oQCGkoSZmQpO
-	U0xhc3RQYWdlhpKEoZuil4J/////hpKEmZkLTlNGaXJzdFBhZ2WGkoShm6KXAYaShJmZ
-	DU5TT3JpZW50YXRpb26GkoShm6KXAIaGhg==
-	
-	ReadOnly
-	NO
-	RowAlign
-	1
-	RowSpacing
-	36
-	SheetTitle
-	Canvas 1
-	SmartAlignmentGuidesActive
-	YES
-	SmartDistanceGuidesActive
-	YES
-	UseEntirePage
-	
-	VPages
-	1
-	WindowInfo
-	
-		CurrentSheet
-		0
-		Frame
-		{{342, -31}, {591, 828}}
-		ShowRuler
-		
-		ShowStatusBar
-		
-		VisibleRegion
-		{{0, 0}, {576, 730}}
-		Zoom
-		1
-	
-
-
diff --git a/tests/FunctionalTests/selenium/selenium-logo.png b/tests/FunctionalTests/selenium/selenium-logo.png
deleted file mode 100644
index 1de09290..00000000
Binary files a/tests/FunctionalTests/selenium/selenium-logo.png and /dev/null differ
diff --git a/tests/FunctionalTests/selenium/selenium-seleneserunner.js b/tests/FunctionalTests/selenium/selenium-seleneserunner.js
deleted file mode 100644
index e1ae6f88..00000000
--- a/tests/FunctionalTests/selenium/selenium-seleneserunner.js
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
-* Copyright 2005 ThoughtWorks, Inc
-*
-*  Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*
-*/
-
-passColor = "#cfffcf";
-failColor = "#ffcfcf";
-errorColor = "#ffffff";
-workingColor = "#DEE7EC";
-doneColor = "#FFFFCC";
-
-slowMode = false;
-
-var cmd1 = document.createElement("div");
-var cmd2 = document.createElement("div");
-var cmd3 = document.createElement("div");
-var cmd4 = document.createElement("div");
-
-var postResult = "START";
-
-function runTest() {
-    var testAppFrame = document.getElementById('myiframe');
-    selenium = Selenium.createForFrame(testAppFrame);
-
-    commandFactory = new CommandHandlerFactory();
-    commandFactory.registerAll(selenium);
-
-    testLoop = new TestLoop(commandFactory);
-
-    testLoop.nextCommand = nextCommand;
-    testLoop.commandStarted = commandStarted;
-    testLoop.commandComplete = commandComplete;
-    testLoop.commandError = commandError;
-    testLoop.testComplete = function() {window.status = "Selenium Tests Complete, for this Test"};
-
-    document.getElementById("commandList").appendChild(cmd4);
-    document.getElementById("commandList").appendChild(cmd3);
-    document.getElementById("commandList").appendChild(cmd2);
-    document.getElementById("commandList").appendChild(cmd1);
-
-    testLoop.start();
-}
-
-function nextCommand() {
-
-    var xmlHttp = XmlHttp.create();
-    
-    try {
-        alert("postResult == " + postResult);
-        if (postResult == "START") {
-            xmlHttp.open("GET", "driver?seleniumStart=true", false);
-        } else {
-            xmlHttp.open("GET", "driver?commandResult=" + postResult, false);
-        }
-        xmlHttp.send(null);
-    } catch(e) {
-        return null;
-    }
-    return extractCommand(xmlHttp);
-}
-
-function extractCommand(xmlHttp) {
-    if (slowMode) {
-        delay(2000);
-    }
-
-    var command;
-    try {
-        command = xmlHttp.responseText;
-    } catch (e) {
-        alert('could not get responseText: ' + e.message);
-    }
-    if (command.substr(0,'|testComplete'.length)=='|testComplete') {
-        return null;
-    }
-
-    return createCommandFromWikiRow(command);
-}
-
-function commandStarted(command) {
-    commandNode = document.createElement("div");
-    innerHTML = command.command + '(';
-    if (command.target != null && command.target != "") {
-        innerHTML += command.target;
-        if (command.value != null && command.value != "") {
-            innerHTML += ', ' + command.value;
-        }
-    }
-    innerHTML += ")";
-    commandNode.innerHTML = innerHTML;
-    commandNode.style.backgroundColor = workingColor;
-    document.getElementById("commandList").removeChild(cmd1);
-    document.getElementById("commandList").removeChild(cmd2);
-    document.getElementById("commandList").removeChild(cmd3);
-    document.getElementById("commandList").removeChild(cmd4);
-    cmd4 = cmd3;
-    cmd3 = cmd2;
-    cmd2 = cmd1;
-    cmd1 = commandNode;
-    document.getElementById("commandList").appendChild(cmd4);
-    document.getElementById("commandList").appendChild(cmd3);
-    document.getElementById("commandList").appendChild(cmd2);
-    document.getElementById("commandList").appendChild(cmd1);
-}
-
-function commandComplete(result) {
-    if (result.failed) {
-        postResult = result.failureMessage;
-        commandNode.title = result.failureMessage;
-        commandNode.style.backgroundColor = failColor;
-    } else if (result.passed) {
-        postResult = "PASSED";
-        commandNode.style.backgroundColor = passColor;
-    } else {
-        postResult = result.result;
-        commandNode.style.backgroundColor = doneColor;
-    }
-}
-
-function commandError(message) {
-    postResult = "ERROR";
-    commandNode.style.backgroundColor = errorColor;
-    commandNode.title = message;
-}
-
-function slowClicked() {
-    slowMode = !slowMode;
-}
-
-function delay(millis) {
-    startMillis = new Date();
-    while (true) {
-        milli = new Date();
-        if (milli-startMillis > millis) {
-            break;
-        }
-    }
-}
-
-function getIframeDocument(iframe) {
-    if (iframe.contentDocument) {
-        return iframe.contentDocument;
-    }
-    else {
-        return iframe.contentWindow.document;
-    }
-}
-
-// Parses a Wiki table row into a Javascript expression
-function createCommandFromWikiRow(wikiRow) {
-    var tokens;
-    if(tokens = wikiRow.trim().match(/^\|([^\|]*)\|([^\|]*)\|([^\|]*)\|$/m)) {
-        var functionName = tokens[1].trim();
-        var arg1 = tokens[2].trim();
-        var arg2 = tokens[3].trim();
-        return new SeleniumCommand(functionName, arg1, arg2);
-    } else {
-       throw new Error("Bad wiki row format:" + wikiRow);
-    }
-}
diff --git a/tests/FunctionalTests/selenium/selenium-tableparser.js b/tests/FunctionalTests/selenium/selenium-tableparser.js
deleted file mode 100644
index 2cc0ff9b..00000000
--- a/tests/FunctionalTests/selenium/selenium-tableparser.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2004 ThoughtWorks, Inc
- *
- *  Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
- 
-TableParser = function(wikiTableRows) {
-    this.wikiTableRows = wikiTableRows;
-};
-
-// Parses a Wiki table row into a SeleniumB Javascript expression
-TableParser.prototype.createCommandFromWikiRow = function(wikiRow) {
-    var tokens;
-    if(tokens = wikiRow.trim().match(/^\|([^\|]*)\|([^\|]*)\|([^\|]*)\|$/m)) {
-        var functionName = tokens[1].trim();
-        var arg1 = tokens[2].trim();
-        var arg2 = tokens[3].trim();
-        return new SeleniumCommand(functionName, arg1, arg2);
-    } else {
-       throw new Error("Bad wiki row format:" + wikiRow);
-    }
-};
-
-// Parses a HTML table row into a SeleniumB Javascript expression
-TableParser.prototype.createCommandFromHtmlRow = function(row) {
-    if(row.cells.length != 3) {
-       throw new Error("Bad HTML row format. Rows must have 3 coumns, but had " + row.cells.length);
-    }
-    var functionName = getText(row.cells[0]);
-    var arg1 = getText(row.cells[1]);
-    var arg2 = getText(row.cells[2]);
-    return new SeleniumCommand(functionName, arg1, arg2);
-};
-
-TableParser.prototype.loop = function() {
-    row = this.wikiTableRows.getRow();
-    if (row == null) return null;
-    return this.createCommandForRow(row);
-};
\ No newline at end of file
diff --git a/tests/FunctionalTests/selenium/selenium-testrunner.js b/tests/FunctionalTests/selenium/selenium-testrunner.js
deleted file mode 100644
index e786b29b..00000000
--- a/tests/FunctionalTests/selenium/selenium-testrunner.js
+++ /dev/null
@@ -1,597 +0,0 @@
-/*
-* Copyright 2004 ThoughtWorks, Inc
-*
-*  Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*
-*/
-
-// The current row in the list of tests (test suite)
-currentRowInSuite = 0;
-
-// Where are we at in the current test
-testTableRows = null;
-currentRowInTest = -1;
-currentCommandRow = null;
-
-// Whether or not the jsFT should run all tests in the suite
-runAllTests = false;
-
-// Whether or not the current test has any errors;
-testFailed = false;
-suiteFailed = false;
-
-// Colors used to provide feedback
-passColor = "#ccffcc";
-doneColor = "#eeffee";
-failColor = "#ffcccc";
-workingColor = "#ffffcc";
-
-// Holds the handlers for each command.
-commandHandlers = null;
-
-// The number of tests run
-numTestPasses = 0;
-
-// The number of tests that have failed
-numTestFailures = 0;
-
-// The number of commands which have passed
-numCommandPasses = 0;
-
-// The number of commands which have failed
-numCommandFailures = 0;
-
-// The number of commands which have caused errors (element not found)
-numCommandErrors = 0;
-
-// The time that the test was started.
-startTime = null;
-
-// The current time.
-currentTime = null;
-
-// An simple enum for failureType
-ERROR = 0;
-FAILURE = 1;
-
-runInterval = 0;
-
-function setRunInterval() {
-    // Get the value of the checked runMode option.
-    // There should be a way of getting the value of the "group", but I don't know how.
-    var runModeOptions = document.forms['controlPanel'].runMode;
-    for (var i = 0; i < runModeOptions.length; i++) {
-        if (runModeOptions[i].checked) {
-            runInterval = runModeOptions[i].value;
-            break;
-        }
-    }
-}
-
-function continueCurrentTest() {
-    document.getElementById('continueTest').disabled = true;
-    testLoop.resume();
-}
-
-function getApplicationFrame() {
-    return document.getElementById('myiframe');
-}
-
-function getSuiteFrame() {
-    return document.getElementById('testSuiteFrame');
-}
-
-function getTestFrame(){
-    return document.getElementById('testFrame');
-}
-
-function loadAndRunIfAuto() {
-    loadSuiteFrame();
-}
-
-function start() {
-    setRunInterval();
-    loadSuiteFrame();
-}
-
-function loadSuiteFrame() {
-    var testAppFrame = document.getElementById('myiframe');
-    selenium = Selenium.createForFrame(testAppFrame);
-    registerCommandHandlers();
-
-    //set the runInterval if there is a queryParameter for it
-    var tempRunInterval = getQueryParameter("runInterval");
-    if (tempRunInterval) {
-        runInterval = tempRunInterval;
-    }
-
-    document.getElementById("modeRun").onclick = setRunInterval;
-    document.getElementById('modeWalk').onclick = setRunInterval;
-    document.getElementById('modeStep').onclick = setRunInterval;
-    document.getElementById('continueTest').onclick = continueCurrentTest;
-
-    var testSuiteName = getQueryParameter("test");
-
-    if (testSuiteName) {
-        addLoadListener(getSuiteFrame(), onloadTestSuite);
-        getSuiteFrame().src = testSuiteName;
-    } else {
-        onloadTestSuite();
-    }
-}
-
-function startSingleTest() {
-    removeLoadListener(getApplicationFrame(), startSingleTest);
-    var singleTestName = getQueryParameter("singletest");
-    addLoadListener(getTestFrame(), startTest);
-    getTestFrame().src = singleTestName;
-}
-
-function getIframeDocument(iframe)
-{
-    if (iframe.contentDocument) {
-        return iframe.contentDocument;
-    }
-    else {
-        return iframe.contentWindow.document;
-    }
-}
-
-function onloadTestSuite() {
-    removeLoadListener(getSuiteFrame(), onloadTestSuite);
-    suiteTable = getIframeDocument(getSuiteFrame()).getElementsByTagName("table")[0];
-
-    // Add an onclick function to each link in the suite table
-    for(rowNum = 1;rowNum < suiteTable.rows.length; rowNum++) {
-        addOnclick(suiteTable, rowNum);
-    }
-
-
-    if (isAutomatedRun()) {
-        startTestSuite();
-    } else if (getQueryParameter("autoURL")) {
-
-        addLoadListener(getApplicationFrame(), startSingleTest);
-
-        getApplicationFrame().src = getQueryParameter("autoURL");
-
-    } else {
-        testLink = suiteTable.rows[currentRowInSuite+1].cells[0].getElementsByTagName("a")[0];
-        getTestFrame().src = testLink.href;
-    }
-}
-
-// Adds an onclick function to the link in the given row in suite table.
-// This function checks whether the test has already been run and the data is
-// stored. If the data is stored, it sets the test frame to be the stored data.
-// Otherwise, it loads the fresh page.
-function addOnclick(suiteTable, rowNum) {
-    aLink = suiteTable.rows[rowNum].cells[0].getElementsByTagName("a")[0];
-    aLink.onclick = function(eventObj) {
-        srcObj = null;
-
-        // For mozilla-like browsers
-        if(eventObj)
-                srcObj = eventObj.target;
-
-        // For IE-like browsers
-        else if (getSuiteFrame().contentWindow.event)
-                srcObj = getSuiteFrame().contentWindow.event.srcElement;
-
-        // The target row (the event source is not consistently reported by browsers)
-        row = srcObj.parentNode.parentNode.rowIndex || srcObj.parentNode.parentNode.parentNode.rowIndex;
-
-        // If the row has a stored results table, use that
-        if(suiteTable.rows[row].cells[1]) {
-            var bodyElement = getIframeDocument(getTestFrame()).body;
-
-            // Create a div element to hold the results table.
-            var tableNode = getIframeDocument(getTestFrame()).createElement("div");
-            var resultsCell = suiteTable.rows[row].cells[1];
-            tableNode.innerHTML = resultsCell.innerHTML;
-
-            // Append this text node, and remove all the preceding nodes.
-            bodyElement.appendChild(tableNode);
-            while (bodyElement.firstChild != bodyElement.lastChild) {
-                bodyElement.removeChild(bodyElement.firstChild);
-            }
-        }
-        // Otherwise, just open up the fresh page.
-        else {
-            getTestFrame().src = suiteTable.rows[row].cells[0].getElementsByTagName("a")[0].href;
-        }
-
-        return false;
-    };
-}
-
-function isQueryParameterTrue(name) {
-    parameterValue = getQueryParameter(name);
-    return (parameterValue != null && parameterValue.toLowerCase() == "true");
-}
-
-function getQueryParameter(searchKey) {
-    var clauses = location.search.substr(1).split('&');
-    for (var i = 0; i < clauses.length; i++) {
-        var keyValuePair = clauses[i].split('=',2);
-        var key = unescape(keyValuePair[0]);
-        if (key == searchKey) {
-            return unescape(keyValuePair[1]);
-        }
-    }
-    return null;
-}
-
-function isNewWindow() {
-    return isQueryParameterTrue("newWindow");
-}
-
-function isAutomatedRun() {
-    return isQueryParameterTrue("auto");
-}
-
-function resetMetrics() {
-    numTestPasses = 0;
-    numTestFailures = 0;
-    numCommandPasses = 0;
-    numCommandFailures = 0;
-    numCommandErrors = 0;
-    startTime = new Date().getTime();
-}
-
-function runSingleTest() {
-    runAllTests = false;
-    resetMetrics();
-    startTest();
-}
-
-function startTest() {
-    removeLoadListener(getTestFrame(), startTest);
-
-    // Scroll to the top of the test frame
-    if (getTestFrame().contentWindow) {
-        getTestFrame().contentWindow.scrollTo(0,0);
-    }
-    else {
-        frames['testFrame'].scrollTo(0,0);
-    }
-
-    testTable = getIframeDocument(getTestFrame()).getElementsByTagName("table")[0];
-    testTableRows = testTable.rows;
-    currentRowInTest = -1;
-    currentCommandRow = null;
-    
-    testFailed = false;
-    storedVars = new Object();
-
-    resetTestTable();
-
-    testLoop = initialiseTestLoop();
-    testLoop.start();
-}
-
-function resetTestTable() {
-    for (var i = 0; i <= testTableRows.length - 1; i++) {
-        testTableRows[i].bgColor = "white";
-    }
-}
-
-function startTestSuite() {
-    resetMetrics();
-    currentRowInSuite = 0;
-    runAllTests = true;
-    suiteFailed = false;
-
-    runNextTest();
-}
-
-function runNextTest() {
-    if (!runAllTests)
-            return;
-
-    suiteTable = getIframeDocument(getSuiteFrame()).getElementsByTagName("table")[0];
-
-    // Do not change the row color of the first row
-    if (currentRowInSuite > 0) {
-        // Provide test-status feedback
-        if (testFailed) {
-            setCellColor(suiteTable.rows, currentRowInSuite, 0, failColor);
-        } else {
-            setCellColor(suiteTable.rows, currentRowInSuite, 0, passColor);
-        }
-    
-        // Set the results from the previous test run
-        setResultsData(suiteTable, currentRowInSuite);
-    }
-
-    currentRowInSuite++;
-
-    // If we are done with all of the tests, set the title bar as pass or fail
-    if (currentRowInSuite >= suiteTable.rows.length) {
-        if (suiteFailed) {
-            setCellColor(suiteTable.rows, 0, 0, failColor);
-        } else {
-            setCellColor(suiteTable.rows, 0, 0, passColor);
-        }
-
-        // If this is an automated run (i.e., build script), then submit
-        // the test results by posting to a form
-        if (isAutomatedRun())
-                postTestResults(suiteFailed, suiteTable);
-    }
-
-    else {
-        // Make the current row blue
-        setCellColor(suiteTable.rows, currentRowInSuite, 0, workingColor);
-
-        testLink = suiteTable.rows[currentRowInSuite].cells[0].getElementsByTagName("a")[0];
-        testLink.focus();
-
-        var testFrame = getTestFrame();
-        addLoadListener(testFrame, startTest);
-
-        selenium.browserbot.setIFrameLocation(testFrame, testLink.href);
-    }
-}
-
-function setCellColor(tableRows, row, col, colorStr) {
-    tableRows[row].cells[col].bgColor = colorStr;
-}
-
-// Sets the results from a test into a hidden column on the suite table.  So,
-// for each tests, the second column is set to the HTML from the test table.
-function setResultsData(suiteTable, row) {
-    // Create a text node of the test table
-    var resultTable = getIframeDocument(getTestFrame()).body.innerHTML;
-    if (!resultTable) return;
-
-    var tableNode = suiteTable.ownerDocument.createElement("div");
-    tableNode.innerHTML = resultTable;
-
-    var new_column = suiteTable.ownerDocument.createElement("td");
-    new_column.appendChild(tableNode);
-
-    // Set the column to be invisible
-    new_column.style.cssText = "display: none;";
-
-    // Add the invisible column
-    suiteTable.rows[row].appendChild(new_column);
-}
-
-// Post the results to a servlet, CGI-script, etc.  The URL of the
-// results-handler defaults to "/postResults", but an alternative location
-// can be specified by providing a "resultsUrl" query parameter.
-//
-// Parameters passed to the results-handler are:
-//      result:         passed/failed depending on whether the suite passed or failed
-//      totalTime:      the total running time in seconds for the suite.
-//
-//      numTestPasses:  the total number of tests which passed.
-//      numTestFailures: the total number of tests which failed.
-//
-//      numCommandPasses: the total number of commands which passed.
-//      numCommandFailures: the total number of commands which failed.
-//      numCommandErrors: the total number of commands which errored.
-//
-//      suite:      the suite table, including the hidden column of test results
-//      testTable.1 to testTable.N: the individual test tables
-//
-function postTestResults(suiteFailed, suiteTable) {
-
-    form = document.createElement("form");
-    document.body.appendChild(form);
-
-    form.id = "resultsForm";
-    form.method="post";
-    form.target="myiframe";
-
-    var resultsUrl = getQueryParameter("resultsUrl");
-    if (!resultsUrl) {
-        resultsUrl = "./postResults";
-    }
-
-    var actionAndParameters = resultsUrl.split('?',2);
-    form.action = actionAndParameters[0];
-    var resultsUrlQueryString = actionAndParameters[1];
-
-    form.createHiddenField = function(name, value) {
-        input = document.createElement("input");
-        input.type = "hidden";
-        input.name = name;
-        input.value = value;
-        this.appendChild(input);
-    };
-
-    if (resultsUrlQueryString) {
-        var clauses = resultsUrlQueryString.split('&');
-        for (var i = 0; i < clauses.length; i++) {
-            var keyValuePair = clauses[i].split('=',2);
-            var key = unescape(keyValuePair[0]);
-            var value = unescape(keyValuePair[1]);
-            form.createHiddenField(key, value);
-        }
-    }
-
-    form.createHiddenField("result", suiteFailed == true ? "failed" : "passed");
-
-    form.createHiddenField("totalTime", Math.floor((currentTime - startTime) / 1000));
-    form.createHiddenField("numTestPasses", numTestPasses);
-    form.createHiddenField("numTestFailures", numTestFailures);
-    form.createHiddenField("numCommandPasses", numCommandPasses);
-    form.createHiddenField("numCommandFailures", numCommandFailures);
-    form.createHiddenField("numCommandErrors", numCommandErrors);
-
-    // Create an input for each test table.  The inputs are named
-    // testTable.1, testTable.2, etc.
-    for (rowNum = 1; rowNum < suiteTable.rows.length;rowNum++) {
-        // If there is a second column, then add a new input
-        if (suiteTable.rows[rowNum].cells.length > 1) {
-            var resultCell = suiteTable.rows[rowNum].cells[1];
-            form.createHiddenField("testTable." + rowNum, resultCell.innerHTML);
-            // remove the resultCell, so it's not included in the suite HTML
-            resultCell.parentNode.removeChild(resultCell); 
-        }
-    }
-
-    // Add HTML for the suite itself
-    form.createHiddenField("suite", suiteTable.parentNode.innerHTML);
-
-    form.submit();
-    document.body.removeChild(form);
-
-}
-
-function printMetrics() {
-    setText(document.getElementById("commandPasses"), numCommandPasses);
-    setText(document.getElementById("commandFailures"), numCommandFailures);
-    setText(document.getElementById("commandErrors"), numCommandErrors);
-    setText(document.getElementById("testRuns"), numTestPasses + numTestFailures);
-    setText(document.getElementById("testFailures"), numTestFailures);
-
-    currentTime = new Date().getTime();
-
-    timeDiff = currentTime - startTime;
-    totalSecs = Math.floor(timeDiff / 1000);
-
-    minutes = Math.floor(totalSecs / 60);
-    seconds = totalSecs % 60;
-
-    setText(document.getElementById("elapsedTime"), pad(minutes)+":"+pad(seconds));
-}
-
-// Puts a leading 0 on num if it is less than 10
-function pad (num) {
-    return (num > 9) ? num : "0" + num;
-}
-
-/*
- * Register all of the built-in command handlers with the CommandHandlerFactory.
- * TODO work out an easy way for people to register handlers without modifying the Selenium sources.
- */
-function registerCommandHandlers() {
-    commandFactory = new CommandHandlerFactory();
-    commandFactory.registerAll(selenium);
-
-}
-
-function initialiseTestLoop() {
-    testLoop = new TestLoop(commandFactory);
-
-    testLoop.getCommandInterval = function() { return runInterval; };
-    testLoop.nextCommand = nextCommand;
-    testLoop.commandStarted = commandStarted;
-    testLoop.commandComplete = commandComplete;
-    testLoop.commandError = commandError;
-    testLoop.testComplete = testComplete;
-    testLoop.pause = function() {
-        document.getElementById('continueTest').disabled = false;
-    };
-    return testLoop;
-}
-
-function findNextCommandRow() {
-    // Return the next row with >= 3 cells
-    while (currentRowInTest < testTableRows.length - 1) {
-        currentRowInTest++;
-        currentCommandRow = testTableRows[currentRowInTest];
-        if (currentCommandRow.cells.length >= 3) {
-            return;
-        }
-    }
-    currentCommandRow = null;
-}
-
-function nextCommand() {
-    findNextCommandRow();
-    if (currentCommandRow == null) {
-        return null;
-    }
-    var row = currentCommandRow;
-    if (! row.cachedValue) {
-        row.cachedValue = removeNbsp(getText(row.cells[2]));
-    }
-    return new SeleniumCommand(getText(row.cells[0]), 
-                               getText(row.cells[1]),
-                               row.cachedValue);
-}
-
-function removeNbsp(value) {
-    return value.replace(/\240/g, "");
-}
-
-function scrollIntoView(element) {
-    if (element.scrollIntoView) {
-        element.scrollIntoView(false);
-        return;
-    }
-    // TODO: work out how to scroll browsers that don't support
-    // scrollIntoView (like Konqueror)
-}
-
-function commandStarted() {
-    currentCommandRow.bgColor = workingColor;
-    scrollIntoView(currentCommandRow.cells[0]);
-    printMetrics();
-}
-
-function commandComplete(result) {
-    if (result.failed) {
-        numCommandFailures += 1;
-        recordFailure(result.failureMessage);
-    } else if (result.passed) {
-        numCommandPasses += 1;
-        currentCommandRow.bgColor = passColor;
-    } else {
-        currentCommandRow.bgColor = doneColor;
-    }
-}
-
-function commandError(errorMessage) {
-    numCommandErrors += 1;
-    recordFailure(errorMessage);
-}
-
-function recordFailure(errorMsg) {
-    // Set cell background to red
-    currentCommandRow.bgColor = failColor;
-
-    // Set error message
-    currentCommandRow.cells[2].innerHTML = errorMsg;
-    currentCommandRow.title = errorMsg;
-    testFailed = true;
-    suiteFailed = true;
-}
-
-function testComplete() {
-    if(testFailed) {
-        testTableRows[0].bgColor = failColor;
-        numTestFailures += 1;
-    }
-    else {
-        testTableRows[0].bgColor = passColor;
-        numTestPasses += 1;
-    }
-
-    printMetrics();
-
-    window.setTimeout("runNextTest()", 1);
-}
-
-Selenium.prototype.doPause = function(waitTime) {
-    testLoop.pauseInterval = waitTime;
-};
-
-Selenium.prototype.doBreak = function() {
-    document.getElementById('modeStep').checked = true;
-    runInterval = -1;
-};
diff --git a/tests/FunctionalTests/selenium/selenium.css b/tests/FunctionalTests/selenium/selenium.css
deleted file mode 100644
index 6e9f3f30..00000000
--- a/tests/FunctionalTests/selenium/selenium.css
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Copyright 2005 ThoughtWorks, Inc
- * 
- *  Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
- *  
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-/*---( Layout )---*/
-
-body {
-    margin: 0;
-    padding: 0;
-    overflow: auto;
-}
-
-td {
-    position: static;
-}
-
-tr {
-    vertical-align: top;
-}
-
-.layout {
-    width: 100%;
-    height: 100%;
-    border-collapse: collapse;
-}
-
-.layout td {
-    margin: 0;
-    padding: 0;
-    border: 0;
-}
-
-iframe {
-    width: 100%;
-    height: 100%;
-    border: 0;
-    background: white;
-    overflow: auto;
-}
-
-/*---( Style )---*/
-
-body, html {
-    font-family: Verdana, Arial, sans-serif;
-}
-
-.selenium th, .selenium td {
-    border: 1px solid #999;
-}
-
-.header {
-    background: #ccc;
-    padding: 0;
-    font-size: 90%;
-}
-
-#controlPanel {
-    padding: 0.5ex;
-    background: #eee;
-    overflow: auto;
-    font-size: 75%;
-    text-align: center;
-}
-
-#controlPanel fieldset {
-    margin: 0.3ex;
-    padding: 0.3ex;
-}
-
-#controlPanel fieldset legend {
-    color: black;
-}
-
-#controlPanel button {
-    margin: 0.5ex;
-}
-
-#controlPanel table {
-    font-size: 100%;
-}
-
-#controlPanel th, #controlPanel td {
-    border: 0;
-}
-
-h1 {
-    margin: 0.2ex;
-    font-size: 130%;
-    font-weight: bold;
-}
-
-h2 {
-    margin: 0.2ex;
-    font-size: 80%;
-    font-weight: normal;
-}
-
-.selenium a {
-    color: black;
-    text-decoration: none;
-}
-
-.selenium a:hover {
-    text-decoration: underline;
-}
-
-button, label {
-    cursor: pointer;
-}
-
-#stats {
-    margin: 0.5em auto 0.5em auto;
-}
-
-#stats th, #stats td {
-    text-align: left;
-    padding-left: 2px;
-}
-
-#stats th {
-    text-decoration: underline;
-}
-
-#stats td.count {
-    font-weight: bold;
-    text-align: right;
-}
-
-#testRuns {
-    color: green;
-}
-
-#testFailures {
-    color: red;
-}
-
-#commandPasses {
-    color: green;
-}
-
-#commandFailures {
-    color: red;
-}
-
-#commandErrors {
-    color: #f90;
-}
-
-.splash {
-    border: 1px solid black;
-    padding: 20px;
-    background: #ccc;
-}
-
-/*---( Logging Console )---*/
-
-#logging-console {
-    background: #fff;
-    font-size: 75%;
-}
-
-#logging-console #banner {
-    display: block;
-    width: 100%;
-    position: fixed;
-    top: 0;
-    background: #ddd;
-    border-bottom: 1px solid #666;
-}
-
-#logging-console #logLevelChooser {
-    float: right;
-    margin: 3px;
-}
-
-#logging-console ul {
-    list-style-type: none;
-    margin: 0px;
-    margin-top: 3em;
-    padding-left: 5px;
-}
-
-#logging-console li {
-    margin: 2px;
-    border-top: 1px solid #ccc;
-}
-
-#logging-console li.error {
-    font-weight: bold;
-    color: red;
-}
-
-#logging-console li.warn {
-    color: red;
-}
-
-#logging-console li.debug {
-    color: green;
-}
diff --git a/tests/FunctionalTests/selenium/user-extensions.js.sample b/tests/FunctionalTests/selenium/user-extensions.js.sample
deleted file mode 100644
index f234c29e..00000000
--- a/tests/FunctionalTests/selenium/user-extensions.js.sample
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * By default, Selenium looks for a file called "user-extensions.js", and loads and javascript
- * code found in that file. This file is a sample of what that file could look like.
- *
- * user-extensions.js provides a convenient location for adding extensions to Selenium, like
- * new actions, checks and locator-strategies.
- * By default, this file does not exist. Users can create this file and place their extension code
- * in this common location, removing the need to modify the Selenium sources, and hopefully assisting
- * with the upgrade process.
- */
-
-// The following examples try to give an indication of how Selenium can be extended with javascript.
-
-// All do* methods on the Selenium prototype are added as actions.
-// Eg add a typeRepeated action to Selenium, which types the text twice into a text box.
-// The typeTwiceAndWait command will be available automatically
-Selenium.prototype.doTypeRepeated = function(locator, text) {
-    // All locator-strategies are automatically handled by "findElement"
-    var element = this.page().findElement(locator);
-
-    // Create the text to type
-    var valueToType = text + text;
-
-    // Replace the element text with the new text
-    this.page().replaceText(element, valueToType);
-};
-
-// All assert* methods on the Selenium prototype are added as checks.
-// Eg add a assertValueRepeated check, that makes sure that the element value
-// consists of the supplied text repeated.
-// The verify version will be available automatically.
-Selenium.prototype.assertValueRepeated = function(locator, text) {
-    // All locator-strategies are automatically handled by "findElement"
-    var element = this.page().findElement(locator);
-
-    // Create the text to verify
-    var expectedValue = text + text;
-
-    // Get the actual element value
-    var actualValue = element.value;
-
-    // Make sure the actual value matches the expected
-    this.assertMatches(expectedValue, actualValue);
-};
-
-// All locateElementBy* methods are added as locator-strategies.
-// Eg add a "valuerepeated=" locator, that finds the first element with the supplied value, repeated.
-// The "inDocument" is a the document you are searching.
-PageBot.prototype.locateElementByValueRepeated = function(text, inDocument) {
-    // Create the text to search for
-    var expectedValue = text + text;
-
-    // Loop through all elements, looking for ones that have a value === our expected value
-    var allElements = inDocument.getElementsByTagName("*");
-    for (var i = 0; i < allElements.length; i++) {
-        var testElement = allElements[i];
-        if (testElement.value && testElement.value === expectedValue) {
-            return testElement;
-        }
-    }
-    return null;
-};
diff --git a/tests/FunctionalTests/selenium/xmlextras.js b/tests/FunctionalTests/selenium/xmlextras.js
deleted file mode 100644
index 267aa058..00000000
--- a/tests/FunctionalTests/selenium/xmlextras.js
+++ /dev/null
@@ -1,153 +0,0 @@
-// This is a third party JavaScript library from
-// http://webfx.eae.net/dhtml/xmlextras/xmlextras.html
-// i.e. This has not been written by ThoughtWorks.
-
-//