No OneTemporary
Actions

Size

82 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php
	index cdbfc115f6..e3689134b5 100644
	--- a/src/__celerity_resource_map__.php
	+++ b/src/__celerity_resource_map__.php
	@@ -1,530 +1,541 @@
	<?php

	/**
	* This file is automatically generated. Use 'celerity_mapper.php' to rebuild
	* it.
	* @generated
	*/

	celerity_register_resource_map(array(
	'aphront-dark-console-css' =>
	array(
	'uri' => '/res/056b0c12/rsrc/css/aphront/dark-console.css',
	'type' => 'css',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/css/aphront/dark-console.css',
	),
	'aphront-dialog-view-css' =>
	array(
	'uri' => '/res/a05107ae/rsrc/css/aphront/dialog-view.css',
	'type' => 'css',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/css/aphront/dialog-view.css',
	),
	'aphront-error-view-css' =>
	array(
	'uri' => '/res/19b27527/rsrc/css/aphront/error-view.css',
	'type' => 'css',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/css/aphront/error-view.css',
	),
	'aphront-form-view-css' =>
	array(
	'uri' => '/res/8aaef437/rsrc/css/aphront/form-view.css',
	'type' => 'css',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/css/aphront/form-view.css',
	),
	'aphront-panel-view-css' =>
	array(
	'uri' => '/res/63672373/rsrc/css/aphront/panel-view.css',
	'type' => 'css',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/css/aphront/panel-view.css',
	),
	'aphront-request-failure-view-css' =>
	array(
	'uri' => '/res/97b8337a/rsrc/css/aphront/request-failure-view.css',
	'type' => 'css',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/css/aphront/request-failure-view.css',
	),
	'aphront-side-nav-view-css' =>
	array(
	'uri' => '/res/09b7eb85/rsrc/css/aphront/side-nav-view.css',
	'type' => 'css',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/css/aphront/side-nav-view.css',
	),
	'aphront-table-view-css' =>
	array(
	'uri' => '/res/6a70f0f0/rsrc/css/aphront/table-view.css',
	'type' => 'css',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/css/aphront/table-view.css',
	),
	'aphront-tokenizer-control-css' =>
	array(
	'uri' => '/res/a3d23074/rsrc/css/aphront/tokenizer.css',
	'type' => 'css',
	'requires' =>
	array(
	0 => 'aphront-typeahead-control-css',
	),
	'disk' => '/rsrc/css/aphront/tokenizer.css',
	),
	'aphront-typeahead-control-css' =>
	array(
	'uri' => '/res/928df9f0/rsrc/css/aphront/typeahead.css',
	'type' => 'css',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/css/aphront/typeahead.css',
	),
	'phabricator-standard-page-view' =>
	array(
	'uri' => '/res/4ebe4b10/rsrc/css/application/base/standard-page-view.css',
	'type' => 'css',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/css/application/base/standard-page-view.css',
	),
	'differential-revision-add-comment-css' =>
	array(
	'uri' => '/res/aaae14d3/rsrc/css/application/differential/add-comment.css',
	'type' => 'css',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/css/application/differential/add-comment.css',
	),
	'differential-changeset-view-css' =>
	array(
	'uri' => '/res/f26ca6f9/rsrc/css/application/differential/changeset-view.css',
	'type' => 'css',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/css/application/differential/changeset-view.css',
	),
	'differential-core-view-css' =>
	array(
	'uri' => '/res/525d1a12/rsrc/css/application/differential/core.css',
	'type' => 'css',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/css/application/differential/core.css',
	),
	'differential-revision-comment-list-css' =>
	array(
	'uri' => '/res/10b9a829/rsrc/css/application/differential/revision-comment-list.css',
	'type' => 'css',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/css/application/differential/revision-comment-list.css',
	),
	'differential-revision-comment-css' =>
	array(
	'uri' => '/res/b271baaf/rsrc/css/application/differential/revision-comment.css',
	'type' => 'css',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/css/application/differential/revision-comment.css',
	),
	'differential-revision-detail-css' =>
	array(
	'uri' => '/res/230a67c6/rsrc/css/application/differential/revision-detail.css',
	'type' => 'css',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/css/application/differential/revision-detail.css',
	),
	'differential-revision-history-css' =>
	array(
	'uri' => '/res/755f3da3/rsrc/css/application/differential/revision-history.css',
	'type' => 'css',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/css/application/differential/revision-history.css',
	),
	'differential-table-of-contents-css' =>
	array(
	'uri' => '/res/e68f6f05/rsrc/css/application/differential/table-of-contents.css',
	'type' => 'css',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/css/application/differential/table-of-contents.css',
	),
	'phabricator-directory-css' =>
	array(
	'uri' => '/res/6a000601/rsrc/css/application/directory/phabricator-directory.css',
	'type' => 'css',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/css/application/directory/phabricator-directory.css',
	),
	'mainphest-task-detail-css' =>
	array(
	'uri' => '/res/e5f3beca/rsrc/css/application/maniphest/task-detail.css',
	'type' => 'css',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/css/application/maniphest/task-detail.css',
	),
	'maniphest-task-summary-css' =>
	array(
	'uri' => '/res/10d5ec2e/rsrc/css/application/maniphest/task-summary.css',
	'type' => 'css',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/css/application/maniphest/task-summary.css',
	),
	'maniphest-transaction-detail-css' =>
	array(
	'uri' => '/res/658912c5/rsrc/css/application/maniphest/transaction-detail.css',
	'type' => 'css',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/css/application/maniphest/transaction-detail.css',
	),
	- 'phabricator-core-buttons-css' =>
	+ 'phabricator-object-selector-css' =>
	array(
	- 'uri' => '/res/ee35ffe1/rsrc/css/core/buttons.css',
	+ 'uri' => '/res/270ce107/rsrc/css/application/objectselector/object-selector.css',
	'type' => 'css',
	'requires' =>
	array(
	+ 0 => 'aphront-dialog-view-css',
	),
	- 'disk' => '/rsrc/css/core/buttons.css',
	+ 'disk' => '/rsrc/css/application/objectselector/object-selector.css',
	),
	- 'phabricator-core-css' =>
	+ 'phabricator-core-buttons-css' =>
	array(
	- 'uri' => '/res/6eebb99b/rsrc/css/core/core.css',
	+ 'uri' => '/res/ee35ffe1/rsrc/css/core/buttons.css',
	'type' => 'css',
	'requires' =>
	array(
	),
	- 'disk' => '/rsrc/css/core/core.css',
	+ 'disk' => '/rsrc/css/core/buttons.css',
	),
	- 'phabricator-core-dialog-css' =>
	+ 'phabricator-core-css' =>
	array(
	- 'uri' => '/res/f66cec41/rsrc/css/core/dialog.css',
	+ 'uri' => '/res/6eebb99b/rsrc/css/core/core.css',
	'type' => 'css',
	'requires' =>
	array(
	),
	- 'disk' => '/rsrc/css/core/dialog.css',
	+ 'disk' => '/rsrc/css/core/core.css',
	),
	'phabricator-remarkup-css' =>
	array(
	'uri' => '/res/786989c3/rsrc/css/core/remarkup.css',
	'type' => 'css',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/css/core/remarkup.css',
	),
	'syntax-highlighting-css' =>
	array(
	'uri' => '/res/fb673ece/rsrc/css/core/syntax.css',
	'type' => 'css',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/css/core/syntax.css',
	),
	'javelin-behavior-dark-console' =>
	array(
	'uri' => '/res/020b0265/rsrc/js/application/core/behavior-dark-console.js',
	'type' => 'js',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/js/application/core/behavior-dark-console.js',
	),
	+ 'javelin-behavior-phabricator-object-selector' =>
	+ array(
	+ 'uri' => '/res/7f7eda6a/rsrc/js/application/core/behavior-object-selector.js',
	+ 'type' => 'js',
	+ 'requires' =>
	+ array(
	+ 0 => 'javelin-lib-dev',
	+ ),
	+ 'disk' => '/rsrc/js/application/core/behavior-object-selector.js',
	+ ),
	'javelin-behavior-aphront-basic-tokenizer' =>
	array(
	'uri' => '/res/8317d761/rsrc/js/application/core/behavior-tokenizer.js',
	'type' => 'js',
	'requires' =>
	array(
	0 => 'javelin-lib-dev',
	),
	'disk' => '/rsrc/js/application/core/behavior-tokenizer.js',
	),
	'javelin-behavior-workflow' =>
	array(
	'uri' => '/res/15446e7e/rsrc/js/application/core/behavior-workflow.js',
	'type' => 'js',
	'requires' =>
	array(
	0 => 'javelin-lib-dev',
	),
	'disk' => '/rsrc/js/application/core/behavior-workflow.js',
	),
	'javelin-behavior-differential-add-reviewers' =>
	array(
	'uri' => '/res/330154e4/rsrc/js/application/differential/behavior-add-reviewers.js',
	'type' => 'js',
	'requires' =>
	array(
	0 => 'javelin-lib-dev',
	),
	'disk' => '/rsrc/js/application/differential/behavior-add-reviewers.js',
	),
	'javelin-behavior-differential-feedback-preview' =>
	array(
	'uri' => '/res/8695d8b8/rsrc/js/application/differential/behavior-comment-preview.js',
	'type' => 'js',
	'requires' =>
	array(
	0 => 'javelin-lib-dev',
	),
	'disk' => '/rsrc/js/application/differential/behavior-comment-preview.js',
	),
	'javelin-behavior-differential-diff-radios' =>
	array(
	'uri' => '/res/fdeb3823/rsrc/js/application/differential/behavior-diff-radios.js',
	'type' => 'js',
	'requires' =>
	array(
	0 => 'javelin-lib-dev',
	),
	'disk' => '/rsrc/js/application/differential/behavior-diff-radios.js',
	),
	'javelin-behavior-differential-edit-inline-comments' =>
	array(
	'uri' => '/res/74747b2e/rsrc/js/application/differential/behavior-edit-inline-comments.js',
	'type' => 'js',
	'requires' =>
	array(
	0 => 'javelin-lib-dev',
	),
	'disk' => '/rsrc/js/application/differential/behavior-edit-inline-comments.js',
	),
	'javelin-behavior-differential-populate' =>
	array(
	'uri' => '/res/a13dcd7e/rsrc/js/application/differential/behavior-populate.js',
	'type' => 'js',
	'requires' =>
	array(
	0 => 'javelin-lib-dev',
	),
	'disk' => '/rsrc/js/application/differential/behavior-populate.js',
	),
	'javelin-behavior-differential-show-all-comments' =>
	array(
	'uri' => '/res/2a3592b8/rsrc/js/application/differential/behavior-show-all-comments.js',
	'type' => 'js',
	'requires' =>
	array(
	0 => 'javelin-lib-dev',
	),
	'disk' => '/rsrc/js/application/differential/behavior-show-all-comments.js',
	),
	'javelin-behavior-differential-show-more' =>
	array(
	'uri' => '/res/ea998002/rsrc/js/application/differential/behavior-show-more.js',
	'type' => 'js',
	'requires' =>
	array(
	0 => 'javelin-lib-dev',
	),
	'disk' => '/rsrc/js/application/differential/behavior-show-more.js',
	),
	'javelin-behavior-maniphest-transaction-controls' =>
	array(
	'uri' => '/res/fc6a8722/rsrc/js/application/maniphest/behavior-transaction-controls.js',
	'type' => 'js',
	'requires' =>
	array(
	0 => 'javelin-lib-dev',
	),
	'disk' => '/rsrc/js/application/maniphest/behavior-transaction-controls.js',
	),
	'javelin-magical-init' =>
	array(
	'uri' => '/res/76614f84/rsrc/js/javelin/init.dev.js',
	'type' => 'js',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/js/javelin/init.dev.js',
	),
	'javelin-init-prod' =>
	array(
	'uri' => '/res/1267c868/rsrc/js/javelin/init.min.js',
	'type' => 'js',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/js/javelin/init.min.js',
	),
	'javelin-lib-dev' =>
	array(
	'uri' => '/res/a0e7a5e9/rsrc/js/javelin/javelin.dev.js',
	'type' => 'js',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/js/javelin/javelin.dev.js',
	),
	'javelin-lib-prod' =>
	array(
	'uri' => '/res/2f2b3b2e/rsrc/js/javelin/javelin.min.js',
	'type' => 'js',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/js/javelin/javelin.min.js',
	),
	'javelin-typeahead-dev' =>
	array(
	'uri' => '/res/6de6ae59/rsrc/js/javelin/typeahead.dev.js',
	'type' => 'js',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/js/javelin/typeahead.dev.js',
	),
	'javelin-typeahead-prod' =>
	array(
	'uri' => '/res/69d5fad1/rsrc/js/javelin/typeahead.min.js',
	'type' => 'js',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/js/javelin/typeahead.min.js',
	),
	'javelin-workflow-dev' =>
	array(
	'uri' => '/res/c6b17f93/rsrc/js/javelin/workflow.dev.js',
	'type' => 'js',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/js/javelin/workflow.dev.js',
	),
	'javelin-workflow-prod' =>
	array(
	'uri' => '/res/b758e0a0/rsrc/js/javelin/workflow.min.js',
	'type' => 'js',
	'requires' =>
	array(
	),
	'disk' => '/rsrc/js/javelin/workflow.min.js',
	),
	), array (
	'packages' =>
	array (
	'4f907a28' =>
	array (
	'name' => 'core.pkg.css',
	'symbols' =>
	array (
	0 => 'phabricator-core-css',
	1 => 'phabricator-core-buttons-css',
	2 => 'phabricator-standard-page-view',
	3 => 'aphront-dialog-view-css',
	4 => 'aphront-form-view-css',
	5 => 'aphront-panel-view-css',
	6 => 'aphront-side-nav-view-css',
	7 => 'aphront-table-view-css',
	8 => 'aphront-tokenizer-control-css',
	9 => 'aphront-typeahead-control-css',
	10 => 'phabricator-directory-css',
	11 => 'phabricator-remarkup-css',
	12 => 'syntax-highlighting-css',
	),
	'uri' => '/res/pkg/4f907a28/core.pkg.css',
	'type' => 'css',
	),
	'2525bbc7' =>
	array (
	'name' => 'differential.pkg.css',
	'symbols' =>
	array (
	0 => 'differential-core-view-css',
	1 => 'differential-changeset-view-css',
	2 => 'differential-revision-detail-css',
	3 => 'differential-revision-history-css',
	4 => 'differential-table-of-contents-css',
	5 => 'differential-revision-comment-css',
	6 => 'differential-revision-add-comment-css',
	7 => 'differential-revision-comment-list-css',
	),
	'uri' => '/res/pkg/2525bbc7/differential.pkg.css',
	'type' => 'css',
	),
	'30d594cf' =>
	array (
	'name' => 'differential.pkg.js',
	'symbols' =>
	array (
	0 => 'javelin-behavior-differential-feedback-preview',
	1 => 'javelin-behavior-differential-edit-inline-comments',
	2 => 'javelin-behavior-differential-populate',
	3 => 'javelin-behavior-differential-show-more',
	4 => 'javelin-behavior-differential-diff-radios',
	),
	'uri' => '/res/pkg/30d594cf/differential.pkg.js',
	'type' => 'js',
	),
	),
	'reverse' =>
	array (
	'phabricator-core-css' => '4f907a28',
	'phabricator-core-buttons-css' => '4f907a28',
	'phabricator-standard-page-view' => '4f907a28',
	'aphront-dialog-view-css' => '4f907a28',
	'aphront-form-view-css' => '4f907a28',
	'aphront-panel-view-css' => '4f907a28',
	'aphront-side-nav-view-css' => '4f907a28',
	'aphront-table-view-css' => '4f907a28',
	'aphront-tokenizer-control-css' => '4f907a28',
	'aphront-typeahead-control-css' => '4f907a28',
	'phabricator-directory-css' => '4f907a28',
	'phabricator-remarkup-css' => '4f907a28',
	'syntax-highlighting-css' => '4f907a28',
	'differential-core-view-css' => '2525bbc7',
	'differential-changeset-view-css' => '2525bbc7',
	'differential-revision-detail-css' => '2525bbc7',
	'differential-revision-history-css' => '2525bbc7',
	'differential-table-of-contents-css' => '2525bbc7',
	'differential-revision-comment-css' => '2525bbc7',
	'differential-revision-add-comment-css' => '2525bbc7',
	'differential-revision-comment-list-css' => '2525bbc7',
	'javelin-behavior-differential-feedback-preview' => '30d594cf',
	'javelin-behavior-differential-edit-inline-comments' => '30d594cf',
	'javelin-behavior-differential-populate' => '30d594cf',
	'javelin-behavior-differential-show-more' => '30d594cf',
	'javelin-behavior-differential-diff-radios' => '30d594cf',
	),
	));
	diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
	index 8f89863e8d..cbc4666dcf 100644
	--- a/src/__phutil_library_map__.php
	+++ b/src/__phutil_library_map__.php
	@@ -1,480 +1,486 @@
	<?php

	/**
	* This file is automatically generated. Use 'phutil_mapper.php' to rebuild it.
	* @generated
	*/

	phutil_register_library_map(array(
	'class' =>
	array(
	'Aphront400Response' => 'aphront/response/400',
	'Aphront404Response' => 'aphront/response/404',
	'AphrontAjaxResponse' => 'aphront/response/ajax',
	'AphrontApplicationConfiguration' => 'aphront/applicationconfiguration',
	'AphrontController' => 'aphront/controller',
	'AphrontDatabaseConnection' => 'storage/connection/base',
	'AphrontDefaultApplicationConfiguration' => 'aphront/default/configuration',
	'AphrontDefaultApplicationController' => 'aphront/default/controller',
	'AphrontDialogResponse' => 'aphront/response/dialog',
	'AphrontDialogView' => 'view/dialog',
	'AphrontErrorView' => 'view/form/error',
	'AphrontException' => 'aphront/exception/base',
	'AphrontFileResponse' => 'aphront/response/file',
	'AphrontFormCheckboxControl' => 'view/form/control/checkbox',
	'AphrontFormControl' => 'view/form/control/base',
	'AphrontFormDividerControl' => 'view/form/control/divider',
	'AphrontFormFileControl' => 'view/form/control/file',
	'AphrontFormMarkupControl' => 'view/form/control/markup',
	'AphrontFormPasswordControl' => 'view/form/control/password',
	'AphrontFormRecaptchaControl' => 'view/form/control/recaptcha',
	'AphrontFormSelectControl' => 'view/form/control/select',
	'AphrontFormStaticControl' => 'view/form/control/static',
	'AphrontFormSubmitControl' => 'view/form/control/submit',
	'AphrontFormTextAreaControl' => 'view/form/control/textarea',
	'AphrontFormTextControl' => 'view/form/control/text',
	'AphrontFormTokenizerControl' => 'view/form/control/tokenizer',
	'AphrontFormView' => 'view/form/base',
	'AphrontMySQLDatabaseConnection' => 'storage/connection/mysql',
	'AphrontNullView' => 'view/null',
	'AphrontPageView' => 'view/page/base',
	'AphrontPanelView' => 'view/layout/panel',
	'AphrontQueryConnectionException' => 'storage/exception/connection',
	'AphrontQueryConnectionLostException' => 'storage/exception/connectionlost',
	'AphrontQueryCountException' => 'storage/exception/count',
	'AphrontQueryDuplicateKeyException' => 'storage/exception/duplicatekey',
	'AphrontQueryException' => 'storage/exception/base',
	'AphrontQueryObjectMissingException' => 'storage/exception/objectmissing',
	'AphrontQueryParameterException' => 'storage/exception/parameter',
	'AphrontQueryRecoverableException' => 'storage/exception/recoverable',
	'AphrontRedirectException' => 'aphront/exception/redirect',
	'AphrontRedirectResponse' => 'aphront/response/redirect',
	'AphrontRequest' => 'aphront/request',
	'AphrontRequestFailureView' => 'view/page/failure',
	'AphrontResponse' => 'aphront/response/base',
	'AphrontSideNavView' => 'view/layout/sidenav',
	'AphrontTableView' => 'view/control/table',
	'AphrontURIMapper' => 'aphront/mapper',
	'AphrontView' => 'view/base',
	'AphrontWebpageResponse' => 'aphront/response/webpage',
	'CelerityAPI' => 'infrastructure/celerity/api',
	'CelerityResourceController' => 'infrastructure/celerity/controller',
	'CelerityResourceMap' => 'infrastructure/celerity/map',
	'CelerityStaticResourceResponse' => 'infrastructure/celerity/response',
	'ConduitAPIMethod' => 'applications/conduit/method/base',
	'ConduitAPIRequest' => 'applications/conduit/protocol/request',
	'ConduitAPI_conduit_connect_Method' => 'applications/conduit/method/conduit/connect',
	'ConduitAPI_differential_creatediff_Method' => 'applications/conduit/method/differential/creatediff',
	'ConduitAPI_differential_createrevision_Method' => 'applications/conduit/method/differential/createrevision',
	'ConduitAPI_differential_find_Method' => 'applications/conduit/method/differential/find',
	'ConduitAPI_differential_getcommitmessage_Method' => 'applications/conduit/method/differential/getcommitmessage',
	'ConduitAPI_differential_markcommitted_Method' => 'applications/conduit/method/differential/markcommitted',
	'ConduitAPI_differential_parsecommitmessage_Method' => 'applications/conduit/method/differential/parsecommitmessage',
	'ConduitAPI_differential_setdiffproperty_Method' => 'applications/conduit/method/differential/setdiffproperty',
	'ConduitAPI_differential_updaterevision_Method' => 'applications/conduit/method/differential/updaterevision',
	'ConduitAPI_file_upload_Method' => 'applications/conduit/method/file/upload',
	'ConduitAPI_user_find_Method' => 'applications/conduit/method/user/find',
	'ConduitException' => 'applications/conduit/protocol/exception',
	'DarkConsole' => 'aphront/console/api',
	'DarkConsoleConfigPlugin' => 'aphront/console/plugin/config',
	'DarkConsoleController' => 'aphront/console/controller',
	'DarkConsoleCore' => 'aphront/console/core',
	'DarkConsoleErrorLogPlugin' => 'aphront/console/plugin/errorlog',
	'DarkConsoleErrorLogPluginAPI' => 'aphront/console/plugin/errorlog/api',
	'DarkConsolePlugin' => 'aphront/console/plugin/base',
	'DarkConsoleRequestPlugin' => 'aphront/console/plugin/request',
	'DarkConsoleServicesPlugin' => 'aphront/console/plugin/services',
	'DarkConsoleServicesPluginAPI' => 'aphront/console/plugin/services/api',
	'DarkConsoleXHProfPlugin' => 'aphront/console/plugin/xhprof',
	'DarkConsoleXHProfPluginAPI' => 'aphront/console/plugin/xhprof/api',
	'DifferentialAction' => 'applications/differential/constants/action',
	'DifferentialAddCommentView' => 'applications/differential/view/addcomment',
	'DifferentialCCWelcomeMail' => 'applications/differential/mail/ccwelcome',
	'DifferentialChangeType' => 'applications/differential/constants/changetype',
	'DifferentialChangeset' => 'applications/differential/storage/changeset',
	'DifferentialChangesetDetailView' => 'applications/differential/view/changesetdetailview',
	'DifferentialChangesetListView' => 'applications/differential/view/changesetlistview',
	'DifferentialChangesetParser' => 'applications/differential/parser/changeset',
	'DifferentialChangesetViewController' => 'applications/differential/controller/changesetview',
	'DifferentialComment' => 'applications/differential/storage/comment',
	'DifferentialCommentEditor' => 'applications/differential/editor/comment',
	'DifferentialCommentMail' => 'applications/differential/mail/comment',
	'DifferentialCommentPreviewController' => 'applications/differential/controller/commentpreview',
	'DifferentialCommentSaveController' => 'applications/differential/controller/commentsave',
	'DifferentialCommitMessage' => 'applications/differential/parser/commitmessage',
	'DifferentialCommitMessageData' => 'applications/differential/data/commitmessage',
	'DifferentialCommitMessageParserException' => 'applications/differential/parser/commitmessage/exception',
	'DifferentialController' => 'applications/differential/controller/base',
	'DifferentialDAO' => 'applications/differential/storage/base',
	'DifferentialDiff' => 'applications/differential/storage/diff',
	'DifferentialDiffContentMail' => 'applications/differential/mail/diffcontent',
	'DifferentialDiffCreateController' => 'applications/differential/controller/diffcreate',
	'DifferentialDiffProperty' => 'applications/differential/storage/diffproperty',
	'DifferentialDiffTableOfContentsView' => 'applications/differential/view/difftableofcontents',
	'DifferentialDiffViewController' => 'applications/differential/controller/diffview',
	'DifferentialHunk' => 'applications/differential/storage/hunk',
	'DifferentialInlineComment' => 'applications/differential/storage/inlinecomment',
	'DifferentialInlineCommentEditController' => 'applications/differential/controller/inlinecommentedit',
	'DifferentialInlineCommentPreviewController' => 'applications/differential/controller/inlinecommentpreview',
	'DifferentialInlineCommentView' => 'applications/differential/view/inlinecomment',
	'DifferentialLintStatus' => 'applications/differential/constants/lintstatus',
	'DifferentialMail' => 'applications/differential/mail/base',
	'DifferentialMarkupEngineFactory' => 'applications/differential/parser/markup',
	'DifferentialNewDiffMail' => 'applications/differential/mail/newdiff',
	'DifferentialReviewRequestMail' => 'applications/differential/mail/reviewrequest',
	'DifferentialRevision' => 'applications/differential/storage/revision',
	'DifferentialRevisionCommentListView' => 'applications/differential/view/revisioncommentlist',
	'DifferentialRevisionCommentView' => 'applications/differential/view/revisioncomment',
	'DifferentialRevisionControlSystem' => 'applications/differential/constants/revisioncontrolsystem',
	'DifferentialRevisionDetailView' => 'applications/differential/view/revisiondetail',
	'DifferentialRevisionEditController' => 'applications/differential/controller/revisionedit',
	'DifferentialRevisionEditor' => 'applications/differential/editor/revision',
	'DifferentialRevisionListController' => 'applications/differential/controller/revisionlist',
	'DifferentialRevisionListData' => 'applications/differential/data/revisionlist',
	'DifferentialRevisionStatus' => 'applications/differential/constants/revisionstatus',
	'DifferentialRevisionUpdateHistoryView' => 'applications/differential/view/revisionupdatehistory',
	'DifferentialRevisionViewController' => 'applications/differential/controller/revisionview',
	'DifferentialUnitStatus' => 'applications/differential/constants/unitstatus',
	'Javelin' => 'infrastructure/javelin/api',
	'LiskDAO' => 'storage/lisk/dao',
	'ManiphestController' => 'applications/maniphest/controller/base',
	'ManiphestDAO' => 'applications/maniphest/storage/base',
	'ManiphestTask' => 'applications/maniphest/storage/task',
	'ManiphestTaskCreateController' => 'applications/maniphest/controller/createtask',
	'ManiphestTaskDetailController' => 'applications/maniphest/controller/taskdetail',
	'ManiphestTaskListController' => 'applications/maniphest/controller/tasklist',
	'ManiphestTaskListView' => 'applications/maniphest/view/tasklist',
	'ManiphestTaskPriority' => 'applications/maniphest/constants/priority',
	+ 'ManiphestTaskSelectorController' => 'applications/maniphest/controller/taskselector',
	+ 'ManiphestTaskSelectorSearchController' => 'applications/maniphest/controller/taskselectorsearch',
	'ManiphestTaskStatus' => 'applications/maniphest/constants/status',
	'ManiphestTaskSummaryView' => 'applications/maniphest/view/tasksummary',
	'ManiphestTransaction' => 'applications/maniphest/storage/transaction',
	'ManiphestTransactionDetailView' => 'applications/maniphest/view/transactiondetail',
	'ManiphestTransactionEditor' => 'applications/maniphest/editor/transaction',
	'ManiphestTransactionListView' => 'applications/maniphest/view/transactionlist',
	'ManiphestTransactionSaveController' => 'applications/maniphest/controller/transactionsave',
	'ManiphestTransactionType' => 'applications/maniphest/constants/transactiontype',
	'Phabricator404Controller' => 'applications/base/controller/404',
	'PhabricatorAuthController' => 'applications/auth/controller/base',
	'PhabricatorConduitAPIController' => 'applications/conduit/controller/api',
	'PhabricatorConduitConnectionLog' => 'applications/conduit/storage/connectionlog',
	'PhabricatorConduitConsoleController' => 'applications/conduit/controller/console',
	'PhabricatorConduitController' => 'applications/conduit/controller/base',
	'PhabricatorConduitDAO' => 'applications/conduit/storage/base',
	'PhabricatorConduitLogController' => 'applications/conduit/controller/log',
	'PhabricatorConduitMethodCallLog' => 'applications/conduit/storage/methodcalllog',
	'PhabricatorController' => 'applications/base/controller/base',
	'PhabricatorDirectoryCategory' => 'applications/directory/storage/category',
	'PhabricatorDirectoryCategoryDeleteController' => 'applications/directory/controller/categorydelete',
	'PhabricatorDirectoryCategoryEditController' => 'applications/directory/controller/categoryedit',
	'PhabricatorDirectoryCategoryListController' => 'applications/directory/controller/categorylist',
	'PhabricatorDirectoryController' => 'applications/directory/controller/base',
	'PhabricatorDirectoryDAO' => 'applications/directory/storage/base',
	'PhabricatorDirectoryItem' => 'applications/directory/storage/item',
	'PhabricatorDirectoryItemDeleteController' => 'applications/directory/controller/itemdelete',
	'PhabricatorDirectoryItemEditController' => 'applications/directory/controller/itemedit',
	'PhabricatorDirectoryItemListController' => 'applications/directory/controller/itemlist',
	'PhabricatorDirectoryMainController' => 'applications/directory/controller/main',
	'PhabricatorDraft' => 'applications/draft/storage/draft',
	'PhabricatorDraftDAO' => 'applications/draft/storage/base',
	'PhabricatorEmailLoginController' => 'applications/auth/controller/email',
	'PhabricatorEmailTokenController' => 'applications/auth/controller/emailtoken',
	'PhabricatorEnv' => 'infrastructure/env',
	'PhabricatorFacebookAuthController' => 'applications/auth/controller/facebookauth',
	'PhabricatorFacebookAuthDiagnosticsController' => 'applications/auth/controller/facebookauth/diagnostics',
	'PhabricatorFile' => 'applications/files/storage/file',
	'PhabricatorFileController' => 'applications/files/controller/base',
	'PhabricatorFileDAO' => 'applications/files/storage/base',
	'PhabricatorFileListController' => 'applications/files/controller/list',
	'PhabricatorFileStorageBlob' => 'applications/files/storage/storageblob',
	'PhabricatorFileURI' => 'applications/files/uri',
	'PhabricatorFileUploadController' => 'applications/files/controller/upload',
	'PhabricatorFileViewController' => 'applications/files/controller/view',
	'PhabricatorLiskDAO' => 'applications/base/storage/lisk',
	'PhabricatorLoginController' => 'applications/auth/controller/login',
	'PhabricatorLogoutController' => 'applications/auth/controller/logout',
	'PhabricatorMailImplementationAdapter' => 'applications/metamta/adapter/base',
	'PhabricatorMailImplementationAmazonSESAdapter' => 'applications/metamta/adapter/amazonses',
	'PhabricatorMailImplementationPHPMailerLiteAdapter' => 'applications/metamta/adapter/phpmailerlite',
	'PhabricatorMetaMTAController' => 'applications/metamta/controller/base',
	'PhabricatorMetaMTADAO' => 'applications/metamta/storage/base',
	'PhabricatorMetaMTADaemon' => 'applications/metamta/daemon/mta',
	'PhabricatorMetaMTAListController' => 'applications/metamta/controller/list',
	'PhabricatorMetaMTAMail' => 'applications/metamta/storage/mail',
	'PhabricatorMetaMTAMailingList' => 'applications/metamta/storage/mailinglist',
	'PhabricatorMetaMTAMailingListEditController' => 'applications/metamta/controller/mailinglistedit',
	'PhabricatorMetaMTAMailingListsController' => 'applications/metamta/controller/mailinglists',
	'PhabricatorMetaMTASendController' => 'applications/metamta/controller/send',
	'PhabricatorMetaMTAViewController' => 'applications/metamta/controller/view',
	'PhabricatorObjectHandle' => 'applications/phid/handle',
	'PhabricatorObjectHandleData' => 'applications/phid/handle/data',
	+ 'PhabricatorObjectSelectorDialog' => 'view/control/objectselector',
	'PhabricatorPHID' => 'applications/phid/storage/phid',
	'PhabricatorPHIDAllocateController' => 'applications/phid/controller/allocate',
	'PhabricatorPHIDController' => 'applications/phid/controller/base',
	'PhabricatorPHIDDAO' => 'applications/phid/storage/base',
	'PhabricatorPHIDListController' => 'applications/phid/controller/list',
	'PhabricatorPHIDLookupController' => 'applications/phid/controller/lookup',
	'PhabricatorPHIDType' => 'applications/phid/storage/type',
	'PhabricatorPHIDTypeEditController' => 'applications/phid/controller/typeedit',
	'PhabricatorPHIDTypeListController' => 'applications/phid/controller/typelist',
	'PhabricatorPeopleController' => 'applications/people/controller/base',
	'PhabricatorPeopleEditController' => 'applications/people/controller/edit',
	'PhabricatorPeopleListController' => 'applications/people/controller/list',
	'PhabricatorPeopleProfileController' => 'applications/people/controller/profile',
	'PhabricatorRemarkupRuleDifferential' => 'infrastructure/markup/remarkup/markuprule/differential',
	'PhabricatorRemarkupRuleManiphest' => 'infrastructure/markup/remarkup/markuprule/maniphest',
	'PhabricatorRepository' => 'applications/repository/storage/repository',
	'PhabricatorRepositoryController' => 'applications/repository/controller/base',
	'PhabricatorRepositoryCreateController' => 'applications/repository/controller/create',
	'PhabricatorRepositoryDAO' => 'applications/repository/storage/base',
	'PhabricatorRepositoryEditController' => 'applications/repository/controller/edit',
	'PhabricatorRepositoryGitHubNotification' => 'applications/repository/storage/githubnotification',
	'PhabricatorRepositoryGitHubPostReceiveController' => 'applications/repository/controller/github-post-receive',
	'PhabricatorRepositoryListController' => 'applications/repository/controller/list',
	'PhabricatorSearchAbstractDocument' => 'applications/search/index/abstractdocument',
	'PhabricatorSearchBaseController' => 'applications/search/controller/base',
	'PhabricatorSearchController' => 'applications/search/controller/search',
	'PhabricatorSearchDAO' => 'applications/search/storage/base',
	'PhabricatorSearchDifferentialIndexer' => 'applications/search/index/indexer/differential',
	'PhabricatorSearchDocument' => 'applications/search/storage/document/document',
	'PhabricatorSearchDocumentField' => 'applications/search/storage/document/field',
	'PhabricatorSearchDocumentIndexer' => 'applications/search/index/indexer/base',
	'PhabricatorSearchDocumentRelationship' => 'applications/search/storage/document/relationship',
	'PhabricatorSearchExecutor' => 'applications/search/execute/base',
	'PhabricatorSearchField' => 'applications/search/constants/field',
	'PhabricatorSearchManiphestIndexer' => 'applications/search/index/indexer/maniphest',
	'PhabricatorSearchMySQLExecutor' => 'applications/search/execute/mysql',
	'PhabricatorSearchQuery' => 'applications/search/storage/query',
	'PhabricatorSearchRelationship' => 'applications/search/constants/relationship',
	'PhabricatorStandardPageView' => 'view/page/standard',
	'PhabricatorTypeaheadCommonDatasourceController' => 'applications/typeahead/controller/common',
	'PhabricatorTypeaheadDatasourceController' => 'applications/typeahead/controller/base',
	'PhabricatorUser' => 'applications/people/storage/user',
	'PhabricatorUserDAO' => 'applications/people/storage/base',
	'PhabricatorUserSettingsController' => 'applications/people/controller/settings',
	'PhabricatorXHProfController' => 'applications/xhprof/controller/base',
	'PhabricatorXHProfProfileController' => 'applications/xhprof/controller/profile',
	'PhabricatorXHProfProfileSymbolView' => 'applications/xhprof/view/symbol',
	'PhabricatorXHProfProfileTopLevelView' => 'applications/xhprof/view/toplevel',
	),
	'function' =>
	array(
	'_qsprintf_check_scalar_type' => 'storage/qsprintf',
	'_qsprintf_check_type' => 'storage/qsprintf',
	'celerity_generate_unique_node_id' => 'infrastructure/celerity/api',
	'celerity_register_resource_map' => 'infrastructure/celerity/map',
	'javelin_render_tag' => 'infrastructure/javelin/markup',
	'phabricator_format_relative_time' => 'view/utils',
	'phabricator_format_timestamp' => 'view/utils',
	'phabricator_format_units_generic' => 'view/utils',
	'phabricator_render_form' => 'infrastructure/javelin/markup',
	'qsprintf' => 'storage/qsprintf',
	'queryfx' => 'storage/queryfx',
	'queryfx_all' => 'storage/queryfx',
	'queryfx_one' => 'storage/queryfx',
	'require_celerity_resource' => 'infrastructure/celerity/api',
	'vqsprintf' => 'storage/qsprintf',
	'vqueryfx' => 'storage/queryfx',
	'vqueryfx_all' => 'storage/queryfx',
	'xsprintf_query' => 'storage/qsprintf',
	),
	'requires_class' =>
	array(
	'Aphront400Response' => 'AphrontResponse',
	'Aphront404Response' => 'AphrontResponse',
	'AphrontAjaxResponse' => 'AphrontResponse',
	'AphrontDefaultApplicationConfiguration' => 'AphrontApplicationConfiguration',
	'AphrontDefaultApplicationController' => 'AphrontController',
	'AphrontDialogResponse' => 'AphrontResponse',
	'AphrontDialogView' => 'AphrontView',
	'AphrontErrorView' => 'AphrontView',
	'AphrontFileResponse' => 'AphrontResponse',
	'AphrontFormCheckboxControl' => 'AphrontFormControl',
	'AphrontFormControl' => 'AphrontView',
	'AphrontFormDividerControl' => 'AphrontFormControl',
	'AphrontFormFileControl' => 'AphrontFormControl',
	'AphrontFormMarkupControl' => 'AphrontFormControl',
	'AphrontFormPasswordControl' => 'AphrontFormControl',
	'AphrontFormRecaptchaControl' => 'AphrontFormControl',
	'AphrontFormSelectControl' => 'AphrontFormControl',
	'AphrontFormStaticControl' => 'AphrontFormControl',
	'AphrontFormSubmitControl' => 'AphrontFormControl',
	'AphrontFormTextAreaControl' => 'AphrontFormControl',
	'AphrontFormTextControl' => 'AphrontFormControl',
	'AphrontFormTokenizerControl' => 'AphrontFormControl',
	'AphrontFormView' => 'AphrontView',
	'AphrontMySQLDatabaseConnection' => 'AphrontDatabaseConnection',
	'AphrontNullView' => 'AphrontView',
	'AphrontPageView' => 'AphrontView',
	'AphrontPanelView' => 'AphrontView',
	'AphrontQueryConnectionException' => 'AphrontQueryException',
	'AphrontQueryConnectionLostException' => 'AphrontQueryRecoverableException',
	'AphrontQueryCountException' => 'AphrontQueryException',
	'AphrontQueryDuplicateKeyException' => 'AphrontQueryException',
	'AphrontQueryObjectMissingException' => 'AphrontQueryException',
	'AphrontQueryParameterException' => 'AphrontQueryException',
	'AphrontQueryRecoverableException' => 'AphrontQueryException',
	'AphrontRedirectException' => 'AphrontException',
	'AphrontRedirectResponse' => 'AphrontResponse',
	'AphrontRequestFailureView' => 'AphrontView',
	'AphrontSideNavView' => 'AphrontView',
	'AphrontTableView' => 'AphrontView',
	'AphrontWebpageResponse' => 'AphrontResponse',
	'CelerityResourceController' => 'AphrontController',
	'ConduitAPI_conduit_connect_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_creatediff_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_createrevision_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_find_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_getcommitmessage_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_markcommitted_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_parsecommitmessage_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_setdiffproperty_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_updaterevision_Method' => 'ConduitAPIMethod',
	'ConduitAPI_file_upload_Method' => 'ConduitAPIMethod',
	'ConduitAPI_user_find_Method' => 'ConduitAPIMethod',
	'DarkConsoleConfigPlugin' => 'DarkConsolePlugin',
	'DarkConsoleController' => 'PhabricatorController',
	'DarkConsoleErrorLogPlugin' => 'DarkConsolePlugin',
	'DarkConsoleRequestPlugin' => 'DarkConsolePlugin',
	'DarkConsoleServicesPlugin' => 'DarkConsolePlugin',
	'DarkConsoleXHProfPlugin' => 'DarkConsolePlugin',
	'DifferentialAddCommentView' => 'AphrontView',
	'DifferentialCCWelcomeMail' => 'DifferentialReviewRequestMail',
	'DifferentialChangeset' => 'DifferentialDAO',
	'DifferentialChangesetDetailView' => 'AphrontView',
	'DifferentialChangesetListView' => 'AphrontView',
	'DifferentialChangesetViewController' => 'DifferentialController',
	'DifferentialComment' => 'DifferentialDAO',
	'DifferentialCommentMail' => 'DifferentialMail',
	'DifferentialCommentPreviewController' => 'DifferentialController',
	'DifferentialCommentSaveController' => 'DifferentialController',
	'DifferentialController' => 'PhabricatorController',
	'DifferentialDAO' => 'PhabricatorLiskDAO',
	'DifferentialDiff' => 'DifferentialDAO',
	'DifferentialDiffContentMail' => 'DifferentialMail',
	'DifferentialDiffCreateController' => 'DifferentialController',
	'DifferentialDiffProperty' => 'DifferentialDAO',
	'DifferentialDiffTableOfContentsView' => 'AphrontView',
	'DifferentialDiffViewController' => 'DifferentialController',
	'DifferentialHunk' => 'DifferentialDAO',
	'DifferentialInlineComment' => 'DifferentialDAO',
	'DifferentialInlineCommentEditController' => 'DifferentialController',
	'DifferentialInlineCommentPreviewController' => 'DifferentialController',
	'DifferentialInlineCommentView' => 'AphrontView',
	'DifferentialNewDiffMail' => 'DifferentialReviewRequestMail',
	'DifferentialReviewRequestMail' => 'DifferentialMail',
	'DifferentialRevision' => 'DifferentialDAO',
	'DifferentialRevisionCommentListView' => 'AphrontView',
	'DifferentialRevisionCommentView' => 'AphrontView',
	'DifferentialRevisionDetailView' => 'AphrontView',
	'DifferentialRevisionEditController' => 'DifferentialController',
	'DifferentialRevisionListController' => 'DifferentialController',
	'DifferentialRevisionUpdateHistoryView' => 'AphrontView',
	'DifferentialRevisionViewController' => 'DifferentialController',
	'ManiphestController' => 'PhabricatorController',
	'ManiphestDAO' => 'PhabricatorLiskDAO',
	'ManiphestTask' => 'ManiphestDAO',
	'ManiphestTaskCreateController' => 'ManiphestController',
	'ManiphestTaskDetailController' => 'ManiphestController',
	'ManiphestTaskListController' => 'ManiphestController',
	'ManiphestTaskListView' => 'AphrontView',
	+ 'ManiphestTaskSelectorController' => 'ManiphestController',
	+ 'ManiphestTaskSelectorSearchController' => 'ManiphestController',
	'ManiphestTaskSummaryView' => 'AphrontView',
	'ManiphestTransaction' => 'ManiphestDAO',
	'ManiphestTransactionDetailView' => 'AphrontView',
	'ManiphestTransactionListView' => 'AphrontView',
	'ManiphestTransactionSaveController' => 'ManiphestController',
	'Phabricator404Controller' => 'PhabricatorController',
	'PhabricatorAuthController' => 'PhabricatorController',
	'PhabricatorConduitAPIController' => 'PhabricatorConduitController',
	'PhabricatorConduitConnectionLog' => 'PhabricatorConduitDAO',
	'PhabricatorConduitConsoleController' => 'PhabricatorConduitController',
	'PhabricatorConduitController' => 'PhabricatorController',
	'PhabricatorConduitDAO' => 'PhabricatorLiskDAO',
	'PhabricatorConduitLogController' => 'PhabricatorConduitController',
	'PhabricatorConduitMethodCallLog' => 'PhabricatorConduitDAO',
	'PhabricatorController' => 'AphrontController',
	'PhabricatorDirectoryCategory' => 'PhabricatorDirectoryDAO',
	'PhabricatorDirectoryCategoryDeleteController' => 'PhabricatorDirectoryController',
	'PhabricatorDirectoryCategoryEditController' => 'PhabricatorDirectoryController',
	'PhabricatorDirectoryCategoryListController' => 'PhabricatorDirectoryController',
	'PhabricatorDirectoryController' => 'PhabricatorController',
	'PhabricatorDirectoryDAO' => 'PhabricatorLiskDAO',
	'PhabricatorDirectoryItem' => 'PhabricatorDirectoryDAO',
	'PhabricatorDirectoryItemDeleteController' => 'PhabricatorDirectoryController',
	'PhabricatorDirectoryItemEditController' => 'PhabricatorDirectoryController',
	'PhabricatorDirectoryItemListController' => 'PhabricatorDirectoryController',
	'PhabricatorDirectoryMainController' => 'PhabricatorDirectoryController',
	'PhabricatorDraft' => 'PhabricatorDraftDAO',
	'PhabricatorDraftDAO' => 'PhabricatorLiskDAO',
	'PhabricatorEmailLoginController' => 'PhabricatorAuthController',
	'PhabricatorEmailTokenController' => 'PhabricatorAuthController',
	'PhabricatorFacebookAuthController' => 'PhabricatorAuthController',
	'PhabricatorFacebookAuthDiagnosticsController' => 'PhabricatorAuthController',
	'PhabricatorFile' => 'PhabricatorFileDAO',
	'PhabricatorFileController' => 'PhabricatorController',
	'PhabricatorFileDAO' => 'PhabricatorLiskDAO',
	'PhabricatorFileListController' => 'PhabricatorFileController',
	'PhabricatorFileStorageBlob' => 'PhabricatorFileDAO',
	'PhabricatorFileUploadController' => 'PhabricatorFileController',
	'PhabricatorFileViewController' => 'PhabricatorFileController',
	'PhabricatorLiskDAO' => 'LiskDAO',
	'PhabricatorLoginController' => 'PhabricatorAuthController',
	'PhabricatorLogoutController' => 'PhabricatorAuthController',
	'PhabricatorMailImplementationAmazonSESAdapter' => 'PhabricatorMailImplementationPHPMailerLiteAdapter',
	'PhabricatorMailImplementationPHPMailerLiteAdapter' => 'PhabricatorMailImplementationAdapter',
	'PhabricatorMetaMTAController' => 'PhabricatorController',
	'PhabricatorMetaMTADAO' => 'PhabricatorLiskDAO',
	'PhabricatorMetaMTAListController' => 'PhabricatorMetaMTAController',
	'PhabricatorMetaMTAMail' => 'PhabricatorMetaMTADAO',
	'PhabricatorMetaMTAMailingList' => 'PhabricatorMetaMTADAO',
	'PhabricatorMetaMTAMailingListEditController' => 'PhabricatorMetaMTAController',
	'PhabricatorMetaMTAMailingListsController' => 'PhabricatorMetaMTAController',
	'PhabricatorMetaMTASendController' => 'PhabricatorMetaMTAController',
	'PhabricatorMetaMTAViewController' => 'PhabricatorMetaMTAController',
	+ 'PhabricatorObjectSelectorDialog' => 'AphrontDialogView',
	'PhabricatorPHID' => 'PhabricatorPHIDDAO',
	'PhabricatorPHIDAllocateController' => 'PhabricatorPHIDController',
	'PhabricatorPHIDController' => 'PhabricatorController',
	'PhabricatorPHIDDAO' => 'PhabricatorLiskDAO',
	'PhabricatorPHIDListController' => 'PhabricatorPHIDController',
	'PhabricatorPHIDLookupController' => 'PhabricatorPHIDController',
	'PhabricatorPHIDType' => 'PhabricatorPHIDDAO',
	'PhabricatorPHIDTypeEditController' => 'PhabricatorPHIDController',
	'PhabricatorPHIDTypeListController' => 'PhabricatorPHIDController',
	'PhabricatorPeopleController' => 'PhabricatorController',
	'PhabricatorPeopleEditController' => 'PhabricatorPeopleController',
	'PhabricatorPeopleListController' => 'PhabricatorPeopleController',
	'PhabricatorPeopleProfileController' => 'PhabricatorPeopleController',
	'PhabricatorRemarkupRuleDifferential' => 'PhutilRemarkupRule',
	'PhabricatorRemarkupRuleManiphest' => 'PhutilRemarkupRule',
	'PhabricatorRepository' => 'PhabricatorRepositoryDAO',
	'PhabricatorRepositoryController' => 'PhabricatorController',
	'PhabricatorRepositoryCreateController' => 'PhabricatorController',
	'PhabricatorRepositoryDAO' => 'PhabricatorLiskDAO',
	'PhabricatorRepositoryEditController' => 'PhabricatorController',
	'PhabricatorRepositoryGitHubNotification' => 'PhabricatorRepositoryDAO',
	'PhabricatorRepositoryGitHubPostReceiveController' => 'PhabricatorRepositoryController',
	'PhabricatorRepositoryListController' => 'PhabricatorController',
	'PhabricatorSearchBaseController' => 'PhabricatorController',
	'PhabricatorSearchController' => 'PhabricatorSearchBaseController',
	'PhabricatorSearchDAO' => 'PhabricatorLiskDAO',
	'PhabricatorSearchDifferentialIndexer' => 'PhabricatorSearchDocumentIndexer',
	'PhabricatorSearchDocument' => 'PhabricatorSearchDAO',
	'PhabricatorSearchDocumentField' => 'PhabricatorSearchDAO',
	'PhabricatorSearchDocumentRelationship' => 'PhabricatorSearchDAO',
	'PhabricatorSearchManiphestIndexer' => 'PhabricatorSearchDocumentIndexer',
	'PhabricatorSearchMySQLExecutor' => 'PhabricatorSearchExecutor',
	'PhabricatorSearchQuery' => 'PhabricatorSearchDAO',
	'PhabricatorStandardPageView' => 'AphrontPageView',
	'PhabricatorTypeaheadCommonDatasourceController' => 'PhabricatorTypeaheadDatasourceController',
	'PhabricatorTypeaheadDatasourceController' => 'PhabricatorController',
	'PhabricatorUser' => 'PhabricatorUserDAO',
	'PhabricatorUserDAO' => 'PhabricatorLiskDAO',
	'PhabricatorUserSettingsController' => 'PhabricatorPeopleController',
	'PhabricatorXHProfController' => 'PhabricatorController',
	'PhabricatorXHProfProfileController' => 'PhabricatorXHProfController',
	'PhabricatorXHProfProfileSymbolView' => 'AphrontView',
	'PhabricatorXHProfProfileTopLevelView' => 'AphrontView',
	),
	'requires_interface' =>
	array(
	),
	));
	diff --git a/src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php b/src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php
	index daa9c14a8a..42cca14afc 100644
	--- a/src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php
	+++ b/src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php
	@@ -1,247 +1,249 @@
	<?php

	/*
	* Copyright 2011 Facebook, Inc.
	*
	* Licensed under the Apache License, Version 2.0 (the "License");
	* you may not use this file except in compliance with the License.
	* You may obtain a copy of the License at
	*
	* http://www.apache.org/licenses/LICENSE-2.0
	*
	* Unless required by applicable law or agreed to in writing, software
	* distributed under the License is distributed on an "AS IS" BASIS,
	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	* See the License for the specific language governing permissions and
	* limitations under the License.
	*/

	/**
	* @group aphront
	*/
	class AphrontDefaultApplicationConfiguration
	extends AphrontApplicationConfiguration {

	public function getApplicationName() {
	return 'aphront-default';
	}

	public function getURIMap() {
	return array(
	'/' => array(
	'$' => 'PhabricatorDirectoryMainController',
	),
	'/directory/' => array(
	'item/$'
	=> 'PhabricatorDirectoryItemListController',
	'item/edit/(?:(?P<id>\d+)/)?$'
	=> 'PhabricatorDirectoryItemEditController',
	'item/delete/(?P<id>\d+)/'
	=> 'PhabricatorDirectoryItemDeleteController',
	'category/$'
	=> 'PhabricatorDirectoryCategoryListController',
	'category/edit/(?:(?P<id>\d+)/)?$'
	=> 'PhabricatorDirectoryCategoryEditController',
	'category/delete/(?P<id>\d+)/'
	=> 'PhabricatorDirectoryCategoryDeleteController',
	),
	'/file/' => array(
	'$' => 'PhabricatorFileListController',
	'upload/$' => 'PhabricatorFileUploadController',
	'(?P<view>info)/(?P<phid>[^/]+)/' => 'PhabricatorFileViewController',
	'(?P<view>view)/(?P<phid>[^/]+)/' => 'PhabricatorFileViewController',
	'(?P<view>download)/(?P<phid>[^/]+)/' => 'PhabricatorFileViewController',
	),
	'/phid/' => array(
	'$' => 'PhabricatorPHIDLookupController',
	'list/$' => 'PhabricatorPHIDListController',
	'type/$' => 'PhabricatorPHIDTypeListController',
	'type/edit/(?:(?P<id>\d+)/)?$' => 'PhabricatorPHIDTypeEditController',
	'new/$' => 'PhabricatorPHIDAllocateController',
	),
	'/people/' => array(
	'$' => 'PhabricatorPeopleListController',
	'edit/(?:(?P<username>\w+)/)?$' => 'PhabricatorPeopleEditController',
	),
	'/p/(?P<username>\w+)/$' => 'PhabricatorPeopleProfileController',
	'/conduit/' => array(
	'$' => 'PhabricatorConduitConsoleController',
	'method/(?P<method>[^/]+)$' => 'PhabricatorConduitConsoleController',
	'log/$' => 'PhabricatorConduitLogController',
	),
	'/api/(?P<method>[^/]+)$' => 'PhabricatorConduitAPIController',


	'/D(?P<id>\d+)' => 'DifferentialRevisionViewController',
	'/differential/' => array(
	'$' => 'DifferentialRevisionListController',
	'filter/(?P<filter>\w+)/$' => 'DifferentialRevisionListController',
	'diff/' => array(
	'(?P<id>\d+)/$' => 'DifferentialDiffViewController',
	'create/$' => 'DifferentialDiffCreateController',
	),
	'changeset/$' => 'DifferentialChangesetViewController',
	'revision/edit/(?:(?P<id>\d+)/)?$'
	=> 'DifferentialRevisionEditController',
	'comment/' => array(
	'preview/(?P<id>\d+)/$' => 'DifferentialCommentPreviewController',
	'save/$' => 'DifferentialCommentSaveController',
	'inline/' => array(
	'preview/(?P<id>\d+)/$' =>
	'DifferentialInlineCommentPreviewController',
	'edit/(?P<id>\d+)/$' => 'DifferentialInlineCommentEditController',
	),
	),
	),

	'/res/' => array(
	'(?P<package>pkg/)?(?P<hash>[a-f0-9]{8})/(?P<path>.+\.(?:css\|js))$'
	=> 'CelerityResourceController',
	),

	'/typeahead/' => array(
	'common/(?P<type>\w+)/$'
	=> 'PhabricatorTypeaheadCommonDatasourceController',
	),

	'/mail/' => array(
	'$' => 'PhabricatorMetaMTAListController',
	'send/$' => 'PhabricatorMetaMTASendController',
	'view/(?P<id>\d+)/$' => 'PhabricatorMetaMTAViewController',
	'lists/$' => 'PhabricatorMetaMTAMailingListsController',
	'lists/edit/(?:(?P<id>\d+)/)?$'
	=> 'PhabricatorMetaMTAMailingListEditController',
	),

	'/login/' => array(
	'$' => 'PhabricatorLoginController',
	'email/$' => 'PhabricatorEmailLoginController',
	'etoken/(?P<token>\w+)/$' => 'PhabricatorEmailTokenController',
	),
	'/logout/$' => 'PhabricatorLogoutController',
	'/facebook-auth/' => array(
	'$' => 'PhabricatorFacebookAuthController',
	'diagnose/$' => 'PhabricatorFacebookAuthDiagnosticsController',
	),

	'/xhprof/' => array(
	'profile/(?P<phid>[^/]+)/$' => 'PhabricatorXHProfProfileController',
	),

	'/~/' => 'DarkConsoleController',

	'/settings/' => array(
	'(?:page/(?P<page>[^/]+)/)?$' => 'PhabricatorUserSettingsController',
	),

	'/maniphest/' => array(
	'$' => 'ManiphestTaskListController',
	'view/(?P<view>\w+)/$' => 'ManiphestTaskListController',
	'task/' => array(
	'create/' => 'ManiphestTaskCreateController',
	),
	'transaction/' => array(
	'save/' => 'ManiphestTransactionSaveController',
	),
	+ 'select/$' => 'ManiphestTaskSelectorController',
	+ 'select/search/$' => 'ManiphestTaskSelectorSearchController',
	),

	'/T(?P<id>\d+)$' => 'ManiphestTaskDetailController',

	'/github-post-receive/(?P<id>\d+)/(?P<token>[^/]+)/$'
	=> 'PhabricatorRepositoryGitHubPostReceiveController',
	'/repository/' => array(
	'$' => 'PhabricatorRepositoryListController',
	'create/$' => 'PhabricatorRepositoryCreateController',
	'edit/(?P<id>\d+)/$' => 'PhabricatorRepositoryEditController',
	'delete/(?P<id>\d+)/$' => 'PhabricatorRepositoryDeleteController',
	),

	'/search/' => array(
	'$' => 'PhabricatorSearchController',
	'(?P<id>\d+)/$' => 'PhabricatorSearchController',
	),
	);
	}

	public function buildRequest() {
	$request = new AphrontRequest($this->getHost(), $this->getPath());
	$request->setRequestData($_GET + $_POST);
	$request->setApplicationConfiguration($this);
	return $request;
	}

	public function handleException(Exception $ex) {

	$class = phutil_escape_html(get_class($ex));
	$message = phutil_escape_html($ex->getMessage());

	$content =
	'<div class="aphront-unhandled-exception">'.
	'<h1>Unhandled Exception "'.$class.'": '.$message.'</h1>'.
	'<code>'.phutil_escape_html((string)$ex).'</code>'.
	'</div>';

	$view = new PhabricatorStandardPageView();
	$view->setRequest($this->getRequest());
	$view->appendChild($content);

	$response = new AphrontWebpageResponse();
	$response->setContent($view->render());

	return $response;
	}

	public function willSendResponse(AphrontResponse $response) {
	$request = $this->getRequest();
	if ($response instanceof AphrontDialogResponse) {
	if (!$request->isAjax()) {
	$view = new PhabricatorStandardPageView();
	$view->setRequest($request);
	$view->appendChild(
	'<div style="padding: 2em 0;">'.
	$response->buildResponseString().
	'</div>');
	$response = new AphrontWebpageResponse();
	$response->setContent($view->render());
	return $response;
	} else {
	return id(new AphrontAjaxResponse())
	->setContent(array(
	'dialog' => $response->buildResponseString(),
	));
	}
	} else if ($response instanceof AphrontRedirectResponse) {
	if ($request->isAjax()) {
	return id(new AphrontAjaxResponse())
	->setContent(
	array(
	'redirect' => $response->getURI(),
	));
	}
	} else if ($response instanceof Aphront404Response) {

	$failure = new AphrontRequestFailureView();
	$failure->setHeader('404 Not Found');
	$failure->appendChild(
	'<p>The page you requested was not found.</p>');

	$view = new PhabricatorStandardPageView();
	$view->setTitle('404 Not Found');
	$view->setRequest($this->getRequest());
	$view->appendChild($failure);

	$response = new AphrontWebpageResponse();
	$response->setContent($view->render());
	$response->setHTTPResponseCode(404);
	return $response;
	}

	return $response;
	}

	public function build404Controller() {
	return array(new Phabricator404Controller($this->getRequest()), array());
	}


	}
	diff --git a/src/applications/maniphest/controller/taskselector/ManiphestTaskSelectorController.php b/src/applications/maniphest/controller/taskselector/ManiphestTaskSelectorController.php
	new file mode 100644
	index 0000000000..5e36b980d9
	--- /dev/null
	+++ b/src/applications/maniphest/controller/taskselector/ManiphestTaskSelectorController.php
	@@ -0,0 +1,163 @@
	+<?php
	+
	+/*
	+ * Copyright 2011 Facebook, Inc.
	+ *
	+ * Licensed under the Apache License, Version 2.0 (the "License");
	+ * you may not use this file except in compliance with the License.
	+ * You may obtain a copy of the License at
	+ *
	+ * http://www.apache.org/licenses/LICENSE-2.0
	+ *
	+ * Unless required by applicable law or agreed to in writing, software
	+ * distributed under the License is distributed on an "AS IS" BASIS,
	+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	+ * See the License for the specific language governing permissions and
	+ * limitations under the License.
	+ */
	+
	+class ManiphestTaskSelectorController extends ManiphestController {
	+
	+ public function processRequest() {
	+ $request = $this->getRequest();
	+ $user = $request->getUser();
	+
	+ $filter_id = celerity_generate_unique_node_id();
	+ $query_id = celerity_generate_unique_node_id();
	+ $search_id = celerity_generate_unique_node_id();
	+ $results_id = celerity_generate_unique_node_id();
	+ $current_id = celerity_generate_unique_node_id();
	+
	+ $search_box =
	+ '<table class="phabricator-object-selector-search">
	+ <tr>
	+ <td class="phabricator-object-selector-search-filter">
	+ <select id="'.$filter_id.'">
	+ <option>Assigned To Me</option>
	+ <option>Created By Me</option>
	+ <option>All Open Tasks</option>
	+ <option>All Tasks</option>
	+ </select>
	+ </td>
	+ <td class="phabricator-object-selector-search-text">
	+ <input type="text" id="'.$query_id.'" />
	+ </td>
	+ <td class="phabricator-object-selector-search-button">
	+ <a href="#" class="button" id="'.$search_id.'">Search</a>
	+ </td>
	+ </tr>
	+ </table>';
	+ $result_box =
	+ '<div class="phabricator-object-selector-results" id="'.$results_id.'">'.
	+
	+ '</div>';
	+ $attached_box =
	+ '<div class="phabricator-object-selector-current">'.
	+ '<div class="phabricator-object-selector-currently-attached">'.
	+ '<div class="phabricator-object-selector-header">'.
	+ 'Currently Attached Tasks'.
	+ '</div>'.
	+ '<div id="'.$current_id.'">'.
	+ '</div>'.
	+ '</div>'.
	+ '</div>';
	+
	+ require_celerity_resource('phabricator-object-selector-css');
	+
	+ Javelin::initBehavior(
	+ 'phabricator-object-selector',
	+ array(
	+ 'filter' => $filter_id,
	+ 'query' => $query_id,
	+ 'search' => $search_id,
	+ 'results' => $results_id,
	+ 'current' => $current_id,
	+ 'uri' => '/maniphest/select/search/',
	+ ));
	+
	+ $dialog = new PhabricatorObjectSelectorDialog();
	+ $dialog
	+ ->setUser($user)
	+ ->setTitle('Manage Attached Tasks')
	+ ->setClass('phabricator-object-selector-dialog')
	+ ->appendChild($search_box)
	+ ->appendChild($result_box)
	+ ->appendChild($attached_box)
	+ ->addCancelButton('#')
	+ ->addSubmitButton('Save Tasks');
	+
	+ return id(new AphrontDialogResponse())->setDialog($dialog);
	+ }
	+
	+}
	+
	+/*
	+
	+ '<table class="phabricator-object-selector-handle">
	+ <tr>
	+ <th>
	+ <input type="checkbox" />
	+ </th>
	+ <td>
	+ <a href="#">T20: Internet Attack Internets</a>
	+ </td>
	+ </tr>
	+ </table>'.
	+ '<table class="phabricator-object-selector-handle">
	+ <tr>
	+ <th>
	+ <input type="checkbox" />
	+ </th>
	+ <td>
	+ <a href="#">T21: Internet Attack Internets</a>
	+ </td>
	+ </tr>
	+ </table>'.
	+ '<table class="phabricator-object-selector-handle">
	+ <tr>
	+ <th>
	+ <input type="checkbox" />
	+ </th>
	+ <td>
	+ <a href="#">T22: Internet Attack Internets</a>
	+ </td>
	+ </tr>
	+ </table>'.
	+ 'more results<br />'.
	+ 'more results<br />'.
	+ 'more results<br />'.
	+ 'more results<br />'.
	+ 'more results<br />'.
	+ 'more results<br />'.
	+ 'more results<br />'.
	+ 'more results<br />'.
	+ 'more results<br />'.
	+ 'more results<br />'.
	+
	+*/
	+
	+
	+/*
	+
	+ '<table class="phabricator-object-selector-handle">
	+ <tr>
	+ <th>
	+ <input type="checkbox" />
	+ </th>
	+ <td>
	+ <a href="#">T22: Internet Attack Internets</a>
	+ </td>
	+ </tr>
	+ </table>'.
	+ '<table class="phabricator-object-selector-handle">
	+ <tr>
	+ <th>
	+ <input type="checkbox" />
	+ </th>
	+ <td>
	+ <a href="#">T22: Internet Attack Internets</a>
	+ </td>
	+ </tr>
	+ </table>'.
	+
	+*/
	diff --git a/src/applications/maniphest/controller/taskselector/__init__.php b/src/applications/maniphest/controller/taskselector/__init__.php
	new file mode 100644
	index 0000000000..5affed985e
	--- /dev/null
	+++ b/src/applications/maniphest/controller/taskselector/__init__.php
	@@ -0,0 +1,18 @@
	+<?php
	+/**
	+ * This file is automatically generated. Lint this module to rebuild it.
	+ * @generated
	+ */
	+
	+
	+
	+phutil_require_module('phabricator', 'aphront/response/dialog');
	+phutil_require_module('phabricator', 'applications/maniphest/controller/base');
	+phutil_require_module('phabricator', 'infrastructure/celerity/api');
	+phutil_require_module('phabricator', 'infrastructure/javelin/api');
	+phutil_require_module('phabricator', 'view/control/objectselector');
	+
	+phutil_require_module('phutil', 'utils');
	+
	+
	+phutil_require_source('ManiphestTaskSelectorController.php');
	diff --git a/src/applications/maniphest/controller/taskselectorsearch/ManiphestTaskSelectorSearchController.php b/src/applications/maniphest/controller/taskselectorsearch/ManiphestTaskSelectorSearchController.php
	new file mode 100644
	index 0000000000..eae6710833
	--- /dev/null
	+++ b/src/applications/maniphest/controller/taskselectorsearch/ManiphestTaskSelectorSearchController.php
	@@ -0,0 +1,43 @@
	+<?php
	+
	+/*
	+ * Copyright 2011 Facebook, Inc.
	+ *
	+ * Licensed under the Apache License, Version 2.0 (the "License");
	+ * you may not use this file except in compliance with the License.
	+ * You may obtain a copy of the License at
	+ *
	+ * http://www.apache.org/licenses/LICENSE-2.0
	+ *
	+ * Unless required by applicable law or agreed to in writing, software
	+ * distributed under the License is distributed on an "AS IS" BASIS,
	+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	+ * See the License for the specific language governing permissions and
	+ * limitations under the License.
	+ */
	+
	+class ManiphestTaskSelectorSearchController extends ManiphestController {
	+
	+ public function processRequest() {
	+ $request = $this->getRequest();
	+ $user = $request->getUser();
	+
	+ $query = new PhabricatorSearchQuery();
	+ $query->setQuery($request->getStr('query'));
	+ $query->setParameter('type', 'TASK');
	+
	+ $exec = new PhabricatorSearchMySQLExecutor();
	+ $results = $exec->executeSearch($query);
	+
	+ $data = array();
	+ foreach ($results as $result) {
	+ $data[] = array(
	+ 'phid' => $result['phid'],
	+ 'name' => $result['documentTitle'],
	+ 'href' => '#',
	+ );
	+ }
	+
	+ return id(new AphrontAjaxResponse())->setContent($data);
	+ }
	+}
	diff --git a/src/applications/maniphest/controller/taskselectorsearch/__init__.php b/src/applications/maniphest/controller/taskselectorsearch/__init__.php
	new file mode 100644
	index 0000000000..ada22948be
	--- /dev/null
	+++ b/src/applications/maniphest/controller/taskselectorsearch/__init__.php
	@@ -0,0 +1,17 @@
	+<?php
	+/**
	+ * This file is automatically generated. Lint this module to rebuild it.
	+ * @generated
	+ */
	+
	+
	+
	+phutil_require_module('phabricator', 'aphront/response/ajax');
	+phutil_require_module('phabricator', 'applications/maniphest/controller/base');
	+phutil_require_module('phabricator', 'applications/search/execute/mysql');
	+phutil_require_module('phabricator', 'applications/search/storage/query');
	+
	+phutil_require_module('phutil', 'utils');
	+
	+
	+phutil_require_source('ManiphestTaskSelectorSearchController.php');
	diff --git a/src/applications/search/execute/mysql/PhabricatorSearchMySQLExecutor.php b/src/applications/search/execute/mysql/PhabricatorSearchMySQLExecutor.php
	index 59bd91e2a1..455572ccc6 100644
	--- a/src/applications/search/execute/mysql/PhabricatorSearchMySQLExecutor.php
	+++ b/src/applications/search/execute/mysql/PhabricatorSearchMySQLExecutor.php
	@@ -1,137 +1,138 @@
	<?php

	/*
	* Copyright 2011 Facebook, Inc.
	*
	* Licensed under the Apache License, Version 2.0 (the "License");
	* you may not use this file except in compliance with the License.
	* You may obtain a copy of the License at
	*
	* http://www.apache.org/licenses/LICENSE-2.0
	*
	* Unless required by applicable law or agreed to in writing, software
	* distributed under the License is distributed on an "AS IS" BASIS,
	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	* See the License for the specific language governing permissions and
	* limitations under the License.
	*/

	class PhabricatorSearchMySQLExecutor extends PhabricatorSearchExecutor {

	public function executeSearch(PhabricatorSearchQuery $query) {

	$where = array();
	$join = array();
	$order = 'ORDER BY documentCreated DESC';

	$dao_doc = new PhabricatorSearchDocument();
	$dao_field = new PhabricatorSearchDocumentField();

	$t_doc = $dao_doc->getTableName();
	$t_field = $dao_field->getTableName();

	$conn_r = $dao_doc->establishConnection('r');

	$q = $query->getQuery();

	if (strlen($q)) {
	$join[] = qsprintf(
	$conn_r,
	"{$t_field} field ON field.phid = document.phid");
	$where[] = qsprintf(
	$conn_r,
	'MATCH(corpus) AGAINST (%s)',
	$q);
	/*
	if ($query->getParameter('order') == AdjutantQuery::ORDER_RELEVANCE) {
	$order = qsprintf(
	$conn_r,
	'ORDER BY MATCH(corpus) AGAINST (%s) DESC',
	$q);
	}
	*/
	$field = $query->getParameter('field');
	if ($field/* && $field != AdjutantQuery::FIELD_ALL*/) {
	$where[] = qsprintf(
	$conn_r,
	'field.field = %s',
	$field);
	}
	}

	if ($query->getParameter('type')) {
	$where[] = qsprintf(
	$conn_r,
	'document.documentType = %s',
	$query->getParameter('type'));
	}

	/*
	$join[] = $this->joinRelationship(
	$conn_r,
	$query,
	'author',
	AdjutantRelationship::RELATIONSHIP_AUTHOR);
	$join[] = $this->joinRelationship(
	$conn_r,
	$query,
	'reviewer',
	AdjutantRelationship::RELATIONSHIP_REVIEWER);
	$join[] = $this->joinRelationship(
	$conn_r,
	$query,
	'subscriber',
	AdjutantRelationship::RELATIONSHIP_SUBSCRIBER);
	$join[] = $this->joinRelationship(
	$conn_r,
	$query,
	'repository',
	AdjutantRelationship::RELATIONSHIP_REPOSITORY);
	*/
	$join = array_filter($join);

	foreach ($join as $key => $clause) {
	$join[$key] = ' JOIN '.$clause;
	}
	$join = implode(' ', $join);

	if ($where) {
	$where = 'WHERE '.implode(' AND ', $where);
	} else {
	$where = '';
	}

	$hits = queryfx_all(
	$conn_r,
	'SELECT DISTINCT
	document.phid,
	document.documentType,
	+ document.documentTitle,
	document.documentCreated FROM %T document %Q %Q %Q
	LIMIT 50',
	$t_doc,
	$join,
	$where,
	$order);

	return $hits;
	}

	protected function joinRelationship($conn, $query, $field, $type) {
	$fbids = $query->getParameter($field, array());
	if (!$fbids) {
	return null;
	}
	return qsprintf(
	$conn,
	'relationship AS %C ON %C.fbid = data.fbid AND %C.relation = %s
	AND %C.relatedFBID in (%Ld)',
	$field,
	$field,
	$field,
	$type,
	$field,
	$fbids);
	}


	}
	diff --git a/src/view/control/objectselector/PhabricatorObjectSelectorDialog.php b/src/view/control/objectselector/PhabricatorObjectSelectorDialog.php
	new file mode 100644
	index 0000000000..8a4018a256
	--- /dev/null
	+++ b/src/view/control/objectselector/PhabricatorObjectSelectorDialog.php
	@@ -0,0 +1,22 @@
	+<?php
	+
	+/*
	+ * Copyright 2011 Facebook, Inc.
	+ *
	+ * Licensed under the Apache License, Version 2.0 (the "License");
	+ * you may not use this file except in compliance with the License.
	+ * You may obtain a copy of the License at
	+ *
	+ * http://www.apache.org/licenses/LICENSE-2.0
	+ *
	+ * Unless required by applicable law or agreed to in writing, software
	+ * distributed under the License is distributed on an "AS IS" BASIS,
	+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	+ * See the License for the specific language governing permissions and
	+ * limitations under the License.
	+ */
	+
	+class PhabricatorObjectSelectorDialog extends AphrontDialogView {
	+
	+
	+}
	diff --git a/src/view/control/objectselector/__init__.php b/src/view/control/objectselector/__init__.php
	new file mode 100644
	index 0000000000..071915f630
	--- /dev/null
	+++ b/src/view/control/objectselector/__init__.php
	@@ -0,0 +1,12 @@
	+<?php
	+/**
	+ * This file is automatically generated. Lint this module to rebuild it.
	+ * @generated
	+ */
	+
	+
	+
	+phutil_require_module('phabricator', 'view/dialog');
	+
	+
	+phutil_require_source('PhabricatorObjectSelectorDialog.php');
	diff --git a/src/view/dialog/AphrontDialogView.php b/src/view/dialog/AphrontDialogView.php
	index f530d486e3..14846d9f66 100755
	--- a/src/view/dialog/AphrontDialogView.php
	+++ b/src/view/dialog/AphrontDialogView.php
	@@ -1,130 +1,138 @@
	<?php

	/*
	* Copyright 2011 Facebook, Inc.
	*
	* Licensed under the Apache License, Version 2.0 (the "License");
	* you may not use this file except in compliance with the License.
	* You may obtain a copy of the License at
	*
	* http://www.apache.org/licenses/LICENSE-2.0
	*
	* Unless required by applicable law or agreed to in writing, software
	* distributed under the License is distributed on an "AS IS" BASIS,
	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	* See the License for the specific language governing permissions and
	* limitations under the License.
	*/

	class AphrontDialogView extends AphrontView {

	private $title;
	private $submitButton;
	private $cancelURI;
	private $submitURI;
	private $user;
	private $hidden = array();
	+ private $class;

	public function setUser(PhabricatorUser $user) {
	$this->user = $user;
	return $this;
	}

	public function setSubmitURI($uri) {
	$this->submitURI = $uri;
	return $this;
	}

	public function setTitle($title) {
	$this->title = $title;
	return $this;
	}

	public function getTitle() {
	return $this->title;
	}

	public function addSubmitButton($text = 'Okay') {
	$this->submitButton = $text;
	return $this;
	}

	public function addCancelButton($uri) {
	$this->cancelURI = $uri;
	return $this;
	}

	public function addHiddenInput($key, $value) {
	$this->hidden[$key] = $value;
	return $this;
	}

	+ public function setClass($class) {
	+ $this->class = $class;
	+ return $this;
	+ }
	+
	final public function render() {
	require_celerity_resource('aphront-dialog-view-css');

	$buttons = array();
	if ($this->submitButton) {
	$buttons[] = phutil_render_tag(
	'button',
	array(
	'name' => '__submit__',
	'sigil' => '__default__',
	),
	phutil_escape_html($this->submitButton));
	}

	if ($this->cancelURI) {
	$buttons[] = javelin_render_tag(
	'a',
	array(
	'href' => $this->cancelURI,
	'class' => 'button grey',
	'name' => '__cancel__',
	'sigil' => 'jx-workflow-button',
	),
	'Cancel');
	}

	if (!$this->user) {
	throw new Exception(
	"You must call setUser() when rendering an AphrontDialogView.");
	}
	$csrf = $this->user->getCSRFToken();

	$hidden_inputs = array();
	foreach ($this->hidden as $key => $value) {
	$hidden_inputs[] = phutil_render_tag(
	'input',
	array(
	'type' => 'hidden',
	'name' => $key,
	'value' => $value,
	));
	}
	$hidden_inputs = implode("\n", $hidden_inputs);

	+ $more = $this->class;
	+
	return javelin_render_tag(
	'form',
	array(
	- 'class' => 'aphront-dialog-view',
	+ 'class' => 'aphront-dialog-view '.$more,
	'action' => $this->submitURI,
	'method' => 'post',
	'sigil' => 'jx-dialog',
	),
	'<input type="hidden" name="__form__" value="1" />'.
	'<input type="hidden" name="__csrf__" value="'.$csrf.'" />'.
	'<input type="hidden" name="__dialog__" value="1" />'.
	$hidden_inputs.
	'<div class="aphront-dialog-head">'.
	phutil_escape_html($this->title).
	'</div>'.
	'<div class="aphront-dialog-body">'.
	$this->renderChildren().
	'</div>'.
	'<div class="aphront-dialog-tail">'.
	implode('', $buttons).
	'<div style="clear: both;"></div>'.
	'</div>');
	}

	}
	diff --git a/webroot/rsrc/css/application/objectselector/object-selector.css b/webroot/rsrc/css/application/objectselector/object-selector.css
	new file mode 100644
	index 0000000000..50421f4ba1
	--- /dev/null
	+++ b/webroot/rsrc/css/application/objectselector/object-selector.css
	@@ -0,0 +1,81 @@
	+/**
	+ * @provides phabricator-object-selector-css
	+ * @requires aphront-dialog-view-css
	+ */
	+
	+form.phabricator-object-selector-dialog {
	+ width: 800px;
	+}
	+
	+form.phabricator-object-selector-dialog .aphront-dialog-body {
	+ padding: 0;
	+}
	+
	+.phabricator-object-selector-search {
	+ width: 100%;
	+ background: #ededed;
	+}
	+
	+.phabricator-object-selector-search td {
	+ padding: 4px 8px;
	+}
	+
	+td.phabricator-object-selector-search-text {
	+ width: 100%;
	+}
	+
	+.phabricator-object-selector-search-text input {
	+ width: 100%;
	+}
	+
	+.phabricator-object-selector-results {
	+ position: relative;
	+ height: 16em;
	+ border: solid #bbbbbb;
	+ border-width: 1px 0px;
	+ overflow-y: scroll;
	+ overflow-x: hidden;
	+}
	+
	+.phabricator-object-selector-handle {
	+ width: 100%;
	+ background: #e9e9e9;
	+ margin-bottom: 1px;
	+}
	+
	+.phabricator-object-selector-handle td {
	+ padding: 4px 1em;
	+}
	+
	+.phabricator-object-selector-handle th {
	+ padding: 4px 1em;
	+ font-weight: bold;
	+ vertical-align: middle;
	+ width: 100%;
	+ overflow: hidden;
	+}
	+
	+.phabricator-object-selector-header {
	+ padding: 2px;
	+ border-bottom: 1px solid #d0d0d0;
	+ margin-bottom: 16px;
	+ color: #444444;
	+}
	+
	+.phabricator-object-selector-attach-explicit {
	+ padding: 4px;
	+ background: #f3f3f3;
	+ border: solid #bbbbbb;
	+ border-width: 1px 0px;
	+}
	+
	+.phabricator-object-selector-currently-attached {
	+ background: #fff;
	+ padding: 16px;
	+ border: 1px solid #dddddd;
	+}
	+
	+.phabricator-object-selector-current {
	+ background: #ededed;
	+ padding: 8px 8px;
	+}
	diff --git a/webroot/rsrc/css/core/dialog.css b/webroot/rsrc/css/core/dialog.css
	deleted file mode 100644
	index ece9beaf74..0000000000
	--- a/webroot/rsrc/css/core/dialog.css
	+++ /dev/null
	@@ -1,55 +0,0 @@
	-/**
	- * @provides phabricator-core-dialog-css
	- */
	-
	-.jx-dialog {
	- display: block;
	- width: 480px;
	- padding: 8px;
	- background: #666;
	- margin: auto;
	-}
	-
	-.jx-client-dialog {
	- position: absolute;
	- z-index: 6;
	-}
	-
	-.jx-dialog .dialog-title {
	- background: #6d84b4;
	- border: none;
	- font-size: 15px;
	- font-weight: bold;
	- padding: 5px 12px 6px;
	- color: #ffffff;
	-}
	-.jx-dialog .dialog-body {
	- background: #ffffff;
	- padding: 16px 12px;
	- border: none;
	- overflow: hidden;
	-}
	-
	-.jx-dialog .dialog-foot {
	- border: none;
	- background: #ededed;
	- padding: .5em;
	- text-align: right;
	-}
	-
	-.jx-dialog button {
	- margin-left: 6px;
	-}
	-
	-.jx-dialog input {
	- padding: 4px;
	-}
	-
	-.jx-dialog .fields {
	- margin-top: 10px;
	-}
	-
	-.jx-dialog input.block {
	- display: block;
	- margin: 3px 0 0 0;
	-}
	diff --git a/webroot/rsrc/js/application/core/behavior-object-selector.js b/webroot/rsrc/js/application/core/behavior-object-selector.js
	new file mode 100644
	index 0000000000..00e0fc547a
	--- /dev/null
	+++ b/webroot/rsrc/js/application/core/behavior-object-selector.js
	@@ -0,0 +1,139 @@
	+/**
	+ * @provides javelin-behavior-phabricator-object-selector
	+ * @requires javelin-lib-dev
	+ */
	+
	+JX.behavior('phabricator-object-selector', function(config) {
	+ var n = 0;
	+
	+ var phids = {};
	+ var handles = {};
	+ var attach_list = {};
	+
	+ function onreceive(seq, r) {
	+ if (seq != n) {
	+ return;
	+ }
	+
	+ var display = [];
	+ attach_list = {};
	+ for (var k in r) {
	+ handles[r[k].phid] = r[k];
	+ display.push(renderHandle(r[k], true));
	+ }
	+
	+ if (!display.length) {
	+ display = renderNote('No results.');
	+ }
	+
	+ JX.DOM.setContent(JX.$(config.results), display);
	+ }
	+
	+ function redrawAttached() {
	+ var display = [];
	+
	+ for (var k in phids) {
	+ display.push(renderHandle(handles[k], false));
	+ }
	+
	+ if (!display.length) {
	+ display = renderNote('Nothing attached.');
	+ }
	+
	+ JX.DOM.setContent(JX.$(config.current), display);
	+ }
	+
	+ function renderHandle(h, attach) {
	+
	+ var td = JX.$N('td');
	+ var table = JX.$N(
	+ 'table',
	+ {className: 'phabricator-object-selector-handle'},
	+ JX.$N(
	+ 'tbody',
	+ {},
	+ [JX.$N('th', {}, h.name), td]));
	+ var btn = JX.$N(
	+ 'a',
	+ {className: 'button small grey'},
	+ attach ? 'Attach' : 'Remove');
	+
	+ JX.Stratcom.addSigil(btn, 'object-attach-button');
	+ JX.Stratcom.addData(btn, {handle : h, table : table});
	+ if (attach) {
	+ attach_list[h.phid] = btn;
	+ }
	+
	+ JX.DOM.setContent(td, btn);
	+
	+ return table;
	+ }
	+
	+ function renderNote(note) {
	+ return JX.$N('div', {}, note);
	+ }
	+
	+ function sendQuery() {
	+ JX.DOM.setContent(JX.$(config.results), renderNote('Loading...'))
	+ new JX.Request(config.uri, JX.bind(null, onreceive, ++n))
	+ .setData({
	+ filter: JX.$(config.filter).value,
	+ query: JX.$(config.query).value
	+ })
	+ .send();
	+ }
	+
	+ JX.DOM.listen(
	+ JX.$(config.search),
	+ 'click',
	+ null,
	+ function(e) {
	+ e.kill();
	+ sendQuery();
	+ });
	+
	+ JX.DOM.listen(
	+ JX.$(config.results),
	+ 'click',
	+ 'object-attach-button',
	+ function(e) {
	+ e.kill();
	+ var button = e.getNode('object-attach-button');
	+ if (button.disabled) {
	+ return;
	+ }
	+
	+ var data = e.getNodeData('object-attach-button');
	+ phids[data.handle.phid] = true;
	+ JX.DOM.alterClass(button, 'disabled', true);
	+ button.disabled = true;
	+
	+ redrawAttached();
	+ });
	+
	+ JX.DOM.listen(
	+ JX.$(config.current),
	+ 'click',
	+ 'object-attach-button',
	+ function(e) {
	+ e.kill();
	+ var button = e.getNode('object-attach-button');
	+ if (button.disabled) {
	+ return;
	+ }
	+
	+ var data = e.getNodeData('object-attach-button');
	+ delete phids[data.handle.phid];
	+
	+ if (attach_list[data.handle.phid]) {
	+ JX.DOM.alterClass(attach_list[data.handle.phid], 'disabled', false);
	+ attach_list[data.handle.phid].disabled = false;
	+ }
	+
	+ redrawAttached();
	+ });
	+
	+ sendQuery();
	+ redrawAttached();
	+
	+});

File Metadata

Mime Type: text/x-diff
Expires: Sun, Jan 19, 17:24 (1 w, 5 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1126920
Default Alt Text: (82 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions