Merge from 3.0 branch till 1253.

1 files changed, 1 insertions, 170 deletions

diff --git a/.gitattributes b/.gitattributes
index a309ea01..2f5fbd05 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -807,6 +807,7 @@ demos/quickstart/protected/pages/Configurations/Templates3.page -text
 demos/quickstart/protected/pages/Construction.page -text
 demos/quickstart/protected/pages/Controls/Button.page -text
 demos/quickstart/protected/pages/Controls/CheckBox.page -text
+demos/quickstart/protected/pages/Controls/ClientScript.page -text
 demos/quickstart/protected/pages/Controls/ColorPicker.page -text
 demos/quickstart/protected/pages/Controls/Data.page -text
 demos/quickstart/protected/pages/Controls/DataGrid.page -text
@@ -1705,9 +1706,6 @@ requirements/messages.txt -text
 requirements/template-bg.html -text
 requirements/template-zh.html -text
 requirements/template.html -text
-tests/FunctionalTests/PradoTester.php -text
-tests/FunctionalTests/README.txt -text
-tests/FunctionalTests/config.php -text
 tests/FunctionalTests/features.php -text
 tests/FunctionalTests/features/index.php -text
 tests/FunctionalTests/features/protected/application.xml -text
@@ -1727,11 +1725,8 @@ tests/FunctionalTests/features/protected/pages/ActiveControls/VisibleUpdate.page
 tests/FunctionalTests/features/protected/pages/ActiveControls/VisibleUpdate.php -text
 tests/FunctionalTests/features/protected/pages/ActiveControls/config.xml -text
 tests/FunctionalTests/features/protected/pages/ColorPicker.page -text
-tests/FunctionalTests/features/protected/pages/CompositeControl.page -text
-tests/FunctionalTests/features/protected/pages/DatePicker.page -text
 tests/FunctionalTests/features/protected/pages/FeatureList.page -text
 tests/FunctionalTests/features/protected/pages/FeatureList.php -text
-tests/FunctionalTests/features/protected/pages/HtmlArea.page -text
 tests/FunctionalTests/features/protected/pages/I18N/BasicI18N.page -text
 tests/FunctionalTests/features/protected/pages/I18N/BasicI18N.php -text
 tests/FunctionalTests/features/protected/pages/I18N/Home.page -text
@@ -1739,9 +1734,7 @@ tests/FunctionalTests/features/protected/pages/I18N/Home.zh_CN.page -text
 tests/FunctionalTests/features/protected/pages/I18N/config.xml -text
 tests/FunctionalTests/features/protected/pages/RatingList.page -text
 tests/FunctionalTests/features/protected/pages/ValidatorEffects.page -text
-tests/FunctionalTests/features/tests/CompositeControlTestCase.php -text
 tests/FunctionalTests/index.php -text
-tests/FunctionalTests/quickstart.php -text
 tests/FunctionalTests/quickstart/Advanced/I18N.php -text
 tests/FunctionalTests/quickstart/Controls/BulletedListTestCase.php -text
 tests/FunctionalTests/quickstart/Controls/ButtonTestCase.php -text
@@ -1781,39 +1774,6 @@ 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/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/tickets.php -text
 tests/FunctionalTests/tickets/index.php -text
 tests/FunctionalTests/tickets/protected/pages/Layout.php -text
@@ -1895,135 +1855,6 @@ tests/FunctionalTests/validators/tests/RegExpValidatorTestCase.php -text
 tests/FunctionalTests/validators/tests/RequiredFieldTestCase.php -text
 tests/FunctionalTests/validators/tests/RequiredListTestCase.php -text
 tests/FunctionalTests/validators/tests/ValidationSummaryTestCase.php -text
