From a717d7db339bfe92508beaee289bfe2068b069ff Mon Sep 17 00:00:00 2001 From: epriestley Date: Mon, 1 Oct 2012 12:56:10 -0700 Subject: [PATCH] Add Conduit and Herald applications Summary: See D3572. Adds applications for Conduit and Herald. Test Plan: Viewed `/applications/`, saw applications. Clicked buttons, got to applications. Reviewers: vrana, btrahan Reviewed By: vrana CC: aran Differential Revision: https://secure.phabricator.com/D3578 --- src/__phutil_library_map__.php | 4 ++ ...AphrontDefaultApplicationConfiguration.php | 23 -------- .../PhabricatorApplicationConduit.php | 50 +++++++++++++++++ .../PhabricatorApplicationHerald.php | 56 +++++++++++++++++++ 4 files changed, 110 insertions(+), 23 deletions(-) create mode 100644 src/applications/conduit/application/PhabricatorApplicationConduit.php create mode 100644 src/applications/herald/application/PhabricatorApplicationHerald.php diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php index e48564d167..8260da9437 100644 --- a/src/__phutil_library_map__.php +++ b/src/__phutil_library_map__.php @@ -554,6 +554,7 @@ phutil_register_library_map(array( 'PhabricatorApplicationApplications' => 'applications/meta/application/PhabricatorApplicationApplications.php', 'PhabricatorApplicationAudit' => 'applications/audit/application/PhabricatorApplicationAudit.php', 'PhabricatorApplicationAuth' => 'applications/auth/application/PhabricatorApplicationAuth.php', + 'PhabricatorApplicationConduit' => 'applications/conduit/application/PhabricatorApplicationConduit.php', 'PhabricatorApplicationCountdown' => 'applications/countdown/application/PhabricatorApplicationCountdown.php', 'PhabricatorApplicationDaemons' => 'applications/daemon/application/PhabricatorApplicationDaemons.php', 'PhabricatorApplicationDifferential' => 'applications/differential/application/PhabricatorApplicationDifferential.php', @@ -561,6 +562,7 @@ phutil_register_library_map(array( 'PhabricatorApplicationDiviner' => 'applications/diviner/application/PhabricatorApplicationDiviner.php', 'PhabricatorApplicationFact' => 'applications/fact/application/PhabricatorApplicationFact.php', 'PhabricatorApplicationFlags' => 'applications/flag/application/PhabricatorApplicationFlags.php', + 'PhabricatorApplicationHerald' => 'applications/herald/application/PhabricatorApplicationHerald.php', 'PhabricatorApplicationLaunchView' => 'applications/meta/view/PhabricatorApplicationLaunchView.php', 'PhabricatorApplicationMailingLists' => 'applications/mailinglists/application/PhabricatorApplicationMailingLists.php', 'PhabricatorApplicationManiphest' => 'applications/maniphest/application/PhabricatorApplicationManiphest.php', @@ -1709,6 +1711,7 @@ phutil_register_library_map(array( 'PhabricatorApplicationApplications' => 'PhabricatorApplication', 'PhabricatorApplicationAudit' => 'PhabricatorApplication', 'PhabricatorApplicationAuth' => 'PhabricatorApplication', + 'PhabricatorApplicationConduit' => 'PhabricatorApplication', 'PhabricatorApplicationCountdown' => 'PhabricatorApplication', 'PhabricatorApplicationDaemons' => 'PhabricatorApplication', 'PhabricatorApplicationDifferential' => 'PhabricatorApplication', @@ -1716,6 +1719,7 @@ phutil_register_library_map(array( 'PhabricatorApplicationDiviner' => 'PhabricatorApplication', 'PhabricatorApplicationFact' => 'PhabricatorApplication', 'PhabricatorApplicationFlags' => 'PhabricatorApplication', + 'PhabricatorApplicationHerald' => 'PhabricatorApplication', 'PhabricatorApplicationLaunchView' => 'AphrontView', 'PhabricatorApplicationMailingLists' => 'PhabricatorApplication', 'PhabricatorApplicationManiphest' => 'PhabricatorApplication', diff --git a/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php b/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php index 71258ad51e..dfcbd786af 100644 --- a/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php +++ b/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php @@ -67,14 +67,6 @@ class AphrontDefaultApplicationConfiguration '/phid/' => array( '' => 'PhabricatorPHIDLookupController', ), - '/conduit/' => array( - '' => 'PhabricatorConduitListController', - 'method/(?P[^/]+)/' => 'PhabricatorConduitConsoleController', - 'log/' => 'PhabricatorConduitLogController', - 'log/view/(?P[^/]+)/' => 'PhabricatorConduitLogController', - 'token/' => 'PhabricatorConduitTokenController', - ), - '/api/(?P[^/]+)' => 'PhabricatorConduitAPIController', '/typeahead/' => array( 'common/(?P\w+)/' @@ -152,21 +144,6 @@ class AphrontDefaultApplicationConfiguration 'index/(?P[^/]+)/' => 'PhabricatorSearchIndexController', ), - '/herald/' => array( - '' => 'HeraldHomeController', - 'view/(?P[^/]+)/(?:(?P[^/]+)/)?' - => 'HeraldHomeController', - 'new/(?:(?P[^/]+)/(?:(?P[^/]+)/)?)?' - => 'HeraldNewController', - 'rule/(?:(?P\d+)/)?' => 'HeraldRuleController', - 'history/(?:(?P\d+)/)?' => 'HeraldRuleEditHistoryController', - 'delete/(?P\d+)/' => 'HeraldDeleteController', - 'test/' => 'HeraldTestConsoleController', - 'transcript/' => 'HeraldTranscriptListController', - 'transcript/(?P\d+)/(?:(?P\w+)/)?' - => 'HeraldTranscriptController', - ), - '/owners/' => array( '' => 'PhabricatorOwnersListController', 'view/(?P[^/]+)/' => 'PhabricatorOwnersListController', diff --git a/src/applications/conduit/application/PhabricatorApplicationConduit.php b/src/applications/conduit/application/PhabricatorApplicationConduit.php new file mode 100644 index 0000000000..3331808a2a --- /dev/null +++ b/src/applications/conduit/application/PhabricatorApplicationConduit.php @@ -0,0 +1,50 @@ + array( + '' => 'PhabricatorConduitListController', + 'method/(?P[^/]+)/' => 'PhabricatorConduitConsoleController', + 'log/' => 'PhabricatorConduitLogController', + 'log/view/(?P[^/]+)/' => 'PhabricatorConduitLogController', + 'token/' => 'PhabricatorConduitTokenController', + ), + '/api/(?P[^/]+)' => 'PhabricatorConduitAPIController', + ); + } + +} diff --git a/src/applications/herald/application/PhabricatorApplicationHerald.php b/src/applications/herald/application/PhabricatorApplicationHerald.php new file mode 100644 index 0000000000..52c9984551 --- /dev/null +++ b/src/applications/herald/application/PhabricatorApplicationHerald.php @@ -0,0 +1,56 @@ + array( + '' => 'HeraldHomeController', + 'view/(?P[^/]+)/(?:(?P[^/]+)/)?' + => 'HeraldHomeController', + 'new/(?:(?P[^/]+)/(?:(?P[^/]+)/)?)?' + => 'HeraldNewController', + 'rule/(?:(?P\d+)/)?' => 'HeraldRuleController', + 'history/(?:(?P\d+)/)?' => 'HeraldRuleEditHistoryController', + 'delete/(?P\d+)/' => 'HeraldDeleteController', + 'test/' => 'HeraldTestConsoleController', + 'transcript/' => 'HeraldTranscriptListController', + 'transcript/(?P\d+)/(?:(?P\w+)/)?' + => 'HeraldTranscriptController', + ), + ); + } + +}