From: Roland Häder Date: Mon, 22 May 2017 19:25:26 +0000 (+0200) Subject: Continued: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=67bc092bedb338f6c9e1fc8582b8d9e0a72d1cb6;p=hub.git Continued: - added namespaces to configuration entries - imported HelpableDht - imported XmlDhtBootstrapTemplateEngine - imported NetworkPackageFactory - imported Compressor - imported PoolVisitor Signed-off-by: Roland Häder --- diff --git a/application/hub/classes/compressor/decorator/class_NetworkPackageCompressorDecorator.php b/application/hub/classes/compressor/decorator/class_NetworkPackageCompressorDecorator.php index be047df90..a382772b8 100644 --- a/application/hub/classes/compressor/decorator/class_NetworkPackageCompressorDecorator.php +++ b/application/hub/classes/compressor/decorator/class_NetworkPackageCompressorDecorator.php @@ -1,10 +1,13 @@ debugOutput('PACKAGE-DECODER: decodedData(' . count($decodedData) . ')=' . print_r($decodedData, TRUE)); $this->getPackageInstance()->handleRawData($decodedData); } -} -// [EOF] -?> +} diff --git a/application/hub/classes/dht/class_BaseDht.php b/application/hub/classes/dht/class_BaseDht.php index 4909bea6d..afa2061be 100644 --- a/application/hub/classes/dht/class_BaseDht.php +++ b/application/hub/classes/dht/class_BaseDht.php @@ -6,6 +6,7 @@ namespace Hub\Dht; use Hub\Factory\State\Dht\DhtStateFactory; use Hub\Dht\Distributable; use Hub\Generic\BaseHubSystem; +use Hub\Helper\Dht\HelpableDht; // Import framework stuff use CoreFramework\Factory\ObjectFactory; @@ -267,7 +268,5 @@ abstract class BaseDht extends BaseHubSystem implements Distributable { // Call method on database wrapper $this->getWrapperInstance()->enableAcceptDhtBootstrap(); } -} -// [EOF] -?> +} diff --git a/application/hub/classes/factories/package/class_NetworkPackageFactory.php b/application/hub/classes/factories/package/class_NetworkPackageFactory.php index 0268c1037..e72708f6c 100644 --- a/application/hub/classes/factories/package/class_NetworkPackageFactory.php +++ b/application/hub/classes/factories/package/class_NetworkPackageFactory.php @@ -75,7 +75,5 @@ class NetworkPackageFactory extends ObjectFactory { // Return the instance return $packageInstance; } -} -// [EOF] -?> +} diff --git a/application/hub/classes/filter/tags/class_PackageDhtBootstrapTagFilter.php b/application/hub/classes/filter/tags/class_PackageDhtBootstrapTagFilter.php index 6447265b4..ab421c71f 100644 --- a/application/hub/classes/filter/tags/class_PackageDhtBootstrapTagFilter.php +++ b/application/hub/classes/filter/tags/class_PackageDhtBootstrapTagFilter.php @@ -5,6 +5,7 @@ namespace Hub\Filter\Tag\Network\Dht\Bootstrap; // Import application-specific stuff use Hub\Filter\Node\BaseNodeFilter; use Hub\Network\Receive\Receivable; +use Hub\Template\Engine\Xml\Dht\Bootstrap\XmlDhtBootstrapTemplateEngine; // Import framework stuff use CoreFramework\Filter\Filterable; diff --git a/application/hub/classes/handler/message-types/answer/class_NodeMessageDhtBootstrapAnswerHandler.php b/application/hub/classes/handler/message-types/answer/class_NodeMessageDhtBootstrapAnswerHandler.php index 337739152..e47c57a42 100644 --- a/application/hub/classes/handler/message-types/answer/class_NodeMessageDhtBootstrapAnswerHandler.php +++ b/application/hub/classes/handler/message-types/answer/class_NodeMessageDhtBootstrapAnswerHandler.php @@ -5,6 +5,7 @@ namespace Hub\Handler\Answer\Node\DhtBootstrap; // Import application-specific stuff use Hub\Factory\Dht\DhtObjectFactory; use Hub\Network\Receive\Receivable; +use Hub\Template\Engine\Xml\Dht\Bootstrap\XmlDhtBootstrapTemplateEngine; use Hub\Template\Engine\Xml\Network\Answer\BaseXmlAnswerTemplateEngine; // Import framework stuff @@ -59,6 +60,7 @@ class NodeMessageDhtBootstrapAnswerHandler extends BaseMessageHandler implements // Init message-data->configuration translation array $this->messageToConfig = array( /* + @TODO Why commented out? XmlDhtBootstrapTemplateEngine::DHT_BOOTSTRAP_DATA_EXTERNAL_ADDRESS => 'your_external_address', XmlDhtBootstrapTemplateEngine::DHT_BOOTSTRAP_DATA_INTERNAL_ADDRESS => 'your_internal_address', XmlDhtBootstrapTemplateEngine::DHT_BOOTSTRAP_DATA_SESSION_ID => 'your_session_id' diff --git a/application/hub/classes/handler/message-types/dht/class_NodeMessageDhtBootstrapHandler.php b/application/hub/classes/handler/message-types/dht/class_NodeMessageDhtBootstrapHandler.php index bcffb8394..dfaa234bc 100644 --- a/application/hub/classes/handler/message-types/dht/class_NodeMessageDhtBootstrapHandler.php +++ b/application/hub/classes/handler/message-types/dht/class_NodeMessageDhtBootstrapHandler.php @@ -7,6 +7,7 @@ use Hub\Database\Frontend\Node\Dht\NodeDistributedHashTableDatabaseWrapper; use Hub\Factory\Dht\DhtObjectFactory; use Hub\Factory\Node\NodeObjectFactory; use Hub\Network\Receive\Receivable; +use Hub\Template\Engine\Xml\Dht\Bootstrap\XmlDhtBootstrapTemplateEngine; // Import framework stuff use CoreFramework\Criteria\Storing\StoreableCriteria; diff --git a/application/hub/classes/helper/class_ b/application/hub/classes/helper/class_ index 907ff5392..e015699a7 100644 --- a/application/hub/classes/helper/class_ +++ b/application/hub/classes/helper/class_ @@ -3,6 +3,7 @@ namespace Hub\Helper\; // Import application-specific stuff +use Hub\Factory\Network\NetworkPackageFactory; use Hub\Helper\BaseHubSystemHelper; use Hub\Network\Package\NetworkPackage; @@ -87,7 +88,5 @@ class !!!???Helper extends BaseHubSystemHelper implements Helpable!!! { // Next, feed the content in. The network package class is a pipe-through class. $packageInstance->enqueueRawDataFromTemplate($this); } -} -// [EOF] -?> +} diff --git a/application/hub/classes/helper/connection/class_BaseConnectionHelper.php b/application/hub/classes/helper/connection/class_BaseConnectionHelper.php index 7aa0ab597..2c48fba82 100644 --- a/application/hub/classes/helper/connection/class_BaseConnectionHelper.php +++ b/application/hub/classes/helper/connection/class_BaseConnectionHelper.php @@ -4,6 +4,7 @@ namespace Hub\Helper\Connection; // Import application-specific stuff use Hub\Factory\Fragmenter\FragmenterFactory; +use Hub\Factory\Network\NetworkPackageFactory; use Hub\Helper\BaseHubSystemHelper; use Hub\Network\Package\NetworkPackage; diff --git a/application/hub/classes/helper/dht/class_DhtBootstrapHelper.php b/application/hub/classes/helper/dht/class_DhtBootstrapHelper.php index 47adf9750..afd3b8de5 100644 --- a/application/hub/classes/helper/dht/class_DhtBootstrapHelper.php +++ b/application/hub/classes/helper/dht/class_DhtBootstrapHelper.php @@ -4,8 +4,10 @@ namespace Hub\Helper\Dht\Bootstrap; // Import application-specific stuff use Hub\Dht\Distributable; +use Hub\Factory\Network\NetworkPackageFactory; use Hub\Generic\BaseHubSystem; use Hub\Helper\BaseHubSystemHelper; +use Hub\Helper\Dht\HelpableDht; use Hub\Network\Package\NetworkPackage; // Import framework stuff @@ -116,7 +118,5 @@ class DhtBootstrapHelper extends BaseHubSystemHelper implements HelpableDht { // Debug message //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('HELPER: EXIT!'); } -} -// [EOF] -?> +} diff --git a/application/hub/classes/helper/dht/class_DhtPublishEntryHelper.php b/application/hub/classes/helper/dht/class_DhtPublishEntryHelper.php index c93667b52..bf1c13a37 100644 --- a/application/hub/classes/helper/dht/class_DhtPublishEntryHelper.php +++ b/application/hub/classes/helper/dht/class_DhtPublishEntryHelper.php @@ -4,8 +4,10 @@ namespace Hub\Helper\Dht\Publish; // Import application-specific stuff use Hub\Dht\Distributable; +use Hub\Factory\Network\NetworkPackageFactory; use Hub\Generic\BaseHubSystem; use Hub\Helper\BaseHubSystemHelper; +use Hub\Helper\Dht\HelpableDht; use Hub\Network\Package\NetworkPackage; // Import framework stuff @@ -105,7 +107,5 @@ class DhtPublishEntryHelper extends BaseHubSystemHelper implements HelpableDht { // Next, feed the content in. The network package class is a pipe-through class. $packageInstance->enqueueRawDataFromTemplate($this); } -} -// [EOF] -?> +} diff --git a/application/hub/classes/helper/node/announcement/class_NodeAnnouncementHelper.php b/application/hub/classes/helper/node/announcement/class_NodeAnnouncementHelper.php index 630058a3f..1df415462 100644 --- a/application/hub/classes/helper/node/announcement/class_NodeAnnouncementHelper.php +++ b/application/hub/classes/helper/node/announcement/class_NodeAnnouncementHelper.php @@ -3,6 +3,7 @@ namespace Hub\Node\Helper\Announcement; // Import application-specific stuff +use Hub\Factory\Network\NetworkPackageFactory; use Hub\Helper\Node\NodeHelper; use Hub\Network\Package\NetworkPackage; @@ -108,7 +109,5 @@ class NodeAnnouncementHelper extends BaseNodeHelper implements HelpableNode { // Next, feed the content in. The network package class is a pipe-through class. $packageInstance->enqueueRawDataFromTemplate($this); } -} -// [EOF] -?> +} diff --git a/application/hub/classes/helper/node/answer/announcement/class_NodeAnnouncementMessageAnswerHelper.php b/application/hub/classes/helper/node/answer/announcement/class_NodeAnnouncementMessageAnswerHelper.php index 522e8150f..0a879d50d 100644 --- a/application/hub/classes/helper/node/answer/announcement/class_NodeAnnouncementMessageAnswerHelper.php +++ b/application/hub/classes/helper/node/answer/announcement/class_NodeAnnouncementMessageAnswerHelper.php @@ -3,6 +3,7 @@ namespace Hub\Node\Helper\Answer\Announcement; // Import application-specific stuff +use Hub\Factory\Network\NetworkPackageFactory; use Hub\Helper\Node\NodeHelper; // Import framework stuff @@ -107,7 +108,5 @@ class NodeAnnouncementMessageAnswerHelper extends BaseHubAnswerHelper implements // Next, feed the content in. The network package class is a pipe-through class. $packageInstance->enqueueRawDataFromTemplate($this); } -} -// [EOF] -?> +} diff --git a/application/hub/classes/helper/node/answer/dht/class_NodeDhtBootstrapMessageAnswerHelper.php b/application/hub/classes/helper/node/answer/dht/class_NodeDhtBootstrapMessageAnswerHelper.php index 7883373ff..c39146760 100644 --- a/application/hub/classes/helper/node/answer/dht/class_NodeDhtBootstrapMessageAnswerHelper.php +++ b/application/hub/classes/helper/node/answer/dht/class_NodeDhtBootstrapMessageAnswerHelper.php @@ -3,7 +3,9 @@ namespace Hub\Node\Helper\Answer\Dht\Bootstrap; // Import application-specific stuff +use Hub\Factory\Network\NetworkPackageFactory; use Hub\Helper\Node\NodeHelper; +use Hub\Template\Engine\Xml\Dht\Bootstrap\XmlDhtBootstrapTemplateEngine; // Import framework stuff use CoreFramework\Factory\Template\XmlTemplateEngineFactory; @@ -107,7 +109,5 @@ class NodeDhtBootstrapMessageAnswerHelper extends BaseHubAnswerHelper implements // Next, feed the content in. The network package class is a pipe-through class. $packageInstance->enqueueRawDataFromTemplate($this); } -} -// [EOF] -?> +} diff --git a/application/hub/classes/helper/node/answer/requests/class_NodeRequestNodeListMessageAnswerHelper.php b/application/hub/classes/helper/node/answer/requests/class_NodeRequestNodeListMessageAnswerHelper.php index 216b28faa..16f662ec4 100644 --- a/application/hub/classes/helper/node/answer/requests/class_NodeRequestNodeListMessageAnswerHelper.php +++ b/application/hub/classes/helper/node/answer/requests/class_NodeRequestNodeListMessageAnswerHelper.php @@ -3,6 +3,7 @@ namespace Hub\Node\Helper\Answer\Request\NodeList; // Import application-specific stuff +use Hub\Factory\Network\NetworkPackageFactory; use Hub\Helper\Node\NodeHelper; // Import framework stuff @@ -113,7 +114,5 @@ class NodeRequestNodeListMessageAnswerHelper extends BaseHubAnswerHelper impleme // Next, feed the content in. The network package class is a pipe-through class. $packageInstance->enqueueRawDataFromTemplate($this); } -} -// [EOF] -?> +} diff --git a/application/hub/classes/helper/node/class_ b/application/hub/classes/helper/node/class_ index 60602db13..f00c3871a 100644 --- a/application/hub/classes/helper/node/class_ +++ b/application/hub/classes/helper/node/class_ @@ -3,6 +3,7 @@ namespace Hub\Node\Helper\; // Import application-specific stuff +use Hub\Factory\Network\NetworkPackageFactory; use Hub\Helper\Node\NodeHelper; use Hub\Network\Package\NetworkPackage; @@ -84,7 +85,5 @@ class Node???Helper extends BaseNodeHelper implements HelpableNode { // Next, feed the content in. The network package class is a pipe-through class. $packageInstance->enqueueRawDataFromTemplate($this); } -} -// [EOF] -?> +} diff --git a/application/hub/classes/helper/node/connection/class_NodeSelfConnectHelper.php b/application/hub/classes/helper/node/connection/class_NodeSelfConnectHelper.php index 83cb5c7ba..5ec6c8dca 100644 --- a/application/hub/classes/helper/node/connection/class_NodeSelfConnectHelper.php +++ b/application/hub/classes/helper/node/connection/class_NodeSelfConnectHelper.php @@ -3,6 +3,7 @@ namespace Hub\Node\Helper\SelfConnect; // Import application-specific stuff +use Hub\Factory\Network\NetworkPackageFactory; use Hub\Helper\Node\NodeHelper; use Hub\Network\Package\NetworkPackage; use Hub\Tag\Tagable; @@ -105,7 +106,5 @@ class NodeSelfConnectHelper extends BaseNodeHelper implements HelpableNode { // Next, feed the content in. The network package class is a pipe-through class. $packageInstance->enqueueRawDataFromTemplate($this); } -} -// [EOF] -?> +} diff --git a/application/hub/classes/helper/node/requests/class_NodeRequestNodeListHelper.php b/application/hub/classes/helper/node/requests/class_NodeRequestNodeListHelper.php index 27a9f9e39..9d5880a75 100644 --- a/application/hub/classes/helper/node/requests/class_NodeRequestNodeListHelper.php +++ b/application/hub/classes/helper/node/requests/class_NodeRequestNodeListHelper.php @@ -3,6 +3,7 @@ namespace Hub\Node\Helper\Request\NodeList; // Import application-specific stuff +use Hub\Factory\Network\NetworkPackageFactory; use Hub\Helper\Node\NodeHelper; use Hub\Network\Package\NetworkPackage; @@ -104,7 +105,5 @@ class NodeRequestNodeListHelper extends BaseNodeHelper implements HelpableNode { // Next, feed the content in. The network package class is a pipe-through class. $packageInstance->enqueueRawDataFromTemplate($this); } -} -// [EOF] -?> +} diff --git a/application/hub/classes/listener/class_BaseListenerDecorator.php b/application/hub/classes/listener/class_BaseListenerDecorator.php index abd07df83..0d8564113 100644 --- a/application/hub/classes/listener/class_BaseListenerDecorator.php +++ b/application/hub/classes/listener/class_BaseListenerDecorator.php @@ -4,6 +4,7 @@ namespace Hub\Listener; // Import application-specific stuff use Hub\Container\Socket\StorableSocket; +use Hub\Factory\Network\NetworkPackageFactory; use Hub\Listener\Listenable; use Hub\Network\Networkable; diff --git a/application/hub/classes/package/class_NetworkPackage.php b/application/hub/classes/package/class_NetworkPackage.php index 063936dda..867461c63 100644 --- a/application/hub/classes/package/class_NetworkPackage.php +++ b/application/hub/classes/package/class_NetworkPackage.php @@ -22,6 +22,7 @@ use Hub\Tag\Tagable; use Hub\Tools\HubTools; // Import framework stuff +use CoreFramework\Compressor\Compressor; use CoreFramework\Factory\ObjectFactory; use CoreFramework\Factory\Registry\Socket\SocketRegistryFactory; use CoreFramework\Registry\Registry; diff --git a/application/hub/classes/tasks/network/class_NetworkPackageReaderTask.php b/application/hub/classes/tasks/network/class_NetworkPackageReaderTask.php index 6ea6fb2fd..8d850d6df 100644 --- a/application/hub/classes/tasks/network/class_NetworkPackageReaderTask.php +++ b/application/hub/classes/tasks/network/class_NetworkPackageReaderTask.php @@ -2,6 +2,9 @@ // Own namespace namespace Hub\Task\Network\Reader; +// Import application-specific stuff +use Hub\Factory\Network\NetworkPackageFactory; + // Import framework stuff use CoreFramework\Task\BaseTask; use CoreFramework\Task\Taskable; @@ -122,7 +125,5 @@ class NetworkPackageReaderTask extends BaseTask implements Taskable, Visitable { public function doShutdown () { self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('TASK: Shutting down...'); } -} -// [EOF] -?> +} diff --git a/application/hub/classes/tasks/network/class_NetworkPackageWriterTask.php b/application/hub/classes/tasks/network/class_NetworkPackageWriterTask.php index 71643c084..dc1c5220b 100644 --- a/application/hub/classes/tasks/network/class_NetworkPackageWriterTask.php +++ b/application/hub/classes/tasks/network/class_NetworkPackageWriterTask.php @@ -2,6 +2,9 @@ // Own namespace namespace Hub\Task\Network\Writer; +// Import application-specific stuff +use Hub\Factory\Network\NetworkPackageFactory; + // Import framework stuff use CoreFramework\Task\BaseTask; use CoreFramework\Task\Taskable; @@ -100,7 +103,5 @@ class NetworkPackageWriterTask extends BaseTask implements Taskable, Visitable { public function doShutdown () { self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('TASK: Shutting down...'); } -} -// [EOF] -?> +} diff --git a/application/hub/classes/visitor/pool/class_ b/application/hub/classes/visitor/pool/class_ index 302c9cf83..7002224e4 100644 --- a/application/hub/classes/visitor/pool/class_ +++ b/application/hub/classes/visitor/pool/class_ @@ -4,6 +4,7 @@ namespace Hub\Visitor\; // Import application-specific stuff use Hub\Pool\Poolable; +use Hub\Visitor\Pool\PoolVisitor; // Import framework stuff use CoreFramework\Visitor\BaseVisitor; diff --git a/application/hub/classes/visitor/pool/handler/class_Handler b/application/hub/classes/visitor/pool/handler/class_Handler index 6a6d4d180..0a4f1298d 100644 --- a/application/hub/classes/visitor/pool/handler/class_Handler +++ b/application/hub/classes/visitor/pool/handler/class_Handler @@ -4,6 +4,7 @@ namespace Hub\Visitor\Handler\; // Import application-specific stuff use Hub\Pool\Poolable; +use Hub\Visitor\Pool\PoolVisitor; // Import framework stuff use CoreFramework\Visitor\BaseVisitor; diff --git a/application/hub/classes/visitor/pool/monitor/class_RawDataPoolMonitorVisitor.php b/application/hub/classes/visitor/pool/monitor/class_RawDataPoolMonitorVisitor.php index ddb59514a..a70420caf 100644 --- a/application/hub/classes/visitor/pool/monitor/class_RawDataPoolMonitorVisitor.php +++ b/application/hub/classes/visitor/pool/monitor/class_RawDataPoolMonitorVisitor.php @@ -7,6 +7,7 @@ use Hub\Listener\Listenable; use Hub\Network\Receive\Receivable; use Hub\Pool\Poolable; use Hub\Visitor\Listener\ListenerVisitor; +use Hub\Visitor\Pool\PoolVisitor; // Import framework stuff use CoreFramework\Visitor\BaseVisitor; diff --git a/application/hub/classes/visitor/pool/shutdown/class_Shutdown b/application/hub/classes/visitor/pool/shutdown/class_Shutdown index 686b38679..08b3b1286 100644 --- a/application/hub/classes/visitor/pool/shutdown/class_Shutdown +++ b/application/hub/classes/visitor/pool/shutdown/class_Shutdown @@ -4,6 +4,7 @@ namespace Hub\Visitor\; // Import application-specific stuff use Hub\Pool\Poolable; +use Hub\Visitor\Pool\PoolVisitor; // Import framework stuff use CoreFramework\Visitor\BaseVisitor; diff --git a/application/hub/classes/visitor/pool/shutdown/class_ShutdownListenerPoolVisitor.php b/application/hub/classes/visitor/pool/shutdown/class_ShutdownListenerPoolVisitor.php index 2d2946923..fab8b1bb5 100644 --- a/application/hub/classes/visitor/pool/shutdown/class_ShutdownListenerPoolVisitor.php +++ b/application/hub/classes/visitor/pool/shutdown/class_ShutdownListenerPoolVisitor.php @@ -5,6 +5,7 @@ namespace Hub\Visitor\Pool\Listener; // Import application-specific stuff use Hub\Listener\Listenable; use Hub\Pool\Poolable; +use Hub\Visitor\Pool\PoolVisitor; // Import framework stuff use CoreFramework\Visitor\BaseVisitor; diff --git a/application/hub/classes/visitor/socket/class_HalfShutdownSocketVisitor.php b/application/hub/classes/visitor/socket/class_HalfShutdownSocketVisitor.php index 15cad687d..07afbe631 100644 --- a/application/hub/classes/visitor/socket/class_HalfShutdownSocketVisitor.php +++ b/application/hub/classes/visitor/socket/class_HalfShutdownSocketVisitor.php @@ -3,6 +3,7 @@ namespace Hub\Visitor\Shutdown\Socket; // Import application-specific stuff +use Hub\Factory\Network\NetworkPackageFactory; use Hub\Helper\Connection\ConnectionHelper; use Hub\Network\Deliver\Deliverable; diff --git a/application/hub/classes/visitor/socket/class_ShutdownSocketVisitor.php b/application/hub/classes/visitor/socket/class_ShutdownSocketVisitor.php index 0d43470e4..302d2aa33 100644 --- a/application/hub/classes/visitor/socket/class_ShutdownSocketVisitor.php +++ b/application/hub/classes/visitor/socket/class_ShutdownSocketVisitor.php @@ -4,6 +4,7 @@ namespace Hub\Visitor\Shutdown\Socket; // Import application-specific stuff use Hub\Container\Socket\StorableSocket; +use Hub\Factory\Network\NetworkPackageFactory; use Hub\Helper\Connection\ConnectionHelper; use Hub\Network\Deliver\Deliverable; diff --git a/application/hub/config.php b/application/hub/config.php index debdcaa33..fabb8afcd 100644 --- a/application/hub/config.php +++ b/application/hub/config.php @@ -133,7 +133,7 @@ $cfg->setConfigEntry('shutdown_socket_visitor_class', 'Hub\Visitor\Shutdown\Sock $cfg->setConfigEntry('half_shutdown_socket_visitor_class', 'Hub\Visitor\Shutdown\Socket\HalfShutdownSocketVisitor'); // CFG: NODE-RAW-DATA-MONITOR-VISITOR-CLASS -$cfg->setConfigEntry('node_raw_data_monitor_visitor_class', 'RawDataPoolMonitorVisitor'); +$cfg->setConfigEntry('node_raw_data_monitor_visitor_class', 'Hub\Visitor\Monitor\Pool\RawDataPoolMonitorVisitor'); // CFG: ACTIVE-TASK-VISITOR-CLASS $cfg->setConfigEntry('active_task_visitor_class', 'Hub\Visitor\Task\Active\ActiveTaskVisitor'); @@ -145,7 +145,7 @@ $cfg->setConfigEntry('node_announcement_helper_class', 'NodeAnnouncementHelper') $cfg->setConfigEntry('node_self_connect_helper_class', 'NodeSelfConnectHelper'); // CFG: DHT-BOOTSTRAP-HELPER-CLASS -$cfg->setConfigEntry('dht_bootstrap_helper_class', 'DhtBootstrapHelper'); +$cfg->setConfigEntry('dht_bootstrap_helper_class', 'Hub\Helper\Dht\Bootstrap\DhtBootstrapHelper'); // CFG: DHT-PUBLISH-ENTRY-HELPER-CLASS $cfg->setConfigEntry('dht_publish_entry_helper_class', 'DhtPublishEntryHelper'); @@ -277,7 +277,7 @@ $cfg->setConfigEntry('node_announcement_answer_template_class', 'XmlAnnouncement $cfg->setConfigEntry('node_request_node_list_template_class', 'XmlRequestNodeListTemplateEngine'); // CFG: NODE-DHT-BOOTSTRAP-TEMPLATE-CLASS -$cfg->setConfigEntry('node_dht_bootstrap_template_class', 'XmlDhtBootstrapTemplateEngine'); +$cfg->setConfigEntry('node_dht_bootstrap_template_class', 'Hub\Template\Engine\Xml\Dht\Bootstrap\XmlDhtBootstrapTemplateEngine'); // CFG: NODE-DHT-BOOTSTRAP-ANSWER-TEMPLATE-CLASS $cfg->setConfigEntry('node_dht_bootstrap_answer_template_class', 'XmlDhtBootstrapAnswerTemplateEngine'); @@ -289,7 +289,7 @@ $cfg->setConfigEntry('node_request_node_list_answer_template_class', 'XmlRequest $cfg->setConfigEntry('node_request_node_list_entries_template_class', 'XmlRequestNodeListEntryTemplateEngine'); // CFG: DHT-BOOTSTRAP-TEMPLATE-CLASS -$cfg->setConfigEntry('dht_bootstrap_template_class', 'XmlDhtBootstrapTemplateEngine'); +$cfg->setConfigEntry('dht_bootstrap_template_class', 'Hub\Template\Engine\Xml\Dht\Bootstrap\XmlDhtBootstrapTemplateEngine'); // CFG: DHT-PUBLISH-ENTRY-TEMPLATE-CLASS $cfg->setConfigEntry('dht_publish_entry_template_class', 'XmlDhtPublishEntryTemplateEngine'); @@ -700,13 +700,13 @@ $cfg->setConfigEntry('node_ping_iterator_class', 'Hub\Iterator\Node\Ping\NodePin $cfg->setConfigEntry('web_template_class', 'ConsoleTemplateEngine'); // CFG: NETWORK-PACKAGE-CLASS -$cfg->setConfigEntry('network_package_class', 'NetworkPackage'); +$cfg->setConfigEntry('network_package_class', 'Hub\Network\Package\NetworkPackage'); // CFG: PACKAGE-COMPRESSOR-CLASS -$cfg->setConfigEntry('deco_package_compressor_class', 'NetworkPackageCompressorDecorator'); +$cfg->setConfigEntry('deco_package_compressor_class', 'Hub\Network\Compressor\Package\NetworkPackageCompressorDecorator'); // CFG: RAW-PACKAGE-COMPRESSOR-CLASS -$cfg->setConfigEntry('raw_package_compressor_class', 'ZlibCompressor'); +$cfg->setConfigEntry('raw_package_compressor_class', 'CoreFramework\Compressor\Zlib\ZlibCompressor'); // CFG: SOCKET-REGISTRY-CLASS $cfg->setConfigEntry('socket_registry_class', 'Hub\Registry\Socket\SocketRegistry'); @@ -803,7 +803,7 @@ $cfg->setConfigEntry('node_status', 'invalid'); $cfg->setConfigEntry('package_fragmenter_class', 'Hub\Network\Package\Fragment\PackageFragmenter'); // CFG: PACKAGE-ASSEMBLER-CLASS -$cfg->setConfigEntry('package_assembler_class', 'PackageAssembler'); +$cfg->setConfigEntry('package_assembler_class', 'Hub\Network\Package\Assembler\PackageAssembler'); // CFG: PACKAGE-CHUNK-SIZE $cfg->setConfigEntry('package_chunk_size', 256*8); diff --git a/application/hub/exceptions/dht/class_DhtBootstrapNotAcceptedException.php b/application/hub/exceptions/dht/class_DhtBootstrapNotAcceptedException.php index 5e2e6dd2c..6bc1d11a0 100644 --- a/application/hub/exceptions/dht/class_DhtBootstrapNotAcceptedException.php +++ b/application/hub/exceptions/dht/class_DhtBootstrapNotAcceptedException.php @@ -4,6 +4,7 @@ namespace Hub\Dht\Bootstrap; // Import application-specific stuff use Hub\Factory\Node\NodeObjectFactory; +use Hub\Template\Engine\Xml\Dht\Bootstrap\XmlDhtBootstrapTemplateEngine; // Import framework stuff use CoreFramework\Generic\FrameworkException; diff --git a/application/hub/interfaces/package/assembler/class_Assembler.php b/application/hub/interfaces/package/assembler/class_Assembler.php index 5e03b451c..600da217d 100644 --- a/application/hub/interfaces/package/assembler/class_Assembler.php +++ b/application/hub/interfaces/package/assembler/class_Assembler.php @@ -1,6 +1,6 @@