From a696876779312476f162ea33a075916331a10b3d Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Mon, 29 Jun 2015 05:29:35 +0200 Subject: [PATCH] Renamed 'testing' daemon to 'default' as this is the default. Signed-off-by: Roland Haeder --- application/city/config.php | 2 +- .../city/main/city_daemon/class_BaseCityDaemon.php | 1 + .../city/main/city_daemon/{testing => default}/.htaccess | 0 .../class_SimulationDefaultCityDaemon.php} | 8 ++++---- 4 files changed, 6 insertions(+), 5 deletions(-) rename application/city/main/city_daemon/{testing => default}/.htaccess (100%) rename application/city/main/city_daemon/{testing/class_SimulationTestingCityDaemon.php => default/class_SimulationDefaultCityDaemon.php} (92%) 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/testing/.htaccess b/application/city/main/city_daemon/default/.htaccess similarity index 100% rename from application/city/main/city_daemon/testing/.htaccess rename to application/city/main/city_daemon/default/.htaccess diff --git a/application/city/main/city_daemon/testing/class_SimulationTestingCityDaemon.php b/application/city/main/city_daemon/default/class_SimulationDefaultCityDaemon.php similarity index 92% rename from application/city/main/city_daemon/testing/class_SimulationTestingCityDaemon.php rename to application/city/main/city_daemon/default/class_SimulationDefaultCityDaemon.php index 4931779..3cde128 100644 --- a/application/city/main/city_daemon/testing/class_SimulationTestingCityDaemon.php +++ b/application/city/main/city_daemon/default/class_SimulationDefaultCityDaemon.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 SimulationTestingCityDaemon extends BaseCityDaemon implements CityHelper, Registerable { +class SimulationDefaultCityDaemon extends BaseCityDaemon implements CityHelper, Registerable { /** * Protected constructor * @@ -38,9 +38,9 @@ class SimulationTestingCityDaemon extends BaseCityDaemon implements CityHelper, * @param $requestInstance An instance of a Requestable class * @return $nodeInstance An instance of this hub-node class */ - public static final function createSimulationTestingCityDaemon (Requestable $requestInstance) { + public static final function createSimulationDefaultCityDaemon (Requestable $requestInstance) { // Get a new instance - $nodeInstance = new SimulationTestingCityDaemon(); + $nodeInstance = new SimulationDefaultCityDaemon(); // Set the request instance $nodeInstance->setRequestInstance($requestInstance); -- 2.39.5