From: Roland Haeder Date: Mon, 29 Jun 2015 03:29:35 +0000 (+0200) Subject: Renamed 'testing' daemon to 'default' as this is the default. X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a696876779312476f162ea33a075916331a10b3d;p=city.git Renamed 'testing' daemon to 'default' as this is the default. Signed-off-by: Roland Haeder --- diff --git a/application/city/config.php b/application/city/config.php index 63e6786..cb910ab 100644 --- a/application/city/config.php +++ b/application/city/config.php @@ -29,7 +29,7 @@ $cfg = FrameworkConfiguration::getSelfInstance(); ******************************************************************************/ // CFG: CITY-DEFAULT-MODE (more is coming) -$cfg->setConfigEntry('city_default_mode', 'testing'); +$cfg->setConfigEntry('city_default_mode', BaseCityDaemon::CITY_TYPE_DEFAULT); // CFG: NEWS-DOWNLOAD-FILTER $cfg->setConfigEntry('news_download_filter', 'NewsDownloadFilter'); diff --git a/application/city/main/city_daemon/class_BaseCityDaemon.php b/application/city/main/city_daemon/class_BaseCityDaemon.php index 51abb5c..5f37722 100644 --- a/application/city/main/city_daemon/class_BaseCityDaemon.php +++ b/application/city/main/city_daemon/class_BaseCityDaemon.php @@ -25,6 +25,7 @@ class BaseCityDaemon extends BaseCitySystem implements Updateable, AddableCriter /** * City types */ + const CITY_TYPE_DEFAULT = 'default'; const CITY_TYPE_TESTING = 'testing'; /** diff --git a/application/city/main/city_daemon/default/.htaccess b/application/city/main/city_daemon/default/.htaccess new file mode 100644 index 0000000..3a42882 --- /dev/null +++ b/application/city/main/city_daemon/default/.htaccess @@ -0,0 +1 @@ +Deny from all diff --git a/application/city/main/city_daemon/default/class_SimulationDefaultCityDaemon.php b/application/city/main/city_daemon/default/class_SimulationDefaultCityDaemon.php new file mode 100644 index 0000000..3cde128 --- /dev/null +++ b/application/city/main/city_daemon/default/class_SimulationDefaultCityDaemon.php @@ -0,0 +1,95 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2015 City Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.shipsimu.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 SimulationDefaultCityDaemon extends BaseCityDaemon implements CityHelper, Registerable { + /** + * Protected constructor + * + * @return void + */ + protected function __construct () { + // Call parent constructor + parent::__construct(__CLASS__); + } + + /** + * Creates an instance of this hub-node class + * + * @param $requestInstance An instance of a Requestable class + * @return $nodeInstance An instance of this hub-node class + */ + public static final function createSimulationDefaultCityDaemon (Requestable $requestInstance) { + // Get a new instance + $nodeInstance = new SimulationDefaultCityDaemon(); + + // Set the request instance + $nodeInstance->setRequestInstance($requestInstance); + + // Return the instance + return $nodeInstance; + } + + /** + * Method to "bootstrap" the city simulation. This step does also apply + * provided command-line arguments stored in the request instance. + * + * @return void + * @todo Implement this method + */ + public function doBootstrapping () { + $this->partialStub(); + } + + /** + * Add some node-specific filters + * + * @return void + */ + public function addExtraCityFilters () { + // Get the application instance from registry + $applicationInstance = Registry::getRegistry()->getInstance('app'); + + // Get the controller from the application + $controllerInstance = $applicationInstance->getControllerInstance(); + + // Foo task + // @TODO $controllerInstance->addActivationFilter(ObjectFactory::createObjectByConfiguredName('city_foo_task_filter')); + + // @TODO Add some filters here + $this->partialStub('Add some filters here.'); + } + + /** + * Adds extra tasks to the given handler for this node + * + * @param $handlerInstance An instance of a HandleableTask class + * @return void + * @todo 0% done + */ + public function addExtraTasks (HandleableTask $handlerInstance) { + $this->partialStub('Please add some tasks or empty this method.'); + } +} + +// [EOF] +?> diff --git a/application/city/main/city_daemon/testing/.htaccess b/application/city/main/city_daemon/testing/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/main/city_daemon/testing/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/main/city_daemon/testing/class_SimulationTestingCityDaemon.php b/application/city/main/city_daemon/testing/class_SimulationTestingCityDaemon.php deleted file mode 100644 index 4931779..0000000 --- a/application/city/main/city_daemon/testing/class_SimulationTestingCityDaemon.php +++ /dev/null @@ -1,95 +0,0 @@ - - * @version 0.0.0 - * @copyright Copyright (c) 2015 City Developer Team - * @license GNU GPL 3.0 or any newer version - * @link http://www.shipsimu.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 SimulationTestingCityDaemon extends BaseCityDaemon implements CityHelper, Registerable { - /** - * Protected constructor - * - * @return void - */ - protected function __construct () { - // Call parent constructor - parent::__construct(__CLASS__); - } - - /** - * Creates an instance of this hub-node class - * - * @param $requestInstance An instance of a Requestable class - * @return $nodeInstance An instance of this hub-node class - */ - public static final function createSimulationTestingCityDaemon (Requestable $requestInstance) { - // Get a new instance - $nodeInstance = new SimulationTestingCityDaemon(); - - // Set the request instance - $nodeInstance->setRequestInstance($requestInstance); - - // Return the instance - return $nodeInstance; - } - - /** - * Method to "bootstrap" the city simulation. This step does also apply - * provided command-line arguments stored in the request instance. - * - * @return void - * @todo Implement this method - */ - public function doBootstrapping () { - $this->partialStub(); - } - - /** - * Add some node-specific filters - * - * @return void - */ - public function addExtraCityFilters () { - // Get the application instance from registry - $applicationInstance = Registry::getRegistry()->getInstance('app'); - - // Get the controller from the application - $controllerInstance = $applicationInstance->getControllerInstance(); - - // Foo task - // @TODO $controllerInstance->addActivationFilter(ObjectFactory::createObjectByConfiguredName('city_foo_task_filter')); - - // @TODO Add some filters here - $this->partialStub('Add some filters here.'); - } - - /** - * Adds extra tasks to the given handler for this node - * - * @param $handlerInstance An instance of a HandleableTask class - * @return void - * @todo 0% done - */ - public function addExtraTasks (HandleableTask $handlerInstance) { - $this->partialStub('Please add some tasks or empty this method.'); - } -} - -// [EOF] -?>