From 8f178c8c8ec8d4fe4efb1fe5482b47aab6fbe0b7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 7 Aug 2009 18:36:02 +0000 Subject: [PATCH] Some filter classes renamed --- .gitattributes | 4 ++-- application/hub/config.php | 8 ++++---- .../main/commands/console/class_HubConsoleMainCommand.php | 6 +++--- ...lter.php => class_HubBootstrapGenerateHubIdFilter.php} | 8 ++++---- ....php => class_HubBootstrapGenerateSessionIdFilter.php} | 8 ++++---- 5 files changed, 17 insertions(+), 17 deletions(-) rename application/hub/main/filter/bootstrap/{class_HubBootstrapAquireHubIdFilter.php => class_HubBootstrapGenerateHubIdFilter.php} (90%) rename application/hub/main/filter/bootstrap/{class_HubBootstrapGenSessionIdFilter.php => class_HubBootstrapGenerateSessionIdFilter.php} (89%) diff --git a/.gitattributes b/.gitattributes index fecd077c5..2f5dca9da 100644 --- a/.gitattributes +++ b/.gitattributes @@ -74,9 +74,9 @@ application/hub/main/filter/activation/.htaccess -text application/hub/main/filter/activation/class_HubActivation -text application/hub/main/filter/bootstrap/.htaccess -text application/hub/main/filter/bootstrap/class_HubBootstrap -text -application/hub/main/filter/bootstrap/class_HubBootstrapAquireHubIdFilter.php -text application/hub/main/filter/bootstrap/class_HubBootstrapExtraBootstrappingFilter.php -text -application/hub/main/filter/bootstrap/class_HubBootstrapGenSessionIdFilter.php -text +application/hub/main/filter/bootstrap/class_HubBootstrapGenerateHubIdFilter.php -text +application/hub/main/filter/bootstrap/class_HubBootstrapGenerateSessionIdFilter.php -text application/hub/main/filter/bootstrap/class_HubBootstrapInitQueuesFilter.php -text application/hub/main/filter/bootstrap/class_HubBootstrapListenerPoolFilter.php -text application/hub/main/filter/bootstrap/class_HubBootstrapRestoreNodeListFilter.php -text diff --git a/application/hub/config.php b/application/hub/config.php index e824a2695..78e4fe8ed 100644 --- a/application/hub/config.php +++ b/application/hub/config.php @@ -117,11 +117,11 @@ $cfg->setConfigEntry('node_initializer_filter', 'NodeInitializationFilter'); // CFG: CONSOLE-WELCOME-TEASER-FILTER $cfg->setConfigEntry('console_welcome_teaser_filter', 'ConsoleWelcomeTeaserFilter'); -// CFG: HUB-BOOTSTRAP-AQUIRE-HUBID-FILTER -$cfg->setConfigEntry('hub_bootstrap_aquire_hubid_filter', 'HubBootstrapAquireHubIdFilter'); +// CFG: HUB-BOOTSTRAP-GENERATE-HUBID-FILTER +$cfg->setConfigEntry('hub_bootstrap_generate_hubid_filter', 'HubBootstrapGenerateHubIdFilter'); -// CFG: HUB-BOOTSTRAP-GEN-SESSIONID-FILTER -$cfg->setConfigEntry('hub_bootstrap_gen_sessionid_filter', 'HubBootstrapGenSessionIdFilter'); +// CFG: HUB-BOOTSTRAP-GENERATE-SESSIONID-FILTER +$cfg->setConfigEntry('hub_bootstrap_generate_sessionid_filter', 'HubBootstrapGenerateSessionIdFilter'); // CFG: HUB-BOOTSTRAP-RESTORE-NODELIST-FILTER $cfg->setConfigEntry('hub_bootstrap_restore_nodelist_filter', 'HubBootstrapRestoreNodeListFilter'); diff --git a/application/hub/main/commands/console/class_HubConsoleMainCommand.php b/application/hub/main/commands/console/class_HubConsoleMainCommand.php index 3030c48b6..576c7b4c7 100644 --- a/application/hub/main/commands/console/class_HubConsoleMainCommand.php +++ b/application/hub/main/commands/console/class_HubConsoleMainCommand.php @@ -112,12 +112,12 @@ class HubConsoleMainCommand extends BaseCommand implements Commandable { */ public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) { // Add pre filters - $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('node_initializer_filter')); $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('console_welcome_teaser_filter')); + $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('node_initializer_filter')); // Add bootstrap filters - $controllerInstance->addBootstrapFilter(ObjectFactory::createObjectByConfiguredName('hub_bootstrap_aquire_hubid_filter')); - $controllerInstance->addBootstrapFilter(ObjectFactory::createObjectByConfiguredName('hub_bootstrap_gen_sessionid_filter')); + $controllerInstance->addBootstrapFilter(ObjectFactory::createObjectByConfiguredName('hub_bootstrap_generate_hubid_filter')); + $controllerInstance->addBootstrapFilter(ObjectFactory::createObjectByConfiguredName('hub_bootstrap_generate_sessionid_filter')); $controllerInstance->addBootstrapFilter(ObjectFactory::createObjectByConfiguredName('hub_bootstrap_restore_nodelist_filter')); $controllerInstance->addBootstrapFilter(ObjectFactory::createObjectByConfiguredName('hub_bootstrap_init_queues_filter')); $controllerInstance->addBootstrapFilter(ObjectFactory::createObjectByConfiguredName('hub_bootstrap_extra_bootstrap_filter')); diff --git a/application/hub/main/filter/bootstrap/class_HubBootstrapAquireHubIdFilter.php b/application/hub/main/filter/bootstrap/class_HubBootstrapGenerateHubIdFilter.php similarity index 90% rename from application/hub/main/filter/bootstrap/class_HubBootstrapAquireHubIdFilter.php rename to application/hub/main/filter/bootstrap/class_HubBootstrapGenerateHubIdFilter.php index 8046882d7..e00ca12c3 100644 --- a/application/hub/main/filter/bootstrap/class_HubBootstrapAquireHubIdFilter.php +++ b/application/hub/main/filter/bootstrap/class_HubBootstrapGenerateHubIdFilter.php @@ -1,6 +1,6 @@ * @version 0.0.0 @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class HubBootstrapAquireHubIdFilter extends BaseFilter implements Filterable { +class HubBootstrapGenerateHubIdFilter extends BaseFilter implements Filterable { /** * Protected constructor * @@ -37,9 +37,9 @@ class HubBootstrapAquireHubIdFilter extends BaseFilter implements Filterable { * * @return $filterInstance An instance of this filter class */ - public final static function createHubBootstrapAquireHubIdFilter () { + public final static function createHubBootstrapGenerateHubIdFilter () { // Get a new instance - $filterInstance = new HubBootstrapAquireHubIdFilter(); + $filterInstance = new HubBootstrapGenerateHubIdFilter(); // Return the instance return $filterInstance; diff --git a/application/hub/main/filter/bootstrap/class_HubBootstrapGenSessionIdFilter.php b/application/hub/main/filter/bootstrap/class_HubBootstrapGenerateSessionIdFilter.php similarity index 89% rename from application/hub/main/filter/bootstrap/class_HubBootstrapGenSessionIdFilter.php rename to application/hub/main/filter/bootstrap/class_HubBootstrapGenerateSessionIdFilter.php index 62a8040b4..1dcaf870b 100644 --- a/application/hub/main/filter/bootstrap/class_HubBootstrapGenSessionIdFilter.php +++ b/application/hub/main/filter/bootstrap/class_HubBootstrapGenerateSessionIdFilter.php @@ -1,6 +1,6 @@ * @version 0.0.0 @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class HubBootstrapGenSessionIdFilter extends BaseFilter implements Filterable { +class HubBootstrapGenerateSessionIdFilter extends BaseFilter implements Filterable { /** * Protected constructor * @@ -37,9 +37,9 @@ class HubBootstrapGenSessionIdFilter extends BaseFilter implements Filterable { * * @return $filterInstance An instance of this filter class */ - public final static function createHubBootstrapGenSessionIdFilter () { + public final static function createHubBootstrapGenerateSessionIdFilter () { // Get a new instance - $filterInstance = new HubBootstrapGenSessionIdFilter(); + $filterInstance = new HubBootstrapGenerateSessionIdFilter(); // Return the instance return $filterInstance; -- 2.39.5