removed duplicate trunk directory

--HG--
rename : trunk/trunk/COPYING => trunk/COPYING
rename : trunk/trunk/README => trunk/README
rename : trunk/trunk/etherpad/.gitignore => trunk/etherpad/.gitignore
rename : trunk/trunk/etherpad/bin/.gitignore => trunk/etherpad/bin/.gitignore
rename : trunk/trunk/etherpad/bin/rebuildjar.sh => trunk/etherpad/bin/rebuildjar.sh
rename : trunk/trunk/etherpad/bin/run-local.sh => trunk/etherpad/bin/run-local.sh
rename : trunk/trunk/etherpad/bin/setup-mysql-db.sh => trunk/etherpad/bin/setup-mysql-db.sh
rename : trunk/trunk/etherpad/etc/etherpad.localdev-default.properties => trunk/etherpad/etc/etherpad.localdev-default.properties
rename : trunk/trunk/etherpad/lib/dnsjava-2.0.6.jar => trunk/etherpad/lib/dnsjava-2.0.6.jar
rename : trunk/trunk/etherpad/lib/jbcrypt-0.2.jar => trunk/etherpad/lib/jbcrypt-0.2.jar
rename : trunk/trunk/etherpad/lib/jcommon-1.0.15.jar => trunk/etherpad/lib/jcommon-1.0.15.jar
rename : trunk/trunk/etherpad/lib/jfreechart-1.0.12.jar => trunk/etherpad/lib/jfreechart-1.0.12.jar
rename : trunk/trunk/etherpad/src/etherpad/admin/shell.js => trunk/etherpad/src/etherpad/admin/shell.js
rename : trunk/trunk/etherpad/src/etherpad/billing/billing.js => trunk/etherpad/src/etherpad/billing/billing.js
rename : trunk/trunk/etherpad/src/etherpad/billing/fields.js => trunk/etherpad/src/etherpad/billing/fields.js
rename : trunk/trunk/etherpad/src/etherpad/billing/team_billing.js => trunk/etherpad/src/etherpad/billing/team_billing.js
rename : trunk/trunk/etherpad/src/etherpad/collab/ace/contentcollector.js => trunk/etherpad/src/etherpad/collab/ace/contentcollector.js
rename : trunk/trunk/etherpad/src/etherpad/collab/ace/domline.js => trunk/etherpad/src/etherpad/collab/ace/domline.js
rename : trunk/trunk/etherpad/src/etherpad/collab/ace/easysync1.js => trunk/etherpad/src/etherpad/collab/ace/easysync1.js
rename : trunk/trunk/etherpad/src/etherpad/collab/ace/easysync2.js => trunk/etherpad/src/etherpad/collab/ace/easysync2.js
rename : trunk/trunk/etherpad/src/etherpad/collab/ace/easysync2_tests.js => trunk/etherpad/src/etherpad/collab/ace/easysync2_tests.js
rename : trunk/trunk/etherpad/src/etherpad/collab/ace/linestylefilter.js => trunk/etherpad/src/etherpad/collab/ace/linestylefilter.js
rename : trunk/trunk/etherpad/src/etherpad/collab/collab_server.js => trunk/etherpad/src/etherpad/collab/collab_server.js
rename : trunk/trunk/etherpad/src/etherpad/collab/collabroom_server.js => trunk/etherpad/src/etherpad/collab/collabroom_server.js
rename : trunk/trunk/etherpad/src/etherpad/collab/genimg.js => trunk/etherpad/src/etherpad/collab/genimg.js
rename : trunk/trunk/etherpad/src/etherpad/collab/json_sans_eval.js => trunk/etherpad/src/etherpad/collab/json_sans_eval.js
rename : trunk/trunk/etherpad/src/etherpad/collab/readonly_server.js => trunk/etherpad/src/etherpad/collab/readonly_server.js
rename : trunk/trunk/etherpad/src/etherpad/collab/server_utils.js => trunk/etherpad/src/etherpad/collab/server_utils.js
rename : trunk/trunk/etherpad/src/etherpad/control/aboutcontrol.js => trunk/etherpad/src/etherpad/control/aboutcontrol.js
rename : trunk/trunk/etherpad/src/etherpad/control/admincontrol.js => trunk/etherpad/src/etherpad/control/admincontrol.js
rename : trunk/trunk/etherpad/src/etherpad/control/blogcontrol.js => trunk/etherpad/src/etherpad/control/blogcontrol.js
rename : trunk/trunk/etherpad/src/etherpad/control/connection_diagnostics_control.js => trunk/etherpad/src/etherpad/control/connection_diagnostics_control.js
rename : trunk/trunk/etherpad/src/etherpad/control/global_pro_account_control.js => trunk/etherpad/src/etherpad/control/global_pro_account_control.js
rename : trunk/trunk/etherpad/src/etherpad/control/historycontrol.js => trunk/etherpad/src/etherpad/control/historycontrol.js
rename : trunk/trunk/etherpad/src/etherpad/control/loadtestcontrol.js => trunk/etherpad/src/etherpad/control/loadtestcontrol.js
rename : trunk/trunk/etherpad/src/etherpad/control/maincontrol.js => trunk/etherpad/src/etherpad/control/maincontrol.js
rename : trunk/trunk/etherpad/src/etherpad/control/pad/pad_changeset_control.js => trunk/etherpad/src/etherpad/control/pad/pad_changeset_control.js
rename : trunk/trunk/etherpad/src/etherpad/control/pad/pad_control.js => trunk/etherpad/src/etherpad/control/pad/pad_control.js
rename : trunk/trunk/etherpad/src/etherpad/control/pad/pad_importexport_control.js => trunk/etherpad/src/etherpad/control/pad/pad_importexport_control.js
rename : trunk/trunk/etherpad/src/etherpad/control/pad/pad_view_control.js => trunk/etherpad/src/etherpad/control/pad/pad_view_control.js
rename : trunk/trunk/etherpad/src/etherpad/control/pne_manual_control.js => trunk/etherpad/src/etherpad/control/pne_manual_control.js
rename : trunk/trunk/etherpad/src/etherpad/control/pne_tracker_control.js => trunk/etherpad/src/etherpad/control/pne_tracker_control.js
rename : trunk/trunk/etherpad/src/etherpad/control/pro/account_control.js => trunk/etherpad/src/etherpad/control/pro/account_control.js
rename : trunk/trunk/etherpad/src/etherpad/control/pro/admin/account_manager_control.js => trunk/etherpad/src/etherpad/control/pro/admin/account_manager_control.js
rename : trunk/trunk/etherpad/src/etherpad/control/pro/admin/license_manager_control.js => trunk/etherpad/src/etherpad/control/pro/admin/license_manager_control.js
rename : trunk/trunk/etherpad/src/etherpad/control/pro/admin/pro_admin_control.js => trunk/etherpad/src/etherpad/control/pro/admin/pro_admin_control.js
rename : trunk/trunk/etherpad/src/etherpad/control/pro/admin/pro_config_control.js => trunk/etherpad/src/etherpad/control/pro/admin/pro_config_control.js
rename : trunk/trunk/etherpad/src/etherpad/control/pro/admin/team_billing_control.js => trunk/etherpad/src/etherpad/control/pro/admin/team_billing_control.js
rename : trunk/trunk/etherpad/src/etherpad/control/pro/pro_main_control.js => trunk/etherpad/src/etherpad/control/pro/pro_main_control.js
rename : trunk/trunk/etherpad/src/etherpad/control/pro/pro_padlist_control.js => trunk/etherpad/src/etherpad/control/pro/pro_padlist_control.js
rename : trunk/trunk/etherpad/src/etherpad/control/pro_beta_control.js => trunk/etherpad/src/etherpad/control/pro_beta_control.js
rename : trunk/trunk/etherpad/src/etherpad/control/pro_help_control.js => trunk/etherpad/src/etherpad/control/pro_help_control.js
rename : trunk/trunk/etherpad/src/etherpad/control/pro_signup_control.js => trunk/etherpad/src/etherpad/control/pro_signup_control.js
rename : trunk/trunk/etherpad/src/etherpad/control/scriptcontrol.js => trunk/etherpad/src/etherpad/control/scriptcontrol.js
rename : trunk/trunk/etherpad/src/etherpad/control/static_control.js => trunk/etherpad/src/etherpad/control/static_control.js
rename : trunk/trunk/etherpad/src/etherpad/control/statscontrol.js => trunk/etherpad/src/etherpad/control/statscontrol.js
rename : trunk/trunk/etherpad/src/etherpad/control/store/eepnet_checkout_control.js => trunk/etherpad/src/etherpad/control/store/eepnet_checkout_control.js
rename : trunk/trunk/etherpad/src/etherpad/control/store/storecontrol.js => trunk/etherpad/src/etherpad/control/store/storecontrol.js
rename : trunk/trunk/etherpad/src/etherpad/control/testcontrol.js => trunk/etherpad/src/etherpad/control/testcontrol.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0000_test.js => trunk/etherpad/src/etherpad/db_migrations/m0000_test.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0001_eepnet_signups_init.js => trunk/etherpad/src/etherpad/db_migrations/m0001_eepnet_signups_init.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0002_eepnet_signups_2.js => trunk/etherpad/src/etherpad/db_migrations/m0002_eepnet_signups_2.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0003_create_tests_table_v2.js => trunk/etherpad/src/etherpad/db_migrations/m0003_create_tests_table_v2.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0004_convert_all_tables_to_innodb.js => trunk/etherpad/src/etherpad/db_migrations/m0004_convert_all_tables_to_innodb.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0005_create_billing_tables.js => trunk/etherpad/src/etherpad/db_migrations/m0005_create_billing_tables.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0006_eepnet_signups_3.js => trunk/etherpad/src/etherpad/db_migrations/m0006_eepnet_signups_3.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0007_create_pro_tables_v4.js => trunk/etherpad/src/etherpad/db_migrations/m0007_create_pro_tables_v4.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0008_persistent_vars.js => trunk/etherpad/src/etherpad/db_migrations/m0008_persistent_vars.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0009_pad_tables.js => trunk/etherpad/src/etherpad/db_migrations/m0009_pad_tables.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0010_pad_sqlmeta.js => trunk/etherpad/src/etherpad/db_migrations/m0010_pad_sqlmeta.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0011_pro_users_temppass.js => trunk/etherpad/src/etherpad/db_migrations/m0011_pro_users_temppass.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0012_pro_users_auto_signin.js => trunk/etherpad/src/etherpad/db_migrations/m0012_pro_users_auto_signin.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0013_pne_padv2_upgrade.js => trunk/etherpad/src/etherpad/db_migrations/m0013_pne_padv2_upgrade.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0014_pne_globalpadids.js => trunk/etherpad/src/etherpad/db_migrations/m0014_pne_globalpadids.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0015_padmeta_passwords.js => trunk/etherpad/src/etherpad/db_migrations/m0015_padmeta_passwords.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0016_pne_tracking_data.js => trunk/etherpad/src/etherpad/db_migrations/m0016_pne_tracking_data.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0017_pne_tracking_data_v2.js => trunk/etherpad/src/etherpad/db_migrations/m0017_pne_tracking_data_v2.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0018_eepnet_checkout_tables.js => trunk/etherpad/src/etherpad/db_migrations/m0018_eepnet_checkout_tables.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0019_padmeta_deleted.js => trunk/etherpad/src/etherpad/db_migrations/m0019_padmeta_deleted.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0020_padmeta_archived.js => trunk/etherpad/src/etherpad/db_migrations/m0020_padmeta_archived.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0021_pro_padmeta_json.js => trunk/etherpad/src/etherpad/db_migrations/m0021_pro_padmeta_json.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0022_create_userids_table.js => trunk/etherpad/src/etherpad/db_migrations/m0022_create_userids_table.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0023_create_usagestats_table.js => trunk/etherpad/src/etherpad/db_migrations/m0023_create_usagestats_table.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0024_statistics_table.js => trunk/etherpad/src/etherpad/db_migrations/m0024_statistics_table.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0025_rename_pro_users_table.js => trunk/etherpad/src/etherpad/db_migrations/m0025_rename_pro_users_table.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0026_create_guests_table.js => trunk/etherpad/src/etherpad/db_migrations/m0026_create_guests_table.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0027_pro_config.js => trunk/etherpad/src/etherpad/db_migrations/m0027_pro_config.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0028_ondemand_beta_emails.js => trunk/etherpad/src/etherpad/db_migrations/m0028_ondemand_beta_emails.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0029_lowercase_subdomains.js => trunk/etherpad/src/etherpad/db_migrations/m0029_lowercase_subdomains.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0030_fix_statistics_values.js => trunk/etherpad/src/etherpad/db_migrations/m0030_fix_statistics_values.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0031_deleted_pro_users.js => trunk/etherpad/src/etherpad/db_migrations/m0031_deleted_pro_users.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0032_reduce_topvalues_counts.js => trunk/etherpad/src/etherpad/db_migrations/m0032_reduce_topvalues_counts.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0033_pro_account_usage.js => trunk/etherpad/src/etherpad/db_migrations/m0033_pro_account_usage.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0034_create_recurring_billing_table.js => trunk/etherpad/src/etherpad/db_migrations/m0034_create_recurring_billing_table.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0035_add_email_to_paymentinfo.js => trunk/etherpad/src/etherpad/db_migrations/m0035_add_email_to_paymentinfo.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0036_create_missing_subscription_records.js => trunk/etherpad/src/etherpad/db_migrations/m0036_create_missing_subscription_records.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0037_create_pro_referral_table.js => trunk/etherpad/src/etherpad/db_migrations/m0037_create_pro_referral_table.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/m0038_pad_coarse_revs.js => trunk/etherpad/src/etherpad/db_migrations/m0038_pad_coarse_revs.js
rename : trunk/trunk/etherpad/src/etherpad/db_migrations/migration_runner.js => trunk/etherpad/src/etherpad/db_migrations/migration_runner.js
rename : trunk/trunk/etherpad/src/etherpad/debug.js => trunk/etherpad/src/etherpad/debug.js
rename : trunk/trunk/etherpad/src/etherpad/globals.js => trunk/etherpad/src/etherpad/globals.js
rename : trunk/trunk/etherpad/src/etherpad/helpers.js => trunk/etherpad/src/etherpad/helpers.js
rename : trunk/trunk/etherpad/src/etherpad/importexport/importexport.js => trunk/etherpad/src/etherpad/importexport/importexport.js
rename : trunk/trunk/etherpad/src/etherpad/legacy_urls.js => trunk/etherpad/src/etherpad/legacy_urls.js
rename : trunk/trunk/etherpad/src/etherpad/licensing.js => trunk/etherpad/src/etherpad/licensing.js
rename : trunk/trunk/etherpad/src/etherpad/log.js => trunk/etherpad/src/etherpad/log.js
rename : trunk/trunk/etherpad/src/etherpad/metrics/metrics.js => trunk/etherpad/src/etherpad/metrics/metrics.js
rename : trunk/trunk/etherpad/src/etherpad/pad/activepads.js => trunk/etherpad/src/etherpad/pad/activepads.js
rename : trunk/trunk/etherpad/src/etherpad/pad/chatarchive.js => trunk/etherpad/src/etherpad/pad/chatarchive.js
rename : trunk/trunk/etherpad/src/etherpad/pad/dbwriter.js => trunk/etherpad/src/etherpad/pad/dbwriter.js
rename : trunk/trunk/etherpad/src/etherpad/pad/easysync2migration.js => trunk/etherpad/src/etherpad/pad/easysync2migration.js
rename : trunk/trunk/etherpad/src/etherpad/pad/exporthtml.js => trunk/etherpad/src/etherpad/pad/exporthtml.js
rename : trunk/trunk/etherpad/src/etherpad/pad/importhtml.js => trunk/etherpad/src/etherpad/pad/importhtml.js
rename : trunk/trunk/etherpad/src/etherpad/pad/model.js => trunk/etherpad/src/etherpad/pad/model.js
rename : trunk/trunk/etherpad/src/etherpad/pad/noprowatcher.js => trunk/etherpad/src/etherpad/pad/noprowatcher.js
rename : trunk/trunk/etherpad/src/etherpad/pad/pad_migrations.js => trunk/etherpad/src/etherpad/pad/pad_migrations.js
rename : trunk/trunk/etherpad/src/etherpad/pad/pad_security.js => trunk/etherpad/src/etherpad/pad/pad_security.js
rename : trunk/trunk/etherpad/src/etherpad/pad/padevents.js => trunk/etherpad/src/etherpad/pad/padevents.js
rename : trunk/trunk/etherpad/src/etherpad/pad/padusers.js => trunk/etherpad/src/etherpad/pad/padusers.js
rename : trunk/trunk/etherpad/src/etherpad/pad/padutils.js => trunk/etherpad/src/etherpad/pad/padutils.js
rename : trunk/trunk/etherpad/src/etherpad/pad/revisions.js => trunk/etherpad/src/etherpad/pad/revisions.js
rename : trunk/trunk/etherpad/src/etherpad/pne/pne_utils.js => trunk/etherpad/src/etherpad/pne/pne_utils.js
rename : trunk/trunk/etherpad/src/etherpad/pro/domains.js => trunk/etherpad/src/etherpad/pro/domains.js
rename : trunk/trunk/etherpad/src/etherpad/pro/pro_account_auto_signin.js => trunk/etherpad/src/etherpad/pro/pro_account_auto_signin.js
rename : trunk/trunk/etherpad/src/etherpad/pro/pro_accounts.js => trunk/etherpad/src/etherpad/pro/pro_accounts.js
rename : trunk/trunk/etherpad/src/etherpad/pro/pro_config.js => trunk/etherpad/src/etherpad/pro/pro_config.js
rename : trunk/trunk/etherpad/src/etherpad/pro/pro_pad_db.js => trunk/etherpad/src/etherpad/pro/pro_pad_db.js
rename : trunk/trunk/etherpad/src/etherpad/pro/pro_pad_editors.js => trunk/etherpad/src/etherpad/pro/pro_pad_editors.js
rename : trunk/trunk/etherpad/src/etherpad/pro/pro_padlist.js => trunk/etherpad/src/etherpad/pro/pro_padlist.js
rename : trunk/trunk/etherpad/src/etherpad/pro/pro_padmeta.js => trunk/etherpad/src/etherpad/pro/pro_padmeta.js
rename : trunk/trunk/etherpad/src/etherpad/pro/pro_quotas.js => trunk/etherpad/src/etherpad/pro/pro_quotas.js
rename : trunk/trunk/etherpad/src/etherpad/pro/pro_utils.js => trunk/etherpad/src/etherpad/pro/pro_utils.js
rename : trunk/trunk/etherpad/src/etherpad/quotas.js => trunk/etherpad/src/etherpad/quotas.js
rename : trunk/trunk/etherpad/src/etherpad/sessions.js => trunk/etherpad/src/etherpad/sessions.js
rename : trunk/trunk/etherpad/src/etherpad/statistics/exceptions.js => trunk/etherpad/src/etherpad/statistics/exceptions.js
rename : trunk/trunk/etherpad/src/etherpad/statistics/statistics.js => trunk/etherpad/src/etherpad/statistics/statistics.js
rename : trunk/trunk/etherpad/src/etherpad/store/checkout.js => trunk/etherpad/src/etherpad/store/checkout.js
rename : trunk/trunk/etherpad/src/etherpad/store/eepnet_checkout.js => trunk/etherpad/src/etherpad/store/eepnet_checkout.js
rename : trunk/trunk/etherpad/src/etherpad/store/eepnet_trial.js => trunk/etherpad/src/etherpad/store/eepnet_trial.js
rename : trunk/trunk/etherpad/src/etherpad/testing/testutils.js => trunk/etherpad/src/etherpad/testing/testutils.js
rename : trunk/trunk/etherpad/src/etherpad/testing/unit_tests/t0000_test.js => trunk/etherpad/src/etherpad/testing/unit_tests/t0000_test.js
rename : trunk/trunk/etherpad/src/etherpad/testing/unit_tests/t0001_sqlbase_transaction_rollback.js => trunk/etherpad/src/etherpad/testing/unit_tests/t0001_sqlbase_transaction_rollback.js
rename : trunk/trunk/etherpad/src/etherpad/testing/unit_tests/t0002_license_generation.js => trunk/etherpad/src/etherpad/testing/unit_tests/t0002_license_generation.js
rename : trunk/trunk/etherpad/src/etherpad/testing/unit_tests/t0003_persistent_vars.js => trunk/etherpad/src/etherpad/testing/unit_tests/t0003_persistent_vars.js
rename : trunk/trunk/etherpad/src/etherpad/testing/unit_tests/t0004_sqlobj.js => trunk/etherpad/src/etherpad/testing/unit_tests/t0004_sqlobj.js
rename : trunk/trunk/etherpad/src/etherpad/testing/unit_tests/t0005_easysync.js => trunk/etherpad/src/etherpad/testing/unit_tests/t0005_easysync.js
rename : trunk/trunk/etherpad/src/etherpad/usage_stats/usage_stats.js => trunk/etherpad/src/etherpad/usage_stats/usage_stats.js
rename : trunk/trunk/etherpad/src/etherpad/utils.js => trunk/etherpad/src/etherpad/utils.js
rename : trunk/trunk/etherpad/src/main.js => trunk/etherpad/src/main.js
rename : trunk/trunk/etherpad/src/static/crossdomain.xml => trunk/etherpad/src/static/crossdomain.xml
rename : trunk/trunk/etherpad/src/static/css/admin/admin-stats.css => trunk/etherpad/src/static/css/admin/admin-stats.css
rename : trunk/trunk/etherpad/src/static/css/beta.css => trunk/etherpad/src/static/css/beta.css
rename : trunk/trunk/etherpad/src/static/css/broadcast.css => trunk/etherpad/src/static/css/broadcast.css
rename : trunk/trunk/etherpad/src/static/css/connection_diagnostics.css => trunk/etherpad/src/static/css/connection_diagnostics.css
rename : trunk/trunk/etherpad/src/static/css/etherpad.css => trunk/etherpad/src/static/css/etherpad.css
rename : trunk/trunk/etherpad/src/static/css/fluxbb.css => trunk/etherpad/src/static/css/fluxbb.css
rename : trunk/trunk/etherpad/src/static/css/framedpage.css => trunk/etherpad/src/static/css/framedpage.css
rename : trunk/trunk/etherpad/src/static/css/global-pro-account.css => trunk/etherpad/src/static/css/global-pro-account.css
rename : trunk/trunk/etherpad/src/static/css/home-opensource.css => trunk/etherpad/src/static/css/home-opensource.css
rename : trunk/trunk/etherpad/src/static/css/home.css => trunk/etherpad/src/static/css/home.css
rename : trunk/trunk/etherpad/src/static/css/lib/jquery.contextmenu.css => trunk/etherpad/src/static/css/lib/jquery.contextmenu.css
rename : trunk/trunk/etherpad/src/static/css/pad.css => trunk/etherpad/src/static/css/pad.css
rename : trunk/trunk/etherpad/src/static/css/pad2_ejs.css => trunk/etherpad/src/static/css/pad2_ejs.css
rename : trunk/trunk/etherpad/src/static/css/pne-manual.css => trunk/etherpad/src/static/css/pne-manual.css
rename : trunk/trunk/etherpad/src/static/css/pricing.css => trunk/etherpad/src/static/css/pricing.css
rename : trunk/trunk/etherpad/src/static/css/pro-help.css => trunk/etherpad/src/static/css/pro-help.css
rename : trunk/trunk/etherpad/src/static/css/pro-signup.css => trunk/etherpad/src/static/css/pro-signup.css
rename : trunk/trunk/etherpad/src/static/css/pro/account.css => trunk/etherpad/src/static/css/pro/account.css
rename : trunk/trunk/etherpad/src/static/css/pro/framedpage-pro.css => trunk/etherpad/src/static/css/pro/framedpage-pro.css
rename : trunk/trunk/etherpad/src/static/css/pro/padlist.css => trunk/etherpad/src/static/css/pro/padlist.css
rename : trunk/trunk/etherpad/src/static/css/pro/payment-required.css => trunk/etherpad/src/static/css/pro/payment-required.css
rename : trunk/trunk/etherpad/src/static/css/pro/pro-admin.css => trunk/etherpad/src/static/css/pro/pro-admin.css
rename : trunk/trunk/etherpad/src/static/css/pro/pro-home.css => trunk/etherpad/src/static/css/pro/pro-home.css
rename : trunk/trunk/etherpad/src/static/css/stats.css => trunk/etherpad/src/static/css/stats.css
rename : trunk/trunk/etherpad/src/static/css/store/eepnet-checkout.css => trunk/etherpad/src/static/css/store/eepnet-checkout.css
rename : trunk/trunk/etherpad/src/static/css/store/ondemand-billing.css => trunk/etherpad/src/static/css/store/ondemand-billing.css
rename : trunk/trunk/etherpad/src/static/css/store/store.css => trunk/etherpad/src/static/css/store/store.css
rename : trunk/trunk/etherpad/src/static/favicon.ico => trunk/etherpad/src/static/favicon.ico
rename : trunk/trunk/etherpad/src/static/img/about/appjet-logo-large.gif => trunk/etherpad/src/static/img/about/appjet-logo-large.gif
rename : trunk/trunk/etherpad/src/static/img/about/appjet-logo-medium.png => trunk/etherpad/src/static/img/about/appjet-logo-medium.png
rename : trunk/trunk/etherpad/src/static/img/about/investors/mitchkapor.jpg => trunk/etherpad/src/static/img/about/investors/mitchkapor.jpg
rename : trunk/trunk/etherpad/src/static/img/about/investors/pb.jpg => trunk/etherpad/src/static/img/about/investors/pb.jpg
rename : trunk/trunk/etherpad/src/static/img/about/investors/pg.jpg => trunk/etherpad/src/static/img/about/investors/pg.jpg
rename : trunk/trunk/etherpad/src/static/img/about/investors/sanjeev.jpg => trunk/etherpad/src/static/img/about/investors/sanjeev.jpg
rename : trunk/trunk/etherpad/src/static/img/about/investors/seth.jpg => trunk/etherpad/src/static/img/about/investors/seth.jpg
rename : trunk/trunk/etherpad/src/static/img/about/people/aaron-david-iphones-thumb.jpg => trunk/etherpad/src/static/img/about/people/aaron-david-iphones-thumb.jpg
rename : trunk/trunk/etherpad/src/static/img/about/people/aaron-david-iphones.jpg => trunk/etherpad/src/static/img/about/people/aaron-david-iphones.jpg
rename : trunk/trunk/etherpad/src/static/img/about/people/aaron-google-air.jpg => trunk/etherpad/src/static/img/about/people/aaron-google-air.jpg
rename : trunk/trunk/etherpad/src/static/img/about/people/aaron-headshot-thumb.jpg => trunk/etherpad/src/static/img/about/people/aaron-headshot-thumb.jpg
rename : trunk/trunk/etherpad/src/static/img/about/people/aaron-headshot.jpg => trunk/etherpad/src/static/img/about/people/aaron-headshot.jpg
rename : trunk/trunk/etherpad/src/static/img/about/people/aaron-headshot2-thumb.jpg => trunk/etherpad/src/static/img/about/people/aaron-headshot2-thumb.jpg
rename : trunk/trunk/etherpad/src/static/img/about/people/aaron-headshot2.jpg => trunk/etherpad/src/static/img/about/people/aaron-headshot2.jpg
rename : trunk/trunk/etherpad/src/static/img/about/people/aaron-headshot3-thumb.jpg => trunk/etherpad/src/static/img/about/people/aaron-headshot3-thumb.jpg
rename : trunk/trunk/etherpad/src/static/img/about/people/aaron-headshot3.jpg => trunk/etherpad/src/static/img/about/people/aaron-headshot3.jpg
rename : trunk/trunk/etherpad/src/static/img/about/people/daniel-headshot-thumb.jpg => trunk/etherpad/src/static/img/about/people/daniel-headshot-thumb.jpg
rename : trunk/trunk/etherpad/src/static/img/about/people/david-headshot-thumb.jpg => trunk/etherpad/src/static/img/about/people/david-headshot-thumb.jpg
rename : trunk/trunk/etherpad/src/static/img/about/people/david-headshot.jpg => trunk/etherpad/src/static/img/about/people/david-headshot.jpg
rename : trunk/trunk/etherpad/src/static/img/about/people/davy-headshot.jpg => trunk/etherpad/src/static/img/about/people/davy-headshot.jpg
rename : trunk/trunk/etherpad/src/static/img/about/people/jd-headshot-thumb.jpg => trunk/etherpad/src/static/img/about/people/jd-headshot-thumb.jpg
rename : trunk/trunk/etherpad/src/static/img/about/people/jd-headshot.jpg => trunk/etherpad/src/static/img/about/people/jd-headshot.jpg
rename : trunk/trunk/etherpad/src/static/img/about/people/rhonda-headshot-thumb.jpg => trunk/etherpad/src/static/img/about/people/rhonda-headshot-thumb.jpg
rename : trunk/trunk/etherpad/src/static/img/about/people/rhonda-headshot.jpg => trunk/etherpad/src/static/img/about/people/rhonda-headshot.jpg
rename : trunk/trunk/etherpad/src/static/img/about/pier38.png => trunk/etherpad/src/static/img/about/pier38.png
rename : trunk/trunk/etherpad/src/static/img/about/quote-close.png => trunk/etherpad/src/static/img/about/quote-close.png
rename : trunk/trunk/etherpad/src/static/img/about/quote-open.png => trunk/etherpad/src/static/img/about/quote-open.png
rename : trunk/trunk/etherpad/src/static/img/about/screencastpreview800x600.jpg => trunk/etherpad/src/static/img/about/screencastpreview800x600.jpg
rename : trunk/trunk/etherpad/src/static/img/account/betawarn.jpg => trunk/etherpad/src/static/img/account/betawarn.jpg
rename : trunk/trunk/etherpad/src/static/img/acecarets/000000.gif => trunk/etherpad/src/static/img/acecarets/000000.gif
rename : trunk/trunk/etherpad/src/static/img/acecarets/666666.gif => trunk/etherpad/src/static/img/acecarets/666666.gif
rename : trunk/trunk/etherpad/src/static/img/acecarets/999999.gif => trunk/etherpad/src/static/img/acecarets/999999.gif
rename : trunk/trunk/etherpad/src/static/img/acecarets/default.gif => trunk/etherpad/src/static/img/acecarets/default.gif
rename : trunk/trunk/etherpad/src/static/img/apr09/backgrad.png => trunk/etherpad/src/static/img/apr09/backgrad.png
rename : trunk/trunk/etherpad/src/static/img/apr09/black35.png => trunk/etherpad/src/static/img/apr09/black35.png
rename : trunk/trunk/etherpad/src/static/img/apr09/blank.gif => trunk/etherpad/src/static/img/apr09/blank.gif
rename : trunk/trunk/etherpad/src/static/img/apr09/modalbar.gif => trunk/etherpad/src/static/img/apr09/modalbar.gif
rename : trunk/trunk/etherpad/src/static/img/apr09/newpadicon.gif => trunk/etherpad/src/static/img/apr09/newpadicon.gif
rename : trunk/trunk/etherpad/src/static/img/apr09/shadbot.png => trunk/etherpad/src/static/img/apr09/shadbot.png
rename : trunk/trunk/etherpad/src/static/img/apr09/shadleft.png => trunk/etherpad/src/static/img/apr09/shadleft.png
rename : trunk/trunk/etherpad/src/static/img/apr09/shadleftbot.png => trunk/etherpad/src/static/img/apr09/shadleftbot.png
rename : trunk/trunk/etherpad/src/static/img/apr09/shadlefttop.png => trunk/etherpad/src/static/img/apr09/shadlefttop.png
rename : trunk/trunk/etherpad/src/static/img/apr09/shadright.png => trunk/etherpad/src/static/img/apr09/shadright.png
rename : trunk/trunk/etherpad/src/static/img/apr09/shadrightbot.png => trunk/etherpad/src/static/img/apr09/shadrightbot.png
rename : trunk/trunk/etherpad/src/static/img/apr09/shadrighttop.png => trunk/etherpad/src/static/img/apr09/shadrighttop.png
rename : trunk/trunk/etherpad/src/static/img/apr09/topbar.gif => trunk/etherpad/src/static/img/apr09/topbar.gif
rename : trunk/trunk/etherpad/src/static/img/apr09/topbarlogo.gif => trunk/etherpad/src/static/img/apr09/topbarlogo.gif
rename : trunk/trunk/etherpad/src/static/img/apr09/widthfull.gif => trunk/etherpad/src/static/img/apr09/widthfull.gif
rename : trunk/trunk/etherpad/src/static/img/apr09/widthfullactive.gif => trunk/etherpad/src/static/img/apr09/widthfullactive.gif
rename : trunk/trunk/etherpad/src/static/img/apr09/widthlim.gif => trunk/etherpad/src/static/img/apr09/widthlim.gif
rename : trunk/trunk/etherpad/src/static/img/apr09/widthlimactive.gif => trunk/etherpad/src/static/img/apr09/widthlimactive.gif
rename : trunk/trunk/etherpad/src/static/img/billing/amex.gif => trunk/etherpad/src/static/img/billing/amex.gif
rename : trunk/trunk/etherpad/src/static/img/billing/creditcard.gif => trunk/etherpad/src/static/img/billing/creditcard.gif
rename : trunk/trunk/etherpad/src/static/img/billing/csc-help.gif => trunk/etherpad/src/static/img/billing/csc-help.gif
rename : trunk/trunk/etherpad/src/static/img/billing/disc.gif => trunk/etherpad/src/static/img/billing/disc.gif
rename : trunk/trunk/etherpad/src/static/img/billing/invoice.gif => trunk/etherpad/src/static/img/billing/invoice.gif
rename : trunk/trunk/etherpad/src/static/img/billing/mc.gif => trunk/etherpad/src/static/img/billing/mc.gif
rename : trunk/trunk/etherpad/src/static/img/billing/paypal.gif => trunk/etherpad/src/static/img/billing/paypal.gif
rename : trunk/trunk/etherpad/src/static/img/billing/visa.gif => trunk/etherpad/src/static/img/billing/visa.gif
rename : trunk/trunk/etherpad/src/static/img/blog/posts/new-features/fullwidth.gif => trunk/etherpad/src/static/img/blog/posts/new-features/fullwidth.gif
rename : trunk/trunk/etherpad/src/static/img/blog/posts/new-features/importexport.gif => trunk/etherpad/src/static/img/blog/posts/new-features/importexport.gif
rename : trunk/trunk/etherpad/src/static/img/blog/posts/new-features/richtext.gif => trunk/etherpad/src/static/img/blog/posts/new-features/richtext.gif
rename : trunk/trunk/etherpad/src/static/img/blog/posts/new-features/viewzoom.gif => trunk/etherpad/src/static/img/blog/posts/new-features/viewzoom.gif
rename : trunk/trunk/etherpad/src/static/img/blog/posts/pricing-survey-results.png => trunk/etherpad/src/static/img/blog/posts/pricing-survey-results.png
rename : trunk/trunk/etherpad/src/static/img/blog/posts/pricing-survey.png => trunk/etherpad/src/static/img/blog/posts/pricing-survey.png
rename : trunk/trunk/etherpad/src/static/img/blog/posts/time-slider-screenshot.gif => trunk/etherpad/src/static/img/blog/posts/time-slider-screenshot.gif
rename : trunk/trunk/etherpad/src/static/img/davy/bg/home-createpad.png => trunk/etherpad/src/static/img/davy/bg/home-createpad.png
rename : trunk/trunk/etherpad/src/static/img/davy/bg/home-features-bottom.gif => trunk/etherpad/src/static/img/davy/bg/home-features-bottom.gif
rename : trunk/trunk/etherpad/src/static/img/davy/bg/home-features-free-bottom.gif => trunk/etherpad/src/static/img/davy/bg/home-features-free-bottom.gif
rename : trunk/trunk/etherpad/src/static/img/davy/bg/home-features-paid-top.gif => trunk/etherpad/src/static/img/davy/bg/home-features-paid-top.gif
rename : trunk/trunk/etherpad/src/static/img/davy/bg/home-features-top.gif => trunk/etherpad/src/static/img/davy/bg/home-features-top.gif
rename : trunk/trunk/etherpad/src/static/img/davy/bg/home-nav-selected.png => trunk/etherpad/src/static/img/davy/bg/home-nav-selected.png
rename : trunk/trunk/etherpad/src/static/img/davy/bg/home-screencast.png => trunk/etherpad/src/static/img/davy/bg/home-screencast.png
rename : trunk/trunk/etherpad/src/static/img/davy/bg/home2.png => trunk/etherpad/src/static/img/davy/bg/home2.png
rename : trunk/trunk/etherpad/src/static/img/davy/bg/product-nav-selected-white.png => trunk/etherpad/src/static/img/davy/bg/product-nav-selected-white.png
rename : trunk/trunk/etherpad/src/static/img/davy/bg/product-nav-selected.png => trunk/etherpad/src/static/img/davy/bg/product-nav-selected.png
rename : trunk/trunk/etherpad/src/static/img/davy/bg/product.png => trunk/etherpad/src/static/img/davy/bg/product.png
rename : trunk/trunk/etherpad/src/static/img/davy/btn/createpad-home.gif => trunk/etherpad/src/static/img/davy/btn/createpad-home.gif
rename : trunk/trunk/etherpad/src/static/img/davy/btn/createpad-large.gif => trunk/etherpad/src/static/img/davy/btn/createpad-large.gif
rename : trunk/trunk/etherpad/src/static/img/davy/btn/createpad-small.gif => trunk/etherpad/src/static/img/davy/btn/createpad-small.gif
rename : trunk/trunk/etherpad/src/static/img/davy/btn/intro-screencast.png => trunk/etherpad/src/static/img/davy/btn/intro-screencast.png
rename : trunk/trunk/etherpad/src/static/img/davy/btn/intro-testimonials.png => trunk/etherpad/src/static/img/davy/btn/intro-testimonials.png
rename : trunk/trunk/etherpad/src/static/img/davy/btn/learnmore.gif => trunk/etherpad/src/static/img/davy/btn/learnmore.gif
rename : trunk/trunk/etherpad/src/static/img/davy/btn/signup-home-2.gif => trunk/etherpad/src/static/img/davy/btn/signup-home-2.gif
rename : trunk/trunk/etherpad/src/static/img/davy/btn/signup-home-3.gif => trunk/etherpad/src/static/img/davy/btn/signup-home-3.gif
rename : trunk/trunk/etherpad/src/static/img/davy/btn/signup-home-4.gif => trunk/etherpad/src/static/img/davy/btn/signup-home-4.gif
rename : trunk/trunk/etherpad/src/static/img/davy/btn/signup-home.gif => trunk/etherpad/src/static/img/davy/btn/signup-home.gif
rename : trunk/trunk/etherpad/src/static/img/davy/btn/uses-more.gif => trunk/etherpad/src/static/img/davy/btn/uses-more.gif
rename : trunk/trunk/etherpad/src/static/img/davy/gfx/32/114.png => trunk/etherpad/src/static/img/davy/gfx/32/114.png
rename : trunk/trunk/etherpad/src/static/img/davy/gfx/32/15.png => trunk/etherpad/src/static/img/davy/gfx/32/15.png
rename : trunk/trunk/etherpad/src/static/img/davy/gfx/32/65.png => trunk/etherpad/src/static/img/davy/gfx/32/65.png
rename : trunk/trunk/etherpad/src/static/img/davy/gfx/32/78.png => trunk/etherpad/src/static/img/davy/gfx/32/78.png
rename : trunk/trunk/etherpad/src/static/img/davy/gfx/bullet.gif => trunk/etherpad/src/static/img/davy/gfx/bullet.gif
rename : trunk/trunk/etherpad/src/static/img/davy/gfx/home-logo2.gif => trunk/etherpad/src/static/img/davy/gfx/home-logo2.gif
rename : trunk/trunk/etherpad/src/static/img/davy/gfx/home-screencast.png => trunk/etherpad/src/static/img/davy/gfx/home-screencast.png
rename : trunk/trunk/etherpad/src/static/img/davy/gfx/plane.gif => trunk/etherpad/src/static/img/davy/gfx/plane.gif
rename : trunk/trunk/etherpad/src/static/img/davy/gfx/product-logo.gif => trunk/etherpad/src/static/img/davy/gfx/product-logo.gif
rename : trunk/trunk/etherpad/src/static/img/davy/gfx/screenshot.gif => trunk/etherpad/src/static/img/davy/gfx/screenshot.gif
rename : trunk/trunk/etherpad/src/static/img/davy/gfx/use-meetings.gif => trunk/etherpad/src/static/img/davy/gfx/use-meetings.gif
rename : trunk/trunk/etherpad/src/static/img/davy/gfx/use-meetings.png => trunk/etherpad/src/static/img/davy/gfx/use-meetings.png
rename : trunk/trunk/etherpad/src/static/img/davy/gfx/use-programming.gif => trunk/etherpad/src/static/img/davy/gfx/use-programming.gif
rename : trunk/trunk/etherpad/src/static/img/davy/gfx/use-programming.png => trunk/etherpad/src/static/img/davy/gfx/use-programming.png
rename : trunk/trunk/etherpad/src/static/img/davy/gfx/use-writing.gif => trunk/etherpad/src/static/img/davy/gfx/use-writing.gif
rename : trunk/trunk/etherpad/src/static/img/davy/gfx/use-writing.png => trunk/etherpad/src/static/img/davy/gfx/use-writing.png
rename : trunk/trunk/etherpad/src/static/img/davy/txt/home-button.gif => trunk/etherpad/src/static/img/davy/txt/home-button.gif
rename : trunk/trunk/etherpad/src/static/img/featuretour/code.gif => trunk/etherpad/src/static/img/featuretour/code.gif
rename : trunk/trunk/etherpad/src/static/img/featuretour/edits.gif => trunk/etherpad/src/static/img/featuretour/edits.gif
rename : trunk/trunk/etherpad/src/static/img/featuretour/editsandusers.gif => trunk/etherpad/src/static/img/featuretour/editsandusers.gif
rename : trunk/trunk/etherpad/src/static/img/featuretour/padlock.png => trunk/etherpad/src/static/img/featuretour/padlock.png
rename : trunk/trunk/etherpad/src/static/img/featuretour/revisions.gif => trunk/etherpad/src/static/img/featuretour/revisions.gif
rename : trunk/trunk/etherpad/src/static/img/featuretour/users.gif => trunk/etherpad/src/static/img/featuretour/users.gif
rename : trunk/trunk/etherpad/src/static/img/feb09/framedheaderback.gif => trunk/etherpad/src/static/img/feb09/framedheaderback.gif
rename : trunk/trunk/etherpad/src/static/img/feb09/framedheaderlogo.gif => trunk/etherpad/src/static/img/feb09/framedheaderlogo.gif
rename : trunk/trunk/etherpad/src/static/img/feb09/home_firstp.gif => trunk/etherpad/src/static/img/feb09/home_firstp.gif
rename : trunk/trunk/etherpad/src/static/img/feb09/home_firstp.png => trunk/etherpad/src/static/img/feb09/home_firstp.png
rename : trunk/trunk/etherpad/src/static/img/feb09/home_firstp2.gif => trunk/etherpad/src/static/img/feb09/home_firstp2.gif
rename : trunk/trunk/etherpad/src/static/img/feb09/home_h1.gif => trunk/etherpad/src/static/img/feb09/home_h1.gif
rename : trunk/trunk/etherpad/src/static/img/feb09/home_h1.png => trunk/etherpad/src/static/img/feb09/home_h1.png
rename : trunk/trunk/etherpad/src/static/img/feb09/home_newpadbutton.gif => trunk/etherpad/src/static/img/feb09/home_newpadbutton.gif
rename : trunk/trunk/etherpad/src/static/img/feb09/home_newpadbutton.png => trunk/etherpad/src/static/img/feb09/home_newpadbutton.png
rename : trunk/trunk/etherpad/src/static/img/feb09/home_newpadbutton2.gif => trunk/etherpad/src/static/img/feb09/home_newpadbutton2.gif
rename : trunk/trunk/etherpad/src/static/img/feb09/home_newpadbutton_eepnet.gif => trunk/etherpad/src/static/img/feb09/home_newpadbutton_eepnet.gif
rename : trunk/trunk/etherpad/src/static/img/feb09/hometop_back.gif => trunk/etherpad/src/static/img/feb09/hometop_back.gif
rename : trunk/trunk/etherpad/src/static/img/feb09/nav1.gif => trunk/etherpad/src/static/img/feb09/nav1.gif
rename : trunk/trunk/etherpad/src/static/img/feb09/nav1_back.gif => trunk/etherpad/src/static/img/feb09/nav1_back.gif
rename : trunk/trunk/etherpad/src/static/img/feb09/nav2.gif => trunk/etherpad/src/static/img/feb09/nav2.gif
rename : trunk/trunk/etherpad/src/static/img/feb09/screencast.gif => trunk/etherpad/src/static/img/feb09/screencast.gif
rename : trunk/trunk/etherpad/src/static/img/home/etherpad-mainheader1.jpg => trunk/etherpad/src/static/img/home/etherpad-mainheader1.jpg
rename : trunk/trunk/etherpad/src/static/img/home/headergradient.gif => trunk/etherpad/src/static/img/home/headergradient.gif
rename : trunk/trunk/etherpad/src/static/img/home/homeheader1.jpg => trunk/etherpad/src/static/img/home/homeheader1.jpg
rename : trunk/trunk/etherpad/src/static/img/home/homeheader2.jpg => trunk/etherpad/src/static/img/home/homeheader2.jpg
rename : trunk/trunk/etherpad/src/static/img/home/leftgrad.gif => trunk/etherpad/src/static/img/home/leftgrad.gif
rename : trunk/trunk/etherpad/src/static/img/home/pencilpaperback.png => trunk/etherpad/src/static/img/home/pencilpaperback.png
rename : trunk/trunk/etherpad/src/static/img/home/screencapture1.gif => trunk/etherpad/src/static/img/home/screencapture1.gif
rename : trunk/trunk/etherpad/src/static/img/home/underdevicon.gif => trunk/etherpad/src/static/img/home/underdevicon.gif
rename : trunk/trunk/etherpad/src/static/img/icon/downarrow.gif => trunk/etherpad/src/static/img/icon/downarrow.gif
rename : trunk/trunk/etherpad/src/static/img/icon/feed.gif => trunk/etherpad/src/static/img/icon/feed.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/backgrad.gif => trunk/etherpad/src/static/img/jun09/pad/backgrad.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/bottomareagfx.gif => trunk/etherpad/src/static/img/jun09/pad/bottomareagfx.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/colorpicker.gif => trunk/etherpad/src/static/img/jun09/pad/colorpicker.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/connectingbar.gif => trunk/etherpad/src/static/img/jun09/pad/connectingbar.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/connectionindicator.gif => trunk/etherpad/src/static/img/jun09/pad/connectionindicator.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/docbarstates.png => trunk/etherpad/src/static/img/jun09/pad/docbarstates.png
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/docbarstates2.png => trunk/etherpad/src/static/img/jun09/pad/docbarstates2.png
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/docbarstates3.png => trunk/etherpad/src/static/img/jun09/pad/docbarstates3.png
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/docpaneledge.png => trunk/etherpad/src/static/img/jun09/pad/docpaneledge.png
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/docpaneledge2.png => trunk/etherpad/src/static/img/jun09/pad/docpaneledge2.png
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/docpanelmiddle.png => trunk/etherpad/src/static/img/jun09/pad/docpanelmiddle.png
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/docpanelmiddle2.png => trunk/etherpad/src/static/img/jun09/pad/docpanelmiddle2.png
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/editbar.gif => trunk/etherpad/src/static/img/jun09/pad/editbar.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/editbar2.gif => trunk/etherpad/src/static/img/jun09/pad/editbar2.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/editbar3.gif => trunk/etherpad/src/static/img/jun09/pad/editbar3.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/editbarback.gif => trunk/etherpad/src/static/img/jun09/pad/editbarback.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/feedbackbox2.gif => trunk/etherpad/src/static/img/jun09/pad/feedbackbox2.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/fileicons.gif => trunk/etherpad/src/static/img/jun09/pad/fileicons.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/hdraggie.gif => trunk/etherpad/src/static/img/jun09/pad/hdraggie.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/inviteshare.gif => trunk/etherpad/src/static/img/jun09/pad/inviteshare.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/inviteshare2.gif => trunk/etherpad/src/static/img/jun09/pad/inviteshare2.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/layoutbuttons.gif => trunk/etherpad/src/static/img/jun09/pad/layoutbuttons.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/overlay.png => trunk/etherpad/src/static/img/jun09/pad/overlay.png
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/overlay2.png => trunk/etherpad/src/static/img/jun09/pad/overlay2.png
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/padtop.gif => trunk/etherpad/src/static/img/jun09/pad/padtop.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/padtop2.gif => trunk/etherpad/src/static/img/jun09/pad/padtop2.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/padtop3.gif => trunk/etherpad/src/static/img/jun09/pad/padtop3.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/padtop4.gif => trunk/etherpad/src/static/img/jun09/pad/padtop4.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/padtop5.gif => trunk/etherpad/src/static/img/jun09/pad/padtop5.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/padtopback.gif => trunk/etherpad/src/static/img/jun09/pad/padtopback.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/padtopback2.gif => trunk/etherpad/src/static/img/jun09/pad/padtopback2.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/protop.gif => trunk/etherpad/src/static/img/jun09/pad/protop.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/public.gif => trunk/etherpad/src/static/img/jun09/pad/public.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/savedrevarrows.gif => trunk/etherpad/src/static/img/jun09/pad/savedrevarrows.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/savedrevsgfx2.gif => trunk/etherpad/src/static/img/jun09/pad/savedrevsgfx2.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/sharebox2.gif => trunk/etherpad/src/static/img/jun09/pad/sharebox2.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/sharebox3.gif => trunk/etherpad/src/static/img/jun09/pad/sharebox3.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/sharebox4.gif => trunk/etherpad/src/static/img/jun09/pad/sharebox4.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/sharedistri.gif => trunk/etherpad/src/static/img/jun09/pad/sharedistri.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/syncdone.gif => trunk/etherpad/src/static/img/jun09/pad/syncdone.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/syncing.gif => trunk/etherpad/src/static/img/jun09/pad/syncing.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/syncing2.gif => trunk/etherpad/src/static/img/jun09/pad/syncing2.gif
rename : trunk/trunk/etherpad/src/static/img/jun09/pad/viewbargfx.gif => trunk/etherpad/src/static/img/jun09/pad/viewbargfx.gif
rename : trunk/trunk/etherpad/src/static/img/lib/jquery.contextmenu.images/cmenu-gloss-cyan-menu-item-hover.gif => trunk/etherpad/src/static/img/lib/jquery.contextmenu.images/cmenu-gloss-cyan-menu-item-hover.gif
rename : trunk/trunk/etherpad/src/static/img/lib/jquery.contextmenu.images/cmenu-gloss-menu-item-hover.gif => trunk/etherpad/src/static/img/lib/jquery.contextmenu.images/cmenu-gloss-menu-item-hover.gif
rename : trunk/trunk/etherpad/src/static/img/lib/jquery.contextmenu.images/cmenu-gloss-semitransparent-menu-item-hover.png => trunk/etherpad/src/static/img/lib/jquery.contextmenu.images/cmenu-gloss-semitransparent-menu-item-hover.png
rename : trunk/trunk/etherpad/src/static/img/lib/jquery.contextmenu.images/cmenu-human-menu-item-hover.gif => trunk/etherpad/src/static/img/lib/jquery.contextmenu.images/cmenu-human-menu-item-hover.gif
rename : trunk/trunk/etherpad/src/static/img/lib/jquery.contextmenu.images/cmenu-osx-menu-item-hover.gif => trunk/etherpad/src/static/img/lib/jquery.contextmenu.images/cmenu-osx-menu-item-hover.gif
rename : trunk/trunk/etherpad/src/static/img/lib/jquery.contextmenu.images/cmenu-vista-bg.gif => trunk/etherpad/src/static/img/lib/jquery.contextmenu.images/cmenu-vista-bg.gif
rename : trunk/trunk/etherpad/src/static/img/lib/jquery.contextmenu.images/cmenu-vista-menu-item-hover.gif => trunk/etherpad/src/static/img/lib/jquery.contextmenu.images/cmenu-vista-menu-item-hover.gif
rename : trunk/trunk/etherpad/src/static/img/lib/jquery.contextmenu.images/cmenu-xp-bg.gif => trunk/etherpad/src/static/img/lib/jquery.contextmenu.images/cmenu-xp-bg.gif
rename : trunk/trunk/etherpad/src/static/img/may09/bold.gif => trunk/etherpad/src/static/img/may09/bold.gif
rename : trunk/trunk/etherpad/src/static/img/may09/doc.gif => trunk/etherpad/src/static/img/may09/doc.gif
rename : trunk/trunk/etherpad/src/static/img/may09/doc.png => trunk/etherpad/src/static/img/may09/doc.png
rename : trunk/trunk/etherpad/src/static/img/may09/html.gif => trunk/etherpad/src/static/img/may09/html.gif
rename : trunk/trunk/etherpad/src/static/img/may09/html.png => trunk/etherpad/src/static/img/may09/html.png
rename : trunk/trunk/etherpad/src/static/img/may09/italic.gif => trunk/etherpad/src/static/img/may09/italic.gif
rename : trunk/trunk/etherpad/src/static/img/may09/leftarrow.gif => trunk/etherpad/src/static/img/may09/leftarrow.gif
rename : trunk/trunk/etherpad/src/static/img/may09/leftarrow2.gif => trunk/etherpad/src/static/img/may09/leftarrow2.gif
rename : trunk/trunk/etherpad/src/static/img/may09/link.gif => trunk/etherpad/src/static/img/may09/link.gif
rename : trunk/trunk/etherpad/src/static/img/may09/link.png => trunk/etherpad/src/static/img/may09/link.png
rename : trunk/trunk/etherpad/src/static/img/may09/odt.gif => trunk/etherpad/src/static/img/may09/odt.gif
rename : trunk/trunk/etherpad/src/static/img/may09/odt.png => trunk/etherpad/src/static/img/may09/odt.png
rename : trunk/trunk/etherpad/src/static/img/may09/padlock.gif => trunk/etherpad/src/static/img/may09/padlock.gif
rename : trunk/trunk/etherpad/src/static/img/may09/padlockopen.gif => trunk/etherpad/src/static/img/may09/padlockopen.gif
rename : trunk/trunk/etherpad/src/static/img/may09/passwordlocked.gif => trunk/etherpad/src/static/img/may09/passwordlocked.gif
rename : trunk/trunk/etherpad/src/static/img/may09/passwordlocked_cropped.gif => trunk/etherpad/src/static/img/may09/passwordlocked_cropped.gif
rename : trunk/trunk/etherpad/src/static/img/may09/passwordnone.gif => trunk/etherpad/src/static/img/may09/passwordnone.gif
rename : trunk/trunk/etherpad/src/static/img/may09/paypal.gif => trunk/etherpad/src/static/img/may09/paypal.gif
rename : trunk/trunk/etherpad/src/static/img/may09/pdf.gif => trunk/etherpad/src/static/img/may09/pdf.gif
rename : trunk/trunk/etherpad/src/static/img/may09/pdf.png => trunk/etherpad/src/static/img/may09/pdf.png
rename : trunk/trunk/etherpad/src/static/img/may09/redo.gif => trunk/etherpad/src/static/img/may09/redo.gif
rename : trunk/trunk/etherpad/src/static/img/may09/txt.gif => trunk/etherpad/src/static/img/may09/txt.gif
rename : trunk/trunk/etherpad/src/static/img/may09/txt.png => trunk/etherpad/src/static/img/may09/txt.png
rename : trunk/trunk/etherpad/src/static/img/may09/underline.gif => trunk/etherpad/src/static/img/may09/underline.gif
rename : trunk/trunk/etherpad/src/static/img/may09/undo.gif => trunk/etherpad/src/static/img/may09/undo.gif
rename : trunk/trunk/etherpad/src/static/img/miniplane.gif => trunk/etherpad/src/static/img/miniplane.gif
rename : trunk/trunk/etherpad/src/static/img/misc/diagnostic-links.gif => trunk/etherpad/src/static/img/misc/diagnostic-links.gif
rename : trunk/trunk/etherpad/src/static/img/misc/status-ball.gif => trunk/etherpad/src/static/img/misc/status-ball.gif
rename : trunk/trunk/etherpad/src/static/img/misc/traclogo.gif => trunk/etherpad/src/static/img/misc/traclogo.gif
rename : trunk/trunk/etherpad/src/static/img/oct/atlonglast.gif => trunk/etherpad/src/static/img/oct/atlonglast.gif
rename : trunk/trunk/etherpad/src/static/img/oct/banner1.jpg => trunk/etherpad/src/static/img/oct/banner1.jpg
rename : trunk/trunk/etherpad/src/static/img/oct/banner2.jpg => trunk/etherpad/src/static/img/oct/banner2.jpg
rename : trunk/trunk/etherpad/src/static/img/oct/banner3.jpg => trunk/etherpad/src/static/img/oct/banner3.jpg
rename : trunk/trunk/etherpad/src/static/img/oct/banner4.jpg => trunk/etherpad/src/static/img/oct/banner4.jpg
rename : trunk/trunk/etherpad/src/static/img/oct/banner5.gif => trunk/etherpad/src/static/img/oct/banner5.gif
rename : trunk/trunk/etherpad/src/static/img/oct/banner6.gif => trunk/etherpad/src/static/img/oct/banner6.gif
rename : trunk/trunk/etherpad/src/static/img/oct/banner7.gif => trunk/etherpad/src/static/img/oct/banner7.gif
rename : trunk/trunk/etherpad/src/static/img/oct/banner8.gif => trunk/etherpad/src/static/img/oct/banner8.gif
rename : trunk/trunk/etherpad/src/static/img/oct/banner9.gif => trunk/etherpad/src/static/img/oct/banner9.gif
rename : trunk/trunk/etherpad/src/static/img/oct/bannerback5.gif => trunk/etherpad/src/static/img/oct/bannerback5.gif
rename : trunk/trunk/etherpad/src/static/img/oct/bannerback6.gif => trunk/etherpad/src/static/img/oct/bannerback6.gif
rename : trunk/trunk/etherpad/src/static/img/oct/bodyback1.gif => trunk/etherpad/src/static/img/oct/bodyback1.gif
rename : trunk/trunk/etherpad/src/static/img/oct/bodyback2.gif => trunk/etherpad/src/static/img/oct/bodyback2.gif
rename : trunk/trunk/etherpad/src/static/img/oct/bodyback3.gif => trunk/etherpad/src/static/img/oct/bodyback3.gif
rename : trunk/trunk/etherpad/src/static/img/oct/bodyback4.gif => trunk/etherpad/src/static/img/oct/bodyback4.gif
rename : trunk/trunk/etherpad/src/static/img/oct/bodyback5.gif => trunk/etherpad/src/static/img/oct/bodyback5.gif
rename : trunk/trunk/etherpad/src/static/img/oct/bodybacktop1.gif => trunk/etherpad/src/static/img/oct/bodybacktop1.gif
rename : trunk/trunk/etherpad/src/static/img/oct/computers.gif => trunk/etherpad/src/static/img/oct/computers.gif
rename : trunk/trunk/etherpad/src/static/img/oct/computers2.gif => trunk/etherpad/src/static/img/oct/computers2.gif
rename : trunk/trunk/etherpad/src/static/img/oct/glossyblue.gif => trunk/etherpad/src/static/img/oct/glossyblue.gif
rename : trunk/trunk/etherpad/src/static/img/oct/glossyblue2.gif => trunk/etherpad/src/static/img/oct/glossyblue2.gif
rename : trunk/trunk/etherpad/src/static/img/oct/glossyblueh.gif => trunk/etherpad/src/static/img/oct/glossyblueh.gif
rename : trunk/trunk/etherpad/src/static/img/oct/insetrect.gif => trunk/etherpad/src/static/img/oct/insetrect.gif
rename : trunk/trunk/etherpad/src/static/img/oct/minilogo1-05e.gif => trunk/etherpad/src/static/img/oct/minilogo1-05e.gif
rename : trunk/trunk/etherpad/src/static/img/oct/minilogo1-07f.gif => trunk/etherpad/src/static/img/oct/minilogo1-07f.gif
rename : trunk/trunk/etherpad/src/static/img/oct/minilogo3.jpg => trunk/etherpad/src/static/img/oct/minilogo3.jpg
rename : trunk/trunk/etherpad/src/static/img/oct/minitopback1.gif => trunk/etherpad/src/static/img/oct/minitopback1.gif
rename : trunk/trunk/etherpad/src/static/img/oct/minitopback2.gif => trunk/etherpad/src/static/img/oct/minitopback2.gif
rename : trunk/trunk/etherpad/src/static/img/oct/minitopbar1-05e.gif => trunk/etherpad/src/static/img/oct/minitopbar1-05e.gif
rename : trunk/trunk/etherpad/src/static/img/oct/minitopbar2-05e.gif => trunk/etherpad/src/static/img/oct/minitopbar2-05e.gif
rename : trunk/trunk/etherpad/src/static/img/oct/minitopbar2-07f.gif => trunk/etherpad/src/static/img/oct/minitopbar2-07f.gif
rename : trunk/trunk/etherpad/src/static/img/oct/minitopbar3.jpg => trunk/etherpad/src/static/img/oct/minitopbar3.jpg
rename : trunk/trunk/etherpad/src/static/img/oct/minitopbar4.gif => trunk/etherpad/src/static/img/oct/minitopbar4.gif
rename : trunk/trunk/etherpad/src/static/img/oct/minitoplogo1.gif => trunk/etherpad/src/static/img/oct/minitoplogo1.gif
rename : trunk/trunk/etherpad/src/static/img/oct/minitoplogo2.gif => trunk/etherpad/src/static/img/oct/minitoplogo2.gif
rename : trunk/trunk/etherpad/src/static/img/oct/newpadmain.gif => trunk/etherpad/src/static/img/oct/newpadmain.gif
rename : trunk/trunk/etherpad/src/static/img/oct/newpadmainback.gif => trunk/etherpad/src/static/img/oct/newpadmainback.gif
rename : trunk/trunk/etherpad/src/static/img/oct/newpadmainbackh.gif => trunk/etherpad/src/static/img/oct/newpadmainbackh.gif
rename : trunk/trunk/etherpad/src/static/img/oct/pageshot.png => trunk/etherpad/src/static/img/oct/pageshot.png
rename : trunk/trunk/etherpad/src/static/img/oct/pageshotmini.png => trunk/etherpad/src/static/img/oct/pageshotmini.png
rename : trunk/trunk/etherpad/src/static/img/oct/sidehead-gradhilite.gif => trunk/etherpad/src/static/img/oct/sidehead-gradhilite.gif
rename : trunk/trunk/etherpad/src/static/img/oct/tinytriangle.gif => trunk/etherpad/src/static/img/oct/tinytriangle.gif
rename : trunk/trunk/etherpad/src/static/img/oct/topnav1.gif => trunk/etherpad/src/static/img/oct/topnav1.gif
rename : trunk/trunk/etherpad/src/static/img/oct/topnav2.gif => trunk/etherpad/src/static/img/oct/topnav2.gif
rename : trunk/trunk/etherpad/src/static/img/oct/topnav3.gif => trunk/etherpad/src/static/img/oct/topnav3.gif
rename : trunk/trunk/etherpad/src/static/img/oct/topnav4.gif => trunk/etherpad/src/static/img/oct/topnav4.gif
rename : trunk/trunk/etherpad/src/static/img/oct/topnav5.gif => trunk/etherpad/src/static/img/oct/topnav5.gif
rename : trunk/trunk/etherpad/src/static/img/oct/topnav6.gif => trunk/etherpad/src/static/img/oct/topnav6.gif
rename : trunk/trunk/etherpad/src/static/img/oct/topnavback1.gif => trunk/etherpad/src/static/img/oct/topnavback1.gif
rename : trunk/trunk/etherpad/src/static/img/oct/topnavback2.gif => trunk/etherpad/src/static/img/oct/topnavback2.gif
rename : trunk/trunk/etherpad/src/static/img/oct/topnavback3.gif => trunk/etherpad/src/static/img/oct/topnavback3.gif
rename : trunk/trunk/etherpad/src/static/img/oct/usecasesnavdown.gif => trunk/etherpad/src/static/img/oct/usecasesnavdown.gif
rename : trunk/trunk/etherpad/src/static/img/oct/usecasesnavdownh.gif => trunk/etherpad/src/static/img/oct/usecasesnavdownh.gif
rename : trunk/trunk/etherpad/src/static/img/oct/usecasesnavup.gif => trunk/etherpad/src/static/img/oct/usecasesnavup.gif
rename : trunk/trunk/etherpad/src/static/img/oct/usecasesnavuph.gif => trunk/etherpad/src/static/img/oct/usecasesnavuph.gif
rename : trunk/trunk/etherpad/src/static/img/oct/watchscreencast.gif => trunk/etherpad/src/static/img/oct/watchscreencast.gif
rename : trunk/trunk/etherpad/src/static/img/pad/animated-orb-orange-12.gif => trunk/etherpad/src/static/img/pad/animated-orb-orange-12.gif
rename : trunk/trunk/etherpad/src/static/img/pad/backgrad.png => trunk/etherpad/src/static/img/pad/backgrad.png
rename : trunk/trunk/etherpad/src/static/img/pad/backshadow/backshadow-940-20-eee-20.gif => trunk/etherpad/src/static/img/pad/backshadow/backshadow-940-20-eee-20.gif
rename : trunk/trunk/etherpad/src/static/img/pad/backshadow/backshadow-940-20-fff-20.gif => trunk/etherpad/src/static/img/pad/backshadow/backshadow-940-20-fff-20.gif
rename : trunk/trunk/etherpad/src/static/img/pad/backshadow/backshadow-940-20-fff-40.gif => trunk/etherpad/src/static/img/pad/backshadow/backshadow-940-20-fff-40.gif
rename : trunk/trunk/etherpad/src/static/img/pad/backshadow/backshadow-940-20-fff-60.gif => trunk/etherpad/src/static/img/pad/backshadow/backshadow-940-20-fff-60.gif
rename : trunk/trunk/etherpad/src/static/img/pad/backshadow/botshadow-940-20-eee-20.gif => trunk/etherpad/src/static/img/pad/backshadow/botshadow-940-20-eee-20.gif
rename : trunk/trunk/etherpad/src/static/img/pad/etherpad-logo-small-grad.gif => trunk/etherpad/src/static/img/pad/etherpad-logo-small-grad.gif
rename : trunk/trunk/etherpad/src/static/img/pad/etherpad-logo-small.gif => trunk/etherpad/src/static/img/pad/etherpad-logo-small.gif
rename : trunk/trunk/etherpad/src/static/img/pad/etherpad-logo-small2.gif => trunk/etherpad/src/static/img/pad/etherpad-logo-small2.gif
rename : trunk/trunk/etherpad/src/static/img/pad/expandy-arrow-down.gif => trunk/etherpad/src/static/img/pad/expandy-arrow-down.gif
rename : trunk/trunk/etherpad/src/static/img/pad/expandy-arrow-right.gif => trunk/etherpad/src/static/img/pad/expandy-arrow-right.gif
rename : trunk/trunk/etherpad/src/static/img/pad/expandy-arrow6-down-active.gif => trunk/etherpad/src/static/img/pad/expandy-arrow6-down-active.gif
rename : trunk/trunk/etherpad/src/static/img/pad/expandy-arrow6-down.gif => trunk/etherpad/src/static/img/pad/expandy-arrow6-down.gif
rename : trunk/trunk/etherpad/src/static/img/pad/expandy-arrow6-right-active.gif => trunk/etherpad/src/static/img/pad/expandy-arrow6-right-active.gif
rename : trunk/trunk/etherpad/src/static/img/pad/expandy-arrow6-right.gif => trunk/etherpad/src/static/img/pad/expandy-arrow6-right.gif
rename : trunk/trunk/etherpad/src/static/img/pad/header-revgrad.gif => trunk/etherpad/src/static/img/pad/header-revgrad.gif
rename : trunk/trunk/etherpad/src/static/img/pad/newpad.gif => trunk/etherpad/src/static/img/pad/newpad.gif
rename : trunk/trunk/etherpad/src/static/img/pad/orb-greenred-12.gif => trunk/etherpad/src/static/img/pad/orb-greenred-12.gif
rename : trunk/trunk/etherpad/src/static/img/pad/padbg1.jpg => trunk/etherpad/src/static/img/pad/padbg1.jpg
rename : trunk/trunk/etherpad/src/static/img/pad/padbg2.jpg => trunk/etherpad/src/static/img/pad/padbg2.jpg
rename : trunk/trunk/etherpad/src/static/img/pad/padbg3.jpg => trunk/etherpad/src/static/img/pad/padbg3.jpg
rename : trunk/trunk/etherpad/src/static/img/pad/padbg4.jpg => trunk/etherpad/src/static/img/pad/padbg4.jpg
rename : trunk/trunk/etherpad/src/static/img/pad/padbg5.jpg => trunk/etherpad/src/static/img/pad/padbg5.jpg
rename : trunk/trunk/etherpad/src/static/img/pad/padhead1.jpg => trunk/etherpad/src/static/img/pad/padhead1.jpg
rename : trunk/trunk/etherpad/src/static/img/pad/padhead2.jpg => trunk/etherpad/src/static/img/pad/padhead2.jpg
rename : trunk/trunk/etherpad/src/static/img/pad/padhead3.jpg => trunk/etherpad/src/static/img/pad/padhead3.jpg
rename : trunk/trunk/etherpad/src/static/img/pad/pencil-icon-small-blue.gif => trunk/etherpad/src/static/img/pad/pencil-icon-small-blue.gif
rename : trunk/trunk/etherpad/src/static/img/pad/sidehead-grad.gif => trunk/etherpad/src/static/img/pad/sidehead-grad.gif
rename : trunk/trunk/etherpad/src/static/img/pad/timeslider/button_depressed.png => trunk/etherpad/src/static/img/pad/timeslider/button_depressed.png
rename : trunk/trunk/etherpad/src/static/img/pad/timeslider/button_undepressed.png => trunk/etherpad/src/static/img/pad/timeslider/button_undepressed.png
rename : trunk/trunk/etherpad/src/static/img/pad/timeslider/crushed_button_depressed.png => trunk/etherpad/src/static/img/pad/timeslider/crushed_button_depressed.png
rename : trunk/trunk/etherpad/src/static/img/pad/timeslider/crushed_button_undepressed.png => trunk/etherpad/src/static/img/pad/timeslider/crushed_button_undepressed.png
rename : trunk/trunk/etherpad/src/static/img/pad/timeslider/crushed_current_location.png => trunk/etherpad/src/static/img/pad/timeslider/crushed_current_location.png
rename : trunk/trunk/etherpad/src/static/img/pad/timeslider/crushed_pause.png => trunk/etherpad/src/static/img/pad/timeslider/crushed_pause.png
rename : trunk/trunk/etherpad/src/static/img/pad/timeslider/crushed_play.png => trunk/etherpad/src/static/img/pad/timeslider/crushed_play.png
rename : trunk/trunk/etherpad/src/static/img/pad/timeslider/crushed_play_button.png => trunk/etherpad/src/static/img/pad/timeslider/crushed_play_button.png
rename : trunk/trunk/etherpad/src/static/img/pad/timeslider/crushed_timeslider_mockup.png => trunk/etherpad/src/static/img/pad/timeslider/crushed_timeslider_mockup.png
rename : trunk/trunk/etherpad/src/static/img/pad/timeslider/current_location.gif => trunk/etherpad/src/static/img/pad/timeslider/current_location.gif
rename : trunk/trunk/etherpad/src/static/img/pad/timeslider/current_location.png => trunk/etherpad/src/static/img/pad/timeslider/current_location.png
rename : trunk/trunk/etherpad/src/static/img/pad/timeslider/pause.gif => trunk/etherpad/src/static/img/pad/timeslider/pause.gif
rename : trunk/trunk/etherpad/src/static/img/pad/timeslider/pause.png => trunk/etherpad/src/static/img/pad/timeslider/pause.png
rename : trunk/trunk/etherpad/src/static/img/pad/timeslider/play.gif => trunk/etherpad/src/static/img/pad/timeslider/play.gif
rename : trunk/trunk/etherpad/src/static/img/pad/timeslider/play.png => trunk/etherpad/src/static/img/pad/timeslider/play.png
rename : trunk/trunk/etherpad/src/static/img/pad/timeslider/play_button.png => trunk/etherpad/src/static/img/pad/timeslider/play_button.png
rename : trunk/trunk/etherpad/src/static/img/pad/timeslider/star.gif => trunk/etherpad/src/static/img/pad/timeslider/star.gif
rename : trunk/trunk/etherpad/src/static/img/pad/timeslider/star.png => trunk/etherpad/src/static/img/pad/timeslider/star.png
rename : trunk/trunk/etherpad/src/static/img/pad/timeslider/star_selected.png => trunk/etherpad/src/static/img/pad/timeslider/star_selected.png
rename : trunk/trunk/etherpad/src/static/img/pad/timeslider/stepper_buttons.png => trunk/etherpad/src/static/img/pad/timeslider/stepper_buttons.png
rename : trunk/trunk/etherpad/src/static/img/pad/timeslider/timeslider_background.png => trunk/etherpad/src/static/img/pad/timeslider/timeslider_background.png
rename : trunk/trunk/etherpad/src/static/img/pad/timeslider/timeslider_left.png => trunk/etherpad/src/static/img/pad/timeslider/timeslider_left.png
rename : trunk/trunk/etherpad/src/static/img/pad/timeslider/timeslider_mockup.png => trunk/etherpad/src/static/img/pad/timeslider/timeslider_mockup.png
rename : trunk/trunk/etherpad/src/static/img/pad/timeslider/timeslider_right.png => trunk/etherpad/src/static/img/pad/timeslider/timeslider_right.png
rename : trunk/trunk/etherpad/src/static/img/pricing/free.gif => trunk/etherpad/src/static/img/pricing/free.gif
rename : trunk/trunk/etherpad/src/static/img/pricing/group.gif => trunk/etherpad/src/static/img/pricing/group.gif
rename : trunk/trunk/etherpad/src/static/img/pricing/on-demand.gif => trunk/etherpad/src/static/img/pricing/on-demand.gif
rename : trunk/trunk/etherpad/src/static/img/pricing/private-network.gif => trunk/etherpad/src/static/img/pricing/private-network.gif
rename : trunk/trunk/etherpad/src/static/img/pricing/support.gif => trunk/etherpad/src/static/img/pricing/support.gif
rename : trunk/trunk/etherpad/src/static/img/pro/billing/cards-button.gif => trunk/etherpad/src/static/img/pro/billing/cards-button.gif
rename : trunk/trunk/etherpad/src/static/img/pro/box/blue-boxtop.gif => trunk/etherpad/src/static/img/pro/box/blue-boxtop.gif
rename : trunk/trunk/etherpad/src/static/img/pro/buttons/bluebutton120.gif => trunk/etherpad/src/static/img/pro/buttons/bluebutton120.gif
rename : trunk/trunk/etherpad/src/static/img/pro/header/pro-header-back.gif => trunk/etherpad/src/static/img/pro/header/pro-header-back.gif
rename : trunk/trunk/etherpad/src/static/img/pro/header/pro-header-logo.png => trunk/etherpad/src/static/img/pro/header/pro-header-logo.png
rename : trunk/trunk/etherpad/src/static/img/pro/header/pro-header-plustopnav-back.gif => trunk/etherpad/src/static/img/pro/header/pro-header-plustopnav-back.gif
rename : trunk/trunk/etherpad/src/static/img/pro/padlist/gear-drop.gif => trunk/etherpad/src/static/img/pro/padlist/gear-drop.gif
rename : trunk/trunk/etherpad/src/static/img/pro/padlist/paper-icon.gif => trunk/etherpad/src/static/img/pro/padlist/paper-icon.gif
rename : trunk/trunk/etherpad/src/static/img/pro/padlist/trash-icon.gif => trunk/etherpad/src/static/img/pro/padlist/trash-icon.gif
rename : trunk/trunk/etherpad/src/static/img/pro/topnav/pro-topnav-back.gif => trunk/etherpad/src/static/img/pro/topnav/pro-topnav-back.gif
rename : trunk/trunk/etherpad/src/static/img/pro/topnav/pro-topnav-notch.gif => trunk/etherpad/src/static/img/pro/topnav/pro-topnav-notch.gif
rename : trunk/trunk/etherpad/src/static/img/tinyplane.gif => trunk/etherpad/src/static/img/tinyplane.gif
rename : trunk/trunk/etherpad/src/static/img/wavejet.jpg => trunk/etherpad/src/static/img/wavejet.jpg
rename : trunk/trunk/etherpad/src/static/js/ace.js => trunk/etherpad/src/static/js/ace.js
rename : trunk/trunk/etherpad/src/static/js/billing.js => trunk/etherpad/src/static/js/billing.js
rename : trunk/trunk/etherpad/src/static/js/billing_shared.js => trunk/etherpad/src/static/js/billing_shared.js
rename : trunk/trunk/etherpad/src/static/js/broadcast.js => trunk/etherpad/src/static/js/broadcast.js
rename : trunk/trunk/etherpad/src/static/js/broadcast_revisions.js => trunk/etherpad/src/static/js/broadcast_revisions.js
rename : trunk/trunk/etherpad/src/static/js/broadcast_slider.js => trunk/etherpad/src/static/js/broadcast_slider.js
rename : trunk/trunk/etherpad/src/static/js/collab_client.js => trunk/etherpad/src/static/js/collab_client.js
rename : trunk/trunk/etherpad/src/static/js/colorutils.js => trunk/etherpad/src/static/js/colorutils.js
rename : trunk/trunk/etherpad/src/static/js/confirmation.js => trunk/etherpad/src/static/js/confirmation.js
rename : trunk/trunk/etherpad/src/static/js/connection_diagnostics.js => trunk/etherpad/src/static/js/connection_diagnostics.js
rename : trunk/trunk/etherpad/src/static/js/cssmanager_client.js => trunk/etherpad/src/static/js/cssmanager_client.js
rename : trunk/trunk/etherpad/src/static/js/domline_client.js => trunk/etherpad/src/static/js/domline_client.js
rename : trunk/trunk/etherpad/src/static/js/draggable.js => trunk/etherpad/src/static/js/draggable.js
rename : trunk/trunk/etherpad/src/static/js/easysync2_client.js => trunk/etherpad/src/static/js/easysync2_client.js
rename : trunk/trunk/etherpad/src/static/js/etherpad.js => trunk/etherpad/src/static/js/etherpad.js
rename : trunk/trunk/etherpad/src/static/js/jquery-1.2.6.js => trunk/etherpad/src/static/js/jquery-1.2.6.js
rename : trunk/trunk/etherpad/src/static/js/jquery-1.3.2.js => trunk/etherpad/src/static/js/jquery-1.3.2.js
rename : trunk/trunk/etherpad/src/static/js/json2.js => trunk/etherpad/src/static/js/json2.js
rename : trunk/trunk/etherpad/src/static/js/lib/jquery.contextmenu.js => trunk/etherpad/src/static/js/lib/jquery.contextmenu.js
rename : trunk/trunk/etherpad/src/static/js/linestylefilter_client.js => trunk/etherpad/src/static/js/linestylefilter_client.js
rename : trunk/trunk/etherpad/src/static/js/pad.js.old => trunk/etherpad/src/static/js/pad.js.old
rename : trunk/trunk/etherpad/src/static/js/pad2.js => trunk/etherpad/src/static/js/pad2.js
rename : trunk/trunk/etherpad/src/static/js/pad_chat.js => trunk/etherpad/src/static/js/pad_chat.js
rename : trunk/trunk/etherpad/src/static/js/pad_connectionstatus.js => trunk/etherpad/src/static/js/pad_connectionstatus.js
rename : trunk/trunk/etherpad/src/static/js/pad_cookie.js => trunk/etherpad/src/static/js/pad_cookie.js
rename : trunk/trunk/etherpad/src/static/js/pad_docbar.js => trunk/etherpad/src/static/js/pad_docbar.js
rename : trunk/trunk/etherpad/src/static/js/pad_editbar.js => trunk/etherpad/src/static/js/pad_editbar.js
rename : trunk/trunk/etherpad/src/static/js/pad_editor.js => trunk/etherpad/src/static/js/pad_editor.js
rename : trunk/trunk/etherpad/src/static/js/pad_impexp.js => trunk/etherpad/src/static/js/pad_impexp.js
rename : trunk/trunk/etherpad/src/static/js/pad_modals.js => trunk/etherpad/src/static/js/pad_modals.js
rename : trunk/trunk/etherpad/src/static/js/pad_savedrevs.js => trunk/etherpad/src/static/js/pad_savedrevs.js
rename : trunk/trunk/etherpad/src/static/js/pad_userlist.js => trunk/etherpad/src/static/js/pad_userlist.js
rename : trunk/trunk/etherpad/src/static/js/pad_utils.js => trunk/etherpad/src/static/js/pad_utils.js
rename : trunk/trunk/etherpad/src/static/js/pricing.js => trunk/etherpad/src/static/js/pricing.js
rename : trunk/trunk/etherpad/src/static/js/pro/guest-knock-client.js => trunk/etherpad/src/static/js/pro/guest-knock-client.js
rename : trunk/trunk/etherpad/src/static/js/pro/pro-padlist-client.js => trunk/etherpad/src/static/js/pro/pro-padlist-client.js
rename : trunk/trunk/etherpad/src/static/js/pro/signin-client.js => trunk/etherpad/src/static/js/pro/signin-client.js
rename : trunk/trunk/etherpad/src/static/js/pulse.jquery.js => trunk/etherpad/src/static/js/pulse.jquery.js
rename : trunk/trunk/etherpad/src/static/js/statpage.js => trunk/etherpad/src/static/js/statpage.js
rename : trunk/trunk/etherpad/src/static/js/store.js => trunk/etherpad/src/static/js/store.js
rename : trunk/trunk/etherpad/src/static/js/swfobject.js => trunk/etherpad/src/static/js/swfobject.js
rename : trunk/trunk/etherpad/src/static/js/timeslider.js => trunk/etherpad/src/static/js/timeslider.js
rename : trunk/trunk/etherpad/src/static/js/undo-xpopup.js => trunk/etherpad/src/static/js/undo-xpopup.js
rename : trunk/trunk/etherpad/src/static/swf/vidplayer.swf => trunk/etherpad/src/static/swf/vidplayer.swf
rename : trunk/trunk/etherpad/src/templates/500_body.ejs => trunk/etherpad/src/templates/500_body.ejs
rename : trunk/trunk/etherpad/src/templates/beta/signup.ejs => trunk/etherpad/src/templates/beta/signup.ejs
rename : trunk/trunk/etherpad/src/templates/email/eepnet_license_info.ejs => trunk/etherpad/src/templates/email/eepnet_license_info.ejs
rename : trunk/trunk/etherpad/src/templates/email/eepnet_purchase_receipt.ejs => trunk/etherpad/src/templates/email/eepnet_purchase_receipt.ejs
rename : trunk/trunk/etherpad/src/templates/email/padinvite.ejs => trunk/etherpad/src/templates/email/padinvite.ejs
rename : trunk/trunk/etherpad/src/templates/email/pro_beta_invite.ejs => trunk/etherpad/src/templates/email/pro_beta_invite.ejs
rename : trunk/trunk/etherpad/src/templates/email/pro_payment_failure.ejs => trunk/etherpad/src/templates/email/pro_payment_failure.ejs
rename : trunk/trunk/etherpad/src/templates/email/pro_payment_receipt.ejs => trunk/etherpad/src/templates/email/pro_payment_receipt.ejs
rename : trunk/trunk/etherpad/src/templates/framed/framedfooter.ejs => trunk/etherpad/src/templates/framed/framedfooter.ejs
rename : trunk/trunk/etherpad/src/templates/framed/framedheader-pro.ejs => trunk/etherpad/src/templates/framed/framedheader-pro.ejs
rename : trunk/trunk/etherpad/src/templates/framed/framedheader.ejs => trunk/etherpad/src/templates/framed/framedheader.ejs
rename : trunk/trunk/etherpad/src/templates/framed/framedpage-pro.ejs => trunk/etherpad/src/templates/framed/framedpage-pro.ejs
rename : trunk/trunk/etherpad/src/templates/framed/framedpage.ejs => trunk/etherpad/src/templates/framed/framedpage.ejs
rename : trunk/trunk/etherpad/src/templates/html.ejs => trunk/etherpad/src/templates/html.ejs
rename : trunk/trunk/etherpad/src/templates/main/home.ejs => trunk/etherpad/src/templates/main/home.ejs
rename : trunk/trunk/etherpad/src/templates/main/pro_signup_body.ejs => trunk/etherpad/src/templates/main/pro_signup_body.ejs
rename : trunk/trunk/etherpad/src/templates/misc/pad_default.ejs => trunk/etherpad/src/templates/misc/pad_default.ejs
rename : trunk/trunk/etherpad/src/templates/notice.ejs => trunk/etherpad/src/templates/notice.ejs
rename : trunk/trunk/etherpad/src/templates/pad/create_body.ejs => trunk/etherpad/src/templates/pad/create_body.ejs
rename : trunk/trunk/etherpad/src/templates/pad/create_body_rafter.ejs => trunk/etherpad/src/templates/pad/create_body_rafter.ejs
rename : trunk/trunk/etherpad/src/templates/pad/exporthtml.ejs => trunk/etherpad/src/templates/pad/exporthtml.ejs
rename : trunk/trunk/etherpad/src/templates/pad/pad_body.ejs => trunk/etherpad/src/templates/pad/pad_body.ejs
rename : trunk/trunk/etherpad/src/templates/pad/pad_body2.ejs => trunk/etherpad/src/templates/pad/pad_body2.ejs
rename : trunk/trunk/etherpad/src/templates/pad/pad_content.ejs => trunk/etherpad/src/templates/pad/pad_content.ejs
rename : trunk/trunk/etherpad/src/templates/pad/pad_download_link.ejs => trunk/etherpad/src/templates/pad/pad_download_link.ejs
rename : trunk/trunk/etherpad/src/templates/pad/pad_iphone_body.ejs => trunk/etherpad/src/templates/pad/pad_iphone_body.ejs
rename : trunk/trunk/etherpad/src/templates/pad/padfull_body.ejs => trunk/etherpad/src/templates/pad/padfull_body.ejs
rename : trunk/trunk/etherpad/src/templates/pad/padslider_body.ejs => trunk/etherpad/src/templates/pad/padslider_body.ejs
rename : trunk/trunk/etherpad/src/templates/pad/padview_body.ejs => trunk/etherpad/src/templates/pad/padview_body.ejs
rename : trunk/trunk/etherpad/src/templates/pad/total_users_exceeded.ejs => trunk/etherpad/src/templates/pad/total_users_exceeded.ejs
rename : trunk/trunk/etherpad/src/templates/pro-account/recover.ejs => trunk/etherpad/src/templates/pro-account/recover.ejs
rename : trunk/trunk/etherpad/src/templates/pro-account/sign-in.ejs => trunk/etherpad/src/templates/pro-account/sign-in.ejs
rename : trunk/trunk/etherpad/src/templates/pro-help/billing.ejs => trunk/etherpad/src/templates/pro-help/billing.ejs
rename : trunk/trunk/etherpad/src/templates/pro-help/essentials.ejs => trunk/etherpad/src/templates/pro-help/essentials.ejs
rename : trunk/trunk/etherpad/src/templates/pro-help/main.ejs => trunk/etherpad/src/templates/pro-help/main.ejs
rename : trunk/trunk/etherpad/src/templates/pro-help/pro-help-template.ejs => trunk/etherpad/src/templates/pro-help/pro-help-template.ejs
rename : trunk/trunk/etherpad/src/templates/pro/account/account-welcome-email.ejs => trunk/etherpad/src/templates/pro/account/account-welcome-email.ejs
rename : trunk/trunk/etherpad/src/templates/pro/account/create-admin-account.ejs => trunk/etherpad/src/templates/pro/account/create-admin-account.ejs
rename : trunk/trunk/etherpad/src/templates/pro/account/forgot-password-email.ejs => trunk/etherpad/src/templates/pro/account/forgot-password-email.ejs
rename : trunk/trunk/etherpad/src/templates/pro/account/forgot-password.ejs => trunk/etherpad/src/templates/pro/account/forgot-password.ejs
rename : trunk/trunk/etherpad/src/templates/pro/account/global-multi-domain-recover-email.ejs => trunk/etherpad/src/templates/pro/account/global-multi-domain-recover-email.ejs
rename : trunk/trunk/etherpad/src/templates/pro/account/guest-knock.ejs => trunk/etherpad/src/templates/pro/account/guest-knock.ejs
rename : trunk/trunk/etherpad/src/templates/pro/account/my-account.ejs => trunk/etherpad/src/templates/pro/account/my-account.ejs
rename : trunk/trunk/etherpad/src/templates/pro/account/signin-guest.ejs => trunk/etherpad/src/templates/pro/account/signin-guest.ejs
rename : trunk/trunk/etherpad/src/templates/pro/account/signin.ejs => trunk/etherpad/src/templates/pro/account/signin.ejs
rename : trunk/trunk/etherpad/src/templates/pro/admin/account-manager.ejs => trunk/etherpad/src/templates/pro/admin/account-manager.ejs
rename : trunk/trunk/etherpad/src/templates/pro/admin/admin-template.ejs => trunk/etherpad/src/templates/pro/admin/admin-template.ejs
rename : trunk/trunk/etherpad/src/templates/pro/admin/admin.ejs => trunk/etherpad/src/templates/pro/admin/admin.ejs
rename : trunk/trunk/etherpad/src/templates/pro/admin/billing-invoices.ejs => trunk/etherpad/src/templates/pro/admin/billing-invoices.ejs
rename : trunk/trunk/etherpad/src/templates/pro/admin/delete-account.ejs => trunk/etherpad/src/templates/pro/admin/delete-account.ejs
rename : trunk/trunk/etherpad/src/templates/pro/admin/manage-account.ejs => trunk/etherpad/src/templates/pro/admin/manage-account.ejs
rename : trunk/trunk/etherpad/src/templates/pro/admin/manage-billing.ejs => trunk/etherpad/src/templates/pro/admin/manage-billing.ejs
rename : trunk/trunk/etherpad/src/templates/pro/admin/new-account.ejs => trunk/etherpad/src/templates/pro/admin/new-account.ejs
rename : trunk/trunk/etherpad/src/templates/pro/admin/pne-config.ejs => trunk/etherpad/src/templates/pro/admin/pne-config.ejs
rename : trunk/trunk/etherpad/src/templates/pro/admin/pne-dashboard.ejs => trunk/etherpad/src/templates/pro/admin/pne-dashboard.ejs
rename : trunk/trunk/etherpad/src/templates/pro/admin/pne-license-manager.ejs => trunk/etherpad/src/templates/pro/admin/pne-license-manager.ejs
rename : trunk/trunk/etherpad/src/templates/pro/admin/pne-shell.ejs => trunk/etherpad/src/templates/pro/admin/pne-shell.ejs
rename : trunk/trunk/etherpad/src/templates/pro/admin/pro-config.ejs => trunk/etherpad/src/templates/pro/admin/pro-config.ejs
rename : trunk/trunk/etherpad/src/templates/pro/admin/single-invoice.ejs => trunk/etherpad/src/templates/pro/admin/single-invoice.ejs
rename : trunk/trunk/etherpad/src/templates/pro/padlist/pro-padlist.ejs => trunk/etherpad/src/templates/pro/padlist/pro-padlist.ejs
rename : trunk/trunk/etherpad/src/templates/pro/pro-payment-required.ejs => trunk/etherpad/src/templates/pro/pro-payment-required.ejs
rename : trunk/trunk/etherpad/src/templates/pro/pro_home.ejs => trunk/etherpad/src/templates/pro/pro_home.ejs
rename : trunk/trunk/etherpad/src/templates/statistics/stat_page.ejs => trunk/etherpad/src/templates/statistics/stat_page.ejs
rename : trunk/trunk/etherpad/src/templates/store/csc-help.ejs => trunk/etherpad/src/templates/store/csc-help.ejs
rename : trunk/trunk/etherpad/src/templates/store/eepnet-checkout/billing-info.ejs => trunk/etherpad/src/templates/store/eepnet-checkout/billing-info.ejs
rename : trunk/trunk/etherpad/src/templates/store/eepnet-checkout/cart.ejs => trunk/etherpad/src/templates/store/eepnet-checkout/cart.ejs
rename : trunk/trunk/etherpad/src/templates/store/eepnet-checkout/checkout-template.ejs => trunk/etherpad/src/templates/store/eepnet-checkout/checkout-template.ejs
rename : trunk/trunk/etherpad/src/templates/store/eepnet-checkout/confirmation.ejs => trunk/etherpad/src/templates/store/eepnet-checkout/confirmation.ejs
rename : trunk/trunk/etherpad/src/templates/store/eepnet-checkout/license-info.ejs => trunk/etherpad/src/templates/store/eepnet-checkout/license-info.ejs
rename : trunk/trunk/etherpad/src/templates/store/eepnet-checkout/purchase.ejs => trunk/etherpad/src/templates/store/eepnet-checkout/purchase.ejs
rename : trunk/trunk/etherpad/src/templates/store/eepnet-checkout/receipt.ejs => trunk/etherpad/src/templates/store/eepnet-checkout/receipt.ejs
rename : trunk/trunk/etherpad/src/templates/store/eepnet-checkout/summary.ejs => trunk/etherpad/src/templates/store/eepnet-checkout/summary.ejs
rename : trunk/trunk/etherpad/src/templates/store/eepnet-checkout/support-contract.ejs => trunk/etherpad/src/templates/store/eepnet-checkout/support-contract.ejs
rename : trunk/trunk/etherpad/src/templates/store/eepnet_download.ejs => trunk/etherpad/src/templates/store/eepnet_download.ejs
rename : trunk/trunk/etherpad/src/templates/store/eepnet_eval_nextsteps.ejs => trunk/etherpad/src/templates/store/eepnet_eval_nextsteps.ejs
rename : trunk/trunk/etherpad/src/templates/store/eepnet_eval_signup.ejs => trunk/etherpad/src/templates/store/eepnet_eval_signup.ejs
rename : trunk/trunk/infrastructure/.gitignore => trunk/infrastructure/.gitignore
rename : trunk/trunk/infrastructure/ace/.gitignore => trunk/infrastructure/ace/.gitignore
rename : trunk/trunk/infrastructure/ace/bin/backup.sh => trunk/infrastructure/ace/bin/backup.sh
rename : trunk/trunk/infrastructure/ace/bin/jsmin.py => trunk/infrastructure/ace/bin/jsmin.py
rename : trunk/trunk/infrastructure/ace/bin/make => trunk/infrastructure/ace/bin/make
rename : trunk/trunk/infrastructure/ace/bin/publish.sh => trunk/infrastructure/ace/bin/publish.sh
rename : trunk/trunk/infrastructure/ace/bin/serve => trunk/infrastructure/ace/bin/serve
rename : trunk/trunk/infrastructure/ace/blog.txt => trunk/infrastructure/ace/blog.txt
rename : trunk/trunk/infrastructure/ace/build/.gitignore => trunk/infrastructure/ace/build/.gitignore
rename : trunk/trunk/infrastructure/ace/build/index.html => trunk/infrastructure/ace/build/index.html
rename : trunk/trunk/infrastructure/ace/build/jquery-1.2.1.js => trunk/infrastructure/ace/build/jquery-1.2.1.js
rename : trunk/trunk/infrastructure/ace/build/testcode.js => trunk/infrastructure/ace/build/testcode.js
rename : trunk/trunk/infrastructure/ace/easysync-notes.txt => trunk/infrastructure/ace/easysync-notes.txt
rename : trunk/trunk/infrastructure/ace/lib/rhino-js-1.7r1.jar => trunk/infrastructure/ace/lib/rhino-js-1.7r1.jar
rename : trunk/trunk/infrastructure/ace/lib/yuicompressor-2.4-appjet.jar => trunk/infrastructure/ace/lib/yuicompressor-2.4-appjet.jar
rename : trunk/trunk/infrastructure/ace/notes.txt => trunk/infrastructure/ace/notes.txt
rename : trunk/trunk/infrastructure/ace/www/ace2_common.js => trunk/infrastructure/ace/www/ace2_common.js
rename : trunk/trunk/infrastructure/ace/www/ace2_common_dev.js => trunk/infrastructure/ace/www/ace2_common_dev.js
rename : trunk/trunk/infrastructure/ace/www/ace2_inner.js => trunk/infrastructure/ace/www/ace2_inner.js
rename : trunk/trunk/infrastructure/ace/www/ace2_outer.js => trunk/infrastructure/ace/www/ace2_outer.js
rename : trunk/trunk/infrastructure/ace/www/ace2_wrapper.js => trunk/infrastructure/ace/www/ace2_wrapper.js
rename : trunk/trunk/infrastructure/ace/www/bbtree.js => trunk/infrastructure/ace/www/bbtree.js
rename : trunk/trunk/infrastructure/ace/www/changesettracker.js => trunk/infrastructure/ace/www/changesettracker.js
rename : trunk/trunk/infrastructure/ace/www/colorutils.js => trunk/infrastructure/ace/www/colorutils.js
rename : trunk/trunk/infrastructure/ace/www/contentcollector.js => trunk/infrastructure/ace/www/contentcollector.js
rename : trunk/trunk/infrastructure/ace/www/cssmanager.js => trunk/infrastructure/ace/www/cssmanager.js
rename : trunk/trunk/infrastructure/ace/www/dev.html => trunk/infrastructure/ace/www/dev.html
rename : trunk/trunk/infrastructure/ace/www/domline.js => trunk/infrastructure/ace/www/domline.js
rename : trunk/trunk/infrastructure/ace/www/easy_sync.js => trunk/infrastructure/ace/www/easy_sync.js
rename : trunk/trunk/infrastructure/ace/www/easysync2.js => trunk/infrastructure/ace/www/easysync2.js
rename : trunk/trunk/infrastructure/ace/www/easysync2_tests.js => trunk/infrastructure/ace/www/easysync2_tests.js
rename : trunk/trunk/infrastructure/ace/www/editor.css => trunk/infrastructure/ace/www/editor.css
rename : trunk/trunk/infrastructure/ace/www/firebug/errorIcon.png => trunk/infrastructure/ace/www/firebug/errorIcon.png
rename : trunk/trunk/infrastructure/ace/www/firebug/firebug.css => trunk/infrastructure/ace/www/firebug/firebug.css
rename : trunk/trunk/infrastructure/ace/www/firebug/firebug.html => trunk/infrastructure/ace/www/firebug/firebug.html
rename : trunk/trunk/infrastructure/ace/www/firebug/firebug.js => trunk/infrastructure/ace/www/firebug/firebug.js
rename : trunk/trunk/infrastructure/ace/www/firebug/firebugx.js => trunk/infrastructure/ace/www/firebug/firebugx.js
rename : trunk/trunk/infrastructure/ace/www/firebug/infoIcon.png => trunk/infrastructure/ace/www/firebug/infoIcon.png
rename : trunk/trunk/infrastructure/ace/www/firebug/warningIcon.png => trunk/infrastructure/ace/www/firebug/warningIcon.png
rename : trunk/trunk/infrastructure/ace/www/index.html => trunk/infrastructure/ace/www/index.html
rename : trunk/trunk/infrastructure/ace/www/inner.css => trunk/infrastructure/ace/www/inner.css
rename : trunk/trunk/infrastructure/ace/www/jquery-1.2.1.js => trunk/infrastructure/ace/www/jquery-1.2.1.js
rename : trunk/trunk/infrastructure/ace/www/lang_html.js => trunk/infrastructure/ace/www/lang_html.js
rename : trunk/trunk/infrastructure/ace/www/lang_js.js => trunk/infrastructure/ace/www/lang_js.js
rename : trunk/trunk/infrastructure/ace/www/lexer_support.js => trunk/infrastructure/ace/www/lexer_support.js
rename : trunk/trunk/infrastructure/ace/www/linestylefilter.js => trunk/infrastructure/ace/www/linestylefilter.js
rename : trunk/trunk/infrastructure/ace/www/magicdom.js => trunk/infrastructure/ace/www/magicdom.js
rename : trunk/trunk/infrastructure/ace/www/multilang_lexer.js => trunk/infrastructure/ace/www/multilang_lexer.js
rename : trunk/trunk/infrastructure/ace/www/processing.js => trunk/infrastructure/ace/www/processing.js
rename : trunk/trunk/infrastructure/ace/www/profiler.js => trunk/infrastructure/ace/www/profiler.js
rename : trunk/trunk/infrastructure/ace/www/skiplist.js => trunk/infrastructure/ace/www/skiplist.js
rename : trunk/trunk/infrastructure/ace/www/spanlist.js => trunk/infrastructure/ace/www/spanlist.js
rename : trunk/trunk/infrastructure/ace/www/syntax-new.css => trunk/infrastructure/ace/www/syntax-new.css
rename : trunk/trunk/infrastructure/ace/www/syntax.css => trunk/infrastructure/ace/www/syntax.css
rename : trunk/trunk/infrastructure/ace/www/test.html => trunk/infrastructure/ace/www/test.html
rename : trunk/trunk/infrastructure/ace/www/testcode.js => trunk/infrastructure/ace/www/testcode.js
rename : trunk/trunk/infrastructure/ace/www/toSource.js => trunk/infrastructure/ace/www/toSource.js
rename : trunk/trunk/infrastructure/ace/www/undomodule.js => trunk/infrastructure/ace/www/undomodule.js
rename : trunk/trunk/infrastructure/ace/www/virtual_lines.js => trunk/infrastructure/ace/www/virtual_lines.js
rename : trunk/trunk/infrastructure/bin/classpath.sh => trunk/infrastructure/bin/classpath.sh
rename : trunk/trunk/infrastructure/bin/comp.sh => trunk/infrastructure/bin/comp.sh
rename : trunk/trunk/infrastructure/bin/compilecache.sh => trunk/infrastructure/bin/compilecache.sh
rename : trunk/trunk/infrastructure/bin/jscomp.sh => trunk/infrastructure/bin/jscomp.sh
rename : trunk/trunk/infrastructure/bin/makejar.sh => trunk/infrastructure/bin/makejar.sh
rename : trunk/trunk/infrastructure/bin/makesars.sh => trunk/infrastructure/bin/makesars.sh
rename : trunk/trunk/infrastructure/bin/run.sh => trunk/infrastructure/bin/run.sh
rename : trunk/trunk/infrastructure/com.etherpad.openofficeservice/importexport.scala => trunk/infrastructure/com.etherpad.openofficeservice/importexport.scala
rename : trunk/trunk/infrastructure/com.etherpad/easysync2support.scala => trunk/infrastructure/com.etherpad/easysync2support.scala
rename : trunk/trunk/infrastructure/com.etherpad/licensing.scala => trunk/infrastructure/com.etherpad/licensing.scala
rename : trunk/trunk/infrastructure/com.etherpad/main.scala => trunk/infrastructure/com.etherpad/main.scala
rename : trunk/trunk/infrastructure/framework-src/modules/atomfeed.js => trunk/infrastructure/framework-src/modules/atomfeed.js
rename : trunk/trunk/infrastructure/framework-src/modules/blob.js => trunk/infrastructure/framework-src/modules/blob.js
rename : trunk/trunk/infrastructure/framework-src/modules/cache_utils.js => trunk/infrastructure/framework-src/modules/cache_utils.js
rename : trunk/trunk/infrastructure/framework-src/modules/comet.js => trunk/infrastructure/framework-src/modules/comet.js
rename : trunk/trunk/infrastructure/framework-src/modules/dateutils.js => trunk/infrastructure/framework-src/modules/dateutils.js
rename : trunk/trunk/infrastructure/framework-src/modules/dispatch.js => trunk/infrastructure/framework-src/modules/dispatch.js
rename : trunk/trunk/infrastructure/framework-src/modules/ejs.js => trunk/infrastructure/framework-src/modules/ejs.js
rename : trunk/trunk/infrastructure/framework-src/modules/email.js => trunk/infrastructure/framework-src/modules/email.js
rename : trunk/trunk/infrastructure/framework-src/modules/exceptionutils.js => trunk/infrastructure/framework-src/modules/exceptionutils.js
rename : trunk/trunk/infrastructure/framework-src/modules/execution.js => trunk/infrastructure/framework-src/modules/execution.js
rename : trunk/trunk/infrastructure/framework-src/modules/fastJSON.js => trunk/infrastructure/framework-src/modules/fastJSON.js
rename : trunk/trunk/infrastructure/framework-src/modules/faststatic.js => trunk/infrastructure/framework-src/modules/faststatic.js
rename : trunk/trunk/infrastructure/framework-src/modules/fileutils.js => trunk/infrastructure/framework-src/modules/fileutils.js
rename : trunk/trunk/infrastructure/framework-src/modules/funhtml.js => trunk/infrastructure/framework-src/modules/funhtml.js
rename : trunk/trunk/infrastructure/framework-src/modules/global/appjet.js => trunk/infrastructure/framework-src/modules/global/appjet.js
rename : trunk/trunk/infrastructure/framework-src/modules/global/request.js => trunk/infrastructure/framework-src/modules/global/request.js
rename : trunk/trunk/infrastructure/framework-src/modules/global/response.js => trunk/infrastructure/framework-src/modules/global/response.js
rename : trunk/trunk/infrastructure/framework-src/modules/image.js => trunk/infrastructure/framework-src/modules/image.js
rename : trunk/trunk/infrastructure/framework-src/modules/jsmin.js => trunk/infrastructure/framework-src/modules/jsmin.js
rename : trunk/trunk/infrastructure/framework-src/modules/jsutils.js => trunk/infrastructure/framework-src/modules/jsutils.js
rename : trunk/trunk/infrastructure/framework-src/modules/netutils.js => trunk/infrastructure/framework-src/modules/netutils.js
rename : trunk/trunk/infrastructure/framework-src/modules/profiler.js => trunk/infrastructure/framework-src/modules/profiler.js
rename : trunk/trunk/infrastructure/framework-src/modules/sessions.js => trunk/infrastructure/framework-src/modules/sessions.js
rename : trunk/trunk/infrastructure/framework-src/modules/sqlbase/persistent_vars.js => trunk/infrastructure/framework-src/modules/sqlbase/persistent_vars.js
rename : trunk/trunk/infrastructure/framework-src/modules/sqlbase/sqlbase.js => trunk/infrastructure/framework-src/modules/sqlbase/sqlbase.js
rename : trunk/trunk/infrastructure/framework-src/modules/sqlbase/sqlcommon.js => trunk/infrastructure/framework-src/modules/sqlbase/sqlcommon.js
rename : trunk/trunk/infrastructure/framework-src/modules/sqlbase/sqlobj.js => trunk/infrastructure/framework-src/modules/sqlbase/sqlobj.js
rename : trunk/trunk/infrastructure/framework-src/modules/stringutils.js => trunk/infrastructure/framework-src/modules/stringutils.js
rename : trunk/trunk/infrastructure/framework-src/modules/sync.js => trunk/infrastructure/framework-src/modules/sync.js
rename : trunk/trunk/infrastructure/framework-src/modules/timer.js => trunk/infrastructure/framework-src/modules/timer.js
rename : trunk/trunk/infrastructure/framework-src/modules/varz.js => trunk/infrastructure/framework-src/modules/varz.js
rename : trunk/trunk/infrastructure/framework-src/modules/yuicompressor.js => trunk/infrastructure/framework-src/modules/yuicompressor.js
rename : trunk/trunk/infrastructure/framework-src/oncomet.js => trunk/infrastructure/framework-src/oncomet.js
rename : trunk/trunk/infrastructure/framework-src/onerror.js => trunk/infrastructure/framework-src/onerror.js
rename : trunk/trunk/infrastructure/framework-src/onprint.js => trunk/infrastructure/framework-src/onprint.js
rename : trunk/trunk/infrastructure/framework-src/onrequest.js => trunk/infrastructure/framework-src/onrequest.js
rename : trunk/trunk/infrastructure/framework-src/onreset.js => trunk/infrastructure/framework-src/onreset.js
rename : trunk/trunk/infrastructure/framework-src/onsars.js => trunk/infrastructure/framework-src/onsars.js
rename : trunk/trunk/infrastructure/framework-src/onscheduledtask.js => trunk/infrastructure/framework-src/onscheduledtask.js
rename : trunk/trunk/infrastructure/framework-src/onshutdown.js => trunk/infrastructure/framework-src/onshutdown.js
rename : trunk/trunk/infrastructure/framework-src/onstartup.js => trunk/infrastructure/framework-src/onstartup.js
rename : trunk/trunk/infrastructure/framework-src/onsyntaxerror.js => trunk/infrastructure/framework-src/onsyntaxerror.js
rename : trunk/trunk/infrastructure/framework-src/postamble.js => trunk/infrastructure/framework-src/postamble.js
rename : trunk/trunk/infrastructure/framework-src/preamble.js => trunk/infrastructure/framework-src/preamble.js
rename : trunk/trunk/infrastructure/framework-src/syntaxerror.js => trunk/infrastructure/framework-src/syntaxerror.js
rename : trunk/trunk/infrastructure/lib/activation.jar => trunk/infrastructure/lib/activation.jar
rename : trunk/trunk/infrastructure/lib/c3p0-0.9.1.2.jar => trunk/infrastructure/lib/c3p0-0.9.1.2.jar
rename : trunk/trunk/infrastructure/lib/commons-lang-2.4.jar => trunk/infrastructure/lib/commons-lang-2.4.jar
rename : trunk/trunk/infrastructure/lib/derby-10.5.1.1.jar => trunk/infrastructure/lib/derby-10.5.1.1.jar
rename : trunk/trunk/infrastructure/lib/derbytools.jar => trunk/infrastructure/lib/derbytools.jar
rename : trunk/trunk/infrastructure/lib/dnsjava-2.0.6.jar => trunk/infrastructure/lib/dnsjava-2.0.6.jar
rename : trunk/trunk/infrastructure/lib/jetty-6.1.20.jar => trunk/infrastructure/lib/jetty-6.1.20.jar
rename : trunk/trunk/infrastructure/lib/jetty-sslengine-6.1.20.jar => trunk/infrastructure/lib/jetty-sslengine-6.1.20.jar
rename : trunk/trunk/infrastructure/lib/jetty-util-6.1.20.jar => trunk/infrastructure/lib/jetty-util-6.1.20.jar
rename : trunk/trunk/infrastructure/lib/json.jar => trunk/infrastructure/lib/json.jar
rename : trunk/trunk/infrastructure/lib/mail.jar => trunk/infrastructure/lib/mail.jar
rename : trunk/trunk/infrastructure/lib/manifest => trunk/infrastructure/lib/manifest
rename : trunk/trunk/infrastructure/lib/rhino-js-1.7r1.jar => trunk/infrastructure/lib/rhino-js-1.7r1.jar
rename : trunk/trunk/infrastructure/lib/sanselan-0.94aj.jar => trunk/infrastructure/lib/sanselan-0.94aj.jar
rename : trunk/trunk/infrastructure/lib/servlet-api-2.5-20081211.jar => trunk/infrastructure/lib/servlet-api-2.5-20081211.jar
rename : trunk/trunk/infrastructure/lib/tagsoup-1.2.jar => trunk/infrastructure/lib/tagsoup-1.2.jar
rename : trunk/trunk/infrastructure/lib/yuicompressor-2.4-appjet.jar => trunk/infrastructure/lib/yuicompressor-2.4-appjet.jar
rename : trunk/trunk/infrastructure/net.appjet.ajstdlib/ajstdlib.scala => trunk/infrastructure/net.appjet.ajstdlib/ajstdlib.scala
rename : trunk/trunk/infrastructure/net.appjet.ajstdlib/sqlbase.scala => trunk/infrastructure/net.appjet.ajstdlib/sqlbase.scala
rename : trunk/trunk/infrastructure/net.appjet.ajstdlib/streaming-client.js => trunk/infrastructure/net.appjet.ajstdlib/streaming-client.js
rename : trunk/trunk/infrastructure/net.appjet.ajstdlib/streaming-iframe.html => trunk/infrastructure/net.appjet.ajstdlib/streaming-iframe.html
rename : trunk/trunk/infrastructure/net.appjet.ajstdlib/streaming.scala => trunk/infrastructure/net.appjet.ajstdlib/streaming.scala
rename : trunk/trunk/infrastructure/net.appjet.ajstdlib/timer.scala => trunk/infrastructure/net.appjet.ajstdlib/timer.scala
rename : trunk/trunk/infrastructure/net.appjet.bodylock/bodylock.scala => trunk/infrastructure/net.appjet.bodylock/bodylock.scala
rename : trunk/trunk/infrastructure/net.appjet.bodylock/compressor.scala => trunk/infrastructure/net.appjet.bodylock/compressor.scala
rename : trunk/trunk/infrastructure/net.appjet.common.cli/cli.scala => trunk/infrastructure/net.appjet.common.cli/cli.scala
rename : trunk/trunk/infrastructure/net.appjet.common.sars/sars.scala => trunk/infrastructure/net.appjet.common.sars/sars.scala
rename : trunk/trunk/infrastructure/net.appjet.common.sars/sha1.scala => trunk/infrastructure/net.appjet.common.sars/sha1.scala
rename : trunk/trunk/infrastructure/net.appjet.common/rhino/rhinospect.scala => trunk/infrastructure/net.appjet.common/rhino/rhinospect.scala
rename : trunk/trunk/infrastructure/net.appjet.common/util/BCrypt.java => trunk/infrastructure/net.appjet.common/util/BCrypt.java
rename : trunk/trunk/infrastructure/net.appjet.common/util/BetterFile.java => trunk/infrastructure/net.appjet.common/util/BetterFile.java
rename : trunk/trunk/infrastructure/net.appjet.common/util/ClassReload.java => trunk/infrastructure/net.appjet.common/util/ClassReload.java
rename : trunk/trunk/infrastructure/net.appjet.common/util/ExpiringMapping.java => trunk/infrastructure/net.appjet.common/util/ExpiringMapping.java
rename : trunk/trunk/infrastructure/net.appjet.common/util/HttpServletRequestFactory.java => trunk/infrastructure/net.appjet.common/util/HttpServletRequestFactory.java
rename : trunk/trunk/infrastructure/net.appjet.common/util/LenientFormatter.java => trunk/infrastructure/net.appjet.common/util/LenientFormatter.java
rename : trunk/trunk/infrastructure/net.appjet.common/util/LimitedSizeMapping.java => trunk/infrastructure/net.appjet.common/util/LimitedSizeMapping.java
rename : trunk/trunk/infrastructure/net.appjet.oui/ConfigParam.java => trunk/infrastructure/net.appjet.oui/ConfigParam.java
rename : trunk/trunk/infrastructure/net.appjet.oui/FastJSON.scala => trunk/infrastructure/net.appjet.oui/FastJSON.scala
rename : trunk/trunk/infrastructure/net.appjet.oui/GeneratedConfigParam.java => trunk/infrastructure/net.appjet.oui/GeneratedConfigParam.java
rename : trunk/trunk/infrastructure/net.appjet.oui/config.scala => trunk/infrastructure/net.appjet.oui/config.scala
rename : trunk/trunk/infrastructure/net.appjet.oui/dynamicvar.scala => trunk/infrastructure/net.appjet.oui/dynamicvar.scala
rename : trunk/trunk/infrastructure/net.appjet.oui/encryption.scala => trunk/infrastructure/net.appjet.oui/encryption.scala
rename : trunk/trunk/infrastructure/net.appjet.oui/execution.scala => trunk/infrastructure/net.appjet.oui/execution.scala
rename : trunk/trunk/infrastructure/net.appjet.oui/files.scala => trunk/infrastructure/net.appjet.oui/files.scala
rename : trunk/trunk/infrastructure/net.appjet.oui/logging.scala => trunk/infrastructure/net.appjet.oui/logging.scala
rename : trunk/trunk/infrastructure/net.appjet.oui/main.scala => trunk/infrastructure/net.appjet.oui/main.scala
rename : trunk/trunk/infrastructure/net.appjet.oui/monitoring.scala => trunk/infrastructure/net.appjet.oui/monitoring.scala
rename : trunk/trunk/infrastructure/net.appjet.oui/network.scala => trunk/infrastructure/net.appjet.oui/network.scala
rename : trunk/trunk/infrastructure/net.appjet.oui/servermodel.scala => trunk/infrastructure/net.appjet.oui/servermodel.scala
rename : trunk/trunk/infrastructure/net.appjet.oui/stats.scala => trunk/infrastructure/net.appjet.oui/stats.scala
rename : trunk/trunk/infrastructure/net.appjet.oui/synchronizer.scala => trunk/infrastructure/net.appjet.oui/synchronizer.scala
rename : trunk/trunk/infrastructure/net.appjet.oui/util.scala => trunk/infrastructure/net.appjet.oui/util.scala
rename : trunk/trunk/infrastructure/rhino1_7R1/apiClasses.properties => trunk/infrastructure/rhino1_7R1/apiClasses.properties
rename : trunk/trunk/infrastructure/rhino1_7R1/build-date => trunk/infrastructure/rhino1_7R1/build-date
rename : trunk/trunk/infrastructure/rhino1_7R1/build.properties => trunk/infrastructure/rhino1_7R1/build.properties
rename : trunk/trunk/infrastructure/rhino1_7R1/build.xml => trunk/infrastructure/rhino1_7R1/build.xml
rename : trunk/trunk/infrastructure/rhino1_7R1/deprecatedsrc/build.xml => trunk/infrastructure/rhino1_7R1/deprecatedsrc/build.xml
rename : trunk/trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/ClassDefinitionException.java => trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/ClassDefinitionException.java
rename : trunk/trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/NotAFunctionException.java => trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/NotAFunctionException.java
rename : trunk/trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/PropertyException.java => trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/PropertyException.java
rename : trunk/trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/LogicalEquality.java => trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/LogicalEquality.java
rename : trunk/trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/Namespace.java => trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/Namespace.java
rename : trunk/trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/NamespaceHelper.java => trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/NamespaceHelper.java
rename : trunk/trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/QName.java => trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/QName.java
rename : trunk/trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/XML.java => trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/XML.java
rename : trunk/trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/XMLCtor.java => trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/XMLCtor.java
rename : trunk/trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/XMLLibImpl.java => trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/XMLLibImpl.java
rename : trunk/trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/XMLList.java => trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/XMLList.java
rename : trunk/trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/XMLName.java => trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/XMLName.java
rename : trunk/trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/XMLObjectImpl.java => trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/XMLObjectImpl.java
rename : trunk/trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/XMLWithScope.java => trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/XMLWithScope.java
rename : trunk/trunk/infrastructure/rhino1_7R1/examples/Control.java => trunk/infrastructure/rhino1_7R1/examples/Control.java
rename : trunk/trunk/infrastructure/rhino1_7R1/examples/Counter.java => trunk/infrastructure/rhino1_7R1/examples/Counter.java
rename : trunk/trunk/infrastructure/rhino1_7R1/examples/CounterTest.java => trunk/infrastructure/rhino1_7R1/examples/CounterTest.java
rename : trunk/trunk/infrastructure/rhino1_7R1/examples/DynamicScopes.java => trunk/infrastructure/rhino1_7R1/examples/DynamicScopes.java
rename : trunk/trunk/infrastructure/rhino1_7R1/examples/E4X/e4x_example.js => trunk/infrastructure/rhino1_7R1/examples/E4X/e4x_example.js
rename : trunk/trunk/infrastructure/rhino1_7R1/examples/File.java => trunk/infrastructure/rhino1_7R1/examples/File.java
rename : trunk/trunk/infrastructure/rhino1_7R1/examples/Foo.java => trunk/infrastructure/rhino1_7R1/examples/Foo.java
rename : trunk/trunk/infrastructure/rhino1_7R1/examples/Matrix.java => trunk/infrastructure/rhino1_7R1/examples/Matrix.java
rename : trunk/trunk/infrastructure/rhino1_7R1/examples/NervousText.html => trunk/infrastructure/rhino1_7R1/examples/NervousText.html
rename : trunk/trunk/infrastructure/rhino1_7R1/examples/NervousText.js => trunk/infrastructure/rhino1_7R1/examples/NervousText.js
rename : trunk/trunk/infrastructure/rhino1_7R1/examples/PrimitiveWrapFactory.java => trunk/infrastructure/rhino1_7R1/examples/PrimitiveWrapFactory.java
rename : trunk/trunk/infrastructure/rhino1_7R1/examples/RunScript.java => trunk/infrastructure/rhino1_7R1/examples/RunScript.java
rename : trunk/trunk/infrastructure/rhino1_7R1/examples/RunScript2.java => trunk/infrastructure/rhino1_7R1/examples/RunScript2.java
rename : trunk/trunk/infrastructure/rhino1_7R1/examples/RunScript3.java => trunk/infrastructure/rhino1_7R1/examples/RunScript3.java
rename : trunk/trunk/infrastructure/rhino1_7R1/examples/RunScript4.java => trunk/infrastructure/rhino1_7R1/examples/RunScript4.java
rename : trunk/trunk/infrastructure/rhino1_7R1/examples/Shell.java => trunk/infrastructure/rhino1_7R1/examples/Shell.java
rename : trunk/trunk/infrastructure/rhino1_7R1/examples/SwingApplication.js => trunk/infrastructure/rhino1_7R1/examples/SwingApplication.js
rename : trunk/trunk/infrastructure/rhino1_7R1/examples/checkParam.js => trunk/infrastructure/rhino1_7R1/examples/checkParam.js
rename : trunk/trunk/infrastructure/rhino1_7R1/examples/enum.js => trunk/infrastructure/rhino1_7R1/examples/enum.js
rename : trunk/trunk/infrastructure/rhino1_7R1/examples/jsdoc.js => trunk/infrastructure/rhino1_7R1/examples/jsdoc.js
rename : trunk/trunk/infrastructure/rhino1_7R1/examples/liveConnect.js => trunk/infrastructure/rhino1_7R1/examples/liveConnect.js
rename : trunk/trunk/infrastructure/rhino1_7R1/examples/unique.js => trunk/infrastructure/rhino1_7R1/examples/unique.js
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/allclasses-frame.html => trunk/infrastructure/rhino1_7R1/javadoc/allclasses-frame.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/allclasses-noframe.html => trunk/infrastructure/rhino1_7R1/javadoc/allclasses-noframe.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/constant-values.html => trunk/infrastructure/rhino1_7R1/javadoc/constant-values.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/deprecated-list.html => trunk/infrastructure/rhino1_7R1/javadoc/deprecated-list.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/help-doc.html => trunk/infrastructure/rhino1_7R1/javadoc/help-doc.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/index-all.html => trunk/infrastructure/rhino1_7R1/javadoc/index-all.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/index.html => trunk/infrastructure/rhino1_7R1/javadoc/index.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/Callable.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/Callable.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/ClassCache.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/ClassCache.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/ClassShutter.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/ClassShutter.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/CompilerEnvirons.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/CompilerEnvirons.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/Context.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/Context.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/ContextAction.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/ContextAction.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/ContextFactory.Listener.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/ContextFactory.Listener.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/ContextFactory.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/ContextFactory.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/EcmaError.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/EcmaError.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/ErrorReporter.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/ErrorReporter.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/EvaluatorException.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/EvaluatorException.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/Function.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/Function.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/FunctionObject.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/FunctionObject.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/GeneratedClassLoader.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/GeneratedClassLoader.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/ImporterTopLevel.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/ImporterTopLevel.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/JavaScriptException.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/JavaScriptException.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/RefCallable.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/RefCallable.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/RhinoException.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/RhinoException.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/Script.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/Script.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/Scriptable.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/Scriptable.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/ScriptableObject.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/ScriptableObject.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/SecurityController.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/SecurityController.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/Synchronizer.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/Synchronizer.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/WrapFactory.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/WrapFactory.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/WrappedException.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/WrappedException.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/Wrapper.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/Wrapper.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/debug/DebuggableScript.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/debug/DebuggableScript.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/debug/package-frame.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/debug/package-frame.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/debug/package-summary.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/debug/package-summary.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/debug/package-tree.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/debug/package-tree.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/optimizer/ClassCompiler.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/optimizer/ClassCompiler.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/optimizer/package-frame.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/optimizer/package-frame.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/optimizer/package-summary.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/optimizer/package-summary.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/optimizer/package-tree.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/optimizer/package-tree.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/package-frame.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/package-frame.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/package-summary.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/package-summary.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/package-tree.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/package-tree.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/serialize/ScriptableInputStream.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/serialize/ScriptableInputStream.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/serialize/ScriptableOutputStream.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/serialize/ScriptableOutputStream.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/serialize/package-frame.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/serialize/package-frame.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/serialize/package-summary.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/serialize/package-summary.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/serialize/package-tree.html => trunk/infrastructure/rhino1_7R1/javadoc/org/mozilla/javascript/serialize/package-tree.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/overview-frame.html => trunk/infrastructure/rhino1_7R1/javadoc/overview-frame.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/overview-summary.html => trunk/infrastructure/rhino1_7R1/javadoc/overview-summary.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/overview-tree.html => trunk/infrastructure/rhino1_7R1/javadoc/overview-tree.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/package-list => trunk/infrastructure/rhino1_7R1/javadoc/package-list
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/resources/inherit.gif => trunk/infrastructure/rhino1_7R1/javadoc/resources/inherit.gif
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/serialized-form.html => trunk/infrastructure/rhino1_7R1/javadoc/serialized-form.html
rename : trunk/trunk/infrastructure/rhino1_7R1/javadoc/stylesheet.css => trunk/infrastructure/rhino1_7R1/javadoc/stylesheet.css
rename : trunk/trunk/infrastructure/rhino1_7R1/lib/jsr173_1.0_api.jar => trunk/infrastructure/rhino1_7R1/lib/jsr173_1.0_api.jar
rename : trunk/trunk/infrastructure/rhino1_7R1/lib/xbean.jar => trunk/infrastructure/rhino1_7R1/lib/xbean.jar
rename : trunk/trunk/infrastructure/rhino1_7R1/src/build.xml => trunk/infrastructure/rhino1_7R1/src/build.xml
rename : trunk/trunk/infrastructure/rhino1_7R1/src/manifest => trunk/infrastructure/rhino1_7R1/src/manifest
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/classfile/ByteCode.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/classfile/ByteCode.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/classfile/ClassFileWriter.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/classfile/ClassFileWriter.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Arguments.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Arguments.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/BaseFunction.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/BaseFunction.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Callable.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Callable.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ClassCache.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ClassCache.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ClassShutter.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ClassShutter.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/CompilerEnvirons.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/CompilerEnvirons.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ConstProperties.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ConstProperties.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Context.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Context.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ContextAction.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ContextAction.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ContextFactory.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ContextFactory.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ContextListener.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ContextListener.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/DToA.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/DToA.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Decompiler.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Decompiler.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/DefaultErrorReporter.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/DefaultErrorReporter.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/DefiningClassLoader.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/DefiningClassLoader.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Delegator.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Delegator.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/EcmaError.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/EcmaError.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ErrorReporter.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ErrorReporter.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Evaluator.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Evaluator.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/EvaluatorException.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/EvaluatorException.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Function.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Function.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/FunctionNode.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/FunctionNode.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/FunctionObject.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/FunctionObject.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/GeneratedClassLoader.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/GeneratedClassLoader.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/IRFactory.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/IRFactory.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/IdFunctionCall.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/IdFunctionCall.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/IdFunctionObject.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/IdFunctionObject.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/IdScriptableObject.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/IdScriptableObject.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ImporterTopLevel.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ImporterTopLevel.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/InformativeParser.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/InformativeParser.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/InterfaceAdapter.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/InterfaceAdapter.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/InterpretedFunction.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/InterpretedFunction.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Interpreter.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Interpreter.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/InterpreterData.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/InterpreterData.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/JavaAdapter.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/JavaAdapter.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/JavaMembers.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/JavaMembers.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/JavaScriptException.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/JavaScriptException.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Kit.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Kit.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/LazilyLoadedCtor.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/LazilyLoadedCtor.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/MemberBox.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/MemberBox.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeArray.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeArray.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeBoolean.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeBoolean.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeCall.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeCall.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeDate.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeDate.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeError.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeError.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeFunction.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeFunction.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeGenerator.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeGenerator.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeGlobal.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeGlobal.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeIterator.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeIterator.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeJavaArray.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeJavaArray.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeJavaClass.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeJavaClass.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeJavaConstructor.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeJavaConstructor.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeJavaMethod.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeJavaMethod.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeJavaObject.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeJavaObject.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeJavaPackage.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeJavaPackage.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeJavaTopPackage.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeJavaTopPackage.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeMath.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeMath.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeNumber.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeNumber.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeObject.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeObject.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeScript.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeScript.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeString.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeString.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeWith.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NativeWith.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Node.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Node.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NodeTransformer.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/NodeTransformer.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ObjArray.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ObjArray.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ObjToIntMap.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ObjToIntMap.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Parser.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Parser.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/PolicySecurityController.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/PolicySecurityController.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Ref.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Ref.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/RefCallable.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/RefCallable.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/RegExpProxy.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/RegExpProxy.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/RhinoException.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/RhinoException.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Script.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Script.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ScriptOrFnNode.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ScriptOrFnNode.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ScriptRuntime.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ScriptRuntime.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Scriptable.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Scriptable.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ScriptableObject.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/ScriptableObject.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/SecureCaller.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/SecureCaller.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/SecurityController.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/SecurityController.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/SecurityUtilities.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/SecurityUtilities.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/SpecialRef.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/SpecialRef.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Synchronizer.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Synchronizer.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Token.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Token.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/TokenStream.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/TokenStream.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/UintMap.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/UintMap.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Undefined.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Undefined.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/UniqueTag.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/UniqueTag.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/VMBridge.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/VMBridge.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/WrapFactory.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/WrapFactory.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/WrappedException.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/WrappedException.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Wrapper.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/Wrapper.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/continuations/Continuation.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/continuations/Continuation.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/debug/DebugFrame.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/debug/DebugFrame.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/debug/DebuggableObject.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/debug/DebuggableObject.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/debug/DebuggableScript.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/debug/DebuggableScript.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/debug/Debugger.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/debug/Debugger.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/jdk11/VMBridge_jdk11.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/jdk11/VMBridge_jdk11.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/jdk13/VMBridge_jdk13.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/jdk13/VMBridge_jdk13.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/jdk15/VMBridge_jdk15.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/jdk15/VMBridge_jdk15.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/optimizer/Block.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/optimizer/Block.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/optimizer/ClassCompiler.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/optimizer/ClassCompiler.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/optimizer/Codegen.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/optimizer/Codegen.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/optimizer/DataFlowBitSet.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/optimizer/DataFlowBitSet.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/optimizer/OptFunctionNode.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/optimizer/OptFunctionNode.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/optimizer/OptRuntime.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/optimizer/OptRuntime.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/optimizer/OptTransformer.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/optimizer/OptTransformer.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/optimizer/Optimizer.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/optimizer/Optimizer.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/regexp/NativeRegExp.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/regexp/NativeRegExp.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/regexp/NativeRegExpCtor.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/regexp/NativeRegExpCtor.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/regexp/RegExpImpl.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/regexp/RegExpImpl.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/regexp/SubString.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/regexp/SubString.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/resources/Messages.properties => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/resources/Messages.properties
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/resources/Messages_fr.properties => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/resources/Messages_fr.properties
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/serialize/ScriptableInputStream.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/serialize/ScriptableInputStream.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/serialize/ScriptableOutputStream.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/serialize/ScriptableOutputStream.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/xml/XMLLib.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/xml/XMLLib.java
rename : trunk/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/xml/XMLObject.java => trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/xml/XMLObject.java
rename : trunk/trunk/infrastructure/rhino1_7R1/testsrc/base.skip => trunk/infrastructure/rhino1_7R1/testsrc/base.skip
rename : trunk/trunk/infrastructure/rhino1_7R1/testsrc/build.xml => trunk/infrastructure/rhino1_7R1/testsrc/build.xml
rename : trunk/trunk/infrastructure/rhino1_7R1/testsrc/opt1.skip => trunk/infrastructure/rhino1_7R1/testsrc/opt1.skip
rename : trunk/trunk/infrastructure/rhino1_7R1/testsrc/org/mozilla/javascript/drivers/JsDriver.java => trunk/infrastructure/rhino1_7R1/testsrc/org/mozilla/javascript/drivers/JsDriver.java
rename : trunk/trunk/infrastructure/rhino1_7R1/testsrc/org/mozilla/javascript/drivers/ShellTest.java => trunk/infrastructure/rhino1_7R1/testsrc/org/mozilla/javascript/drivers/ShellTest.java
rename : trunk/trunk/infrastructure/rhino1_7R1/testsrc/org/mozilla/javascript/drivers/StandardTests.java => trunk/infrastructure/rhino1_7R1/testsrc/org/mozilla/javascript/drivers/StandardTests.java
rename : trunk/trunk/infrastructure/rhino1_7R1/testsrc/org/mozilla/javascript/drivers/results.html => trunk/infrastructure/rhino1_7R1/testsrc/org/mozilla/javascript/drivers/results.html
rename : trunk/trunk/infrastructure/rhino1_7R1/testsrc/org/mozilla/javascript/tests/Bug409702Test.java => trunk/infrastructure/rhino1_7R1/testsrc/org/mozilla/javascript/tests/Bug409702Test.java
rename : trunk/trunk/infrastructure/rhino1_7R1/testsrc/org/mozilla/javascript/tests/JavaAcessibilityTest.java => trunk/infrastructure/rhino1_7R1/testsrc/org/mozilla/javascript/tests/JavaAcessibilityTest.java
rename : trunk/trunk/infrastructure/rhino1_7R1/testsrc/org/mozilla/javascript/tests/PrivateAccessClass.java => trunk/infrastructure/rhino1_7R1/testsrc/org/mozilla/javascript/tests/PrivateAccessClass.java
rename : trunk/trunk/infrastructure/rhino1_7R1/toolsrc/build.xml => trunk/infrastructure/rhino1_7R1/toolsrc/build.xml
rename : trunk/trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/ToolErrorReporter.java => trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/ToolErrorReporter.java
rename : trunk/trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/debugger/Dim.java => trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/debugger/Dim.java
rename : trunk/trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/debugger/GuiCallback.java => trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/debugger/GuiCallback.java
rename : trunk/trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/debugger/Main.java => trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/debugger/Main.java
rename : trunk/trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/debugger/ScopeProvider.java => trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/debugger/ScopeProvider.java
rename : trunk/trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/debugger/SwingGui.java => trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/debugger/SwingGui.java
rename : trunk/trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/debugger/build.xml => trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/debugger/build.xml
rename : trunk/trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/idswitch/CodePrinter.java => trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/idswitch/CodePrinter.java
rename : trunk/trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/idswitch/FileBody.java => trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/idswitch/FileBody.java
rename : trunk/trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/idswitch/IdValuePair.java => trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/idswitch/IdValuePair.java
rename : trunk/trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/idswitch/Main.java => trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/idswitch/Main.java
rename : trunk/trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/idswitch/SwitchGenerator.java => trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/idswitch/SwitchGenerator.java
rename : trunk/trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/jsc/Main.java => trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/jsc/Main.java
rename : trunk/trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/resources/Messages.properties => trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/resources/Messages.properties
rename : trunk/trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/shell/ConsoleTextArea.java => trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/shell/ConsoleTextArea.java
rename : trunk/trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/shell/Environment.java => trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/shell/Environment.java
rename : trunk/trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/shell/Global.java => trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/shell/Global.java
rename : trunk/trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/shell/JSConsole.java => trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/shell/JSConsole.java
rename : trunk/trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java => trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java
rename : trunk/trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/shell/Main.java => trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/shell/Main.java
rename : trunk/trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/shell/QuitAction.java => trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/shell/QuitAction.java
rename : trunk/trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/shell/SecurityProxy.java => trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/shell/SecurityProxy.java
rename : trunk/trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/shell/ShellContextFactory.java => trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/shell/ShellContextFactory.java
rename : trunk/trunk/infrastructure/rhino1_7R1/xmlimplsrc/build.xml => trunk/infrastructure/rhino1_7R1/xmlimplsrc/build.xml
rename : trunk/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java => trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java
rename : trunk/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java => trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java
rename : trunk/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XML.java => trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XML.java
rename : trunk/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLCtor.java => trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLCtor.java
rename : trunk/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLLibImpl.java => trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLLibImpl.java
rename : trunk/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLList.java => trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLList.java
rename : trunk/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLName.java => trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLName.java
rename : trunk/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java => trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java
rename : trunk/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLWithScope.java => trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLWithScope.java
rename : trunk/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XmlNode.java => trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XmlNode.java
rename : trunk/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XmlProcessor.java => trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XmlProcessor.java
rename : trunk/trunk/infrastructure/yuicompressor/lib/jargs-1.0.jar => trunk/infrastructure/yuicompressor/lib/jargs-1.0.jar
rename : trunk/trunk/infrastructure/yuicompressor/lib/rhino-yuicompressor.jar => trunk/infrastructure/yuicompressor/lib/rhino-yuicompressor.jar
rename : trunk/trunk/infrastructure/yuicompressor/make.sh => trunk/infrastructure/yuicompressor/make.sh
rename : trunk/trunk/infrastructure/yuicompressor/src/com/yahoo/platform/yui/compressor/Bootstrap.java => trunk/infrastructure/yuicompressor/src/com/yahoo/platform/yui/compressor/Bootstrap.java
rename : trunk/trunk/infrastructure/yuicompressor/src/com/yahoo/platform/yui/compressor/CssCompressor.java => trunk/infrastructure/yuicompressor/src/com/yahoo/platform/yui/compressor/CssCompressor.java
rename : trunk/trunk/infrastructure/yuicompressor/src/com/yahoo/platform/yui/compressor/JarClassLoader.java => trunk/infrastructure/yuicompressor/src/com/yahoo/platform/yui/compressor/JarClassLoader.java
rename : trunk/trunk/infrastructure/yuicompressor/src/com/yahoo/platform/yui/compressor/JavaScriptCompressor.java => trunk/infrastructure/yuicompressor/src/com/yahoo/platform/yui/compressor/JavaScriptCompressor.java
rename : trunk/trunk/infrastructure/yuicompressor/src/com/yahoo/platform/yui/compressor/JavaScriptIdentifier.java => trunk/infrastructure/yuicompressor/src/com/yahoo/platform/yui/compressor/JavaScriptIdentifier.java
rename : trunk/trunk/infrastructure/yuicompressor/src/com/yahoo/platform/yui/compressor/JavaScriptToken.java => trunk/infrastructure/yuicompressor/src/com/yahoo/platform/yui/compressor/JavaScriptToken.java
rename : trunk/trunk/infrastructure/yuicompressor/src/com/yahoo/platform/yui/compressor/ScriptOrFnScope.java => trunk/infrastructure/yuicompressor/src/com/yahoo/platform/yui/compressor/ScriptOrFnScope.java
rename : trunk/trunk/infrastructure/yuicompressor/src/com/yahoo/platform/yui/compressor/YUICompressor.java => trunk/infrastructure/yuicompressor/src/com/yahoo/platform/yui/compressor/YUICompressor.java
rename : trunk/trunk/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Decompiler.java => trunk/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Decompiler.java
rename : trunk/trunk/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Decompiler.java.orig => trunk/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Decompiler.java.orig
rename : trunk/trunk/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Parser.java => trunk/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Parser.java
rename : trunk/trunk/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Parser.java.orig => trunk/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Parser.java.orig
rename : trunk/trunk/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Token.java => trunk/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Token.java
rename : trunk/trunk/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Token.java.orig => trunk/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Token.java.orig
rename : trunk/trunk/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/TokenStream.java => trunk/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/TokenStream.java
rename : trunk/trunk/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/TokenStream.java.orig => trunk/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/TokenStream.java.orig

11 files changed, 5853 insertions, 0 deletions

diff --git a/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java b/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java
new file mode 100644
index 0000000..a4cf585
--- /dev/null
+++ b/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java
@@ -0,0 +1,367 @@
+/* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Rhino code, released
+ * May 6, 1999.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1997-2000
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ethan Hugg
+ *   Terry Lucas
+ *   Milen Nankov
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * the GNU General Public License Version 2 or later (the "GPL"), in which
+ * case the provisions of the GPL are applicable instead of those above. If
+ * you wish to allow use of your version of this file only under the terms of
+ * the GPL and not to allow others to use your version of this file under the
+ * MPL, indicate your decision by deleting the provisions above and replacing
+ * them with the notice and other provisions required by the GPL. If you do
+ * not delete the provisions above, a recipient may use your version of this
+ * file under either the MPL or the GPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+package org.mozilla.javascript.xmlimpl;
+
+import org.mozilla.javascript.*;
+
+/**
+ * Class Namespace
+ *
+ */
+class Namespace extends IdScriptableObject
+{
+    static final long serialVersionUID = -5765755238131301744L;
+
+    private static final Object NAMESPACE_TAG = new Object();
+
+    private Namespace prototype;
+    private XmlNode.Namespace ns;
+
+    private Namespace() {
+    }
+
+    static Namespace create(Scriptable scope, Namespace prototype, XmlNode.Namespace namespace) {
+        Namespace rv = new Namespace();
+        rv.setParentScope(scope);
+        rv.prototype = prototype;
+        rv.setPrototype(prototype);
+        rv.ns = namespace;
+        return rv;
+    }
+
+    final XmlNode.Namespace getDelegate() {
+        return ns;
+    }
+
+    public void exportAsJSClass(boolean sealed) {
+        exportAsJSClass(MAX_PROTOTYPE_ID, this.getParentScope(), sealed);
+    }
+
+    public String uri() {
+        return ns.getUri();
+    }
+
+    public String prefix() {
+        return ns.getPrefix();
+    }
+
+    public String toString() {
+        return uri();
+    }
+
+    public String toLocaleString() {
+        return toString();
+    }
+
+    private boolean equals(Namespace n) {
+        return uri().equals(n.uri());
+    }
+
+    public boolean equals(Object obj) {
+        if (!(obj instanceof Namespace)) return false;
+        return equals((Namespace)obj);
+    }
+
+    protected Object equivalentValues(Object value) {
+        if (!(value instanceof Namespace)) return Scriptable.NOT_FOUND;
+        boolean result = equals((Namespace)value);
+        return result ? Boolean.TRUE : Boolean.FALSE;
+    }
+
+    public String getClassName() {
+        return "Namespace";
+    }
+
+    public Object getDefaultValue(Class hint) {
+        return uri();
+    }
+
+// #string_id_map#
+    private static final int
+        Id_prefix               = 1,
+        Id_uri                  = 2,
+        MAX_INSTANCE_ID         = 2;
+
+    protected int getMaxInstanceId()
+    {
+        return super.getMaxInstanceId() + MAX_INSTANCE_ID;
+    }
+
+    protected int findInstanceIdInfo(String s)
+    {
+        int id;
+// #generated# Last update: 2007-08-20 08:23:22 EDT
+        L0: { id = 0; String X = null;
+            int s_length = s.length();
+            if (s_length==3) { X="uri";id=Id_uri; }
+            else if (s_length==6) { X="prefix";id=Id_prefix; }
+            if (X!=null && X!=s && !X.equals(s)) id = 0;
+            break L0;
+        }
+// #/generated#
+
+        if (id == 0) return super.findInstanceIdInfo(s);
+
+        int attr;
+        switch (id) {
+          case Id_prefix:
+          case Id_uri:
+            attr = PERMANENT | READONLY;
+            break;
+          default: throw new IllegalStateException();
+        }
+        return instanceIdInfo(attr, super.getMaxInstanceId() + id);
+    }
+// #/string_id_map#
+
+    protected String getInstanceIdName(int id)
+    {
+        switch (id - super.getMaxInstanceId()) {
+          case Id_prefix: return "prefix";
+          case Id_uri: return "uri";
+        }
+        return super.getInstanceIdName(id);
+    }
+
+    protected Object getInstanceIdValue(int id)
+    {
+        switch (id - super.getMaxInstanceId()) {
+          case Id_prefix:
+            if (ns.getPrefix() == null) return Undefined.instance;
+            return ns.getPrefix();
+          case Id_uri:
+            return ns.getUri();
+        }
+        return super.getInstanceIdValue(id);
+    }
+
+
+// #string_id_map#
+    private static final int
+        Id_constructor          = 1,
+        Id_toString             = 2,
+        Id_toSource             = 3,
+        MAX_PROTOTYPE_ID        = 3;
+
+    protected int findPrototypeId(String s)
+    {
+        int id;
+// #generated# Last update: 2007-08-20 08:23:22 EDT
+        L0: { id = 0; String X = null; int c;
+            int s_length = s.length();
+            if (s_length==8) {
+                c=s.charAt(3);
+                if (c=='o') { X="toSource";id=Id_toSource; }
+                else if (c=='t') { X="toString";id=Id_toString; }
+            }
+            else if (s_length==11) { X="constructor";id=Id_constructor; }
+            if (X!=null && X!=s && !X.equals(s)) id = 0;
+            break L0;
+        }
+// #/generated#
+        return id;
+    }
+// #/string_id_map#
+
+    protected void initPrototypeId(int id)
+    {
+        String s;
+        int arity;
+        switch (id) {
+          case Id_constructor: arity=2; s="constructor"; break;
+          case Id_toString:    arity=0; s="toString";    break;
+          case Id_toSource:    arity=0; s="toSource";    break;
+          default: throw new IllegalArgumentException(String.valueOf(id));
+        }
+        initPrototypeMethod(NAMESPACE_TAG, id, s, arity);
+    }
+
+    public Object execIdCall(IdFunctionObject f,
+                             Context cx,
+                             Scriptable scope,
+                             Scriptable thisObj,
+                             Object[] args)
+    {
+        if (!f.hasTag(NAMESPACE_TAG)) {
+            return super.execIdCall(f, cx, scope, thisObj, args);
+        }
+        int id = f.methodId();
+        switch (id) {
+          case Id_constructor:
+            return jsConstructor(cx, (thisObj == null), args);
+          case Id_toString:
+            return realThis(thisObj, f).toString();
+          case Id_toSource:
+            return realThis(thisObj, f).js_toSource();
+        }
+        throw new IllegalArgumentException(String.valueOf(id));
+    }
+
+    private Namespace realThis(Scriptable thisObj, IdFunctionObject f) {
+        if(!(thisObj instanceof Namespace))
+            throw incompatibleCallError(f);
+        return (Namespace)thisObj;
+    }
+
+    Namespace newNamespace(String uri) {
+        Namespace prototype = (this.prototype == null) ? this : this.prototype;
+        return create( this.getParentScope(), prototype, XmlNode.Namespace.create(uri) );
+    }
+
+    Namespace newNamespace(String prefix, String uri) {
+        if (prefix == null) return newNamespace(uri);
+        Namespace prototype = (this.prototype == null) ? this : this.prototype;
+        return create( this.getParentScope(), prototype, XmlNode.Namespace.create(prefix, uri) );
+    }
+
+    Namespace constructNamespace(Object uriValue) {
+        String prefix;
+        String uri;
+
+        if (uriValue instanceof Namespace) {
+            Namespace ns = (Namespace)uriValue;
+            prefix = ns.prefix();
+            uri = ns.uri();
+        } else if (uriValue instanceof QName) {
+            QName qname = (QName)uriValue;
+            uri = qname.uri();
+            if (uri != null) {
+                //    TODO    Is there a way to push this back into QName so that we can make prefix() private?
+                prefix = qname.prefix();
+            } else {
+                uri = qname.toString();
+                prefix = null;
+            }
+        } else {
+            uri = ScriptRuntime.toString(uriValue);
+            prefix = (uri.length() == 0) ? "" : null;
+        }
+
+        return newNamespace(prefix, uri);
+    }
+
+    Namespace castToNamespace(Object namespaceObj) {
+        if (namespaceObj instanceof Namespace) {
+            return (Namespace)namespaceObj;
+        }
+        return constructNamespace(namespaceObj);
+    }
+
+    private Namespace constructNamespace(Object prefixValue, Object uriValue) {
+        String prefix;
+        String uri;
+
+        if (uriValue instanceof QName) {
+            QName qname = (QName)uriValue;
+            uri = qname.uri();
+            if (uri == null) {
+                uri = qname.toString();
+            }
+        } else {
+            uri = ScriptRuntime.toString(uriValue);
+        }
+
+        if (uri.length() == 0) {
+            if (prefixValue == Undefined.instance) {
+                prefix = "";
+            } else {
+                prefix = ScriptRuntime.toString(prefixValue);
+                if (prefix.length() != 0) {
+                    throw ScriptRuntime.typeError(
+                        "Illegal prefix '"+prefix+"' for 'no namespace'.");
+                }
+            }
+        } else if (prefixValue == Undefined.instance) {
+            prefix = "";
+        } else if (!XMLName.accept(prefixValue)) {
+            prefix = "";
+        } else {
+            prefix = ScriptRuntime.toString(prefixValue);
+        }
+
+        return newNamespace(prefix, uri);
+    }
+
+    private Namespace constructNamespace() {
+        return newNamespace("", "");
+    }
+
+    private Object jsConstructor(Context cx, boolean inNewExpr, Object[] args)
+    {
+        if (!inNewExpr && args.length == 1) {
+            return castToNamespace(args[0]);
+        }
+
+        if (args.length == 0) {
+            return constructNamespace();
+        } else if (args.length == 1) {
+            return constructNamespace(args[0]);
+        } else {
+            return constructNamespace(args[0], args[1]);
+        }
+    }
+
+    private String js_toSource()
+    {
+        StringBuffer sb = new StringBuffer();
+        sb.append('(');
+        toSourceImpl(ns.getPrefix(), ns.getUri(), sb);
+        sb.append(')');
+        return sb.toString();
+    }
+
+    static void toSourceImpl(String prefix, String uri, StringBuffer sb)
+    {
+        sb.append("new Namespace(");
+        if (uri.length() == 0) {
+            if (!"".equals(prefix)) throw new IllegalArgumentException(prefix);
+        } else {
+            sb.append('\'');
+            if (prefix != null) {
+                sb.append(ScriptRuntime.escapeString(prefix, '\''));
+                sb.append("', '");
+            }
+            sb.append(ScriptRuntime.escapeString(uri, '\''));
+            sb.append('\'');
+        }
+        sb.append(')');
+    }
+}
diff --git a/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java b/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java
new file mode 100644
index 0000000..90a18cb
--- /dev/null
+++ b/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java
@@ -0,0 +1,381 @@
+/* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Rhino code, released
+ * May 6, 1999.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1997-2000
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ethan Hugg
+ *   Terry Lucas
+ *   Milen Nankov
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * the GNU General Public License Version 2 or later (the "GPL"), in which
+ * case the provisions of the GPL are applicable instead of those above. If
+ * you wish to allow use of your version of this file only under the terms of
+ * the GPL and not to allow others to use your version of this file under the
+ * MPL, indicate your decision by deleting the provisions above and replacing
+ * them with the notice and other provisions required by the GPL. If you do
+ * not delete the provisions above, a recipient may use your version of this
+ * file under either the MPL or the GPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+package org.mozilla.javascript.xmlimpl;
+
+import org.mozilla.javascript.*;
+
+/**
+ * Class QName
+ *
+ */
+final class QName extends IdScriptableObject
+{
+    static final long serialVersionUID = 416745167693026750L;
+
+    private static final Object QNAME_TAG = new Object();
+
+    private XMLLibImpl lib;
+
+    private QName prototype;
+
+    private XmlNode.QName delegate;
+
+    private QName() {
+    }
+
+    static QName create(XMLLibImpl lib, Scriptable scope, QName prototype, XmlNode.QName delegate) {
+        QName rv = new QName();
+        rv.lib = lib;
+        rv.setParentScope(scope);
+        rv.prototype = prototype;
+        rv.setPrototype(prototype);
+        rv.delegate = delegate;
+        return rv;
+    }
+
+//    /** @deprecated */
+//    static QName create(XMLLibImpl lib, XmlNode.QName nodeQname) {
+//        return create(lib, lib.globalScope(), lib.qnamePrototype(), nodeQname);
+//    }
+
+    void exportAsJSClass(boolean sealed) {
+        exportAsJSClass(MAX_PROTOTYPE_ID, getParentScope(), sealed);
+    }
+
+    public String toString() {
+        //    ECMA357 13.3.4.2
+        if (delegate.getNamespace() == null) {
+            return "*::" + localName();
+        } else if (delegate.getNamespace().isGlobal()) {
+            //    leave as empty
+            return localName();
+        } else {
+            return uri() + "::" + localName();
+        }
+    }
+
+    public String localName() {
+        if (delegate.getLocalName() == null) return "*";
+        return delegate.getLocalName();
+    }
+
+    /**
+        @deprecated
+
+        This property is supposed to be invisible and I think we can make it private at some point, though Namespace
+        might need it
+    */
+    String prefix() {
+        if (delegate.getNamespace() == null) return null;
+        return delegate.getNamespace().getPrefix();
+    }
+
+    String uri() {
+        if (delegate.getNamespace() == null) return null;
+        return delegate.getNamespace().getUri();
+    }
+
+    /** @deprecated */
+    final XmlNode.QName toNodeQname() {
+        return delegate;
+    }
+
+    final XmlNode.QName getDelegate() {
+        return delegate;
+    }
+
+    public boolean equals(Object obj) {
+        if(!(obj instanceof QName)) return false;
+        return equals((QName)obj);
+    }
+
+    protected Object equivalentValues(Object value)
+    {
+        if(!(value instanceof QName)) return Scriptable.NOT_FOUND;
+        boolean result = equals((QName)value);
+        return result ? Boolean.TRUE : Boolean.FALSE;
+    }
+
+    private boolean equals(QName q) {
+        return this.delegate.isEqualTo(q.delegate);
+    }
+
+    public String getClassName() {
+        return "QName";
+    }
+
+    public Object getDefaultValue(Class hint) {
+        return toString();
+    }
+
+// #string_id_map#
+    private static final int
+        Id_localName            = 1,
+        Id_uri                  = 2,
+        MAX_INSTANCE_ID         = 2;
+
+    protected int getMaxInstanceId()
+    {
+        return super.getMaxInstanceId() + MAX_INSTANCE_ID;
+    }
+
+    protected int findInstanceIdInfo(String s)
+    {
+        int id;
+// #generated# Last update: 2007-08-20 08:21:41 EDT
+        L0: { id = 0; String X = null;
+            int s_length = s.length();
+            if (s_length==3) { X="uri";id=Id_uri; }
+            else if (s_length==9) { X="localName";id=Id_localName; }
+            if (X!=null && X!=s && !X.equals(s)) id = 0;
+            break L0;
+        }
+// #/generated#
+
+        if (id == 0) return super.findInstanceIdInfo(s);
+
+        int attr;
+        switch (id) {
+          case Id_localName:
+          case Id_uri:
+            attr = PERMANENT | READONLY;
+            break;
+          default: throw new IllegalStateException();
+        }
+        return instanceIdInfo(attr, super.getMaxInstanceId() + id);
+    }
+// #/string_id_map#
+
+    protected String getInstanceIdName(int id)
+    {
+        switch (id - super.getMaxInstanceId()) {
+          case Id_localName: return "localName";
+          case Id_uri: return "uri";
+        }
+        return super.getInstanceIdName(id);
+    }
+
+    protected Object getInstanceIdValue(int id)
+    {
+        switch (id - super.getMaxInstanceId()) {
+          case Id_localName: return localName();
+          case Id_uri: return uri();
+        }
+        return super.getInstanceIdValue(id);
+    }
+
+// #string_id_map#
+    private static final int
+        Id_constructor          = 1,
+        Id_toString             = 2,
+        Id_toSource             = 3,
+        MAX_PROTOTYPE_ID        = 3;
+
+    protected int findPrototypeId(String s)
+    {
+        int id;
+// #generated# Last update: 2007-08-20 08:21:41 EDT
+        L0: { id = 0; String X = null; int c;
+            int s_length = s.length();
+            if (s_length==8) {
+                c=s.charAt(3);
+                if (c=='o') { X="toSource";id=Id_toSource; }
+                else if (c=='t') { X="toString";id=Id_toString; }
+            }
+            else if (s_length==11) { X="constructor";id=Id_constructor; }
+            if (X!=null && X!=s && !X.equals(s)) id = 0;
+            break L0;
+        }
+// #/generated#
+        return id;
+    }
+// #/string_id_map#
+
+    protected void initPrototypeId(int id)
+    {
+        String s;
+        int arity;
+        switch (id) {
+          case Id_constructor: arity=2; s="constructor"; break;
+          case Id_toString:    arity=0; s="toString";    break;
+          case Id_toSource:    arity=0; s="toSource";    break;
+          default: throw new IllegalArgumentException(String.valueOf(id));
+        }
+        initPrototypeMethod(QNAME_TAG, id, s, arity);
+    }
+
+    public Object execIdCall(IdFunctionObject f,
+                             Context cx,
+                             Scriptable scope,
+                             Scriptable thisObj,
+                             Object[] args)
+    {
+        if (!f.hasTag(QNAME_TAG)) {
+            return super.execIdCall(f, cx, scope, thisObj, args);
+        }
+        int id = f.methodId();
+        switch (id) {
+          case Id_constructor:
+            return jsConstructor(cx, (thisObj == null), args);
+          case Id_toString:
+            return realThis(thisObj, f).toString();
+          case Id_toSource:
+            return realThis(thisObj, f).js_toSource();
+        }
+        throw new IllegalArgumentException(String.valueOf(id));
+    }
+
+    private QName realThis(Scriptable thisObj, IdFunctionObject f)
+    {
+        if(!(thisObj instanceof QName))
+            throw incompatibleCallError(f);
+        return (QName)thisObj;
+    }
+
+    QName newQName(XMLLibImpl lib, String q_uri, String q_localName, String q_prefix) {
+        QName prototype = this.prototype;
+        if (prototype == null) {
+            prototype = this;
+        }
+        XmlNode.Namespace ns = null;
+        if (q_prefix != null) {
+            ns = XmlNode.Namespace.create(q_uri, q_prefix);
+        } else if (q_uri != null) {
+            ns = XmlNode.Namespace.create(q_uri);
+        } else {
+            ns = null;
+        }
+        if (q_localName != null && q_localName.equals("*")) q_localName = null;
+        return create(lib, this.getParentScope(), prototype, XmlNode.QName.create(ns, q_localName));
+    }
+
+    //    See ECMA357 13.3.2
+    QName constructQName(XMLLibImpl lib, Context cx, Object namespace, Object name) {
+        String nameString = null;
+        if (name instanceof QName) {
+            if (namespace == Undefined.instance) {
+                return (QName)name;
+            } else {
+                nameString = ((QName)name).localName();
+            }
+        }
+        if (name == Undefined.instance) {
+            nameString = "";
+        } else {
+            nameString = ScriptRuntime.toString(name);
+        }
+
+        if (namespace == Undefined.instance) {
+            if ("*".equals(nameString)) {
+                namespace = null;
+            } else {
+                namespace = lib.getDefaultNamespace(cx);
+            }
+        }
+        Namespace namespaceNamespace = null;
+        if (namespace == null) {
+            //    leave as null
+        } else if (namespace instanceof Namespace) {
+            namespaceNamespace = (Namespace)namespace;
+        } else {
+            namespaceNamespace = lib.newNamespace(ScriptRuntime.toString(namespace));
+        }
+        String q_localName = nameString;
+        String q_uri;
+        String q_prefix;
+        if (namespace == null) {
+            q_uri = null;
+            q_prefix = null;    //    corresponds to undefined; see QName class
+        } else {
+            q_uri = namespaceNamespace.uri();
+            q_prefix = namespaceNamespace.prefix();
+        }
+        return newQName(lib, q_uri, q_localName, q_prefix);
+    }
+
+    QName constructQName(XMLLibImpl lib, Context cx, Object nameValue) {
+        return constructQName(lib, cx, Undefined.instance, nameValue);
+    }
+
+    QName castToQName(XMLLibImpl lib, Context cx, Object qnameValue) {
+        if (qnameValue instanceof QName) {
+            return (QName)qnameValue;
+        }
+        return constructQName(lib, cx, qnameValue);
+    }
+
+    private Object jsConstructor(Context cx, boolean inNewExpr, Object[] args) {
+        //    See ECMA357 13.3.2
+        if (!inNewExpr && args.length == 1) {
+            return castToQName(lib, cx, args[0]);
+        }
+        if (args.length == 0) {
+            return constructQName(lib, cx, Undefined.instance);
+        } else if (args.length == 1) {
+            return constructQName(lib, cx, args[0]);
+        } else {
+            return constructQName(lib, cx, args[0], args[1]);
+        }
+    }
+
+    private String js_toSource() {
+        StringBuffer sb = new StringBuffer();
+        sb.append('(');
+        toSourceImpl(uri(), localName(), prefix(), sb);
+        sb.append(')');
+        return sb.toString();
+    }
+
+    private static void toSourceImpl(String uri, String localName, String prefix, StringBuffer sb) {
+        sb.append("new QName(");
+        if (uri == null && prefix == null) {
+            if (!"*".equals(localName)) {
+                sb.append("null, ");
+            }
+        } else {
+            Namespace.toSourceImpl(prefix, uri, sb);
+            sb.append(", ");
+        }
+        sb.append('\'');
+        sb.append(ScriptRuntime.escapeString(localName, '\''));
+        sb.append("')");
+    }
+}
diff --git a/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XML.java b/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XML.java
new file mode 100644
index 0000000..090ae1a
--- /dev/null
+++ b/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XML.java
@@ -0,0 +1,734 @@
+/* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Rhino code, released
+ * May 6, 1999.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1997-2000
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ethan Hugg
+ *   Terry Lucas
+ *   Milen Nankov
+ *   David P. Caldwell <inonit@inonit.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * the GNU General Public License Version 2 or later (the "GPL"), in which
+ * case the provisions of the GPL are applicable instead of those above. If
+ * you wish to allow use of your version of this file only under the terms of
+ * the GPL and not to allow others to use your version of this file under the
+ * MPL, indicate your decision by deleting the provisions above and replacing
+ * them with the notice and other provisions required by the GPL. If you do
+ * not delete the provisions above, a recipient may use your version of this
+ * file under either the MPL or the GPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+package org.mozilla.javascript.xmlimpl;
+
+import org.mozilla.javascript.*;
+import org.mozilla.javascript.xml.XMLObject;
+
+class XML extends XMLObjectImpl {
+    static final long serialVersionUID = -630969919086449092L;
+
+    private XmlNode node;
+
+    XML(XMLLibImpl lib, Scriptable scope, XMLObject prototype, XmlNode node) {
+      super(lib, scope, prototype);
+      initialize(node);
+    }
+
+    void initialize(XmlNode node) {
+        this.node = node;
+        this.node.setXml(this);
+    }
+
+    final XML getXML() {
+        return this;
+    }
+
+    void replaceWith(XML value) {
+        //    We use the underlying document structure if the node is not
+        //    "standalone," but we need to just replace the XmlNode instance
+        //    otherwise
+        if (this.node.parent() != null || false) {
+            this.node.replaceWith(value.node);
+        } else {
+            this.initialize(value.node);
+        }
+    }
+
+    /** @deprecated I would love to encapsulate this somehow. */
+    XML makeXmlFromString(XMLName name, String value) {
+        try {
+            return newTextElementXML(this.node, name.toQname(), value.toString());
+        } catch(Exception e) {
+            throw ScriptRuntime.typeError(e.getMessage());
+        }
+    }
+
+    /** @deprecated Rename this, at the very least.  But it's not clear it's even necessary */
+    XmlNode getAnnotation() {
+        return node;
+    }
+
+    //
+    //  Methods from ScriptableObject
+    //
+
+    //    TODO Either cross-reference this next comment with the specification or delete it and change the behavior
+    //    The comment: XML[0] should return this, all other indexes are Undefined
+    public Object get(int index, Scriptable start) {
+        if (index == 0) {
+            return this;
+        } else {
+            return Scriptable.NOT_FOUND;
+        }
+    }
+
+    public boolean has(int index, Scriptable start) {
+        return (index == 0);
+    }
+
+    public void put(int index, Scriptable start, Object value) {
+        //    TODO    Clarify the following comment and add a reference to the spec
+        //    The comment: Spec says assignment to indexed XML object should return type error
+        throw ScriptRuntime.typeError("Assignment to indexed XML is not allowed");
+    }
+
+    public Object[] getIds() {
+        if (isPrototype()) {
+            return new Object[0];
+        } else {
+            return new Object[] { new Integer(0) };
+        }
+    }
+
+    //    TODO    This is how I found it but I am not sure it makes sense
+    public void delete(int index) {
+        if (index == 0) {
+            this.remove();
+        }
+    }
+
+    //
+    //    Methods from XMLObjectImpl
+    //
+
+    boolean hasXMLProperty(XMLName xmlName) {
+        if (isPrototype()) {
+            return getMethod(xmlName.localName()) != NOT_FOUND;
+        } else {
+            return (getPropertyList(xmlName).length() > 0) || (getMethod(xmlName.localName()) != NOT_FOUND);
+        }
+    }
+
+    Object getXMLProperty(XMLName xmlName) {
+        if (isPrototype()) {
+            return getMethod(xmlName.localName());
+        } else {
+            return getPropertyList(xmlName);
+        }
+    }
+
+    //
+    //
+    //    Methods that merit further review
+    //
+    //
+
+    XmlNode.QName getNodeQname() {
+        return this.node.getQname();
+    }
+
+    XML[] getChildren() {
+        if (!isElement()) return null;
+        XmlNode[] children = this.node.getMatchingChildren(XmlNode.Filter.TRUE);
+        XML[] rv = new XML[children.length];
+        for (int i=0; i<rv.length; i++) {
+            rv[i] = toXML(children[i]);
+        }
+        return rv;
+    }
+
+    XML[] getAttributes() {
+        XmlNode[] attributes = this.node.getAttributes();
+        XML[] rv = new XML[attributes.length];
+        for (int i=0; i<rv.length; i++) {
+            rv[i] = toXML(attributes[i]);
+        }
+        return rv;
+    }
+
+    //    Used only by XML, XMLList
+    XMLList getPropertyList(XMLName name) {
+        return name.getMyValueOn(this);
+    }
+
+    void deleteXMLProperty(XMLName name) {
+        XMLList list = getPropertyList(name);
+        for (int i=0; i<list.length(); i++) {
+            list.item(i).node.deleteMe();
+        }
+    }
+
+    void putXMLProperty(XMLName xmlName, Object value) {
+        if (isPrototype()) {
+            //    TODO    Is this really a no-op?  Check the spec to be sure
+        } else {
+            xmlName.setMyValueOn(this, value);
+        }
+    }
+
+    boolean hasOwnProperty(XMLName xmlName) {
+        boolean hasProperty = false;
+
+        if (isPrototype()) {
+            String property = xmlName.localName();
+            hasProperty = (0 != findPrototypeId(property));
+        } else {
+            hasProperty = (getPropertyList(xmlName).length() > 0);
+        }
+
+        return hasProperty;
+    }
+
+    protected Object jsConstructor(Context cx, boolean inNewExpr, Object[] args) {
+        if (args.length == 0 || args[0] == null || args[0] == Undefined.instance) {
+            args = new Object[] { "" };
+        }
+        //    ECMA 13.4.2 does not appear to specify what to do if multiple arguments are sent.
+        XML toXml = ecmaToXml(args[0]);
+        if (inNewExpr) {
+            return toXml.copy();
+        } else {
+            return toXml;
+        }
+    }
+
+    //    See ECMA 357, 11_2_2_1, Semantics, 3_f.
+    public Scriptable getExtraMethodSource(Context cx) {
+        if (hasSimpleContent()) {
+            String src = toString();
+            return ScriptRuntime.toObjectOrNull(cx, src);
+        }
+        return null;
+    }
+
+    //
+    //    TODO    Miscellaneous methods not yet grouped
+    //
+
+    void removeChild(int index) {
+        this.node.removeChild(index);
+    }
+
+    void normalize() {
+        this.node.normalize();
+    }
+
+    private XML toXML(XmlNode node) {
+        if (node.getXml() == null) {
+            node.setXml(newXML(node));
+        }
+        return node.getXml();
+    }
+
+    void setAttribute(XMLName xmlName, Object value) {
+        if (!isElement()) throw new IllegalStateException("Can only set attributes on elements.");
+        //    TODO    Is this legal, but just not "supported"?  If so, support it.
+        if (xmlName.uri() == null && xmlName.localName().equals("*")) {
+            throw ScriptRuntime.typeError("@* assignment not supported.");
+        }
+        this.node.setAttribute(xmlName.toQname(), ScriptRuntime.toString(value));
+    }
+
+    void remove() {
+        this.node.deleteMe();
+    }
+
+    void addMatches(XMLList rv, XMLName name) {
+        name.addMatches(rv, this);
+    }
+
+    XMLList elements(XMLName name) {
+        XMLList rv = newXMLList();
+        rv.setTargets(this, name.toQname());
+        //    TODO    Should have an XMLNode.Filter implementation based on XMLName
+        XmlNode[] elements = this.node.getMatchingChildren(XmlNode.Filter.ELEMENT);
+        for (int i=0; i<elements.length; i++) {
+            if (name.matches( toXML(elements[i]) )) {
+                rv.addToList( toXML(elements[i]) );
+            }
+        }
+        return rv;
+    }
+
+    XMLList child(XMLName xmlName) {
+        //    TODO    Right now I think this method would allow child( "@xxx" ) to return the xxx attribute, which is wrong
+
+        XMLList rv = newXMLList();
+
+        //    TODO    Should this also match processing instructions?  If so, we have to change the filter and also the XMLName
+        //            class to add an acceptsProcessingInstruction() method
+
+        XmlNode[] elements = this.node.getMatchingChildren(XmlNode.Filter.ELEMENT);
+        for (int i=0; i<elements.length; i++) {
+            if (xmlName.matchesElement(elements[i].getQname())) {
+                rv.addToList( toXML(elements[i]) );
+            }
+        }
+        rv.setTargets(this, xmlName.toQname());
+        return rv;
+    }
+
+    XML replace(XMLName xmlName, Object xml) {
+        putXMLProperty(xmlName, xml);
+        return this;
+    }
+
+    XMLList children() {
+        XMLList rv = newXMLList();
+        XMLName all = XMLName.formStar();
+        rv.setTargets(this, all.toQname());
+        XmlNode[] children = this.node.getMatchingChildren(XmlNode.Filter.TRUE);
+        for (int i=0; i<children.length; i++) {
+            rv.addToList( toXML(children[i]) );
+        }
+        return rv;
+    }
+
+    XMLList child(int index) {
+        //    ECMA357 13.4.4.6 (numeric case)
+        XMLList result = newXMLList();
+        result.setTargets(this, null);
+        if (index >= 0 && index < this.node.getChildCount()) {
+            result.addToList(getXmlChild(index));
+        }
+        return result;
+    }
+
+    XML getXmlChild(int index) {
+        XmlNode child = this.node.getChild(index);
+        if (child.getXml() == null) {
+            child.setXml(newXML(child));
+        }
+        return child.getXml();
+    }
+
+    int childIndex() {
+        return this.node.getChildIndex();
+    }
+
+    boolean contains(Object xml) {
+        if (xml instanceof XML) {
+            return equivalentXml(xml);
+        } else {
+            return false;
+        }
+    }
+
+    //    Method overriding XMLObjectImpl
+    boolean equivalentXml(Object target) {
+        boolean result = false;
+
+        if (target instanceof XML) {
+            //    TODO    This is a horrifyingly inefficient way to do this so we should make it better.  It may also not work.
+            return this.node.toXmlString(getProcessor()).equals( ((XML)target).node.toXmlString(getProcessor()) );
+        } else if (target instanceof XMLList) {
+            //    TODO    Is this right?  Check the spec ...
+            XMLList otherList = (XMLList) target;
+
+            if (otherList.length() == 1) {
+                result = equivalentXml(otherList.getXML());
+            }
+        } else if (hasSimpleContent()) {
+            String otherStr = ScriptRuntime.toString(target);
+
+            result = toString().equals(otherStr);
+        }
+
+        return result;
+    }
+
+    XMLObjectImpl copy() {
+        return newXML( this.node.copy() );
+    }
+
+    boolean hasSimpleContent() {
+        if (isComment() || isProcessingInstruction()) return false;
+        if (isText() || this.node.isAttributeType()) return true;
+        return !this.node.hasChildElement();
+    }
+
+    boolean hasComplexContent() {
+        return !hasSimpleContent();
+    }
+
+    //    TODO Cross-reference comment below with spec
+    //    Comment is: Length of an XML object is always 1, it's a list of XML objects of size 1.
+    int length() {
+        return 1;
+    }
+
+    //    TODO    it is not clear what this method was for ...
+    boolean is(XML other) {
+        return this.node.isSameNode(other.node);
+    }
+
+    Object nodeKind() {
+        return ecmaClass();
+    }
+
+    Object parent() {
+        XmlNode parent = this.node.parent();
+        if (parent == null) return null;
+        return newXML(this.node.parent());
+    }
+
+    boolean propertyIsEnumerable(Object name)
+    {
+        boolean result;
+        if (name instanceof Integer) {
+            result = (((Integer)name).intValue() == 0);
+        } else if (name instanceof Number) {
+            double x = ((Number)name).doubleValue();
+            // Check that number is positive 0
+            result = (x == 0.0 && 1.0 / x > 0);
+        } else {
+            result = ScriptRuntime.toString(name).equals("0");
+        }
+        return result;
+    }
+
+    Object valueOf() {
+        return this;
+    }
+
+    //
+    //    Selection of children
+    //
+
+    XMLList comments() {
+        XMLList rv = newXMLList();
+        this.node.addMatchingChildren(rv, XmlNode.Filter.COMMENT);
+        return rv;
+    }
+
+    XMLList text() {
+        XMLList rv = newXMLList();
+        this.node.addMatchingChildren(rv, XmlNode.Filter.TEXT);
+        return rv;
+    }
+
+    XMLList processingInstructions(XMLName xmlName) {
+        XMLList rv = newXMLList();
+        this.node.addMatchingChildren(rv, XmlNode.Filter.PROCESSING_INSTRUCTION(xmlName));
+        return rv;
+    }
+
+    //
+    //    Methods relating to modification of child nodes
+    //
+
+    //    We create all the nodes we are inserting before doing the insert to
+    //    avoid nasty cycles caused by mutability of these objects.  For example,
+    //    what if the toString() method of value modifies the XML object we were
+    //    going to insert into?  insertAfter might get confused about where to
+    //    insert.  This actually came up with SpiderMonkey, leading to a (very)
+    //    long discussion.  See bug #354145.
+    private XmlNode[] getNodesForInsert(Object value) {
+        if (value instanceof XML) {
+            return new XmlNode[] { ((XML)value).node };
+        } else if (value instanceof XMLList) {
+            XMLList list = (XMLList)value;
+            XmlNode[] rv = new XmlNode[list.length()];
+            for (int i=0; i<list.length(); i++) {
+                rv[i] = list.item(i).node;
+            }
+            return rv;
+        } else {
+            return new XmlNode[] {
+                XmlNode.createText(getProcessor(), ScriptRuntime.toString(value))
+            };
+        }
+    }
+
+    XML replace(int index, Object xml) {
+        XMLList xlChildToReplace = child(index);
+        if (xlChildToReplace.length() > 0) {
+            // One exists an that index
+            XML childToReplace = xlChildToReplace.item(0);
+            insertChildAfter(childToReplace, xml);
+            removeChild(index);
+        }
+        return this;
+    }
+
+    XML prependChild(Object xml) {
+        if (this.node.isParentType()) {
+            this.node.insertChildrenAt(0, getNodesForInsert(xml));
+        }
+        return this;
+    }
+
+    XML appendChild(Object xml) {
+        if (this.node.isParentType()) {
+            XmlNode[] nodes = getNodesForInsert(xml);
+            this.node.insertChildrenAt(this.node.getChildCount(), nodes);
+        }
+        return this;
+    }
+
+    private int getChildIndexOf(XML child) {
+        for (int i=0; i<this.node.getChildCount(); i++) {
+            if (this.node.getChild(i).isSameNode(child.node)) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    XML insertChildBefore(XML child, Object xml) {
+        if (child == null) {
+            // Spec says inserting before nothing is the same as appending
+            appendChild(xml);
+        } else {
+            XmlNode[] toInsert = getNodesForInsert(xml);
+            int index = getChildIndexOf(child);
+            if (index != -1) {
+                this.node.insertChildrenAt(index, toInsert);
+            }
+        }
+
+        return this;
+    }
+
+    XML insertChildAfter(XML child, Object xml) {
+        if (child == null) {
+            // Spec says inserting after nothing is the same as prepending
+            prependChild(xml);
+        } else {
+            XmlNode[] toInsert = getNodesForInsert(xml);
+            int index = getChildIndexOf(child);
+            if (index != -1) {
+                this.node.insertChildrenAt(index+1, toInsert);
+            }
+        }
+
+        return this;
+    }
+
+    XML setChildren(Object xml) {
+        //    TODO    Have not carefully considered the spec but it seems to call for this
+        if (!isElement()) return this;
+
+        while(this.node.getChildCount() > 0) {
+            this.node.removeChild(0);
+        }
+        XmlNode[] toInsert = getNodesForInsert(xml);
+        // append new children
+        this.node.insertChildrenAt(0, toInsert);
+
+        return this;
+    }
+
+    //
+    //    Name and namespace-related methods
+    //
+
+    private void addInScopeNamespace(Namespace ns) {
+        if (!isElement()) {
+            return;
+        }
+        //    See ECMA357 9.1.1.13
+        //    in this implementation null prefix means ECMA undefined
+        if (ns.prefix() != null) {
+            if (ns.prefix().length() == 0 && ns.uri().length() == 0) {
+                return;
+            }
+            if (node.getQname().getNamespace().getPrefix().equals(ns.prefix())) {
+                node.invalidateNamespacePrefix();
+            }
+            node.declareNamespace(ns.prefix(), ns.uri());
+        } else {
+            return;
+        }
+    }
+
+    Namespace[] inScopeNamespaces() {
+        XmlNode.Namespace[] inScope = this.node.getInScopeNamespaces();
+        return createNamespaces(inScope);
+    }
+
+    private XmlNode.Namespace adapt(Namespace ns) {
+        if (ns.prefix() == null) {
+            return XmlNode.Namespace.create(ns.uri());
+        } else {
+            return XmlNode.Namespace.create(ns.prefix(), ns.uri());
+        }
+    }
+
+    XML removeNamespace(Namespace ns) {
+        if (!isElement()) return this;
+        this.node.removeNamespace(adapt(ns));
+        return this;
+    }
+
+    XML addNamespace(Namespace ns) {
+        addInScopeNamespace(ns);
+        return this;
+    }
+
+    QName name() {
+        if (isText() || isComment()) return null;
+        if (isProcessingInstruction()) return newQName("", this.node.getQname().getLocalName(), null);
+        return newQName(node.getQname());
+    }
+
+    Namespace[] namespaceDeclarations() {
+        XmlNode.Namespace[] declarations = node.getNamespaceDeclarations();
+        return createNamespaces(declarations);
+    }
+
+    Namespace namespace(String prefix) {
+        if (prefix == null) {
+            return createNamespace( this.node.getNamespaceDeclaration() );
+        } else {
+            return createNamespace( this.node.getNamespaceDeclaration(prefix) );
+        }
+    }
+
+    String localName() {
+        if (name() == null) return null;
+        return name().localName();
+    }
+
+    void setLocalName(String localName) {
+        //    ECMA357 13.4.4.34
+        if (isText() || isComment()) return;
+        this.node.setLocalName(localName);
+    }
+
+    void setName(QName name) {
+        //    See ECMA357 13.4.4.35
+        if (isText() || isComment()) return;
+        if (isProcessingInstruction()) {
+            //    Spec says set the name URI to empty string and then set the [[Name]] property, but I understand this to do the same
+            //    thing, unless we allow colons in processing instruction targets, which I think we do not.
+            this.node.setLocalName(name.localName());
+            return;
+        }
+        node.renameNode(name.getDelegate());
+    }
+
+    void setNamespace(Namespace ns) {
+        //    See ECMA357 13.4.4.36
+        if (isText() || isComment() || isProcessingInstruction()) return;
+        setName(newQName(ns.uri(), localName(), ns.prefix()));
+    }
+
+    final String ecmaClass() {
+        //    See ECMA357 9.1
+
+        //    TODO    See ECMA357 9.1.1 last paragraph for what defaults should be
+
+        if (node.isTextType()) {
+            return "text";
+        } else if (node.isAttributeType()) {
+            return "attribute";
+        } else if (node.isCommentType()) {
+            return "comment";
+        } else if (node.isProcessingInstructionType()) {
+            return "processing-instruction";
+        } else if (node.isElementType()) {
+            return "element";
+        } else {
+            throw new RuntimeException("Unrecognized type: " + node);
+        }
+    }
+
+    public String getClassName() {
+        //    TODO:    This appears to confuse the interpreter if we use the "real" class property from ECMA.  Otherwise this code
+        //    would be:
+        //    return ecmaClass();
+        return "XML";
+    }
+
+    private String ecmaValue() {
+        return node.ecmaValue();
+    }
+
+    private String ecmaToString() {
+        //    See ECMA357 10.1.1
+        if (isAttribute() || isText()) {
+            return ecmaValue();
+        }
+        if (this.hasSimpleContent()) {
+            StringBuffer rv = new StringBuffer();
+            for (int i=0; i < this.node.getChildCount(); i++) {
+                XmlNode child = this.node.getChild(i);
+                if (!child.isProcessingInstructionType() &&
+                    !child.isCommentType())
+                {
+                    // TODO: Probably inefficient; taking clean non-optimized
+                    // solution for now
+                    XML x = new XML(getLib(), getParentScope(),
+                                    (XMLObject)getPrototype(), child);
+                    rv.append(x.toString());
+                }
+            }
+            return rv.toString();
+        }
+        return toXMLString();
+    }
+
+    public String toString() {
+        return ecmaToString();
+    }
+
+    String toXMLString() {
+        return this.node.ecmaToXMLString(getProcessor());
+    }
+
+    final boolean isAttribute() {
+        return node.isAttributeType();
+    }
+
+    final boolean isComment() {
+        return node.isCommentType();
+    }
+
+    final boolean isText() {
+        return node.isTextType();
+    }
+
+    final boolean isElement() {
+        return node.isElementType();
+    }
+
+    final boolean isProcessingInstruction() {
+        return node.isProcessingInstructionType();
+    }
+
+    //    Support experimental Java interface
+    org.w3c.dom.Node toDomNode() {
+        return node.toDomNode();
+    }
+}
diff --git a/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLCtor.java b/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLCtor.java
new file mode 100644
index 0000000..fac8773
--- /dev/null
+++ b/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLCtor.java
@@ -0,0 +1,280 @@
+/* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Rhino code, released
+ * May 6, 1999.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1997-2000
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Igor Bukanov
+ *   David P. Caldwell <inonit@inonit.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * the GNU General Public License Version 2 or later (the "GPL"), in which
+ * case the provisions of the GPL are applicable instead of those above. If
+ * you wish to allow use of your version of this file only under the terms of
+ * the GPL and not to allow others to use your version of this file under the
+ * MPL, indicate your decision by deleting the provisions above and replacing
+ * them with the notice and other provisions required by the GPL. If you do
+ * not delete the provisions above, a recipient may use your version of this
+ * file under either the MPL or the GPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+package org.mozilla.javascript.xmlimpl;
+
+import org.mozilla.javascript.*;
+
+class XMLCtor extends IdFunctionObject
+{
+    static final long serialVersionUID = -8708195078359817341L;
+
+    private static final Object XMLCTOR_TAG = new Object();
+
+    private XmlProcessor options;
+//    private XMLLibImpl lib;
+
+    XMLCtor(XML xml, Object tag, int id, int arity)
+    {
+        super(xml, tag, id, arity);
+//        this.lib = xml.lib;
+        this.options = xml.getProcessor();
+        activatePrototypeMap(MAX_FUNCTION_ID);
+    }
+
+    private void writeSetting(Scriptable target)
+    {
+        for (int i = 1; i <= MAX_INSTANCE_ID; ++i) {
+            int id = super.getMaxInstanceId() + i;
+            String name = getInstanceIdName(id);
+            Object value = getInstanceIdValue(id);
+            ScriptableObject.putProperty(target, name, value);
+        }
+    }
+
+    private void readSettings(Scriptable source)
+    {
+        for (int i = 1; i <= MAX_INSTANCE_ID; ++i) {
+            int id = super.getMaxInstanceId() + i;
+            String name = getInstanceIdName(id);
+            Object value = ScriptableObject.getProperty(source, name);
+            if (value == Scriptable.NOT_FOUND) {
+                continue;
+            }
+            switch (i) {
+              case Id_ignoreComments:
+              case Id_ignoreProcessingInstructions:
+              case Id_ignoreWhitespace:
+              case Id_prettyPrinting:
+                if (!(value instanceof Boolean)) {
+                    continue;
+                }
+                break;
+              case Id_prettyIndent:
+                if (!(value instanceof Number)) {
+                    continue;
+                }
+                break;
+              default:
+                throw new IllegalStateException();
+            }
+            setInstanceIdValue(id, value);
+        }
+    }
+
+// #string_id_map#
+
+    private static final int
+        Id_ignoreComments               = 1,
+        Id_ignoreProcessingInstructions = 2,
+        Id_ignoreWhitespace             = 3,
+        Id_prettyIndent                 = 4,
+        Id_prettyPrinting               = 5,
+
+        MAX_INSTANCE_ID                 = 5;
+
+    protected int getMaxInstanceId()
+    {
+        return super.getMaxInstanceId() + MAX_INSTANCE_ID;
+    }
+
+    protected int findInstanceIdInfo(String s) {
+        int id;
+// #generated# Last update: 2007-08-20 09:01:10 EDT
+        L0: { id = 0; String X = null; int c;
+            L: switch (s.length()) {
+            case 12: X="prettyIndent";id=Id_prettyIndent; break L;
+            case 14: c=s.charAt(0);
+                if (c=='i') { X="ignoreComments";id=Id_ignoreComments; }
+                else if (c=='p') { X="prettyPrinting";id=Id_prettyPrinting; }
+                break L;
+            case 16: X="ignoreWhitespace";id=Id_ignoreWhitespace; break L;
+            case 28: X="ignoreProcessingInstructions";id=Id_ignoreProcessingInstructions; break L;
+            }
+            if (X!=null && X!=s && !X.equals(s)) id = 0;
+            break L0;
+        }
+// #/generated#
+
+        if (id == 0) return super.findInstanceIdInfo(s);
+
+        int attr;
+        switch (id) {
+          case Id_ignoreComments:
+          case Id_ignoreProcessingInstructions:
+          case Id_ignoreWhitespace:
+          case Id_prettyIndent:
+          case Id_prettyPrinting:
+            attr = PERMANENT | DONTENUM;
+            break;
+          default: throw new IllegalStateException();
+        }
+        return instanceIdInfo(attr, super.getMaxInstanceId() + id);
+    }
+
+// #/string_id_map#
+
+    protected String getInstanceIdName(int id)
+    {
+        switch (id - super.getMaxInstanceId()) {
+          case Id_ignoreComments:               return "ignoreComments";
+          case Id_ignoreProcessingInstructions: return "ignoreProcessingInstructions";
+          case Id_ignoreWhitespace:             return "ignoreWhitespace";
+          case Id_prettyIndent:                 return "prettyIndent";
+          case Id_prettyPrinting:               return "prettyPrinting";
+        }
+        return super.getInstanceIdName(id);
+    }
+
+    protected Object getInstanceIdValue(int id)
+    {
+        switch (id - super.getMaxInstanceId()) {
+          case Id_ignoreComments:
+            return ScriptRuntime.wrapBoolean(options.isIgnoreComments());
+          case Id_ignoreProcessingInstructions:
+            return ScriptRuntime.wrapBoolean(options.isIgnoreProcessingInstructions());
+          case Id_ignoreWhitespace:
+            return ScriptRuntime.wrapBoolean(options.isIgnoreWhitespace());
+          case Id_prettyIndent:
+            return ScriptRuntime.wrapInt(options.getPrettyIndent());
+          case Id_prettyPrinting:
+            return ScriptRuntime.wrapBoolean(options.isPrettyPrinting());
+        }
+        return super.getInstanceIdValue(id);
+    }
+
+    protected void setInstanceIdValue(int id, Object value) {
+        switch (id - super.getMaxInstanceId()) {
+            case Id_ignoreComments:
+                options.setIgnoreComments(ScriptRuntime.toBoolean(value));
+                return;
+            case Id_ignoreProcessingInstructions:
+                options.setIgnoreProcessingInstructions(ScriptRuntime.toBoolean(value));
+                return;
+            case Id_ignoreWhitespace:
+                options.setIgnoreWhitespace(ScriptRuntime.toBoolean(value));
+                return;
+            case Id_prettyIndent:
+                options.setPrettyIndent(ScriptRuntime.toInt32(value));
+                return;
+            case Id_prettyPrinting:
+                options.setPrettyPrinting(ScriptRuntime.toBoolean(value));
+                return;
+        }
+        super.setInstanceIdValue(id, value);
+    }
+
+// #string_id_map#
+    private static final int
+        Id_defaultSettings              = 1,
+        Id_settings                     = 2,
+        Id_setSettings                  = 3,
+        MAX_FUNCTION_ID                 = 3;
+
+    protected int findPrototypeId(String s)
+    {
+        int id;
+// #generated# Last update: 2007-08-20 09:01:10 EDT
+        L0: { id = 0; String X = null;
+            int s_length = s.length();
+            if (s_length==8) { X="settings";id=Id_settings; }
+            else if (s_length==11) { X="setSettings";id=Id_setSettings; }
+            else if (s_length==15) { X="defaultSettings";id=Id_defaultSettings; }
+            if (X!=null && X!=s && !X.equals(s)) id = 0;
+            break L0;
+        }
+// #/generated#
+        return id;
+    }
+// #/string_id_map#
+
+    protected void initPrototypeId(int id)
+    {
+        String s;
+        int arity;
+        switch (id) {
+          case Id_defaultSettings:  arity=0; s="defaultSettings";  break;
+          case Id_settings:         arity=0; s="settings";         break;
+          case Id_setSettings:      arity=1; s="setSettings";      break;
+          default: throw new IllegalArgumentException(String.valueOf(id));
+        }
+        initPrototypeMethod(XMLCTOR_TAG, id, s, arity);
+    }
+
+    public Object execIdCall(IdFunctionObject f, Context cx, Scriptable scope,
+                             Scriptable thisObj, Object[] args)
+    {
+        if (!f.hasTag(XMLCTOR_TAG)) {
+            return super.execIdCall(f, cx, scope, thisObj, args);
+        }
+        int id = f.methodId();
+        switch (id) {
+          case Id_defaultSettings: {
+            options.setDefault();
+            Scriptable obj = cx.newObject(scope);
+            writeSetting(obj);
+            return obj;
+          }
+          case Id_settings: {
+            Scriptable obj = cx.newObject(scope);
+            writeSetting(obj);
+            return obj;
+          }
+          case Id_setSettings: {
+            if (args.length == 0
+                || args[0] == null
+                || args[0] == Undefined.instance)
+            {
+                options.setDefault();
+            } else if (args[0] instanceof Scriptable) {
+                readSettings((Scriptable)args[0]);
+            }
+            return Undefined.instance;
+          }
+        }
+        throw new IllegalArgumentException(String.valueOf(id));
+    }
+
+    /**
+        hasInstance for XML objects works differently than other objects; see ECMA357 13.4.3.10.
+     */
+    public boolean hasInstance(Scriptable instance) {
+        return (instance instanceof XML || instance instanceof XMLList);
+    }
+}
diff --git a/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLLibImpl.java b/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLLibImpl.java
new file mode 100644
index 0000000..6d45240
--- /dev/null
+++ b/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLLibImpl.java
@@ -0,0 +1,606 @@
+/* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Rhino code, released
+ * May 6, 1999.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1997-2000
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Igor Bukanov
+ *   David P. Caldwell <inonit@inonit.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * the GNU General Public License Version 2 or later (the "GPL"), in which
+ * case the provisions of the GPL are applicable instead of those above. If
+ * you wish to allow use of your version of this file only under the terms of
+ * the GPL and not to allow others to use your version of this file under the
+ * MPL, indicate your decision by deleting the provisions above and replacing
+ * them with the notice and other provisions required by the GPL. If you do
+ * not delete the provisions above, a recipient may use your version of this
+ * file under either the MPL or the GPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+package org.mozilla.javascript.xmlimpl;
+
+import java.io.Serializable;
+
+import org.mozilla.javascript.*;
+import org.mozilla.javascript.xml.*;
+
+public final class XMLLibImpl extends XMLLib implements Serializable {
+    //    TODO    Document that this only works with JDK 1.5 or backport its
+    //    features to earlier versions
+    private static final long serialVersionUID = 1L;
+
+    //
+    //    EXPERIMENTAL Java interface
+    //
+
+    /**
+        This experimental interface is undocumented.
+     */
+    public static org.w3c.dom.Node toDomNode(Object xmlObject) {
+        //    Could return DocumentFragment for XMLList
+        //    Probably a single node for XMLList with one element
+        if (xmlObject instanceof XML) {
+            return ((XML)xmlObject).toDomNode();
+        } else {
+            throw new IllegalArgumentException("xmlObject is not an XML object in JavaScript.");
+        }
+    }
+
+    public static void init(Context cx, Scriptable scope, boolean sealed) {
+        XMLLibImpl lib = new XMLLibImpl(scope);
+        XMLLib bound = lib.bindToScope(scope);
+        if (bound == lib) {
+            lib.exportToScope(sealed);
+        }
+    }
+
+    private Scriptable globalScope;
+
+    private XML xmlPrototype;
+    private XMLList xmlListPrototype;
+    private Namespace namespacePrototype;
+    private QName qnamePrototype;
+
+    private XmlProcessor options = new XmlProcessor();
+
+    private XMLLibImpl(Scriptable globalScope) {
+        this.globalScope = globalScope;
+    }
+
+    /** @deprecated */
+    QName qnamePrototype() {
+        return qnamePrototype;
+    }
+
+    /** @deprecated */
+    Scriptable globalScope() {
+        return globalScope;
+    }
+
+    XmlProcessor getProcessor() {
+        return options;
+    }
+
+    private void exportToScope(boolean sealed) {
+        xmlPrototype = newXML(XmlNode.createText(options, ""));
+        xmlListPrototype = newXMLList();
+        namespacePrototype = Namespace.create(this.globalScope, null, XmlNode.Namespace.GLOBAL);
+        qnamePrototype = QName.create(this, this.globalScope, null, XmlNode.QName.create(XmlNode.Namespace.create(""), ""));
+
+        xmlPrototype.exportAsJSClass(sealed);
+        xmlListPrototype.exportAsJSClass(sealed);
+        namespacePrototype.exportAsJSClass(sealed);
+        qnamePrototype.exportAsJSClass(sealed);
+    }
+
+    /** @deprecated */
+    XMLName toAttributeName(Context cx, Object nameValue) {
+        if (nameValue instanceof XMLName) {
+            //    TODO    Will this always be an XMLName of type attribute name?
+            return (XMLName)nameValue;
+        } else if (nameValue instanceof QName) {
+            return XMLName.create( ((QName)nameValue).getDelegate(), true, false );
+        } else if (nameValue instanceof Boolean
+            || nameValue instanceof Number
+            || nameValue == Undefined.instance
+            || nameValue == null) {
+            throw badXMLName(nameValue);
+        } else {
+            //    TODO    Not 100% sure that putting these in global namespace is the right thing to do
+            String localName = null;
+            if (nameValue instanceof String) {
+                localName = (String)nameValue;
+            } else {
+                localName = ScriptRuntime.toString(nameValue);
+            }
+            if (localName != null && localName.equals("*")) localName = null;
+            return XMLName.create(XmlNode.QName.create(XmlNode.Namespace.create(""), localName), true, false);
+        }
+    }
+
+    private static RuntimeException badXMLName(Object value)
+    {
+        String msg;
+        if (value instanceof Number) {
+            msg = "Can not construct XML name from number: ";
+        } else if (value instanceof Boolean) {
+            msg = "Can not construct XML name from boolean: ";
+        } else if (value == Undefined.instance || value == null) {
+            msg = "Can not construct XML name from ";
+        } else {
+            throw new IllegalArgumentException(value.toString());
+        }
+        return ScriptRuntime.typeError(msg+ScriptRuntime.toString(value));
+    }
+
+    XMLName toXMLNameFromString(Context cx, String name) {
+        return XMLName.create( getDefaultNamespaceURI(cx), name );
+    }
+
+    /** @deprecated */
+    XMLName toXMLName(Context cx, Object nameValue) {
+        XMLName result;
+
+        if (nameValue instanceof XMLName) {
+            result = (XMLName)nameValue;
+        } else if (nameValue instanceof QName) {
+            QName qname = (QName)nameValue;
+            result = XMLName.formProperty(qname.uri(), qname.localName());
+        } else if (nameValue instanceof String) {
+            result = toXMLNameFromString(cx, (String)nameValue);
+        } else if (nameValue instanceof Boolean
+            || nameValue instanceof Number
+            || nameValue == Undefined.instance
+            || nameValue == null) {
+            throw badXMLName(nameValue);
+        } else {
+            String name = ScriptRuntime.toString(nameValue);
+            result = toXMLNameFromString(cx, name);
+        }
+
+        return result;
+    }
+
+    /**
+     * If value represents Uint32 index, make it available through
+     * ScriptRuntime.lastUint32Result(cx) and return null.
+     * Otherwise return the same value as toXMLName(cx, value).
+     */
+    XMLName toXMLNameOrIndex(Context cx, Object value)
+    {
+        XMLName result;
+
+        if (value instanceof XMLName) {
+            result = (XMLName)value;
+        } else if (value instanceof String) {
+            String str = (String)value;
+            long test = ScriptRuntime.testUint32String(str);
+            if (test >= 0) {
+                ScriptRuntime.storeUint32Result(cx, test);
+                result = null;
+            } else {
+                result = toXMLNameFromString(cx, str);
+            }
+        } else if (value instanceof Number) {
+            double d = ((Number)value).doubleValue();
+            long l = (long)d;
+            if (l == d && 0 <= l && l <= 0xFFFFFFFFL) {
+                ScriptRuntime.storeUint32Result(cx, l);
+                result = null;
+            } else {
+                throw badXMLName(value);
+            }
+        } else if (value instanceof QName) {
+            QName qname = (QName)value;
+            String uri = qname.uri();
+            boolean number = false;
+            result = null;
+            if (uri != null && uri.length() == 0) {
+                // Only in this case qname.toString() can resemble uint32
+                long test = ScriptRuntime.testUint32String(uri);
+                if (test >= 0) {
+                    ScriptRuntime.storeUint32Result(cx, test);
+                    number = true;
+                }
+            }
+            if (!number) {
+                result = XMLName.formProperty(uri, qname.localName());
+            }
+        } else if (value instanceof Boolean
+                   || value == Undefined.instance
+                   || value == null)
+        {
+            throw badXMLName(value);
+        } else {
+            String str = ScriptRuntime.toString(value);
+            long test = ScriptRuntime.testUint32String(str);
+            if (test >= 0) {
+                ScriptRuntime.storeUint32Result(cx, test);
+                result = null;
+            } else {
+                result = toXMLNameFromString(cx, str);
+            }
+        }
+
+        return result;
+    }
+
+    Object addXMLObjects(Context cx, XMLObject obj1, XMLObject obj2)
+    {
+        XMLList listToAdd = newXMLList();
+
+        if (obj1 instanceof XMLList) {
+            XMLList list1 = (XMLList)obj1;
+            if (list1.length() == 1) {
+                listToAdd.addToList(list1.item(0));
+            } else {
+                // Might be xmlFragment + xmlFragment + xmlFragment + ...;
+                // then the result will be an XMLList which we want to be an
+                // rValue and allow it to be assigned to an lvalue.
+                listToAdd = newXMLListFrom(obj1);
+            }
+        } else {
+            listToAdd.addToList(obj1);
+        }
+
+        if (obj2 instanceof XMLList) {
+            XMLList list2 = (XMLList)obj2;
+            for (int i = 0; i < list2.length(); i++) {
+                listToAdd.addToList(list2.item(i));
+            }
+        } else if (obj2 instanceof XML) {
+            listToAdd.addToList(obj2);
+        }
+
+        return listToAdd;
+    }
+
+    private Ref xmlPrimaryReference(Context cx, XMLName xmlName, Scriptable scope) {
+        XMLObjectImpl xmlObj;
+        XMLObjectImpl firstXml = null;
+        for (;;) {
+            // XML object can only present on scope chain as a wrapper
+            // of XMLWithScope
+            if (scope instanceof XMLWithScope) {
+                xmlObj = (XMLObjectImpl)scope.getPrototype();
+                if (xmlObj.hasXMLProperty(xmlName)) {
+                    break;
+                }
+                if (firstXml == null) {
+                    firstXml = xmlObj;
+                }
+            }
+            scope = scope.getParentScope();
+            if (scope == null) {
+                xmlObj = firstXml;
+                break;
+            }
+        }
+
+        // xmlObj == null corresponds to undefined as the target of
+        // the reference
+        if (xmlObj != null) {
+            xmlName.initXMLObject(xmlObj);
+        }
+        return xmlName;
+    }
+
+    Namespace castToNamespace(Context cx, Object namespaceObj) {
+        return this.namespacePrototype.castToNamespace(namespaceObj);
+    }
+
+    private String getDefaultNamespaceURI(Context cx) {
+        return getDefaultNamespace(cx).uri();
+    }
+
+    Namespace newNamespace(String uri) {
+        return this.namespacePrototype.newNamespace(uri);
+    }
+
+    Namespace getDefaultNamespace(Context cx) {
+        if (cx == null) {
+            cx = Context.getCurrentContext();
+            if (cx == null) {
+                return namespacePrototype;
+            }
+        }
+
+        Object ns = ScriptRuntime.searchDefaultNamespace(cx);
+        if (ns == null) {
+            return namespacePrototype;
+        } else {
+            if (ns instanceof Namespace) {
+                return (Namespace)ns;
+            } else {
+                //    TODO    Clarify or remove the following comment
+                // Should not happen but for now it could
+                // due to bad searchDefaultNamespace implementation.
+                return namespacePrototype;
+            }
+        }
+    }
+
+    Namespace[] createNamespaces(XmlNode.Namespace[] declarations) {
+        Namespace[] rv = new Namespace[declarations.length];
+        for (int i=0; i<declarations.length; i++) {
+            rv[i] = this.namespacePrototype.newNamespace(declarations[i].getPrefix(), declarations[i].getUri());
+        }
+        return rv;
+    }
+
+    //    See ECMA357 13.3.2
+    QName constructQName(Context cx, Object namespace, Object name) {
+        return this.qnamePrototype.constructQName(this, cx, namespace, name);
+    }
+
+    QName newQName(String uri, String localName, String prefix) {
+        return this.qnamePrototype.newQName(this, uri, localName, prefix);
+    }
+
+    QName constructQName(Context cx, Object nameValue) {
+//        return constructQName(cx, Undefined.instance, nameValue);
+        return this.qnamePrototype.constructQName(this, cx, nameValue);
+    }
+
+    QName castToQName(Context cx, Object qnameValue) {
+        return this.qnamePrototype.castToQName(this, cx, qnameValue);
+    }
+
+    QName newQName(XmlNode.QName qname) {
+        return QName.create(this, this.globalScope, this.qnamePrototype, qname);
+    }
+
+    XML newXML(XmlNode node) {
+        return new XML(this, this.globalScope, this.xmlPrototype, node);
+    }
+
+    /**
+        @deprecated I believe this can be replaced by ecmaToXml below.
+     */
+    final XML newXMLFromJs(Object inputObject) {
+        String frag;
+
+        if (inputObject == null || inputObject == Undefined.instance) {
+            frag = "";
+        } else if (inputObject instanceof XMLObjectImpl) {
+            // todo: faster way for XMLObjects?
+            frag = ((XMLObjectImpl) inputObject).toXMLString();
+        } else {
+            frag = ScriptRuntime.toString(inputObject);
+        }
+
+        if (frag.trim().startsWith("<>")) {
+            throw ScriptRuntime.typeError("Invalid use of XML object anonymous tags <></>.");
+        }
+
+        if (frag.indexOf("<") == -1) {
+            //    Solo text node
+            return newXML(XmlNode.createText(options, frag));
+        }
+        return parse(frag);
+    }
+
+    private XML parse(String frag) {
+        try {
+            return newXML(XmlNode.createElement(options, getDefaultNamespaceURI(Context.getCurrentContext()), frag));
+        } catch (org.xml.sax.SAXException e) {
+            throw ScriptRuntime.typeError("Cannot parse XML: " + e.getMessage());
+        }
+    }
+
+    final XML ecmaToXml(Object object) {
+        //    See ECMA357 10.3
+        if (object == null || object == Undefined.instance) throw ScriptRuntime.typeError("Cannot convert " + object + " to XML");
+        if (object instanceof XML) return (XML)object;
+        if (object instanceof XMLList) {
+            XMLList list = (XMLList)object;
+            if (list.getXML() != null) {
+                return list.getXML();
+            } else {
+                throw ScriptRuntime.typeError("Cannot convert list of >1 element to XML");
+            }
+        }
+        //    TODO    Technically we should fail on anything except a String, Number or Boolean
+        //            See ECMA357 10.3
+        // Extension: if object is a DOM node, use that to construct the XML
+        // object.
+        if (object instanceof Wrapper) {
+            object = ((Wrapper) object).unwrap();
+        }
+        if (object instanceof org.w3c.dom.Node) {
+            org.w3c.dom.Node node = (org.w3c.dom.Node) object;
+            return newXML(XmlNode.createElementFromNode(node));
+        }
+        //    Instead we just blindly cast to a String and let them convert anything.
+        String s = ScriptRuntime.toString(object);
+        //    TODO    Could this get any uglier?
+        if (s.length() > 0 && s.charAt(0) == '<') {
+            return parse(s);
+        } else {
+            return newXML(XmlNode.createText(options, s));
+        }
+    }
+
+    final XML newTextElementXML(XmlNode reference, XmlNode.QName qname, String value) {
+        return newXML(XmlNode.newElementWithText(options, reference, qname, value));
+    }
+
+    XMLList newXMLList() {
+        return new XMLList(this, this.globalScope, this.xmlListPrototype);
+    }
+
+    final XMLList newXMLListFrom(Object inputObject) {
+        XMLList rv = newXMLList();
+
+        if (inputObject == null || inputObject instanceof Undefined) {
+            return rv;
+        } else if (inputObject instanceof XML) {
+            XML xml = (XML) inputObject;
+            rv.getNodeList().add(xml);
+            return rv;
+        } else if (inputObject instanceof XMLList) {
+            XMLList xmll = (XMLList) inputObject;
+            rv.getNodeList().add(xmll.getNodeList());
+            return rv;
+        } else {
+            String frag = ScriptRuntime.toString(inputObject).trim();
+
+            if (!frag.startsWith("<>")) {
+                frag = "<>" + frag + "</>";
+            }
+
+            frag = "<fragment>" + frag.substring(2);
+            if (!frag.endsWith("</>")) {
+                throw ScriptRuntime.typeError("XML with anonymous tag missing end anonymous tag");
+            }
+
+            frag = frag.substring(0, frag.length() - 3) + "</fragment>";
+
+            XML orgXML = newXMLFromJs(frag);
+
+            // Now orphan the children and add them to our XMLList.
+            XMLList children = orgXML.children();
+
+            for (int i = 0; i < children.getNodeList().length(); i++) {
+                // Copy here is so that they'll be orphaned (parent() will be undefined)
+                rv.getNodeList().add(((XML) children.item(i).copy()));
+            }
+            return rv;
+        }
+    }
+
+    XmlNode.QName toNodeQName(Context cx, Object namespaceValue, Object nameValue) {
+        // This is duplication of constructQName(cx, namespaceValue, nameValue)
+        // but for XMLName
+
+        String localName;
+
+        if (nameValue instanceof QName) {
+            QName qname = (QName)nameValue;
+            localName = qname.localName();
+        } else {
+            localName = ScriptRuntime.toString(nameValue);
+        }
+
+        XmlNode.Namespace ns;
+        if (namespaceValue == Undefined.instance) {
+            if ("*".equals(localName)) {
+                ns = null;
+            } else {
+                ns = getDefaultNamespace(cx).getDelegate();
+            }
+        } else if (namespaceValue == null) {
+            ns = null;
+        } else if (namespaceValue instanceof Namespace) {
+            ns = ((Namespace)namespaceValue).getDelegate();
+        } else {
+            ns = this.namespacePrototype.constructNamespace(namespaceValue).getDelegate();
+        }
+
+        if (localName != null && localName.equals("*")) localName = null;
+        return XmlNode.QName.create(ns, localName);
+    }
+
+    XmlNode.QName toNodeQName(Context cx, String name, boolean attribute) {
+        XmlNode.Namespace defaultNamespace = getDefaultNamespace(cx).getDelegate();
+        if (name != null && name.equals("*")) {
+            return XmlNode.QName.create(null, null);
+        } else {
+            if (attribute) {
+                return XmlNode.QName.create(XmlNode.Namespace.GLOBAL, name);
+            } else {
+                return XmlNode.QName.create(defaultNamespace, name);
+            }
+        }
+    }
+
+    /**
+        @deprecated Too general; this should be split into overloaded methods.
+        Is that possible?
+     */
+    XmlNode.QName toNodeQName(Context cx, Object nameValue, boolean attribute) {
+        if (nameValue instanceof XMLName) {
+            return ((XMLName)nameValue).toQname();
+        } else if (nameValue instanceof QName) {
+            QName qname = (QName)nameValue;
+            return qname.getDelegate();
+        } else if (
+            nameValue instanceof Boolean
+            || nameValue instanceof Number
+            || nameValue == Undefined.instance
+            || nameValue == null
+        ) {
+            throw badXMLName(nameValue);
+        } else {
+            String local = null;
+            if (nameValue instanceof String) {
+                local = (String)nameValue;
+            } else {
+                local = ScriptRuntime.toString(nameValue);
+            }
+            return toNodeQName(cx, local, attribute);
+        }
+    }
+
+    //
+    //    Override methods from XMLLib
+    //
+
+    public boolean isXMLName(Context _cx, Object nameObj) {
+        return XMLName.accept(nameObj);
+    }
+
+    public Object toDefaultXmlNamespace(Context cx, Object uriValue) {
+        return this.namespacePrototype.constructNamespace(uriValue);
+    }
+
+    public String escapeTextValue(Object o) {
+        return options.escapeTextValue(o);
+    }
+
+    public String escapeAttributeValue(Object o) {
+        return options.escapeAttributeValue(o);
+    }
+
+    public Ref nameRef(Context cx, Object name, Scriptable scope, int memberTypeFlags) {
+        if ((memberTypeFlags & Node.ATTRIBUTE_FLAG) == 0) {
+            // should only be called foir cases like @name or @[expr]
+            throw Kit.codeBug();
+        }
+        XMLName xmlName = toAttributeName(cx, name);
+        return xmlPrimaryReference(cx, xmlName, scope);
+    }
+
+    public Ref nameRef(Context cx, Object namespace, Object name, Scriptable scope, int memberTypeFlags) {
+        XMLName xmlName = XMLName.create(toNodeQName(cx, namespace, name), false, false);
+
+        //    No idea what is coming in from the parser in this case; is it detecting the "@"?
+        if ((memberTypeFlags & Node.ATTRIBUTE_FLAG) != 0) {
+            if (!xmlName.isAttributeName()) {
+                xmlName.setAttributeName();
+            }
+        }
+
+        return xmlPrimaryReference(cx, xmlName, scope);
+    }
+}
diff --git a/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLList.java b/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLList.java
new file mode 100644
index 0000000..59dcca3
--- /dev/null
+++ b/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLList.java
@@ -0,0 +1,765 @@
+/* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Rhino code, released
+ * May 6, 1999.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1997-2000
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ethan Hugg
+ *   Terry Lucas
+ *   Milen Nankov
+ *   David P. Caldwell <inonit@inonit.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * the GNU General Public License Version 2 or later (the "GPL"), in which
+ * case the provisions of the GPL are applicable instead of those above. If
+ * you wish to allow use of your version of this file only under the terms of
+ * the GPL and not to allow others to use your version of this file under the
+ * MPL, indicate your decision by deleting the provisions above and replacing
+ * them with the notice and other provisions required by the GPL. If you do
+ * not delete the provisions above, a recipient may use your version of this
+ * file under either the MPL or the GPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+package org.mozilla.javascript.xmlimpl;
+
+import org.mozilla.javascript.*;
+import org.mozilla.javascript.xml.*;
+
+class XMLList extends XMLObjectImpl implements Function {
+    static final long serialVersionUID = -4543618751670781135L;
+
+    private XmlNode.List _annos;
+    private XMLObjectImpl targetObject = null;
+    private XmlNode.QName targetProperty = null;
+
+    XMLList(XMLLibImpl lib, Scriptable scope, XMLObject prototype) {
+        super(lib, scope, prototype);
+        _annos = new XmlNode.List();
+    }
+
+    /** @deprecated Will probably end up unnecessary as we move things around */
+    XmlNode.List getNodeList() {
+        return _annos;
+    }
+
+    //    TODO    Should be XMLObjectImpl, XMLName?
+    void setTargets(XMLObjectImpl object, XmlNode.QName property) {
+        targetObject = object;
+        targetProperty = property;
+    }
+
+    /** @deprecated */
+    private XML getXmlFromAnnotation(int index) {
+        return getXML(_annos, index);
+    }
+
+    XML getXML() {
+        if (length() == 1) return getXmlFromAnnotation(0);
+        return null;
+    }
+
+    private void internalRemoveFromList(int index) {
+        _annos.remove(index);
+    }
+
+    void replace(int index, XML xml) {
+        if (index < length()) {
+            XmlNode.List newAnnoList = new XmlNode.List();
+            newAnnoList.add(_annos, 0, index);
+            newAnnoList.add(xml);
+            newAnnoList.add(_annos, index+1, length());
+            _annos = newAnnoList;
+        }
+    }
+
+    private void insert(int index, XML xml) {
+        if (index < length()) {
+            XmlNode.List newAnnoList = new XmlNode.List();
+            newAnnoList.add(_annos, 0, index);
+            newAnnoList.add(xml);
+            newAnnoList.add(_annos, index, length());
+            _annos = newAnnoList;
+        }
+    }
+
+    //
+    //
+    //  methods overriding ScriptableObject
+    //
+    //
+
+    public String getClassName() {
+        return "XMLList";
+    }
+
+    //
+    //
+    //  methods overriding IdScriptableObject
+    //
+    //
+
+    public Object get(int index, Scriptable start) {
+        //Log("get index: " + index);
+
+        if (index >= 0 && index < length()) {
+            return getXmlFromAnnotation(index);
+        } else {
+            return Scriptable.NOT_FOUND;
+        }
+    }
+
+    boolean hasXMLProperty(XMLName xmlName) {
+        boolean result = false;
+
+        // Has now should return true if the property would have results > 0 or
+        // if it's a method name
+        String name = xmlName.localName();
+        if ((getPropertyList(xmlName).length() > 0) ||
+            (getMethod(name) != NOT_FOUND)) {
+            result = true;
+        }
+
+        return result;
+    }
+
+    public boolean has(int index, Scriptable start) {
+        return 0 <= index && index < length();
+    }
+
+    void putXMLProperty(XMLName xmlName, Object value) {
+        //Log("put property: " + name);
+
+        // Special-case checks for undefined and null
+        if (value == null) {
+            value = "null";
+        } else if (value instanceof Undefined) {
+            value = "undefined";
+        }
+
+        if (length() > 1) {
+            throw ScriptRuntime.typeError("Assignment to lists with more than one item is not supported");
+        } else if (length() == 0) {
+            // Secret sauce for super-expandos.
+            // We set an element here, and then add ourselves to our target.
+            if (targetObject != null && targetProperty != null && targetProperty.getLocalName() != null) {
+                // Add an empty element with our targetProperty name and then set it.
+                XML xmlValue = newTextElementXML(null, targetProperty, null);
+                addToList(xmlValue);
+
+                if(xmlName.isAttributeName()) {
+                    setAttribute(xmlName, value);
+                } else {
+                    XML xml = item(0);
+                    xml.putXMLProperty(xmlName, value);
+
+                    // Update the list with the new item at location 0.
+                    replace(0, item(0));
+                }
+
+                // Now add us to our parent
+                XMLName name2 = XMLName.formProperty(targetProperty.getUri(), targetProperty.getLocalName());
+                targetObject.putXMLProperty(name2, this);
+            } else {
+                throw ScriptRuntime.typeError("Assignment to empty XMLList without targets not supported");
+            }
+        } else if(xmlName.isAttributeName()) {
+            setAttribute(xmlName, value);
+        } else {
+            XML xml = item(0);
+            xml.putXMLProperty(xmlName, value);
+
+            // Update the list with the new item at location 0.
+            replace(0, item(0));
+        }
+    }
+
+    Object getXMLProperty(XMLName name) {
+        return getPropertyList(name);
+    }
+
+    private void replaceNode(XML xml, XML with) {
+        xml.replaceWith(with);
+    }
+
+    public void put(int index, Scriptable start, Object value) {
+        Object parent = Undefined.instance;
+        // Convert text into XML if needed.
+        XMLObject xmlValue;
+
+        // Special-case checks for undefined and null
+        if (value == null) {
+            value = "null";
+        } else if (value instanceof Undefined) {
+            value = "undefined";
+        }
+
+        if (value instanceof XMLObject) {
+            xmlValue = (XMLObject) value;
+        } else {
+            if (targetProperty == null) {
+                xmlValue = newXMLFromJs(value.toString());
+            } else {
+                //    Note that later in the code, we will use this as an argument to replace(int,value)
+                //    So we will be "replacing" this element with itself
+                //    There may well be a better way to do this
+                //    TODO    Find a way to refactor this whole method and simplify it
+                xmlValue = item(index);
+                ((XML)xmlValue).setChildren(value);
+            }
+        }
+
+        // Find the parent
+        if (index < length()) {
+            parent = item(index).parent();
+        } else {
+            // Appending
+            parent = parent();
+        }
+
+        if (parent instanceof XML) {
+            // found parent, alter doc
+            XML xmlParent = (XML) parent;
+
+            if (index < length()) {
+                // We're replacing the the node.
+                XML xmlNode = getXmlFromAnnotation(index);
+
+                if (xmlValue instanceof XML) {
+                    replaceNode(xmlNode, (XML) xmlValue);
+                    replace(index, xmlNode);
+                } else if (xmlValue instanceof XMLList) {
+                    // Replace the first one, and add the rest on the list.
+                    XMLList list = (XMLList) xmlValue;
+
+                    if (list.length() > 0) {
+                        int lastIndexAdded = xmlNode.childIndex();
+                        replaceNode(xmlNode, list.item(0));
+                        replace(index, list.item(0));
+
+                        for (int i = 1; i < list.length(); i++) {
+                            xmlParent.insertChildAfter(xmlParent.getXmlChild(lastIndexAdded), list.item(i));
+                            lastIndexAdded++;
+                            insert(index + i, list.item(i));
+                        }
+                    }
+                }
+            } else {
+                // Appending
+                xmlParent.appendChild(xmlValue);
+                addToList(xmlParent.getXmlChild(index));
+            }
+        } else {
+            // Don't all have same parent, no underlying doc to alter
+            if (index < length()) {
+                XML xmlNode = getXML(_annos, index);
+
+                if (xmlValue instanceof XML) {
+                    replaceNode(xmlNode, (XML) xmlValue);
+                    replace(index, xmlNode);
+                } else if (xmlValue instanceof XMLList) {
+                    // Replace the first one, and add the rest on the list.
+                    XMLList list = (XMLList) xmlValue;
+
+                    if (list.length() > 0) {
+                        replaceNode(xmlNode, list.item(0));
+                        replace(index, list.item(0));
+
+                        for (int i = 1; i < list.length(); i++) {
+                            insert(index + i, list.item(i));
+                        }
+                    }
+                }
+            } else {
+                addToList(xmlValue);
+            }
+        }
+    }
+
+    private XML getXML(XmlNode.List _annos, int index) {
+        if (index >= 0 && index < length()) {
+            return xmlFromNode(_annos.item(index));
+        } else {
+            return null;
+        }
+    }
+
+    void deleteXMLProperty(XMLName name) {
+        for (int i = 0; i < length(); i++) {
+            XML xml = getXmlFromAnnotation(i);
+
+            if (xml.isElement()) {
+                xml.deleteXMLProperty(name);
+            }
+        }
+    }
+
+    public void delete(int index) {
+        if (index >= 0 && index < length()) {
+            XML xml = getXmlFromAnnotation(index);
+
+            xml.remove();
+
+            internalRemoveFromList(index);
+        }
+    }
+
+    public Object[] getIds() {
+        Object enumObjs[];
+
+        if (isPrototype()) {
+            enumObjs = new Object[0];
+        } else {
+            enumObjs = new Object[length()];
+
+            for (int i = 0; i < enumObjs.length; i++) {
+                enumObjs[i] = new Integer(i);
+            }
+        }
+
+        return enumObjs;
+    }
+
+    public Object[] getIdsForDebug() {
+        return getIds();
+    }
+
+
+    // XMLList will remove will delete all items in the list (a set delete) this differs from the XMLList delete operator.
+    void remove() {
+        int nLen = length();
+        for (int i = nLen - 1; i >= 0; i--) {
+            XML xml = getXmlFromAnnotation(i);
+            if (xml != null) {
+                xml.remove();
+                internalRemoveFromList(i);
+            }
+        }
+    }
+
+    XML item(int index) {
+        return _annos != null
+            ? getXmlFromAnnotation(index) : createEmptyXML();
+    }
+
+    private void setAttribute(XMLName xmlName, Object value) {
+        for (int i = 0; i < length(); i++) {
+            XML xml = getXmlFromAnnotation(i);
+            xml.setAttribute(xmlName, value);
+        }
+    }
+
+    void addToList(Object toAdd) {
+        _annos.addToList(toAdd);
+    }
+
+    //
+    //
+    // Methods from section 12.4.4 in the spec
+    //
+    //
+
+    XMLList child(int index) {
+        XMLList result = newXMLList();
+
+        for (int i = 0; i < length(); i++) {
+            result.addToList(getXmlFromAnnotation(i).child(index));
+        }
+
+        return result;
+    }
+
+    XMLList child(XMLName xmlName) {
+        XMLList result = newXMLList();
+
+        for (int i = 0; i < length(); i++) {
+            result.addToList(getXmlFromAnnotation(i).child(xmlName));
+        }
+
+        return result;
+    }
+
+    void addMatches(XMLList rv, XMLName name) {
+        for (int i=0; i<length(); i++) {
+            getXmlFromAnnotation(i).addMatches(rv, name);
+        }
+    }
+
+    XMLList children() {
+        java.util.Vector v = new java.util.Vector();
+
+        for (int i = 0; i < length(); i++) {
+            XML xml = getXmlFromAnnotation(i);
+
+            if (xml != null) {
+                Object o = xml.children();
+                if (o instanceof XMLList) {
+                    XMLList childList = (XMLList)o;
+
+                    int cChildren = childList.length();
+                    for (int j = 0; j < cChildren; j++) {
+                        v.addElement(childList.item(j));
+                    }
+                }
+            }
+        }
+
+        XMLList allChildren = newXMLList();
+        int sz = v.size();
+
+        for (int i = 0; i < sz; i++) {
+            allChildren.addToList(v.get(i));
+        }
+
+        return allChildren;
+    }
+
+    XMLList comments() {
+        XMLList result = newXMLList();
+
+        for (int i = 0; i < length(); i++) {
+            XML xml = getXmlFromAnnotation(i);
+            result.addToList(xml.comments());
+        }
+
+        return result;
+    }
+
+    XMLList elements(XMLName name) {
+        XMLList rv = newXMLList();
+        for (int i=0; i<length(); i++) {
+            XML xml = getXmlFromAnnotation(i);
+            rv.addToList(xml.elements(name));
+        }
+        return rv;
+    }
+
+    boolean contains(Object xml) {
+        boolean result = false;
+
+        for (int i = 0; i < length(); i++) {
+            XML member = getXmlFromAnnotation(i);
+
+            if (member.equivalentXml(xml)) {
+                result = true;
+                break;
+            }
+        }
+
+        return result;
+    }
+
+    XMLObjectImpl copy() {
+        XMLList result = newXMLList();
+
+        for (int i = 0; i < length(); i++) {
+            XML xml = getXmlFromAnnotation(i);
+            result.addToList(xml.copy());
+        }
+
+        return result;
+    }
+
+    boolean hasOwnProperty(XMLName xmlName) {
+        if (isPrototype()) {
+            String property = xmlName.localName();
+            return (findPrototypeId(property) != 0);
+        } else {
+            return (getPropertyList(xmlName).length() > 0);
+        }
+    }
+
+    boolean hasComplexContent() {
+        boolean complexContent;
+        int length = length();
+
+        if (length == 0) {
+            complexContent = false;
+        } else if (length == 1) {
+            complexContent = getXmlFromAnnotation(0).hasComplexContent();
+        } else {
+            complexContent = false;
+
+            for (int i = 0; i < length; i++) {
+                XML nextElement = getXmlFromAnnotation(i);
+                if (nextElement.isElement()) {
+                    complexContent = true;
+                    break;
+                }
+            }
+        }
+
+        return complexContent;
+    }
+
+    boolean hasSimpleContent() {
+        if (length() == 0) {
+            return true;
+        } else if (length() == 1) {
+            return getXmlFromAnnotation(0).hasSimpleContent();
+        } else {
+            for (int i=0; i<length(); i++) {
+                XML nextElement = getXmlFromAnnotation(i);
+                if (nextElement.isElement()) {
+                    return false;
+                }
+            }
+            return true;
+        }
+    }
+
+    int length() {
+        int result = 0;
+
+        if (_annos != null) {
+            result = _annos.length();
+        }
+
+        return result;
+    }
+
+    void normalize() {
+        for (int i = 0; i < length(); i++) {
+            getXmlFromAnnotation(i).normalize();
+        }
+    }
+
+    /**
+     * If list is empty, return undefined, if elements have different parents return undefined,
+     * If they all have the same parent, return that parent
+     */
+    Object parent() {
+        if (length() == 0) return Undefined.instance;
+
+        XML candidateParent = null;
+
+        for (int i = 0; i < length(); i++) {
+            Object currParent = getXmlFromAnnotation(i).parent();
+            if (!(currParent instanceof XML)) return Undefined.instance;
+            XML xml = (XML)currParent;
+            if (i == 0) {
+                // Set the first for the rest to compare to.
+                candidateParent = xml;
+            } else {
+                if (candidateParent.is(xml)) {
+                    //    keep looking
+                } else {
+                    return Undefined.instance;
+                }
+            }
+        }
+        return candidateParent;
+    }
+
+    XMLList processingInstructions(XMLName xmlName) {
+        XMLList result = newXMLList();
+
+        for (int i = 0; i < length(); i++) {
+            XML xml = getXmlFromAnnotation(i);
+
+            result.addToList(xml.processingInstructions(xmlName));
+        }
+
+        return result;
+    }
+
+    boolean propertyIsEnumerable(Object name) {
+        long index;
+        if (name instanceof Integer) {
+            index = ((Integer)name).intValue();
+        } else if (name instanceof Number) {
+            double x = ((Number)name).doubleValue();
+            index = (long)x;
+            if (index != x) {
+                return false;
+            }
+            if (index == 0 && 1.0 / x < 0) {
+                // Negative 0
+                return false;
+            }
+        } else {
+            String s = ScriptRuntime.toString(name);
+            index = ScriptRuntime.testUint32String(s);
+        }
+        return (0 <= index && index < length());
+    }
+
+    XMLList text() {
+        XMLList result = newXMLList();
+
+        for (int i = 0; i < length(); i++) {
+            result.addToList(getXmlFromAnnotation(i).text());
+        }
+
+        return result;
+    }
+
+    public String toString() {
+        //    ECMA357 10.1.2
+        if (hasSimpleContent()) {
+            StringBuffer sb = new StringBuffer();
+
+            for(int i = 0; i < length(); i++) {
+                XML next = getXmlFromAnnotation(i);
+                if (next.isComment() || next.isProcessingInstruction()) {
+                    //    do nothing
+                } else {
+                    sb.append(next.toString());
+                }
+            }
+
+            return sb.toString();
+        } else {
+            return toXMLString();
+        }
+    }
+
+    String toXMLString() {
+        //    See ECMA 10.2.1
+        StringBuffer sb = new StringBuffer();
+
+        for (int i=0; i<length(); i++) {
+            if (getProcessor().isPrettyPrinting() && i != 0) {
+                sb.append('\n');
+            }
+            sb.append(getXmlFromAnnotation(i).toXMLString());
+        }
+        return sb.toString();
+    }
+
+    Object valueOf() {
+        return this;
+    }
+
+    //
+    // Other public Functions from XMLObject
+    //
+
+    boolean equivalentXml(Object target) {
+        boolean result = false;
+
+        // Zero length list should equate to undefined
+        if (target instanceof Undefined && length() == 0) {
+            result = true;
+        } else if (length() == 1) {
+            result = getXmlFromAnnotation(0).equivalentXml(target);
+        } else if (target instanceof XMLList) {
+            XMLList otherList = (XMLList) target;
+
+            if (otherList.length() == length()) {
+                result = true;
+
+                for (int i = 0; i < length(); i++) {
+                    if (!getXmlFromAnnotation(i).equivalentXml(otherList.getXmlFromAnnotation(i))) {
+                        result = false;
+                        break;
+                    }
+                }
+            }
+        }
+
+        return result;
+    }
+
+    private XMLList getPropertyList(XMLName name) {
+        XMLList propertyList = newXMLList();
+        XmlNode.QName qname = null;
+
+        if (!name.isDescendants() && !name.isAttributeName()) {
+            // Only set the targetProperty if this is a regular child get
+            // and not a descendant or attribute get
+            qname = name.toQname();
+        }
+
+        propertyList.setTargets(this, qname);
+
+        for (int i = 0; i < length(); i++) {
+            propertyList.addToList(
+                getXmlFromAnnotation(i).getPropertyList(name));
+        }
+
+        return propertyList;
+    }
+
+    private Object applyOrCall(boolean isApply,
+        Context cx, Scriptable scope,
+        Scriptable thisObj, Object[] args) {
+        String methodName = isApply ? "apply" : "call";
+        if(!(thisObj instanceof XMLList) ||
+            ((XMLList)thisObj).targetProperty == null)
+            throw ScriptRuntime.typeError1("msg.isnt.function",
+                methodName);
+
+        return ScriptRuntime.applyOrCall(isApply, cx, scope, thisObj, args);
+    }
+
+    protected Object jsConstructor(Context cx, boolean inNewExpr,
+        Object[] args) {
+        if (args.length == 0) {
+            return newXMLList();
+        } else {
+            Object arg0 = args[0];
+            if (!inNewExpr && arg0 instanceof XMLList) {
+                // XMLList(XMLList) returns the same object.
+                return arg0;
+            }
+            return newXMLListFrom(arg0);
+        }
+    }
+
+    /**
+     * See ECMA 357, 11_2_2_1, Semantics, 3_e.
+     */
+    public Scriptable getExtraMethodSource(Context cx) {
+        if (length() == 1) {
+            return getXmlFromAnnotation(0);
+        }
+        return null;
+    }
+
+    public Object call(Context cx, Scriptable scope, Scriptable thisObj,
+        Object[] args) {
+        // This XMLList is being called as a Function.
+        // Let's find the real Function object.
+        if(targetProperty == null)
+            throw ScriptRuntime.notFunctionError(this);
+
+        String methodName = targetProperty.getLocalName();
+
+        boolean isApply = methodName.equals("apply");
+        if(isApply || methodName.equals("call"))
+            return applyOrCall(isApply, cx, scope, thisObj, args);
+
+        Callable method = ScriptRuntime.getElemFunctionAndThis(
+            this, methodName, cx);
+        // Call lastStoredScriptable to clear stored thisObj
+        // but ignore the result as the method should use the supplied
+        // thisObj, not one from redirected call
+        ScriptRuntime.lastStoredScriptable(cx);
+        return method.call(cx, scope, thisObj, args);
+    }
+
+    public Scriptable construct(Context cx, Scriptable scope, Object[] args) {
+        throw ScriptRuntime.typeError1("msg.not.ctor", "XMLList");
+    }
+}
+
+
diff --git a/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLName.java b/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLName.java
new file mode 100644
index 0000000..edd7525
--- /dev/null
+++ b/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLName.java
@@ -0,0 +1,469 @@
+/* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Rhino code, released
+ * May 6, 1999.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1997-2000
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Igor Bukanov
+ *   Milen Nankov
+ *   David P. Caldwell <inonit@inonit.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * the GNU General Public License Version 2 or later (the "GPL"), in which
+ * case the provisions of the GPL are applicable instead of those above. If
+ * you wish to allow use of your version of this file only under the terms of
+ * the GPL and not to allow others to use your version of this file under the
+ * MPL, indicate your decision by deleting the provisions above and replacing
+ * them with the notice and other provisions required by the GPL. If you do
+ * not delete the provisions above, a recipient may use your version of this
+ * file under either the MPL or the GPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+package org.mozilla.javascript.xmlimpl;
+
+import org.mozilla.javascript.*;
+
+class XMLName extends Ref {
+    static final long serialVersionUID = 3832176310755686977L;
+
+    private static boolean isNCNameStartChar(int c) {
+        if ((c & ~0x7F) == 0) {
+            // Optimize for ASCII and use A..Z < _ < a..z
+            if (c >= 'a') {
+                return c <= 'z';
+            } else if (c >= 'A') {
+                if (c <= 'Z') {
+                    return true;
+                }
+                return c == '_';
+            }
+        } else if ((c & ~0x1FFF) == 0) {
+            return (0xC0 <= c && c <= 0xD6)
+            || (0xD8 <= c && c <= 0xF6)
+            || (0xF8 <= c && c <= 0x2FF)
+            || (0x370 <= c && c <= 0x37D)
+            || 0x37F <= c;
+        }
+        return (0x200C <= c && c <= 0x200D)
+        || (0x2070 <= c && c <= 0x218F)
+        || (0x2C00 <= c && c <= 0x2FEF)
+        || (0x3001 <= c && c <= 0xD7FF)
+        || (0xF900 <= c && c <= 0xFDCF)
+        || (0xFDF0 <= c && c <= 0xFFFD)
+        || (0x10000 <= c && c <= 0xEFFFF);
+    }
+
+    private static boolean isNCNameChar(int c) {
+        if ((c & ~0x7F) == 0) {
+            // Optimize for ASCII and use - < . < 0..9 < A..Z < _ < a..z
+            if (c >= 'a') {
+                return c <= 'z';
+            } else if (c >= 'A') {
+                if (c <= 'Z') {
+                    return true;
+                }
+                return c == '_';
+            } else if (c >= '0') {
+                return c <= '9';
+            } else {
+                return c == '-' || c == '.';
+            }
+        } else if ((c & ~0x1FFF) == 0) {
+            return isNCNameStartChar(c) || c == 0xB7
+                || (0x300 <= c && c <= 0x36F);
+        }
+        return isNCNameStartChar(c) || (0x203F <= c && c <= 0x2040);
+    }
+
+    //    This means "accept" in the parsing sense
+    //    See ECMA357 13.1.2.1
+    static boolean accept(Object nameObj) {
+        String name;
+        try {
+            name = ScriptRuntime.toString(nameObj);
+        } catch (EcmaError ee) {
+            if ("TypeError".equals(ee.getName())) {
+                return false;
+            }
+            throw ee;
+        }
+
+        // See http://w3.org/TR/xml-names11/#NT-NCName
+        int length = name.length();
+        if (length != 0) {
+            if (isNCNameStartChar(name.charAt(0))) {
+                for (int i = 1; i != length; ++i) {
+                    if (!isNCNameChar(name.charAt(i))) {
+                        return false;
+                    }
+                }
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private XmlNode.QName qname;
+    private boolean isAttributeName;
+    private boolean isDescendants;
+    private XMLObjectImpl xmlObject;
+
+    private XMLName() {
+    }
+
+    static XMLName formStar() {
+        XMLName rv = new XMLName();
+        rv.qname = XmlNode.QName.create(null, null);
+        return rv;
+    }
+
+    /** @deprecated */
+    static XMLName formProperty(XmlNode.Namespace namespace, String localName) {
+        if (localName != null && localName.equals("*")) localName = null;
+        XMLName rv = new XMLName();
+        rv.qname = XmlNode.QName.create(namespace, localName);
+        return rv;
+    }
+
+    /** @deprecated */
+    static XMLName formProperty(String uri, String localName) {
+        return formProperty(XmlNode.Namespace.create(uri), localName);
+    }
+
+    /** @deprecated */
+    static XMLName create(String defaultNamespaceUri, String name) {
+        if (name == null)
+            throw new IllegalArgumentException();
+
+        int l = name.length();
+        if (l != 0) {
+            char firstChar = name.charAt(0);
+            if (firstChar == '*') {
+                if (l == 1) {
+                    return XMLName.formStar();
+                }
+            } else if (firstChar == '@') {
+                XMLName xmlName = XMLName.formProperty("", name.substring(1));
+                xmlName.setAttributeName();
+                return xmlName;
+            }
+        }
+
+        return XMLName.formProperty(defaultNamespaceUri, name);
+    }
+
+    static XMLName create(XmlNode.QName qname, boolean attribute, boolean descendants) {
+        XMLName rv = new XMLName();
+        rv.qname = qname;
+        rv.isAttributeName = attribute;
+        rv.isDescendants = descendants;
+        return rv;
+    }
+
+    /** @deprecated */
+    static XMLName create(XmlNode.QName qname) {
+        return create(qname, false, false);
+    }
+
+    void initXMLObject(XMLObjectImpl xmlObject) {
+        if (xmlObject == null) throw new IllegalArgumentException();
+        if (this.xmlObject != null) throw new IllegalStateException();
+        this.xmlObject = xmlObject;
+    }
+
+    String uri() {
+        if (qname.getNamespace() == null) return null;
+        return qname.getNamespace().getUri();
+    }
+
+    String localName() {
+        if (qname.getLocalName() == null) return "*";
+        return qname.getLocalName();
+    }
+
+    private void addDescendantChildren(XMLList list, XML target) {
+        XMLName xmlName = this;
+        if (target.isElement()) {
+            XML[] children = target.getChildren();
+            for (int i=0; i<children.length; i++) {
+                if (xmlName.matches( children[i] )) {
+                    list.addToList( children[i] );
+                }
+                addDescendantChildren(list, children[i]);
+            }
+        }
+    }
+
+    void addMatchingAttributes(XMLList list, XML target) {
+        XMLName name = this;
+        if (target.isElement()) {
+            XML[] attributes = target.getAttributes();
+            for (int i=0; i<attributes.length; i++) {
+                if (name.matches( attributes[i]) ) {
+                    list.addToList( attributes[i] );
+                }
+            }
+        }
+    }
+
+    private void addDescendantAttributes(XMLList list, XML target) {
+        if (target.isElement()) {
+            addMatchingAttributes(list, target);
+            XML[] children = target.getChildren();
+            for (int i=0; i<children.length; i++) {
+                addDescendantAttributes(list, children[i]);
+            }
+        }
+    }
+
+    XMLList matchDescendantAttributes(XMLList rv, XML target) {
+        rv.setTargets(target, null);
+        addDescendantAttributes(rv, target);
+        return rv;
+    }
+
+    XMLList matchDescendantChildren(XMLList rv, XML target) {
+        rv.setTargets(target, null);
+        addDescendantChildren(rv, target);
+        return rv;
+    }
+
+    void addDescendants(XMLList rv, XML target) {
+        XMLName xmlName = this;
+        if (xmlName.isAttributeName()) {
+            matchDescendantAttributes(rv, target);
+        } else {
+            matchDescendantChildren(rv, target);
+        }
+    }
+
+    private void addAttributes(XMLList rv, XML target) {
+        addMatchingAttributes(rv, target);
+    }
+
+    void addMatches(XMLList rv, XML target) {
+        if (isDescendants()) {
+            addDescendants(rv, target);
+        } else if (isAttributeName()) {
+            addAttributes(rv, target);
+        } else {
+            XML[] children = target.getChildren();
+            if (children != null) {
+                for (int i=0; i<children.length; i++) {
+                    if (this.matches(children[i])) {
+                        rv.addToList( children[i] );
+                    }
+                }
+            }
+            rv.setTargets(target, this.toQname());
+        }
+    }
+
+    XMLList getMyValueOn(XML target) {
+        XMLList rv = target.newXMLList();
+        addMatches(rv, target);
+        return rv;
+    }
+
+    void setMyValueOn(XML target, Object value) {
+        // Special-case checks for undefined and null
+        if (value == null) {
+            value = "null";
+        } else if (value instanceof Undefined) {
+            value = "undefined";
+        }
+
+        XMLName xmlName = this;
+        // Get the named property
+        if (xmlName.isAttributeName()) {
+            target.setAttribute(xmlName, value);
+        } else if (xmlName.uri() == null && xmlName.localName().equals("*")) {
+            target.setChildren(value);
+        } else {
+            // Convert text into XML if needed.
+            XMLObjectImpl xmlValue = null;
+
+            if (value instanceof XMLObjectImpl) {
+                xmlValue = (XMLObjectImpl)value;
+
+                // Check for attribute type and convert to textNode
+                if (xmlValue instanceof XML) {
+                    if (((XML)xmlValue).isAttribute()) {
+                        xmlValue = target.makeXmlFromString(xmlName, xmlValue.toString());
+                    }
+                }
+
+                if (xmlValue instanceof XMLList) {
+                    for (int i = 0; i < xmlValue.length(); i++) {
+                        XML xml = ((XMLList) xmlValue).item(i);
+
+                        if (xml.isAttribute()) {
+                            ((XMLList)xmlValue).replace(i, target.makeXmlFromString(xmlName, xml.toString()));
+                        }
+                    }
+                }
+            } else {
+                xmlValue = target.makeXmlFromString(xmlName, ScriptRuntime.toString(value));
+            }
+
+            XMLList matches = target.getPropertyList(xmlName);
+
+            if (matches.length() == 0) {
+                target.appendChild(xmlValue);
+            } else {
+                // Remove all other matches
+                for (int i = 1; i < matches.length(); i++) {
+                    target.removeChild(matches.item(i).childIndex());
+                }
+
+                // Replace first match with new value.
+                XML firstMatch = matches.item(0);
+                target.replace(firstMatch.childIndex(), xmlValue);
+            }
+        }
+    }
+
+    public boolean has(Context cx) {
+        if (xmlObject == null) {
+            return false;
+        }
+        return xmlObject.hasXMLProperty(this);
+    }
+
+    public Object get(Context cx) {
+        if (xmlObject == null) {
+            throw ScriptRuntime.undefReadError(Undefined.instance,
+                toString());
+        }
+        return xmlObject.getXMLProperty(this);
+    }
+
+    public Object set(Context cx, Object value) {
+        if (xmlObject == null) {
+            throw ScriptRuntime.undefWriteError(Undefined.instance,
+                toString(),
+                value);
+        }
+        // Assignment to descendants causes parse error on bad reference
+        // and this should not be called
+        if (isDescendants) throw Kit.codeBug();
+        xmlObject.putXMLProperty(this, value);
+        return value;
+    }
+
+    public boolean delete(Context cx) {
+        if (xmlObject == null) {
+            return true;
+        }
+        xmlObject.deleteXMLProperty(this);
+        return !xmlObject.hasXMLProperty(this);
+    }
+
+    public String toString() {
+        //return qname.localName();
+        StringBuffer buff = new StringBuffer();
+        if (isDescendants) buff.append("..");
+        if (isAttributeName) buff.append('@');
+        if (uri() == null) {
+            buff.append('*');
+            if(localName().equals("*")) {
+                return buff.toString();
+            }
+        } else {
+            buff.append('"').append(uri()).append('"');
+        }
+        buff.append(':').append(localName());
+        return buff.toString();
+    }
+
+    final XmlNode.QName toQname() {
+        return this.qname;
+    }
+
+    final boolean matchesLocalName(String localName) {
+        return localName().equals("*") || localName().equals(localName);
+    }
+
+    final boolean matchesElement(XmlNode.QName qname) {
+        if (this.uri() == null || this.uri().equals(qname.getNamespace().getUri())) {
+            if (this.localName().equals("*") || this.localName().equals(qname.getLocalName())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    final boolean matches(XML node) {
+        XmlNode.QName qname = node.getNodeQname();
+        String nodeUri = null;
+        if (qname.getNamespace() != null) {
+            nodeUri = qname.getNamespace().getUri();
+        }
+        if (isAttributeName) {
+            if (node.isAttribute()) {
+                if (this.uri() == null || this.uri().equals(nodeUri)) {
+                    if (this.localName().equals("*") || this.localName().equals(qname.getLocalName())) {
+                        return true;
+                    }
+                }
+                return false;
+            } else {
+                //    TODO    Could throw exception maybe, should not call this method on attribute name with arbitrary node type
+                //            unless we traverse all attributes and children habitually
+                return false;
+            }
+        } else {
+            if ( this.uri() == null || ((node.isElement()) && this.uri().equals(nodeUri)) ) {
+                if (localName().equals("*")) return true;
+                if (node.isElement()) {
+                    if (localName().equals(qname.getLocalName())) return true;
+                }
+            }
+            return false;
+        }
+    }
+
+    /**    @deprecated */
+    boolean isAttributeName() {
+        return isAttributeName;
+    }
+
+    //    TODO    Fix whether this is an attribute XMLName at construction?
+    /** @deprecated */
+    void setAttributeName() {
+//        if (isAttributeName) throw new IllegalStateException();
+        isAttributeName = true;
+    }
+
+    /**    @deprecated */
+    boolean isDescendants() {
+        return isDescendants;
+    }
+
+    //    TODO    Fix whether this is an descendant XMLName at construction?
+    /** @deprecated */
+    void setIsDescendants() {
+//        if (isDescendants) throw new IllegalStateException();
+        isDescendants = true;
+    }
+}
diff --git a/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java b/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java
new file mode 100644
index 0000000..db918f8
--- /dev/null
+++ b/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java
@@ -0,0 +1,812 @@
+/* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Rhino code, released
+ * May 6, 1999.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1997-2000
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Igor Bukanov
+ *   Ethan Hugg
+ *   Terry Lucas
+ *   Milen Nankov
+ *   David P. Caldwell <inonit@inonit.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * the GNU General Public License Version 2 or later (the "GPL"), in which
+ * case the provisions of the GPL are applicable instead of those above. If
+ * you wish to allow use of your version of this file only under the terms of
+ * the GPL and not to allow others to use your version of this file under the
+ * MPL, indicate your decision by deleting the provisions above and replacing
+ * them with the notice and other provisions required by the GPL. If you do
+ * not delete the provisions above, a recipient may use your version of this
+ * file under either the MPL or the GPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+package org.mozilla.javascript.xmlimpl;
+
+import org.mozilla.javascript.*;
+import org.mozilla.javascript.xml.*;
+
+/**
+ *  This abstract class describes what all XML objects (XML, XMLList) should
+ *  have in common.
+ *
+ * @see XML
+ */
+abstract class XMLObjectImpl extends XMLObject {
+    private static final Object XMLOBJECT_TAG = new Object();
+    private XMLLibImpl lib;
+    private boolean prototypeFlag;
+
+    protected XMLObjectImpl(XMLLibImpl lib, Scriptable scope,
+                            XMLObject prototype)
+    {
+        initialize(lib, scope, prototype);
+    }
+
+    final void initialize(XMLLibImpl lib, Scriptable scope,
+                          XMLObject prototype)
+    {
+        setParentScope(scope);
+        setPrototype(prototype);
+        prototypeFlag = (prototype == null);
+        this.lib = lib;
+    }
+
+    final boolean isPrototype() {
+        return prototypeFlag;
+    }
+
+    XMLLibImpl getLib() {
+        return lib;
+    }
+
+    final XML newXML(XmlNode node) {
+        return lib.newXML(node);
+    }
+
+    XML xmlFromNode(XmlNode node) {
+        if (node.getXml() == null) {
+            node.setXml( newXML(node) );
+        }
+        return node.getXml();
+    }
+
+    final XMLList newXMLList() {
+        return lib.newXMLList();
+    }
+
+    final XMLList newXMLListFrom(Object o) {
+        return lib.newXMLListFrom(o);
+    }
+
+    final XmlProcessor getProcessor() {
+        return lib.getProcessor();
+    }
+
+    final QName newQName(String uri, String localName, String prefix) {
+        return lib.newQName(uri, localName, prefix);
+    }
+
+    final QName newQName(XmlNode.QName name) {
+        return lib.newQName(name);
+    }
+
+    final Namespace createNamespace(XmlNode.Namespace declaration) {
+        if (declaration == null) return null;
+        return lib.createNamespaces( new XmlNode.Namespace[] { declaration } )[0];
+    }
+
+    final Namespace[] createNamespaces(XmlNode.Namespace[] declarations) {
+        return lib.createNamespaces(declarations);
+    }
+
+    //
+    //    Scriptable
+    //
+
+    public final Object get(String name, Scriptable start) {
+        return super.get(name, start);
+    }
+
+    public final boolean has(String name, Scriptable start) {
+        return super.has(name, start);
+    }
+
+    public final void put(String name, Scriptable start, Object value) {
+        super.put(name, start, value);
+    }
+
+    public final void delete(String name) {
+        //    TODO    I am not sure about this, but this is how I found it.  DPC
+        throw new IllegalArgumentException("String: [" + name + "]");
+    }
+
+    public final Scriptable getPrototype() {
+        return super.getPrototype();
+    }
+
+    public final void setPrototype(Scriptable prototype) {
+        super.setPrototype(prototype);
+    }
+
+    public final Scriptable getParentScope() {
+        return super.getParentScope();
+    }
+
+    public final void setParentScope(Scriptable parent) {
+        super.setParentScope(parent);
+    }
+
+    public final Object getDefaultValue(Class hint) {
+        return this.toString();
+    }
+
+    public final boolean hasInstance(Scriptable scriptable) {
+        return super.hasInstance(scriptable);
+    }
+
+    /**
+     * ecmaHas(cx, id) calls this after resolving when id to XMLName
+     * and checking it is not Uint32 index.
+     */
+    abstract boolean hasXMLProperty(XMLName name);
+
+    /**
+     * ecmaGet(cx, id) calls this after resolving when id to XMLName
+     * and checking it is not Uint32 index.
+     */
+    abstract Object getXMLProperty(XMLName name);
+
+    /**
+     * ecmaPut(cx, id, value) calls this after resolving when id to XMLName
+     * and checking it is not Uint32 index.
+     */
+    abstract void putXMLProperty(XMLName name, Object value);
+
+    /**
+     * ecmaDelete(cx, id) calls this after resolving when id to XMLName
+     * and checking it is not Uint32 index.
+     */
+    abstract void deleteXMLProperty(XMLName name);
+
+    /**
+     * Test XML equality with target the target.
+     */
+    abstract boolean equivalentXml(Object target);
+
+    abstract void addMatches(XMLList rv, XMLName name);
+
+    private XMLList getMatches(XMLName name) {
+        XMLList rv = newXMLList();
+        addMatches(rv, name);
+        return rv;
+    }
+
+    abstract XML getXML();
+
+    // Methods from section 12.4.4 in the spec
+    abstract XMLList child(int index);
+    abstract XMLList child(XMLName xmlName);
+    abstract XMLList children();
+    abstract XMLList comments();
+    abstract boolean contains(Object xml);
+    abstract XMLObjectImpl copy();
+    abstract XMLList elements(XMLName xmlName);
+    abstract boolean hasOwnProperty(XMLName xmlName);
+    abstract boolean hasComplexContent();
+    abstract boolean hasSimpleContent();
+    abstract int length();
+    abstract void normalize();
+    abstract Object parent();
+    abstract XMLList processingInstructions(XMLName xmlName);
+    abstract boolean propertyIsEnumerable(Object member);
+    abstract XMLList text();
+    public abstract String toString();
+    abstract String toXMLString();
+    abstract Object valueOf();
+
+    protected abstract Object jsConstructor(Context cx, boolean inNewExpr, Object[] args);
+
+    final Object getMethod(String id) {
+        return super.get(id, this);
+    }
+
+    //
+    //
+    // Methods overriding ScriptableObject
+    //
+    //
+
+    /**
+     * XMLObject always compare with any value and equivalentValues
+     * never returns {@link Scriptable#NOT_FOUND} for them but rather
+     * calls equivalentXml(value) and wrap the result as Boolean.
+     */
+    protected final Object equivalentValues(Object value) {
+        boolean result = equivalentXml(value);
+        return result ? Boolean.TRUE : Boolean.FALSE;
+    }
+
+    //
+    //
+    // Methods overriding XMLObject
+    //
+    //
+
+    /**
+     * Implementation of ECMAScript [[Has]]
+     */
+    public final boolean ecmaHas(Context cx, Object id) {
+        if (cx == null) cx = Context.getCurrentContext();
+        XMLName xmlName = lib.toXMLNameOrIndex(cx, id);
+        if (xmlName == null) {
+            long index = ScriptRuntime.lastUint32Result(cx);
+            // XXX Fix this cast
+            return has((int)index, this);
+        }
+        return hasXMLProperty(xmlName);
+    }
+
+    /**
+     * Implementation of ECMAScript [[Get]]
+     */
+    public final Object ecmaGet(Context cx, Object id) {
+        if (cx == null) cx = Context.getCurrentContext();
+        XMLName xmlName = lib.toXMLNameOrIndex(cx, id);
+        if (xmlName == null) {
+            long index = ScriptRuntime.lastUint32Result(cx);
+            // XXX Fix this cast
+            Object result = get((int)index, this);
+            if (result == Scriptable.NOT_FOUND) {
+                result = Undefined.instance;
+            }
+            return result;
+        }
+        return getXMLProperty(xmlName);
+    }
+
+    /**
+     * Implementation of ECMAScript [[Put]]
+     */
+    public final void ecmaPut(Context cx, Object id, Object value) {
+        if (cx == null) cx = Context.getCurrentContext();
+        XMLName xmlName = lib.toXMLNameOrIndex(cx, id);
+        if (xmlName == null) {
+            long index = ScriptRuntime.lastUint32Result(cx);
+            // XXX Fix this cast
+            put((int)index, this, value);
+            return;
+        }
+        putXMLProperty(xmlName, value);
+    }
+
+    /**
+     * Implementation of ECMAScript [[Delete]].
+     */
+    public final boolean ecmaDelete(Context cx, Object id) {
+        if (cx == null) cx = Context.getCurrentContext();
+        XMLName xmlName = lib.toXMLNameOrIndex(cx, id);
+        if (xmlName == null) {
+            long index = ScriptRuntime.lastUint32Result(cx);
+            // XXX Fix this
+            delete((int)index);
+            return true;
+        }
+        deleteXMLProperty(xmlName);
+        return true;
+    }
+
+    //    TODO    Can this be made more strongly typed?
+    public Ref memberRef(Context cx, Object elem, int memberTypeFlags) {
+        boolean attribute = (memberTypeFlags & Node.ATTRIBUTE_FLAG) != 0;
+        boolean descendants = (memberTypeFlags & Node.DESCENDANTS_FLAG) != 0;
+        if (!attribute && !descendants) {
+            // Code generation would use ecma(Get|Has|Delete|Set) for
+            // normal name identifiers so one ATTRIBUTE_FLAG
+            // or DESCENDANTS_FLAG has to be set
+            throw Kit.codeBug();
+        }
+        XmlNode.QName qname = lib.toNodeQName(cx, elem, attribute);
+        XMLName rv = XMLName.create(qname, attribute, descendants);
+        rv.initXMLObject(this);
+        return rv;
+    }
+
+    /**
+     * Generic reference to implement x::ns, x.@ns::y, x..@ns::y etc.
+     */
+    public Ref memberRef(Context cx, Object namespace, Object elem, int memberTypeFlags) {
+        boolean attribute = (memberTypeFlags & Node.ATTRIBUTE_FLAG) != 0;
+        boolean descendants = (memberTypeFlags & Node.DESCENDANTS_FLAG) != 0;
+        XMLName rv = XMLName.create(lib.toNodeQName(cx, namespace, elem), attribute, descendants);
+        rv.initXMLObject(this);
+        return rv;
+    }
+
+    public NativeWith enterWith(Scriptable scope) {
+        return new XMLWithScope(lib, scope, this);
+    }
+
+    public NativeWith enterDotQuery(Scriptable scope) {
+        XMLWithScope xws = new XMLWithScope(lib, scope, this);
+        xws.initAsDotQuery();
+        return xws;
+    }
+
+    public final Object addValues(Context cx, boolean thisIsLeft,
+        Object value) {
+        if (value instanceof XMLObject) {
+            XMLObject v1, v2;
+            if (thisIsLeft) {
+                v1 = this;
+                v2 = (XMLObject)value;
+            } else {
+                v1 = (XMLObject)value;
+                v2 = this;
+            }
+            return lib.addXMLObjects(cx, v1, v2);
+        }
+        if (value == Undefined.instance) {
+            // both "xml + undefined" and "undefined + xml" gives String(xml)
+            return ScriptRuntime.toString(this);
+        }
+
+        return super.addValues(cx, thisIsLeft, value);
+    }
+
+    //
+    //
+    // IdScriptableObject machinery
+    //
+    //
+
+    final void exportAsJSClass(boolean sealed) {
+        prototypeFlag = true;
+        exportAsJSClass(MAX_PROTOTYPE_ID, getParentScope(), sealed);
+    }
+
+// #string_id_map#
+    private final static int
+        Id_constructor             = 1,
+
+        Id_addNamespace            = 2,
+        Id_appendChild             = 3,
+        Id_attribute               = 4,
+        Id_attributes              = 5,
+        Id_child                   = 6,
+        Id_childIndex              = 7,
+        Id_children                = 8,
+        Id_comments                = 9,
+        Id_contains                = 10,
+        Id_copy                    = 11,
+        Id_descendants             = 12,
+        Id_elements                = 13,
+        Id_inScopeNamespaces       = 14,
+        Id_insertChildAfter        = 15,
+        Id_insertChildBefore       = 16,
+        Id_hasOwnProperty          = 17,
+        Id_hasComplexContent       = 18,
+        Id_hasSimpleContent        = 19,
+        Id_length                  = 20,
+        Id_localName               = 21,
+        Id_name                    = 22,
+        Id_namespace               = 23,
+        Id_namespaceDeclarations   = 24,
+        Id_nodeKind                = 25,
+        Id_normalize               = 26,
+        Id_parent                  = 27,
+        Id_prependChild            = 28,
+        Id_processingInstructions  = 29,
+        Id_propertyIsEnumerable    = 30,
+        Id_removeNamespace         = 31,
+        Id_replace                 = 32,
+        Id_setChildren             = 33,
+        Id_setLocalName            = 34,
+        Id_setName                 = 35,
+        Id_setNamespace            = 36,
+        Id_text                    = 37,
+        Id_toString                = 38,
+        Id_toXMLString             = 39,
+        Id_valueOf                 = 40,
+
+        MAX_PROTOTYPE_ID           = 40;
+
+    protected int findPrototypeId(String s) {
+        int id;
+// #generated# Last update: 2007-08-20 09:04:06 EDT
+        L0: { id = 0; String X = null; int c;
+            L: switch (s.length()) {
+            case 4: c=s.charAt(0);
+                if (c=='c') { X="copy";id=Id_copy; }
+                else if (c=='n') { X="name";id=Id_name; }
+                else if (c=='t') { X="text";id=Id_text; }
+                break L;
+            case 5: X="child";id=Id_child; break L;
+            case 6: c=s.charAt(0);
+                if (c=='l') { X="length";id=Id_length; }
+                else if (c=='p') { X="parent";id=Id_parent; }
+                break L;
+            case 7: c=s.charAt(0);
+                if (c=='r') { X="replace";id=Id_replace; }
+                else if (c=='s') { X="setName";id=Id_setName; }
+                else if (c=='v') { X="valueOf";id=Id_valueOf; }
+                break L;
+            case 8: switch (s.charAt(2)) {
+                case 'S': X="toString";id=Id_toString; break L;
+                case 'd': X="nodeKind";id=Id_nodeKind; break L;
+                case 'e': X="elements";id=Id_elements; break L;
+                case 'i': X="children";id=Id_children; break L;
+                case 'm': X="comments";id=Id_comments; break L;
+                case 'n': X="contains";id=Id_contains; break L;
+                } break L;
+            case 9: switch (s.charAt(2)) {
+                case 'c': X="localName";id=Id_localName; break L;
+                case 'm': X="namespace";id=Id_namespace; break L;
+                case 'r': X="normalize";id=Id_normalize; break L;
+                case 't': X="attribute";id=Id_attribute; break L;
+                } break L;
+            case 10: c=s.charAt(0);
+                if (c=='a') { X="attributes";id=Id_attributes; }
+                else if (c=='c') { X="childIndex";id=Id_childIndex; }
+                break L;
+            case 11: switch (s.charAt(0)) {
+                case 'a': X="appendChild";id=Id_appendChild; break L;
+                case 'c': X="constructor";id=Id_constructor; break L;
+                case 'd': X="descendants";id=Id_descendants; break L;
+                case 's': X="setChildren";id=Id_setChildren; break L;
+                case 't': X="toXMLString";id=Id_toXMLString; break L;
+                } break L;
+            case 12: c=s.charAt(0);
+                if (c=='a') { X="addNamespace";id=Id_addNamespace; }
+                else if (c=='p') { X="prependChild";id=Id_prependChild; }
+                else if (c=='s') {
+                    c=s.charAt(3);
+                    if (c=='L') { X="setLocalName";id=Id_setLocalName; }
+                    else if (c=='N') { X="setNamespace";id=Id_setNamespace; }
+                }
+                break L;
+            case 14: X="hasOwnProperty";id=Id_hasOwnProperty; break L;
+            case 15: X="removeNamespace";id=Id_removeNamespace; break L;
+            case 16: c=s.charAt(0);
+                if (c=='h') { X="hasSimpleContent";id=Id_hasSimpleContent; }
+                else if (c=='i') { X="insertChildAfter";id=Id_insertChildAfter; }
+                break L;
+            case 17: c=s.charAt(3);
+                if (c=='C') { X="hasComplexContent";id=Id_hasComplexContent; }
+                else if (c=='c') { X="inScopeNamespaces";id=Id_inScopeNamespaces; }
+                else if (c=='e') { X="insertChildBefore";id=Id_insertChildBefore; }
+                break L;
+            case 20: X="propertyIsEnumerable";id=Id_propertyIsEnumerable; break L;
+            case 21: X="namespaceDeclarations";id=Id_namespaceDeclarations; break L;
+            case 22: X="processingInstructions";id=Id_processingInstructions; break L;
+            }
+            if (X!=null && X!=s && !X.equals(s)) id = 0;
+            break L0;
+        }
+// #/generated#
+        return id;
+    }
+// #/string_id_map#
+
+    protected void initPrototypeId(int id) {
+        String s;
+        int arity;
+        switch (id) {
+            case Id_constructor: {
+                IdFunctionObject ctor;
+                if (this instanceof XML) {
+                    ctor = new XMLCtor((XML)this, XMLOBJECT_TAG, id, 1);
+                } else {
+                    ctor = new IdFunctionObject(this, XMLOBJECT_TAG, id, 1);
+                }
+                initPrototypeConstructor(ctor);
+                return;
+            }
+
+            case Id_addNamespace:      arity=1; s="addNamespace";      break;
+            case Id_appendChild:       arity=1; s="appendChild";       break;
+            case Id_attribute:         arity=1; s="attribute";         break;
+            case Id_attributes:        arity=0; s="attributes";        break;
+            case Id_child:             arity=1; s="child";             break;
+            case Id_childIndex:        arity=0; s="childIndex";        break;
+            case Id_children:          arity=0; s="children";          break;
+            case Id_comments:          arity=0; s="comments";          break;
+            case Id_contains:          arity=1; s="contains";          break;
+            case Id_copy:              arity=0; s="copy";              break;
+            case Id_descendants:       arity=1; s="descendants";       break;
+            case Id_elements:          arity=1; s="elements";          break;
+            case Id_hasComplexContent: arity=0; s="hasComplexContent"; break;
+            case Id_hasOwnProperty:    arity=1; s="hasOwnProperty";    break;
+            case Id_hasSimpleContent:  arity=0; s="hasSimpleContent";  break;
+            case Id_inScopeNamespaces: arity=0; s="inScopeNamespaces"; break;
+            case Id_insertChildAfter:  arity=2; s="insertChildAfter";  break;
+            case Id_insertChildBefore: arity=2; s="insertChildBefore"; break;
+            case Id_length:            arity=0; s="length";            break;
+            case Id_localName:         arity=0; s="localName";         break;
+            case Id_name:              arity=0; s="name";              break;
+            case Id_namespace:         arity=1; s="namespace";         break;
+            case Id_namespaceDeclarations:
+                arity=0; s="namespaceDeclarations"; break;
+            case Id_nodeKind:          arity=0; s="nodeKind";          break;
+            case Id_normalize:         arity=0; s="normalize";         break;
+            case Id_parent:            arity=0; s="parent";            break;
+            case Id_prependChild:      arity=1; s="prependChild";      break;
+            case Id_processingInstructions:
+                arity=1; s="processingInstructions"; break;
+            case Id_propertyIsEnumerable:
+                arity=1; s="propertyIsEnumerable"; break;
+            case Id_removeNamespace:   arity=1; s="removeNamespace";   break;
+            case Id_replace:           arity=2; s="replace";           break;
+            case Id_setChildren:       arity=1; s="setChildren";       break;
+            case Id_setLocalName:      arity=1; s="setLocalName";      break;
+            case Id_setName:           arity=1; s="setName";           break;
+            case Id_setNamespace:      arity=1; s="setNamespace";      break;
+            case Id_text:              arity=0; s="text";              break;
+            case Id_toString:          arity=0; s="toString";          break;
+            case Id_toXMLString:       arity=1; s="toXMLString";       break;
+            case Id_valueOf:           arity=0; s="valueOf";           break;
+
+            default: throw new IllegalArgumentException(String.valueOf(id));
+        }
+        initPrototypeMethod(XMLOBJECT_TAG, id, s, arity);
+    }
+
+    private Object[] toObjectArray(Object[] typed) {
+        Object[] rv = new Object[typed.length];
+        for (int i=0; i<rv.length; i++) {
+            rv[i] = typed[i];
+        }
+        return rv;
+    }
+
+    private void xmlMethodNotFound(Object object, String name) {
+        throw ScriptRuntime.notFunctionError(object, name);
+    }
+
+    public Object execIdCall(IdFunctionObject f, Context cx, Scriptable scope, Scriptable thisObj, Object[] args) {
+        if (!f.hasTag(XMLOBJECT_TAG)) {
+            return super.execIdCall(f, cx, scope, thisObj, args);
+        }
+        int id = f.methodId();
+        if (id == Id_constructor) {
+            return jsConstructor(cx, thisObj == null, args);
+        }
+
+        // All (XML|XMLList).prototype methods require thisObj to be XML
+        if (!(thisObj instanceof XMLObjectImpl))
+            throw incompatibleCallError(f);
+        XMLObjectImpl realThis = (XMLObjectImpl)thisObj;
+
+        XML xml = realThis.getXML();
+        switch (id) {
+            case Id_appendChild: {
+                if (xml == null) xmlMethodNotFound(realThis, "appendChild");
+                return xml.appendChild(arg(args, 0));
+            }
+            case Id_addNamespace: {
+                if (xml == null) xmlMethodNotFound(realThis, "addNamespace");
+                Namespace ns = lib.castToNamespace(cx, arg(args, 0));
+                return xml.addNamespace(ns);
+            }
+            case Id_childIndex: {
+                if (xml == null) xmlMethodNotFound(realThis, "childIndex");
+                return ScriptRuntime.wrapInt(xml.childIndex());
+            }
+            case Id_inScopeNamespaces: {
+                if (xml == null) xmlMethodNotFound(realThis, "inScopeNamespaces");
+                return cx.newArray(scope, toObjectArray(xml.inScopeNamespaces()));
+            }
+            case Id_insertChildAfter: {
+                if (xml == null) xmlMethodNotFound(realThis, "insertChildAfter");
+                Object arg0 = arg(args, 0);
+                if (arg0 == null || arg0 instanceof XML) {
+                    return xml.insertChildAfter((XML)arg0, arg(args, 1));
+                }
+                return Undefined.instance;
+            }
+            case Id_insertChildBefore: {
+                if (xml == null) xmlMethodNotFound(realThis, "insertChildBefore");
+                Object arg0 = arg(args, 0);
+                if (arg0 == null || arg0 instanceof XML) {
+                    return xml.insertChildBefore((XML)arg0, arg(args, 1));
+                }
+                return Undefined.instance;
+            }
+            case Id_localName: {
+                if (xml == null) xmlMethodNotFound(realThis, "localName");
+                return xml.localName();
+            }
+            case Id_name: {
+                if (xml == null) xmlMethodNotFound(realThis, "name");
+                return xml.name();
+            }
+            case Id_namespace: {
+                if (xml == null) xmlMethodNotFound(realThis, "namespace");
+                String prefix = (args.length > 0) ? ScriptRuntime.toString(args[0]) : null;
+                Namespace rv = xml.namespace(prefix);
+                if (rv == null) {
+                    return Undefined.instance;
+                } else {
+                    return rv;
+                }
+            }
+            case Id_namespaceDeclarations: {
+                if (xml == null) xmlMethodNotFound(realThis, "namespaceDeclarations");
+                Namespace[] array = xml.namespaceDeclarations();
+                return cx.newArray(scope, toObjectArray(array));
+            }
+            case Id_nodeKind: {
+                if (xml == null) xmlMethodNotFound(realThis, "nodeKind");
+                return xml.nodeKind();
+            }
+            case Id_prependChild: {
+                if (xml == null) xmlMethodNotFound(realThis, "prependChild");
+                return xml.prependChild(arg(args, 0));
+            }
+            case Id_removeNamespace: {
+                if (xml == null) xmlMethodNotFound(realThis, "removeNamespace");
+                Namespace ns = lib.castToNamespace(cx, arg(args, 0));
+                return xml.removeNamespace(ns);
+            }
+            case Id_replace: {
+                if (xml == null) xmlMethodNotFound(realThis, "replace");
+                XMLName xmlName = lib.toXMLNameOrIndex(cx, arg(args, 0));
+                Object arg1 = arg(args, 1);
+                if (xmlName == null) {
+                    //    I refuse to believe that this number will exceed 2^31
+                    int index = (int)ScriptRuntime.lastUint32Result(cx);
+                    return xml.replace(index, arg1);
+                } else {
+                    return xml.replace(xmlName, arg1);
+                }
+            }
+            case Id_setChildren: {
+                if (xml == null) xmlMethodNotFound(realThis, "setChildren");
+                return xml.setChildren(arg(args, 0));
+            }
+            case Id_setLocalName: {
+                if (xml == null) xmlMethodNotFound(realThis, "setLocalName");
+                String localName;
+                Object arg = arg(args, 0);
+                if (arg instanceof QName) {
+                    localName = ((QName)arg).localName();
+                } else {
+                    localName = ScriptRuntime.toString(arg);
+                }
+                xml.setLocalName(localName);
+                return Undefined.instance;
+            }
+            case Id_setName: {
+                if (xml == null) xmlMethodNotFound(realThis, "setName");
+                Object arg = (args.length != 0) ? args[0] : Undefined.instance;
+                QName qname = lib.constructQName(cx, arg);
+                xml.setName(qname);
+                return Undefined.instance;
+            }
+            case Id_setNamespace: {
+                if (xml == null) xmlMethodNotFound(realThis, "setNamespace");
+                Namespace ns = lib.castToNamespace(cx, arg(args, 0));
+                xml.setNamespace(ns);
+                return Undefined.instance;
+            }
+
+            case Id_attribute: {
+                XMLName xmlName = XMLName.create( lib.toNodeQName(cx, arg(args, 0), true), true, false );
+                return realThis.getMatches(xmlName);
+            }
+            case Id_attributes:
+                return realThis.getMatches(XMLName.create(XmlNode.QName.create(null, null), true, false));
+            case Id_child: {
+                XMLName xmlName = lib.toXMLNameOrIndex(cx, arg(args, 0));
+                if (xmlName == null) {
+                    //    Two billion or so is a fine upper limit, so we cast to int
+                    int index = (int)ScriptRuntime.lastUint32Result(cx);
+                    return realThis.child(index);
+                } else {
+                    return realThis.child(xmlName);
+                }
+            }
+            case Id_children:
+                return realThis.children();
+            case Id_comments:
+                return realThis.comments();
+            case Id_contains:
+                return ScriptRuntime.wrapBoolean(
+                    realThis.contains(arg(args, 0)));
+            case Id_copy:
+                return realThis.copy();
+            case Id_descendants: {
+                XmlNode.QName qname = (args.length == 0) ? XmlNode.QName.create(null, null) : lib.toNodeQName(cx, args[0], false);
+                return realThis.getMatches( XMLName.create(qname, false, true) );
+            }
+            case Id_elements: {
+                XMLName xmlName = (args.length == 0)
+                ? XMLName.formStar()
+                : lib.toXMLName(cx, args[0]);
+                return realThis.elements(xmlName);
+            }
+            case Id_hasOwnProperty: {
+                XMLName xmlName = lib.toXMLName(cx, arg(args, 0));
+                return ScriptRuntime.wrapBoolean(
+                    realThis.hasOwnProperty(xmlName));
+            }
+            case Id_hasComplexContent:
+                return ScriptRuntime.wrapBoolean(realThis.hasComplexContent());
+            case Id_hasSimpleContent:
+                return ScriptRuntime.wrapBoolean(realThis.hasSimpleContent());
+            case Id_length:
+                return ScriptRuntime.wrapInt(realThis.length());
+            case Id_normalize:
+                realThis.normalize();
+                return Undefined.instance;
+            case Id_parent:
+                return realThis.parent();
+            case Id_processingInstructions: {
+                XMLName xmlName = (args.length > 0)
+                ? lib.toXMLName(cx, args[0])
+                : XMLName.formStar();
+                return realThis.processingInstructions(xmlName);
+            }
+            case Id_propertyIsEnumerable: {
+                return ScriptRuntime.wrapBoolean(
+                    realThis.propertyIsEnumerable(arg(args, 0)));
+            }
+            case Id_text:
+                return realThis.text();
+            case Id_toString:
+                return realThis.toString();
+            case Id_toXMLString: {
+                return realThis.toXMLString();
+            }
+            case Id_valueOf:
+                return realThis.valueOf();
+        }
+        throw new IllegalArgumentException(String.valueOf(id));
+    }
+
+    private static Object arg(Object[] args, int i) {
+        return (i < args.length) ? args[i] : Undefined.instance;
+    }
+
+    final XML newTextElementXML(XmlNode reference, XmlNode.QName qname, String value) {
+        return lib.newTextElementXML(reference, qname, value);
+    }
+
+    /** @deprecated Hopefully this can be replaced with ecmaToXml below. */
+    final XML newXMLFromJs(Object inputObject) {
+        return lib.newXMLFromJs(inputObject);
+    }
+
+    final XML ecmaToXml(Object object) {
+        return lib.ecmaToXml(object);
+    }
+
+    final String ecmaEscapeAttributeValue(String s) {
+        //    TODO    Check this
+        String quoted = lib.escapeAttributeValue(s);
+        return quoted.substring(1, quoted.length() - 1);
+    }
+
+    final XML createEmptyXML() {
+        return newXML(XmlNode.createEmpty(getProcessor()));
+    }
+}
diff --git a/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLWithScope.java b/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLWithScope.java
new file mode 100644
index 0000000..fbeb45e
--- /dev/null
+++ b/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLWithScope.java
@@ -0,0 +1,125 @@
+/* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Rhino code, released
+ * May 6, 1999.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1997-1999
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Norris Boyd
+ *   Ethan Hugg
+ *   Terry Lucas
+ *   Milen Nankov
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * the GNU General Public License Version 2 or later (the "GPL"), in which
+ * case the provisions of the GPL are applicable instead of those above. If
+ * you wish to allow use of your version of this file only under the terms of
+ * the GPL and not to allow others to use your version of this file under the
+ * MPL, indicate your decision by deleting the provisions above and replacing
+ * them with the notice and other provisions required by the GPL. If you do
+ * not delete the provisions above, a recipient may use your version of this
+ * file under either the MPL or the GPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+package org.mozilla.javascript.xmlimpl;
+
+import org.mozilla.javascript.*;
+import org.mozilla.javascript.xml.*;
+
+final class XMLWithScope extends NativeWith
+{
+    private static final long serialVersionUID = -696429282095170887L;
+
+    private XMLLibImpl lib;
+    private int         _currIndex;
+    private XMLList     _xmlList;
+    private XMLObject   _dqPrototype;
+
+    XMLWithScope(XMLLibImpl lib, Scriptable parent, XMLObject prototype)
+    {
+        super(parent, prototype);
+        this.lib = lib;
+    }
+
+    void initAsDotQuery()
+    {
+        XMLObject prototype = (XMLObject)getPrototype();
+        // XMLWithScope also handles the .(xxx) DotQuery for XML
+        // basically DotQuery is a for/in/with statement and in
+        // the following 3 statements we setup to signal it's
+        // DotQuery,
+        // the index and the object being looped over.  The
+        // xws.setPrototype is the scope of the object which is
+        // is a element of the lhs (XMLList).
+        _currIndex = 0;
+        _dqPrototype = prototype;
+        if (prototype instanceof XMLList) {
+            XMLList xl = (XMLList)prototype;
+            if (xl.length() > 0) {
+                setPrototype((Scriptable)(xl.get(0, null)));
+            }
+        }
+        // Always return the outer-most type of XML lValue of
+        // XML to left of dotQuery.
+        _xmlList = lib.newXMLList();
+    }
+
+    protected Object updateDotQuery(boolean value)
+    {
+        // Return null to continue looping
+
+        XMLObject seed = _dqPrototype;
+        XMLList xmlL = _xmlList;
+
+        if (seed instanceof XMLList) {
+            // We're a list so keep testing each element of the list if the
+            // result on the top of stack is true then that element is added
+            // to our result list.  If false, we try the next element.
+            XMLList orgXmlL = (XMLList)seed;
+
+            int idx = _currIndex;
+
+            if (value) {
+                xmlL.addToList(orgXmlL.get(idx, null));
+            }
+
+            // More elements to test?
+            if (++idx < orgXmlL.length()) {
+                // Yes, set our new index, get the next element and
+                // reset the expression to run with this object as
+                // the WITH selector.
+                _currIndex = idx;
+                setPrototype((Scriptable)(orgXmlL.get(idx, null)));
+
+                // continue looping
+                return null;
+            }
+        } else {
+            // If we're not a XMLList then there's no looping
+            // just return DQPrototype if the result is true.
+            if (value) {
+              xmlL.addToList(seed);
+            }
+        }
+
+        return xmlL;
+    }
+}
diff --git a/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XmlNode.java b/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XmlNode.java
new file mode 100644
index 0000000..06955d0
--- /dev/null
+++ b/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XmlNode.java
@@ -0,0 +1,869 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Rhino DOM-only E4X implementation.
+ *
+ * The Initial Developer of the Original Code is
+ * David P. Caldwell.
+ * Portions created by David P. Caldwell are Copyright (C)
+ * 2007 David P. Caldwell. All Rights Reserved.
+ *
+ *
+ * Contributor(s):
+ *   David P. Caldwell <inonit@inonit.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * the GNU General Public License Version 2 or later (the "GPL"), in which
+ * case the provisions of the GPL are applicable instead of those above. If
+ * you wish to allow use of your version of this file only under the terms of
+ * the GPL and not to allow others to use your version of this file under the
+ * MPL, indicate your decision by deleting the provisions above and replacing
+ * them with the notice and other provisions required by the GPL. If you do
+ * not delete the provisions above, a recipient may use your version of this
+ * file under either the MPL or the GPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+package org.mozilla.javascript.xmlimpl;
+
+import java.util.*;
+
+import org.w3c.dom.*;
+
+import org.mozilla.javascript.*;
+
+//    Disambiguate with org.mozilla.javascript
+import org.w3c.dom.Node;
+
+class XmlNode {
+    private static final String XML_NAMESPACES_NAMESPACE_URI = "http://www.w3.org/2000/xmlns/";
+
+    private static final String USER_DATA_XMLNODE_KEY = XmlNode.class.getName();
+
+    private static final boolean DOM_LEVEL_3 = true;
+
+    private static XmlNode getUserData(Node node) {
+        if (DOM_LEVEL_3) {
+            return (XmlNode)node.getUserData(USER_DATA_XMLNODE_KEY);
+        }
+        return null;
+    }
+
+    private static void setUserData(Node node, XmlNode wrap) {
+        if (DOM_LEVEL_3) {
+            node.setUserData(USER_DATA_XMLNODE_KEY, wrap, wrap.events);
+        }
+    }
+
+    private static XmlNode createImpl(Node node) {
+        if (node instanceof Document) throw new IllegalArgumentException();
+        XmlNode rv = null;
+        if (getUserData(node) == null) {
+            rv = new XmlNode();
+            rv.dom = node;
+            setUserData(node, rv);
+        } else {
+            rv = getUserData(node);
+        }
+        return rv;
+    }
+
+    static XmlNode newElementWithText(XmlProcessor processor, XmlNode reference, XmlNode.QName qname, String value) {
+        if (reference instanceof org.w3c.dom.Document) throw new IllegalArgumentException("Cannot use Document node as reference");
+        Document document = null;
+        if (reference != null) {
+            document = reference.dom.getOwnerDocument();
+        } else {
+            document = processor.newDocument();
+        }
+        Node referenceDom = (reference != null) ? reference.dom : null;
+        Element e = document.createElementNS(qname.getUri(), qname.qualify(referenceDom));
+        if (value != null) {
+            e.appendChild(document.createTextNode(value));
+        }
+        return XmlNode.createImpl(e);
+    }
+
+    static XmlNode createText(XmlProcessor processor, String value) {
+        return createImpl( processor.newDocument().createTextNode(value) );
+    }
+
+    static XmlNode createElementFromNode(Node node) {
+        if (node instanceof Document)
+            node = ((Document) node).getDocumentElement();
+        return createImpl(node);
+    }
+
+    static XmlNode createElement(XmlProcessor processor, String namespaceUri, String xml) throws org.xml.sax.SAXException {
+        return createImpl( processor.toXml(namespaceUri, xml) );
+    }
+
+    static XmlNode createEmpty(XmlProcessor processor) {
+        return createText(processor, "");
+    }
+
+    private static XmlNode copy(XmlNode other) {
+        return createImpl( other.dom.cloneNode(true) );
+    }
+
+    private static final long serialVersionUID = 1L;
+
+    private UserDataHandler events = new UserDataHandler() {
+        public void handle(short operation, String key, Object data, Node src, Node dest) {
+        }
+    };
+
+    private Node dom;
+
+    private XML xml;
+
+    private XmlNode() {
+    }
+
+    String debug() {
+        XmlProcessor raw = new XmlProcessor();
+        raw.setIgnoreComments(false);
+        raw.setIgnoreProcessingInstructions(false);
+        raw.setIgnoreWhitespace(false);
+        raw.setPrettyPrinting(false);
+        return raw.ecmaToXmlString(this.dom);
+    }
+
+    public String toString() {
+        return "XmlNode: type=" + dom.getNodeType() + " dom=" + dom.toString();
+    }
+
+    XML getXml() {
+        return xml;
+    }
+
+    void setXml(XML xml) {
+        this.xml = xml;
+    }
+
+    int getChildCount() {
+        return this.dom.getChildNodes().getLength();
+    }
+
+    XmlNode parent() {
+        Node domParent = dom.getParentNode();
+        if (domParent instanceof Document) return null;
+        if (domParent == null) return null;
+        return createImpl(domParent);
+    }
+
+    int getChildIndex() {
+        if (this.isAttributeType()) return -1;
+        if (parent() == null) return -1;
+        org.w3c.dom.NodeList siblings = this.dom.getParentNode().getChildNodes();
+        for (int i=0; i<siblings.getLength(); i++) {
+            if (siblings.item(i) == dom) {
+                return i;
+            }
+        }
+        //    Either the parent is -1 or one of the this node's parent's children is this node.
+        throw new RuntimeException("Unreachable.");
+    }
+
+    void removeChild(int index) {
+        this.dom.removeChild( this.dom.getChildNodes().item(index) );
+    }
+
+    String toXmlString(XmlProcessor processor) {
+        return processor.ecmaToXmlString(this.dom);
+    }
+
+    String ecmaValue() {
+        //    TODO    See ECMA 357 Section 9.1
+        if (isTextType()) {
+            return ((org.w3c.dom.Text)dom).getData();
+        } else if (isAttributeType()) {
+            return ((org.w3c.dom.Attr)dom).getValue();
+        } else if (isProcessingInstructionType()) {
+            return ((org.w3c.dom.ProcessingInstruction)dom).getData();
+        } else if (isCommentType()) {
+            return ((org.w3c.dom.Comment)dom).getNodeValue();
+        } else if (isElementType()) {
+            throw new RuntimeException("Unimplemented ecmaValue() for elements.");
+        } else {
+            throw new RuntimeException("Unimplemented for node " + dom);
+        }
+    }
+
+    void deleteMe() {
+        if (dom instanceof Attr) {
+            Attr attr = (Attr)this.dom;
+            attr.getOwnerElement().getAttributes().removeNamedItemNS(attr.getNamespaceURI(), attr.getLocalName());
+        } else {
+            if (this.dom.getParentNode() != null) {
+                this.dom.getParentNode().removeChild(this.dom);
+            } else {
+                //    This case can be exercised at least when executing the regression
+                //    tests under https://bugzilla.mozilla.org/show_bug.cgi?id=354145
+            }
+        }
+    }
+
+    void normalize() {
+        this.dom.normalize();
+    }
+
+    void insertChildAt(int index, XmlNode node) {
+        Node parent = this.dom;
+        Node child = parent.getOwnerDocument().importNode( node.dom, true );
+        if (parent.getChildNodes().getLength() < index) {
+            //    TODO    Check ECMA for what happens here
+            throw new IllegalArgumentException("index=" + index + " length=" + parent.getChildNodes().getLength());
+        }
+        if (parent.getChildNodes().getLength() == index) {
+            parent.appendChild(child);
+        } else {
+            parent.insertBefore(child, parent.getChildNodes().item(index));
+        }
+    }
+
+    void insertChildrenAt(int index, XmlNode[] nodes) {
+        for (int i=0; i<nodes.length; i++) {
+            insertChildAt(index+i, nodes[i]);
+        }
+    }
+
+    XmlNode getChild(int index) {
+        Node child = dom.getChildNodes().item(index);
+        return createImpl(child);
+    }
+
+    //    Helper method for XML.hasSimpleContent()
+    boolean hasChildElement() {
+        org.w3c.dom.NodeList nodes = this.dom.getChildNodes();
+        for (int i=0; i<nodes.getLength(); i++) {
+            if (nodes.item(i).getNodeType() == org.w3c.dom.Node.ELEMENT_NODE) return true;
+        }
+        return false;
+    }
+
+    boolean isSameNode(XmlNode other) {
+        //    TODO    May need to be changed if we allow XmlNode to refer to several Node objects
+        return this.dom == other.dom;
+    }
+
+    private String toUri(String ns) {
+        return (ns == null) ? "" : ns;
+    }
+
+    private void addNamespaces(Namespaces rv, Element element) {
+        if (element == null) throw new RuntimeException("element must not be null");
+        String myDefaultNamespace = toUri(element.lookupNamespaceURI(null));
+        String parentDefaultNamespace = "";
+        if (element.getParentNode() != null) {
+            parentDefaultNamespace = toUri(element.getParentNode().lookupNamespaceURI(null));
+        }
+        if (!myDefaultNamespace.equals(parentDefaultNamespace) || !(element.getParentNode() instanceof Element) ) {
+            rv.declare(Namespace.create("", myDefaultNamespace));
+        }
+        NamedNodeMap attributes = element.getAttributes();
+        for (int i=0; i<attributes.getLength(); i++) {
+            Attr attr = (Attr)attributes.item(i);
+            if (attr.getPrefix() != null && attr.getPrefix().equals("xmlns")) {
+                rv.declare(Namespace.create(attr.getLocalName(), attr.getValue()));
+            }
+        }
+    }
+
+    private Namespaces getAllNamespaces() {
+        Namespaces rv = new Namespaces();
+
+        Node target = this.dom;
+        if (target instanceof Attr) {
+            target = ((Attr)target).getOwnerElement();
+        }
+        while(target != null) {
+            if (target instanceof Element) {
+                addNamespaces(rv, (Element)target);
+            }
+            target = target.getParentNode();
+        }
+        //    Fallback in case no namespace was declared
+        rv.declare(Namespace.create("", ""));
+        return rv;
+    }
+
+    Namespace[] getInScopeNamespaces() {
+        Namespaces rv = getAllNamespaces();
+        return rv.getNamespaces();
+    }
+
+    Namespace[] getNamespaceDeclarations() {
+        //    ECMA357 13.4.4.24
+        if (this.dom instanceof Element) {
+            Namespaces rv = new Namespaces();
+            addNamespaces( rv, (Element)this.dom );
+            return rv.getNamespaces();
+        } else {
+            return new Namespace[0];
+        }
+    }
+
+    Namespace getNamespaceDeclaration(String prefix) {
+        if (prefix.equals("") && dom instanceof Attr) {
+            //    Default namespaces do not apply to attributes; see XML Namespaces section 5.2
+            return Namespace.create("", "");
+        }
+        Namespaces rv = getAllNamespaces();
+        return rv.getNamespace(prefix);
+    }
+
+    Namespace getNamespaceDeclaration() {
+        if (dom.getPrefix() == null) return getNamespaceDeclaration("");
+        return getNamespaceDeclaration(dom.getPrefix());
+    }
+
+    private static class Namespaces {
+        private HashMap map = new HashMap();
+        private HashMap uriToPrefix = new HashMap();
+
+        Namespaces() {
+        }
+
+        void declare(Namespace n) {
+            if (map.get(n.prefix) == null) {
+                map.put(n.prefix, n.uri);
+            }
+            //    TODO    I think this is analogous to the other way, but have not really thought it through ... should local scope
+            //            matter more than outer scope?
+            if (uriToPrefix.get(n.uri) == null) {
+                uriToPrefix.put(n.uri, n.prefix);
+            }
+        }
+
+        Namespace getNamespaceByUri(String uri) {
+            if (uriToPrefix.get(uri) == null) return null;
+            return Namespace.create(uri, (String)uriToPrefix.get(uri));
+        }
+
+        Namespace getNamespace(String prefix) {
+            if (map.get(prefix) == null) return null;
+            return Namespace.create(prefix, (String)map.get(prefix));
+        }
+
+        Namespace[] getNamespaces() {
+            Iterator i = map.keySet().iterator();
+            ArrayList rv = new ArrayList();
+            while(i.hasNext()) {
+                String prefix = (String)i.next();
+                String uri = (String)map.get(prefix);
+                Namespace n = Namespace.create(prefix, uri);
+                if (!n.isEmpty()) {
+                    rv.add( n );
+                }
+            }
+            return (Namespace[])rv.toArray(new Namespace[0]);
+        }
+    }
+
+    final XmlNode copy() {
+        return copy( this );
+    }
+
+    //    Returns whether this node is capable of being a parent
+    final boolean isParentType() {
+        return isElementType();
+    }
+
+    final boolean isTextType() {
+        return dom.getNodeType() == Node.TEXT_NODE || dom.getNodeType() == Node.CDATA_SECTION_NODE;
+    }
+
+    final boolean isAttributeType() {
+        return dom.getNodeType() == Node.ATTRIBUTE_NODE;
+    }
+
+    final boolean isProcessingInstructionType() {
+        return dom.getNodeType() == Node.PROCESSING_INSTRUCTION_NODE;
+    }
+
+    final boolean isCommentType() {
+        return dom.getNodeType() == Node.COMMENT_NODE;
+    }
+
+    final boolean isElementType() {
+        return dom.getNodeType() == Node.ELEMENT_NODE;
+    }
+
+    final void renameNode(QName qname) {
+        this.dom = dom.getOwnerDocument().renameNode(dom, qname.getUri(), qname.qualify(dom));
+    }
+
+    void invalidateNamespacePrefix() {
+        if (!(dom instanceof Element)) throw new IllegalStateException();
+        String prefix = this.dom.getPrefix();
+        QName after = QName.create(this.dom.getNamespaceURI(), this.dom.getLocalName(), null);
+        renameNode(after);
+        NamedNodeMap attrs = this.dom.getAttributes();
+        for (int i=0; i<attrs.getLength(); i++) {
+            if (attrs.item(i).getPrefix().equals(prefix)) {
+                createImpl( attrs.item(i) ).renameNode( QName.create(attrs.item(i).getNamespaceURI(), attrs.item(i).getLocalName(), null) );
+            }
+        }
+    }
+
+    private void declareNamespace(Element e, String prefix, String uri) {
+        if (prefix.length() > 0) {
+            e.setAttributeNS(XML_NAMESPACES_NAMESPACE_URI, "xmlns:" + prefix, uri);
+        } else {
+            e.setAttribute("xmlns", uri);
+        }
+    }
+
+    void declareNamespace(String prefix, String uri) {
+        if (!(dom instanceof Element)) throw new IllegalStateException();
+        if (dom.lookupNamespaceURI(uri) != null && dom.lookupNamespaceURI(uri).equals(prefix)) {
+            //    do nothing
+        } else {
+            Element e = (Element)dom;
+            declareNamespace(e, prefix, uri);
+        }
+    }
+
+    private Namespace getDefaultNamespace() {
+        String prefix = "";
+        String uri = (dom.lookupNamespaceURI(null) == null) ? "" : dom.lookupNamespaceURI(null);
+        return Namespace.create(prefix, uri);
+    }
+
+    private String getExistingPrefixFor(Namespace namespace) {
+        if (getDefaultNamespace().getUri().equals(namespace.getUri())) {
+            return "";
+        }
+        return dom.lookupPrefix(namespace.getUri());
+    }
+
+    private Namespace getNodeNamespace() {
+        String uri = dom.getNamespaceURI();
+        String prefix = dom.getPrefix();
+        if (uri == null) uri = "";
+        if (prefix == null) prefix = "";
+        return Namespace.create(prefix, uri);
+    }
+
+    Namespace getNamespace() {
+        return getNodeNamespace();
+    }
+
+    void removeNamespace(Namespace namespace) {
+        Namespace current = getNodeNamespace();
+
+        //    Do not remove in-use namespace
+        if (namespace.is(current)) return;
+        NamedNodeMap attrs = this.dom.getAttributes();
+        for (int i=0; i<attrs.getLength(); i++) {
+            XmlNode attr = XmlNode.createImpl(attrs.item(i));
+            if (namespace.is(attr.getNodeNamespace())) return;
+        }
+
+        //    TODO    I must confess I am not sure I understand the spec fully.  See ECMA357 13.4.4.31
+        String existingPrefix = getExistingPrefixFor(namespace);
+        if (existingPrefix != null) {
+            if (namespace.isUnspecifiedPrefix()) {
+                //    we should remove any namespace with this URI from scope; we do this by declaring a namespace with the same
+                //    prefix as the existing prefix and setting its URI to the default namespace
+                declareNamespace(existingPrefix, getDefaultNamespace().getUri());
+            } else {
+                if (existingPrefix.equals(namespace.getPrefix())) {
+                    declareNamespace(existingPrefix, getDefaultNamespace().getUri());
+                }
+            }
+        } else {
+            //    the argument namespace is not declared in this scope, so do nothing.
+        }
+    }
+
+    private void setProcessingInstructionName(String localName) {
+        org.w3c.dom.ProcessingInstruction pi = (ProcessingInstruction)this.dom;
+        //    We cannot set the node name; Document.renameNode() only supports elements and attributes.  So we replace it
+        pi.getParentNode().replaceChild(
+            pi,
+            pi.getOwnerDocument().createProcessingInstruction(localName, pi.getData())
+        );
+    }
+
+    final void setLocalName(String localName) {
+        if (dom instanceof ProcessingInstruction) {
+            setProcessingInstructionName(localName);
+        } else {
+            String prefix = dom.getPrefix();
+            if (prefix == null) prefix = "";
+            this.dom = dom.getOwnerDocument().renameNode(dom, dom.getNamespaceURI(), QName.qualify(prefix, localName));
+        }
+    }
+
+    final QName getQname() {
+        String uri = (dom.getNamespaceURI()) == null ? "" : dom.getNamespaceURI();
+        String prefix = (dom.getPrefix() == null) ? "" : dom.getPrefix();
+        return QName.create( uri, dom.getLocalName(), prefix );
+    }
+
+    void addMatchingChildren(XMLList result, XmlNode.Filter filter) {
+        Node node = this.dom;
+        NodeList children = node.getChildNodes();
+        for(int i=0; i<children.getLength(); i++) {
+            Node childnode = children.item(i);
+            XmlNode child = XmlNode.createImpl(childnode);
+            if (filter.accept(childnode)) {
+                result.addToList(child);
+            }
+        }
+    }
+
+    XmlNode[] getMatchingChildren(Filter filter) {
+        ArrayList rv = new ArrayList();
+        NodeList nodes = this.dom.getChildNodes();
+        for (int i=0; i<nodes.getLength(); i++) {
+            Node node = nodes.item(i);
+            if (filter.accept(node)) {
+                rv.add( createImpl(node) );
+            }
+        }
+        return (XmlNode[])rv.toArray(new XmlNode[0]);
+    }
+
+    XmlNode[] getAttributes() {
+        NamedNodeMap attrs = this.dom.getAttributes();
+        //    TODO    Or could make callers handle null?
+        if (attrs == null) throw new IllegalStateException("Must be element.");
+        XmlNode[] rv = new XmlNode[attrs.getLength()];
+        for (int i=0; i<attrs.getLength(); i++) {
+            rv[i] = createImpl( attrs.item(i) );
+        }
+        return rv;
+    }
+
+    String getAttributeValue() {
+        return ((Attr)dom).getValue();
+    }
+
+    void setAttribute(QName name, String value) {
+        if (!(dom instanceof Element)) throw new IllegalStateException("Can only set attribute on elements.");
+        name.setAttribute( (Element)dom, value );
+    }
+
+    void replaceWith(XmlNode other) {
+        Node replacement = other.dom;
+        if (replacement.getOwnerDocument() != this.dom.getOwnerDocument()) {
+            replacement = this.dom.getOwnerDocument().importNode(replacement, true);
+        }
+        this.dom.getParentNode().replaceChild(replacement, this.dom);
+    }
+
+    String ecmaToXMLString(XmlProcessor processor) {
+        if (this.isElementType()) {
+            Element copy = (Element)this.dom.cloneNode(true);
+            Namespace[] inScope = this.getInScopeNamespaces();
+            for (int i=0; i<inScope.length; i++) {
+                declareNamespace(copy, inScope[i].getPrefix(), inScope[i].getUri());
+            }
+            return processor.ecmaToXmlString(copy);
+        } else {
+            return processor.ecmaToXmlString(dom);
+        }
+    }
+
+    static class Namespace {
+        static Namespace create(String prefix, String uri) {
+            if (prefix == null) throw new IllegalArgumentException("Empty string represents default namespace prefix");
+            if (uri == null) throw new IllegalArgumentException("Namespace may not lack a URI");
+            Namespace rv = new Namespace();
+            rv.prefix = prefix;
+            rv.uri = uri;
+            return rv;
+        }
+
+        static Namespace create(String uri) {
+            Namespace rv = new Namespace();
+            rv.uri = uri;
+            return rv;
+        }
+
+        static final Namespace GLOBAL = create("", "");
+
+        private String prefix;
+        private String uri;
+
+        private Namespace() {
+        }
+
+        public String toString() {
+            if (prefix == null) return "XmlNode.Namespace [" + uri + "]";
+            return "XmlNode.Namespace [" + prefix + "{" + uri + "}]";
+        }
+
+        boolean isUnspecifiedPrefix() {
+            return prefix == null;
+        }
+
+        boolean is(Namespace other) {
+            return this.prefix != null && other.prefix != null && this.prefix.equals(other.prefix) && this.uri.equals(other.uri);
+        }
+
+        boolean isEmpty() {
+            return prefix != null && prefix.equals("") && uri.equals("");
+        }
+
+        boolean isDefault() {
+            return prefix != null && prefix.equals("");
+        }
+
+        boolean isGlobal() {
+            return uri != null && uri.equals("");
+        }
+
+        //    Called by QName
+        //    TODO    Move functionality from QName lookupPrefix to here
+        private void setPrefix(String prefix) {
+            if (prefix == null) throw new IllegalArgumentException();
+            this.prefix = prefix;
+        }
+
+        String getPrefix() {
+            return prefix;
+        }
+
+        String getUri() {
+            return uri;
+        }
+    }
+
+    //    TODO    Where is this class used?  No longer using it in QName implementation
+    static class QName {
+        static QName create(Namespace namespace, String localName) {
+            //    A null namespace indicates a wild-card match for any namespace
+            //    A null localName indicates "*" from the point of view of ECMA357
+            if (localName != null && localName.equals("*")) throw new RuntimeException("* is not valid localName");
+            QName rv = new QName();
+            rv.namespace = namespace;
+            rv.localName = localName;
+            return rv;
+        }
+
+        /** @deprecated */
+        static QName create(String uri, String localName, String prefix) {
+            return create(Namespace.create(prefix, uri), localName);
+        }
+
+        static String qualify(String prefix, String localName) {
+            if (prefix == null) throw new IllegalArgumentException("prefix must not be null");
+            if (prefix.length() > 0) return prefix + ":" + localName;
+            return localName;
+        }
+
+        private Namespace namespace;
+        private String localName;
+
+        private QName() {
+        }
+
+        public String toString() {
+            return "XmlNode.QName [" + localName + "," + namespace + "]";
+        }
+
+        private boolean equals(String one, String two) {
+            if (one == null && two == null) return true;
+            if (one == null || two == null) return false;
+            return one.equals(two);
+        }
+
+        private boolean namespacesEqual(Namespace one, Namespace two) {
+            if (one == null && two == null) return true;
+            if (one == null || two == null) return false;
+            return equals(one.getUri(), two.getUri());
+        }
+
+        final boolean isEqualTo(QName other) {
+            if (!namespacesEqual(this.namespace, other.namespace)) return false;
+            if (!equals(this.localName, other.localName)) return false;
+            return true;
+        }
+
+        void lookupPrefix(org.w3c.dom.Node node) {
+            if (node == null) throw new IllegalArgumentException("node must not be null");
+            String prefix = node.lookupPrefix(namespace.getUri());
+            if (prefix == null) {
+                //    check to see if we match the default namespace
+                String defaultNamespace = node.lookupNamespaceURI(null);
+                if (defaultNamespace == null) defaultNamespace = "";
+                String nodeNamespace = namespace.getUri();
+                if (nodeNamespace.equals(defaultNamespace)) {
+                    prefix = "";
+                }
+            }
+            int i = 0;
+            while(prefix == null) {
+                String generatedPrefix = "e4x_" + i++;
+                String generatedUri = node.lookupNamespaceURI(generatedPrefix);
+                if (generatedUri == null) {
+                    prefix = generatedPrefix;
+                    org.w3c.dom.Node top = node;
+                    while(top.getParentNode() != null && top.getParentNode() instanceof org.w3c.dom.Element) {
+                        top = top.getParentNode();
+                    }
+                    ((org.w3c.dom.Element)top).setAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns:" + prefix, namespace.getUri());
+                }
+            }
+            namespace.setPrefix(prefix);
+        }
+
+        String qualify(org.w3c.dom.Node node) {
+            if (namespace.getPrefix() == null) {
+                if (node != null) {
+                    lookupPrefix(node);
+                } else {
+                    if (namespace.getUri().equals("")) {
+                        namespace.setPrefix("");
+                    } else {
+                        //    TODO    I am not sure this is right, but if we are creating a standalone node, I think we can set the
+                        //            default namespace on the node itself and not worry about setting a prefix for that namespace.
+                        namespace.setPrefix("");
+                    }
+                }
+            }
+            return qualify(namespace.getPrefix(), localName);
+        }
+
+        void setAttribute(org.w3c.dom.Element element, String value) {
+            if (namespace.getPrefix() == null) lookupPrefix(element);
+            element.setAttributeNS(namespace.getUri(), qualify(namespace.getPrefix(), localName), value);
+        }
+
+        /** @deprecated Use getNamespace() */
+        String getUri() {
+            return namespace.getUri();
+        }
+
+        /** @deprecated Use getNamespace() */
+        String getPrefix() {
+            return namespace.getPrefix();
+        }
+
+        Namespace getNamespace() {
+            return namespace;
+        }
+
+        String getLocalName() {
+            return localName;
+        }
+    }
+
+    static class List {
+        private java.util.Vector v;
+
+        List() {
+            v = new java.util.Vector();
+        }
+
+        private void _add(XmlNode n) {
+            v.add(n);
+        }
+
+        XmlNode item(int index) {
+            return (XmlNode)(v.get(index));
+        }
+
+        void remove(int index) {
+            v.remove(index);
+        }
+
+        void add(List other) {
+            for (int i=0; i<other.length(); i++) {
+                _add(other.item(i));
+            }
+        }
+
+        void add(List from, int startInclusive, int endExclusive) {
+            for (int i=startInclusive; i<endExclusive; i++) {
+                _add(from.item(i));
+            }
+        }
+
+        void add(XmlNode node) {
+            _add(node);
+        }
+
+        /** @deprecated */
+        void add(XML xml) {
+            _add(xml.getAnnotation());
+        }
+
+        /** @deprecated */
+        void addToList(Object toAdd) {
+            if (toAdd instanceof Undefined) {
+                // Missing argument do nothing...
+                return;
+            }
+
+            if (toAdd instanceof XMLList) {
+                XMLList xmlSrc = (XMLList)toAdd;
+                for (int i = 0; i < xmlSrc.length(); i++) {
+                    this._add((xmlSrc.item(i)).getAnnotation());
+                }
+            } else if (toAdd instanceof XML) {
+                this._add(((XML)(toAdd)).getAnnotation());
+            } else if (toAdd instanceof XmlNode) {
+                this._add((XmlNode)toAdd);
+            }
+        }
+
+        int length() {
+            return v.size();
+        }
+    }
+
+    static abstract class Filter {
+        static final Filter COMMENT = new Filter() {
+            boolean accept(Node node) {
+                return node.getNodeType() == Node.COMMENT_NODE;
+            }
+        };
+        static final Filter TEXT = new Filter() {
+            boolean accept(Node node) {
+                return node.getNodeType() == Node.TEXT_NODE;
+            }
+        };
+        static Filter PROCESSING_INSTRUCTION(final XMLName name) {
+            return new Filter() {
+                boolean accept(Node node) {
+                    if (node.getNodeType() == Node.PROCESSING_INSTRUCTION_NODE) {
+                        ProcessingInstruction pi = (ProcessingInstruction)node;
+                        return name.matchesLocalName(pi.getTarget());
+                    }
+                    return false;
+                }
+            };
+        }
+        static Filter ELEMENT = new Filter() {
+            boolean accept(Node node) {
+                return node.getNodeType() == Node.ELEMENT_NODE;
+            }
+        };
+        static Filter TRUE = new Filter() {
+            boolean accept(Node node) {
+                return true;
+            }
+        };
+        abstract boolean accept(Node node);
+    }
+
+    //    Support experimental Java interface
+    org.w3c.dom.Node toDomNode() {
+        return this.dom;
+    }
+}
diff --git a/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XmlProcessor.java b/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XmlProcessor.java
new file mode 100644
index 0000000..d8ad495
--- /dev/null
+++ b/trunk/infrastructure/rhino1_7R1/xmlimplsrc/org/mozilla/javascript/xmlimpl/XmlProcessor.java
@@ -0,0 +1,445 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Rhino DOM-only E4X implementation.
+ *
+ * The Initial Developer of the Original Code is
+ * David P. Caldwell.
+ * Portions created by David P. Caldwell are Copyright (C)
+ * 2007 David P. Caldwell. All Rights Reserved.
+ *
+ *
+ * Contributor(s):
+ *   David P. Caldwell <inonit@inonit.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * the GNU General Public License Version 2 or later (the "GPL"), in which
+ * case the provisions of the GPL are applicable instead of those above. If
+ * you wish to allow use of your version of this file only under the terms of
+ * the GPL and not to allow others to use your version of this file under the
+ * MPL, indicate your decision by deleting the provisions above and replacing
+ * them with the notice and other provisions required by the GPL. If you do
+ * not delete the provisions above, a recipient may use your version of this
+ * file under either the MPL or the GPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+package org.mozilla.javascript.xmlimpl;
+
+import org.w3c.dom.*;
+
+import javax.xml.parsers.DocumentBuilder;
+
+import org.mozilla.javascript.*;
+
+//    Disambiguate from org.mozilla.javascript.Node
+import org.w3c.dom.Node;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.SAXParseException;
+
+class XmlProcessor {
+    private boolean ignoreComments;
+    private boolean ignoreProcessingInstructions;
+    private boolean ignoreWhitespace;
+    private boolean prettyPrint;
+    private int prettyIndent;
+
+    private javax.xml.parsers.DocumentBuilderFactory dom;
+    private javax.xml.transform.TransformerFactory xform;
+    private DocumentBuilder documentBuilder;
+    private RhinoSAXErrorHandler errorHandler = new RhinoSAXErrorHandler();
+
+
+    private static class RhinoSAXErrorHandler implements ErrorHandler {
+
+        private void throwError(SAXParseException e) {
+            throw ScriptRuntime.constructError("TypeError", e.getMessage(),
+                e.getLineNumber() - 1);
+        }
+
+        public void error(SAXParseException e) {
+            throwError(e);
+        }
+
+        public void fatalError(SAXParseException e) {
+            throwError(e);
+        }
+
+        public void warning(SAXParseException e) {
+            Context.reportWarning(e.getMessage());
+        }
+    }
+
+    XmlProcessor() {
+        setDefault();
+        this.dom = javax.xml.parsers.DocumentBuilderFactory.newInstance();
+        this.dom.setNamespaceAware(true);
+        this.dom.setIgnoringComments(false);
+        this.xform = javax.xml.transform.TransformerFactory.newInstance();
+    }
+
+    final void setDefault() {
+        this.setIgnoreComments(true);
+        this.setIgnoreProcessingInstructions(true);
+        this.setIgnoreWhitespace(true);
+        this.setPrettyPrinting(true);
+        this.setPrettyIndent(2);
+    }
+
+    final void setIgnoreComments(boolean b) {
+        this.ignoreComments = b;
+    }
+
+    final void setIgnoreWhitespace(boolean b) {
+        this.ignoreWhitespace = b;
+    }
+
+    final void setIgnoreProcessingInstructions(boolean b) {
+        this.ignoreProcessingInstructions = b;
+    }
+
+    final void setPrettyPrinting(boolean b) {
+        this.prettyPrint = b;
+    }
+
+    final void setPrettyIndent(int i) {
+        this.prettyIndent = i;
+    }
+
+    final boolean isIgnoreComments() {
+        return ignoreComments;
+    }
+
+    final boolean isIgnoreProcessingInstructions() {
+        return ignoreProcessingInstructions;
+    }
+
+    final boolean isIgnoreWhitespace() {
+        return ignoreWhitespace;
+    }
+
+    final boolean isPrettyPrinting() {
+        return prettyPrint;
+    }
+
+    final int getPrettyIndent() {
+        return prettyIndent;
+    }
+
+    private String toXmlNewlines(String rv) {
+        StringBuffer nl = new StringBuffer();
+        for (int i=0; i<rv.length(); i++) {
+            if (rv.charAt(i) == '\r') {
+                if (rv.charAt(i+1) == '\n') {
+                    //    DOS, do nothing and skip the \r
+                } else {
+                    //    Macintosh, substitute \n
+                    nl.append('\n');
+                }
+            } else {
+                nl.append(rv.charAt(i));
+            }
+        }
+        return nl.toString();
+    }
+
+    private javax.xml.parsers.DocumentBuilderFactory getDomFactory() {
+        return dom;
+    }
+    
+    private synchronized DocumentBuilder getDocumentBuilderFromPool()
+        throws javax.xml.parsers.ParserConfigurationException
+    {
+        DocumentBuilder result;
+        if (documentBuilder == null) {
+            javax.xml.parsers.DocumentBuilderFactory factory = getDomFactory();
+            result = factory.newDocumentBuilder();
+        } else {
+            result = documentBuilder;
+            documentBuilder = null;
+        }
+        result.setErrorHandler(errorHandler);
+        return result;
+    }
+        
+    private synchronized void returnDocumentBuilderToPool(DocumentBuilder db) {
+        if (documentBuilder == null) {
+            documentBuilder = db;
+            documentBuilder.reset();
+        }
+    }
+
+    private void addProcessingInstructionsTo(java.util.Vector v, Node node) {
+        if (node instanceof ProcessingInstruction) {
+            v.add(node);
+        }
+        if (node.getChildNodes() != null) {
+            for (int i=0; i<node.getChildNodes().getLength(); i++) {
+                addProcessingInstructionsTo(v, node.getChildNodes().item(i));
+            }
+        }
+    }
+
+    private void addCommentsTo(java.util.Vector v, Node node) {
+        if (node instanceof Comment) {
+            v.add(node);
+        }
+        if (node.getChildNodes() != null) {
+            for (int i=0; i<node.getChildNodes().getLength(); i++) {
+                addProcessingInstructionsTo(v, node.getChildNodes().item(i));
+            }
+        }
+    }
+
+    private void addTextNodesToRemoveAndTrim(java.util.Vector toRemove, Node node) {
+        if (node instanceof Text) {
+            Text text = (Text)node;
+            boolean BUG_369394_IS_VALID = false;
+            if (!BUG_369394_IS_VALID) {
+                text.setData(text.getData().trim());
+            } else {
+                if (text.getData().trim().length() == 0) {
+                    text.setData("");
+                }
+            }
+            if (text.getData().length() == 0) {
+                toRemove.add(node);
+            }
+        }
+        if (node.getChildNodes() != null) {
+            for (int i=0; i<node.getChildNodes().getLength(); i++) {
+                addTextNodesToRemoveAndTrim(toRemove, node.getChildNodes().item(i));
+            }
+        }
+    }
+
+    final Node toXml(String defaultNamespaceUri, String xml) throws org.xml.sax.SAXException {
+        //    See ECMA357 10.3.1
+        DocumentBuilder builder = null;
+        try {
+            String syntheticXml = "<parent xmlns=\"" + defaultNamespaceUri +
+                "\">" + xml + "</parent>";
+            builder = getDocumentBuilderFromPool(); 
+            Document document = builder.parse( new org.xml.sax.InputSource(new java.io.StringReader(syntheticXml)) );
+            if (ignoreProcessingInstructions) {
+                java.util.Vector v = new java.util.Vector();
+                addProcessingInstructionsTo(v, document);
+                for (int i=0; i<v.size(); i++) {
+                    Node node = (Node)v.elementAt(i);
+                    node.getParentNode().removeChild(node);
+                }
+            }
+            if (ignoreComments) {
+                java.util.Vector v = new java.util.Vector();
+                addCommentsTo(v, document);
+                for (int i=0; i<v.size(); i++) {
+                    Node node = (Node)v.elementAt(i);
+                    node.getParentNode().removeChild(node);
+                }
+            }
+            if (ignoreWhitespace) {
+                //    Apparently JAXP setIgnoringElementContentWhitespace() has a different meaning, it appears from the Javadoc
+                //    Refers to element-only content models, which means we would need to have a validating parser and DTD or schema
+                //    so that it would know which whitespace to ignore.
+
+                //    Instead we will try to delete it ourselves.
+                java.util.Vector v = new java.util.Vector();
+                addTextNodesToRemoveAndTrim(v, document);
+                for (int i=0; i<v.size(); i++) {
+                    Node node = (Node)v.elementAt(i);
+                    node.getParentNode().removeChild(node);
+                }
+            }
+            NodeList rv = document.getDocumentElement().getChildNodes();
+            if (rv.getLength() > 1) {
+                throw ScriptRuntime.constructError("SyntaxError", "XML objects may contain at most one node.");
+            } else if (rv.getLength() == 0) {
+                Node node = document.createTextNode("");
+                return node;
+            } else {
+                Node node = rv.item(0);
+                document.getDocumentElement().removeChild(node);
+                return node;
+            }
+        } catch (java.io.IOException e) {
+            throw new RuntimeException("Unreachable.");
+        } catch (javax.xml.parsers.ParserConfigurationException e) {
+            throw new RuntimeException(e);
+        } finally {
+            if (builder != null)
+                returnDocumentBuilderToPool(builder);
+        }
+    }
+
+    Document newDocument() {
+        DocumentBuilder builder = null;
+        try {
+            //    TODO    Should this use XML settings?
+            builder = getDocumentBuilderFromPool();
+            return builder.newDocument();
+        } catch (javax.xml.parsers.ParserConfigurationException ex) {
+            //    TODO    How to handle these runtime errors?
+            throw new RuntimeException(ex);
+        } finally {
+            if (builder != null)
+                returnDocumentBuilderToPool(builder);
+        }
+    }
+
+    //    TODO    Cannot remember what this is for, so whether it should use settings or not
+    private String toString(Node node) {
+        javax.xml.transform.dom.DOMSource source = new javax.xml.transform.dom.DOMSource(node);
+        java.io.StringWriter writer = new java.io.StringWriter();
+        javax.xml.transform.stream.StreamResult result = new javax.xml.transform.stream.StreamResult(writer);
+        try {
+            javax.xml.transform.Transformer transformer = xform.newTransformer();
+            transformer.setOutputProperty(javax.xml.transform.OutputKeys.OMIT_XML_DECLARATION, "yes");
+            transformer.setOutputProperty(javax.xml.transform.OutputKeys.INDENT, "no");
+            transformer.setOutputProperty(javax.xml.transform.OutputKeys.METHOD, "xml");
+            transformer.transform(source, result);
+        } catch (javax.xml.transform.TransformerConfigurationException ex) {
+            //    TODO    How to handle these runtime errors?
+            throw new RuntimeException(ex);
+        } catch (javax.xml.transform.TransformerException ex) {
+            //    TODO    How to handle these runtime errors?
+            throw new RuntimeException(ex);
+        }
+        return toXmlNewlines(writer.toString());
+    }
+
+    String escapeAttributeValue(Object value) {
+        String text = ScriptRuntime.toString(value);
+
+        if (text.length() == 0) return "";
+
+        Document dom = newDocument();
+        Element e = dom.createElement("a");
+        e.setAttribute("b", text);
+        String elementText = toString(e);
+        int begin = elementText.indexOf('"');
+        int end = elementText.lastIndexOf('"');
+        return elementText.substring(begin+1,end);
+    }
+
+    String escapeTextValue(Object value) {
+        if (value instanceof XMLObjectImpl) {
+            return ((XMLObjectImpl)value).toXMLString();
+        }
+
+        String text = ScriptRuntime.toString(value);
+
+        if (text.length() == 0) return text;
+
+        Document dom = newDocument();
+        Element e = dom.createElement("a");
+        e.setTextContent(text);
+        String elementText = toString(e);
+
+        int begin = elementText.indexOf('>') + 1;
+        int end = elementText.lastIndexOf('<');
+        return (begin < end) ? elementText.substring(begin, end) : "";
+    }
+
+    private String escapeElementValue(String s) {
+        //    TODO    Check this
+        return escapeTextValue(s);
+    }
+
+    private String elementToXmlString(Element element) {
+        //    TODO    My goodness ECMA is complicated (see 10.2.1).  We'll try this first.
+        Element copy = (Element)element.cloneNode(true);
+        if (prettyPrint) {
+            beautifyElement(copy, 0);
+        }
+        return toString(copy);
+    }
+
+    final String ecmaToXmlString(Node node) {
+        //    See ECMA 357 Section 10.2.1
+        StringBuffer s = new StringBuffer();
+        int indentLevel = 0;
+        if (prettyPrint) {
+            for (int i=0; i<indentLevel; i++) {
+                s.append(' ');
+            }
+        }
+        if (node instanceof Text) {
+            String data = ((Text)node).getData();
+            //    TODO Does Java trim() work same as XMLWhitespace?
+            String v = (prettyPrint) ? data.trim() : data;
+            s.append(escapeElementValue(v));
+            return s.toString();
+        }
+        if (node instanceof Attr) {
+            String value = ((Attr)node).getValue();
+            s.append(escapeAttributeValue(value));
+            return s.toString();
+        }
+        if (node instanceof Comment) {
+            s.append("<!--" + ((Comment)node).getNodeValue() + "-->");
+            return s.toString();
+        }
+        if (node instanceof ProcessingInstruction) {
+            ProcessingInstruction pi = (ProcessingInstruction)node;
+            s.append("<?" + pi.getTarget() + " " + pi.getData() + "?>");
+            return s.toString();
+        }
+        s.append(elementToXmlString((Element)node));
+        return s.toString();
+    }
+
+    private void beautifyElement(Element e, int indent) {
+        StringBuffer s = new StringBuffer();
+        s.append('\n');
+        for (int i=0; i<indent; i++) {
+            s.append(' ');
+        }
+        String afterContent = s.toString();
+        for (int i=0; i<prettyIndent; i++) {
+            s.append(' ');
+        }
+        String beforeContent = s.toString();
+
+        //    We "mark" all the nodes first; if we tried to do this loop otherwise, it would behave unexpectedly (the inserted nodes
+        //    would contribute to the length and it might never terminate).
+        java.util.Vector toIndent = new java.util.Vector();
+        boolean indentChildren = false;
+        for (int i=0; i<e.getChildNodes().getLength(); i++) {
+            if (i == 1) indentChildren = true;
+            if (e.getChildNodes().item(i) instanceof Text) {
+                toIndent.add(e.getChildNodes().item(i));
+            } else {
+                indentChildren = true;
+                toIndent.add(e.getChildNodes().item(i));
+            }
+        }
+        if (indentChildren) {
+            for (int i=0; i<toIndent.size(); i++) {
+                e.insertBefore( e.getOwnerDocument().createTextNode(beforeContent), (Node)toIndent.elementAt(i) );
+            }
+        }
+        NodeList nodes = e.getChildNodes();
+        java.util.Vector v = new java.util.Vector();
+        for (int i=0; i<nodes.getLength(); i++) {
+            if (nodes.item(i) instanceof Element) {
+                v.add( nodes.item(i) );
+            }
+        }
+        for (int i=0; i<v.size(); i++) {
+            beautifyElement( (Element)v.elementAt(i), indent + prettyIndent );
+        }
+        if (indentChildren) {
+            e.appendChild( e.getOwnerDocument().createTextNode(afterContent) );
+        }
+    }
+}