-tests/UnitTests/TODO.txt -text
-tests/UnitTests/framework/Collections/utList.php -text
-tests/UnitTests/framework/Collections/utMap.php -text
-tests/UnitTests/framework/Data/CacheTestCase.php -text
-tests/UnitTests/framework/Data/test.db -text
-tests/UnitTests/framework/Data/utAPCCache.php -text
-tests/UnitTests/framework/Data/utDateTimeSimpleFormatter.php -text
-tests/UnitTests/framework/Data/utMemCache.php -text
-tests/UnitTests/framework/Data/utSqliteCache.php -text
-tests/UnitTests/framework/Data/utXmlDocument.php -text
-tests/UnitTests/framework/Data/xml/data1.xml -text
-tests/UnitTests/framework/Data/xml/data1.xml.out -text
-tests/UnitTests/framework/Data/xml/data2.xml -text
-tests/UnitTests/framework/Data/xml/data2.xml.out -text
-tests/UnitTests/framework/Data/xml/data3.xml -text
-tests/UnitTests/framework/Data/xml/data3.xml.out -text
-tests/UnitTests/framework/I18N/TestOfDateTimeFormatInfo.php -text
-tests/UnitTests/framework/I18N/messages/en/tests.mo -text
-tests/UnitTests/framework/I18N/messages/en/tests.po -text
-tests/UnitTests/framework/I18N/messages/en/tests.xml -text
-tests/UnitTests/framework/I18N/messages/en_AU/tests.mo -text
-tests/UnitTests/framework/I18N/messages/en_AU/tests.mo.bak -text
-tests/UnitTests/framework/I18N/messages/en_AU/tests.po -text
-tests/UnitTests/framework/I18N/messages/en_AU/tests.po.bak -text
-tests/UnitTests/framework/I18N/messages/en_AU/tests.xml -text
-tests/UnitTests/framework/I18N/messages/en_AU/tests.xml.bak -text
-tests/UnitTests/framework/I18N/messages/messages.db -text
-tests/UnitTests/framework/I18N/messages/messages.db.bak -text
-tests/UnitTests/framework/I18N/messages/messages.en.mo -text
-tests/UnitTests/framework/I18N/messages/messages.en.po -text
-tests/UnitTests/framework/I18N/messages/messages.en.xml -text
-tests/UnitTests/framework/I18N/messages/messages.en_AU.mo -text
-tests/UnitTests/framework/I18N/messages/messages.en_AU.mo.bak -text
-tests/UnitTests/framework/I18N/messages/messages.en_AU.po -text
-tests/UnitTests/framework/I18N/messages/messages.en_AU.po.bak -text
-tests/UnitTests/framework/I18N/messages/messages.en_AU.xml -text
-tests/UnitTests/framework/I18N/messages/messages.en_AU.xml.bak -text
-tests/UnitTests/framework/I18N/messages/messages.mo -text
-tests/UnitTests/framework/I18N/messages/messages.po -text
-tests/UnitTests/framework/I18N/messages/messages.xml -text
-tests/UnitTests/framework/I18N/messages/messages_mysql.sql -text
-tests/UnitTests/framework/I18N/messages/tests.en_AU.po -text
-tests/UnitTests/framework/I18N/messages/tests.mo -text
-tests/UnitTests/framework/I18N/messages/tests.po -text
-tests/UnitTests/framework/I18N/messages/tests.xml -text
-tests/UnitTests/framework/I18N/testChoiceFormat.php -text
-tests/UnitTests/framework/I18N/testCultureInfo.php -text
-tests/UnitTests/framework/I18N/testDateFormat.php -text
-tests/UnitTests/framework/I18N/testMessageFormat.php -text
-tests/UnitTests/framework/I18N/testMessageFormat_SQLite.php -text
-tests/UnitTests/framework/I18N/testMessageFormat_XLIFF.php -text
-tests/UnitTests/framework/I18N/testMessageFormat_gettext.php -text
-tests/UnitTests/framework/I18N/testNumberFormat.php -text
-tests/UnitTests/framework/I18N/testNumberFormatInfo.php -text
-tests/UnitTests/framework/I18N/tmp/cache.txt -text
-tests/UnitTests/framework/TestSystem/protected/application.xml -text
-tests/UnitTests/framework/TestSystem/protected/data/test.db -text
-tests/UnitTests/framework/TestSystem/protected/pages/config.xml -text
-tests/UnitTests/framework/Web/UI/utControl.php -text
-tests/UnitTests/framework/Web/UI/utJavascriptSerializer.php -text
-tests/UnitTests/framework/Web/utHttpRequest.php -text
-tests/UnitTests/framework/common.php -text
-tests/UnitTests/framework/index.php -text
-tests/UnitTests/framework/utApplication.php -text
-tests/UnitTests/framework/utComponent.php -text
-tests/UnitTests/framework/utPradoBase.php -text
-tests/UnitTests/simpletest/CHANGELOG -text
-tests/UnitTests/simpletest/HELP_MY_TESTS_DONT_WORK_ANYMORE -text
-tests/UnitTests/simpletest/HtmlReporterWithCoverage.php -text
-tests/UnitTests/simpletest/LICENSE -text
-tests/UnitTests/simpletest/README -text
-tests/UnitTests/simpletest/VERSION -text
-tests/UnitTests/simpletest/authentication.php -text
-tests/UnitTests/simpletest/browser.php -text
-tests/UnitTests/simpletest/docs/en/authentication_documentation.html -text
-tests/UnitTests/simpletest/docs/en/browser_documentation.html -text
-tests/UnitTests/simpletest/docs/en/docs.css -text
-tests/UnitTests/simpletest/docs/en/expectation_documentation.html -text
-tests/UnitTests/simpletest/docs/en/form_testing_documentation.html -text
-tests/UnitTests/simpletest/docs/en/group_test_documentation.html -text
-tests/UnitTests/simpletest/docs/en/index.html -text
-tests/UnitTests/simpletest/docs/en/mock_objects_documentation.html -text
-tests/UnitTests/simpletest/docs/en/overview.html -text
-tests/UnitTests/simpletest/docs/en/partial_mocks_documentation.html -text
-tests/UnitTests/simpletest/docs/en/reporter_documentation.html -text
-tests/UnitTests/simpletest/docs/en/server_stubs_documentation.html -text
-tests/UnitTests/simpletest/docs/en/unit_test_documentation.html -text
-tests/UnitTests/simpletest/docs/en/web_tester_documentation.html -text
-tests/UnitTests/simpletest/docs/fr/authentication_documentation.html -text
-tests/UnitTests/simpletest/docs/fr/browser_documentation.html -text
-tests/UnitTests/simpletest/docs/fr/docs.css -text
-tests/UnitTests/simpletest/docs/fr/expectation_documentation.html -text
-tests/UnitTests/simpletest/docs/fr/form_testing_documentation.html -text
-tests/UnitTests/simpletest/docs/fr/group_test_documentation.html -text
-tests/UnitTests/simpletest/docs/fr/index.html -text
-tests/UnitTests/simpletest/docs/fr/mock_objects_documentation.html -text
-tests/UnitTests/simpletest/docs/fr/overview.html -text
-tests/UnitTests/simpletest/docs/fr/partial_mocks_documentation.html -text
-tests/UnitTests/simpletest/docs/fr/reporter_documentation.html -text
-tests/UnitTests/simpletest/docs/fr/server_stubs_documentation.html -text
-tests/UnitTests/simpletest/docs/fr/unit_test_documentation.html -text
-tests/UnitTests/simpletest/docs/fr/web_tester_documentation.html -text
-tests/UnitTests/simpletest/dumper.php -text
-tests/UnitTests/simpletest/encoding.php -text
-tests/UnitTests/simpletest/errors.php -text
-tests/UnitTests/simpletest/expectation.php -text
-tests/UnitTests/simpletest/extensions/pear_test_case.php -text
-tests/UnitTests/simpletest/extensions/phpunit_test_case.php -text
-tests/UnitTests/simpletest/form.php -text
-tests/UnitTests/simpletest/frames.php -text
-tests/UnitTests/simpletest/http.php -text
-tests/UnitTests/simpletest/mock_objects.php -text
-tests/UnitTests/simpletest/mytests/log_test.php -text
-tests/UnitTests/simpletest/options.php -text
-tests/UnitTests/simpletest/page.php -text
-tests/UnitTests/simpletest/parser.php -text
-tests/UnitTests/simpletest/remote.php -text
-tests/UnitTests/simpletest/reporter.php -text
-tests/UnitTests/simpletest/runner.php -text
-tests/UnitTests/simpletest/scorer.php -text
-tests/UnitTests/simpletest/shell_tester.php -text
-tests/UnitTests/simpletest/simple_test.php -text
-tests/UnitTests/simpletest/socket.php -text
-tests/UnitTests/simpletest/tag.php -text
-tests/UnitTests/simpletest/unit_tester.php -text
-tests/UnitTests/simpletest/url.php -text
-tests/UnitTests/simpletest/user_agent.php -text
-tests/UnitTests/simpletest/web_tester.php -text
-tests/UnitTests/simpletest/xml.php -text
 tests/unit/Collections/TListTest.php -text
 tests/unit/Collections/TMapTest.php -text
 tests/unit/I18N/core/CultureInfoTest.php -text