From 9f29f1a8d53d9ac5de5cc9008b618583aa9f6e97 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 1 Feb 2013 22:50:01 +0000 Subject: [PATCH] Removed also deprecated queues/queries as there are now stacks --- application/hub/config.php | 6 -- .../helper/nodes/class_NodeHelper.php | 7 -- .../console/class_HubConsoleMainCommand.php | 2 - .../class_NodeBootstrapInitQueuesFilter.php | 65 +--------------- .../class_NodeShutdownDeinitQueuesFilter.php | 75 +------------------ .../hub/main/nodes/boot/class_HubBootNode.php | 12 --- .../hub/main/nodes/class_BaseHubNode.php | 25 ------- .../hub/main/nodes/list/class_HubListNode.php | 12 --- .../main/nodes/master/class_HubMasterNode.php | 12 --- .../nodes/regular/class_HubRegularNode.php | 12 --- 10 files changed, 2 insertions(+), 226 deletions(-) diff --git a/application/hub/config.php b/application/hub/config.php index 8f932df76..692d38224 100644 --- a/application/hub/config.php +++ b/application/hub/config.php @@ -171,9 +171,6 @@ $cfg->setConfigEntry('node_bootstrap_generate_sessionid_filter', 'NodeBootstrapG // CFG: NODE-BOOTSTRAP-GENERATE-PRIVATE-KEY-FILTER $cfg->setConfigEntry('node_bootstrap_generate_private_key_filter', 'NodeBootstrapGeneratePrivateKeyFilter'); -// CFG: NODE-BOOTSTRAP-INIT-QUEUES-FILTER -$cfg->setConfigEntry('node_bootstrap_init_queues_filter', 'NodeBootstrapInitQueuesFilter'); - // CFG: NODE-BOOTSTRAP-EXTRA-BOOTSTRAPPING-FILTER $cfg->setConfigEntry('node_bootstrap_extra_bootstrapping_filter', 'NodeBootstrapExtraBootstrappingFilter'); @@ -183,9 +180,6 @@ $cfg->setConfigEntry('node_bootstrap_listener_pool_filter', 'NodeBootstrapListen // CFG: NODE-SHUTDOWN-FLUSH-NODE-LIST-FILTER $cfg->setConfigEntry('node_shutdown_flush_node_list_filter', 'NodeShutdownFlushNodeListFilter'); -// CFG: NODE-SHUTDOWN-DEINIT-QUEUES-FILTER -$cfg->setConfigEntry('node_shutdown_deinit_queues_filter', 'NodeShutdownDeinitQueuesFilter'); - // CFG: NODE-SHUTDOWN-TASK-HANDLER-FILTER $cfg->setConfigEntry('node_shutdown_task_handler_filter', 'NodeShutdownTaskHandlerFilter'); diff --git a/application/hub/interfaces/helper/nodes/class_NodeHelper.php b/application/hub/interfaces/helper/nodes/class_NodeHelper.php index 284ecea7e..eaaf5879c 100644 --- a/application/hub/interfaces/helper/nodes/class_NodeHelper.php +++ b/application/hub/interfaces/helper/nodes/class_NodeHelper.php @@ -32,13 +32,6 @@ interface NodeHelper extends Helper { */ function doBootstrapping (); - /** - * Initializes hub-specific queues - * - * @return void - */ - function initQueues (); - /** * Outputs the console teaser. This should only be executed on startup or * full restarts. This method generates some space around the teaser. diff --git a/application/hub/main/commands/console/class_HubConsoleMainCommand.php b/application/hub/main/commands/console/class_HubConsoleMainCommand.php index 036a38ca0..45385ea7b 100644 --- a/application/hub/main/commands/console/class_HubConsoleMainCommand.php +++ b/application/hub/main/commands/console/class_HubConsoleMainCommand.php @@ -123,7 +123,6 @@ class HubConsoleMainCommand extends BaseCommand implements Commandable { $controllerInstance->addBootstrapFilter(ObjectFactory::createObjectByConfiguredName('node_bootstrap_generate_nodeid_filter')); $controllerInstance->addBootstrapFilter(ObjectFactory::createObjectByConfiguredName('node_bootstrap_generate_sessionid_filter')); $controllerInstance->addBootstrapFilter(ObjectFactory::createObjectByConfiguredName('node_bootstrap_generate_private_key_filter')); - $controllerInstance->addBootstrapFilter(ObjectFactory::createObjectByConfiguredName('node_bootstrap_init_queues_filter')); $controllerInstance->addBootstrapFilter(ObjectFactory::createObjectByConfiguredName('node_bootstrap_extra_bootstrapping_filter')); $controllerInstance->addBootstrapFilter(ObjectFactory::createObjectByConfiguredName('node_bootstrap_listener_pool_filter')); @@ -132,7 +131,6 @@ class HubConsoleMainCommand extends BaseCommand implements Commandable { // Add shutdown filters $controllerInstance->addShutdownFilter(ObjectFactory::createObjectByConfiguredName('node_shutdown_flush_node_list_filter')); - $controllerInstance->addShutdownFilter(ObjectFactory::createObjectByConfiguredName('node_shutdown_deinit_queues_filter')); $controllerInstance->addShutdownFilter(ObjectFactory::createObjectByConfiguredName('node_shutdown_task_handler_filter')); // This is the last generic shutdown filter diff --git a/application/hub/main/filter/bootstrap/node/class_NodeBootstrapInitQueuesFilter.php b/application/hub/main/filter/bootstrap/node/class_NodeBootstrapInitQueuesFilter.php index 63371d3e2..f551ef47b 100644 --- a/application/hub/main/filter/bootstrap/node/class_NodeBootstrapInitQueuesFilter.php +++ b/application/hub/main/filter/bootstrap/node/class_NodeBootstrapInitQueuesFilter.php @@ -1,66 +1,3 @@ - * @version 0.0.0 - * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Node Developer Team - * @license GNU GPL 3.0 or any newer version - * @link http://www.ship-simu.org - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -class NodeBootstrapInitQueuesFilter extends BaseNodeFilter implements Filterable { - /** - * Protected constructor - * - * @return void - */ - protected function __construct () { - // Call parent constructor - parent::__construct(__CLASS__); - } - - /** - * Creates an instance of this filter class - * - * @return $filterInstance An instance of this filter class - */ - public static final function createNodeBootstrapInitQueuesFilter () { - // Get a new instance - $filterInstance = new NodeBootstrapInitQueuesFilter(); - - // Return the instance - return $filterInstance; - } - - /** - * Executes the filter with given request and response objects - * - * @param $requestInstance An instance of a class with an Requestable interface - * @param $responseInstance An instance of a class with an Responseable interface - * @return void - * @throws FilterChainException If $nodeInstance is null (no NullPointerException here) - */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { - // Get node instance - $nodeInstance = Registry::getRegistry()->getInstance('node'); - - // Now init the queues - $nodeInstance->initQueues(); - } -} - -// [EOF] +// @DEPRECATED ?> diff --git a/application/hub/main/filter/shutdown/node/class_NodeShutdownDeinitQueuesFilter.php b/application/hub/main/filter/shutdown/node/class_NodeShutdownDeinitQueuesFilter.php index facfedaa9..f551ef47b 100644 --- a/application/hub/main/filter/shutdown/node/class_NodeShutdownDeinitQueuesFilter.php +++ b/application/hub/main/filter/shutdown/node/class_NodeShutdownDeinitQueuesFilter.php @@ -1,76 +1,3 @@ - * @version 0.0.0 - * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Hub Developer Team - * @license GNU GPL 3.0 or any newer version - * @link http://www.ship-simu.org - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -class NodeShutdownDeinitQueuesFilter extends BaseNodeFilter implements Filterable { - /** - * Protected constructor - * - * @return void - */ - protected function __construct () { - // Call parent constructor - parent::__construct(__CLASS__); - } - - /** - * Creates an instance of this filter class - * - * @return $filterInstance An instance of this filter class - */ - public static final function createNodeShutdownDeinitQueuesFilter () { - // Get a new instance - $filterInstance = new NodeShutdownDeinitQueuesFilter(); - - // Return the instance - return $filterInstance; - } - - /** - * Executes the filter with given request and response objects - * - * @param $requestInstance An instance of a class with an Requestable interface - * @param $responseInstance An instance of a class with an Responseable interface - * @return void - * @throws FilterChainException If $nodeInstance is null (no NullPointerException here) - * @todo 0% done - */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { - // Get node instance - $nodeInstance = Registry::getRegistry()->getInstance('node'); - - // Get query instance - $connectorInstance = $nodeInstance->getQueryConnectorInstance(); - - // Sanity-check on it - if (is_null($connectorInstance)) { - // Throws a FilterChainException to stop further processing - throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED); - } // END - if - - // Now shutdown this one done - $connectorInstance->doShutdown(); - } -} - -// [EOF] +// @DEPRECATED ?> diff --git a/application/hub/main/nodes/boot/class_HubBootNode.php b/application/hub/main/nodes/boot/class_HubBootNode.php index bc62fcb1c..ef05db54a 100644 --- a/application/hub/main/nodes/boot/class_HubBootNode.php +++ b/application/hub/main/nodes/boot/class_HubBootNode.php @@ -95,18 +95,6 @@ class HubBootNode extends BaseHubNode implements NodeHelper, Registerable { $this->partialStub('Please implement more bootsrapping steps.'); } - /** - * Initializes hub-specific queues - * - * @return void - * @todo Unfinished method - */ - public function initQueues () { - // Call generic queues every hub may have, like the core queue - parent::initGenericQueues(); - $this->partialStub('Please add some more hub-specific queues.'); - } - /** * Add some node-specific filters * diff --git a/application/hub/main/nodes/class_BaseHubNode.php b/application/hub/main/nodes/class_BaseHubNode.php index 163ff96f8..6af32bc73 100644 --- a/application/hub/main/nodes/class_BaseHubNode.php +++ b/application/hub/main/nodes/class_BaseHubNode.php @@ -396,31 +396,6 @@ class BaseHubNode extends BaseHubSystem implements Updateable { } } - /** - * Initializes queues which every node needs - * - * @return void - */ - protected function initGenericQueues () { - // Debug message - self::createDebugInstance(__CLASS__)->debugOutput('BOOTSTRAP: Initialize queues: START'); - - // Set the query connector instance - $this->setQueryConnectorInstance(ObjectFactory::createObjectByConfiguredName('query_connector_class', array($this))); - - // Run a test query - $this->getQueryConnectorInstance()->doTestQuery(); - - // Set the queue connector instance - $this->setQueueConnectorInstance(ObjectFactory::createObjectByConfiguredName('queue_connector_class', array($this))); - - // Run a test queue - $this->getQueueConnectorInstance()->doTestQueue(); - - // Debug message - self::createDebugInstance(__CLASS__)->debugOutput('BOOTSTRAP: Initialize queues: FINISHED'); - } - /** * Adds hub data elements to a given dataset instance * diff --git a/application/hub/main/nodes/list/class_HubListNode.php b/application/hub/main/nodes/list/class_HubListNode.php index 944a08175..010c49734 100644 --- a/application/hub/main/nodes/list/class_HubListNode.php +++ b/application/hub/main/nodes/list/class_HubListNode.php @@ -61,18 +61,6 @@ class HubListNode extends BaseHubNode implements NodeHelper, Registerable { $this->partialStub(); } - /** - * Initializes hub-specific queues - * - * @return void - * @todo Unfinished method - */ - public function initQueues () { - // Call generic queues every hub may have, like the core queue - parent::initGenericQueues(); - $this->partialStub('Please add some more hub-specific queues.'); - } - /** * Add some node-specific filters * diff --git a/application/hub/main/nodes/master/class_HubMasterNode.php b/application/hub/main/nodes/master/class_HubMasterNode.php index 4b8963734..23124cc7e 100644 --- a/application/hub/main/nodes/master/class_HubMasterNode.php +++ b/application/hub/main/nodes/master/class_HubMasterNode.php @@ -65,18 +65,6 @@ class HubMasterNode extends BaseHubNode implements NodeHelper, Registerable { $this->partialStub('Please implement more boot-strapping steps!'); } - /** - * Initializes hub-specific queues - * - * @return void - * @todo Unfinished method - */ - public function initQueues () { - // Call generic queues every hub may have, like the core queue - parent::initGenericQueues(); - $this->partialStub('Please add some more hub-specific queues.'); - } - /** * Add some node-specific filters * diff --git a/application/hub/main/nodes/regular/class_HubRegularNode.php b/application/hub/main/nodes/regular/class_HubRegularNode.php index 692d1b6c9..13c99aa60 100644 --- a/application/hub/main/nodes/regular/class_HubRegularNode.php +++ b/application/hub/main/nodes/regular/class_HubRegularNode.php @@ -61,18 +61,6 @@ class HubRegularNode extends BaseHubNode implements NodeHelper, Registerable { $this->partialStub(); } - /** - * Initializes hub-specific queues - * - * @return void - * @todo Unfinished method - */ - public function initQueues () { - // Call generic queues every hub may have, like the core queue - parent::initGenericQueues(); - $this->partialStub('Please add some more hub-specific queues.'); - } - /** * Add some node-specific filters * -- 2.39.5