From: Roland Häder Date: Sat, 5 Dec 2020 22:26:20 +0000 (+0100) Subject: Continued: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7aa1c905d98ec5bafe6cde5e4bd6385f512ae688;p=hub.git Continued: - had renamed some namespaces - updated core framework Signed-off-by: Roland Häder --- diff --git a/application/hub/class_ApplicationHelper.php b/application/hub/class_ApplicationHelper.php index 65cb781ce..beb0f3d7d 100644 --- a/application/hub/class_ApplicationHelper.php +++ b/application/hub/class_ApplicationHelper.php @@ -179,7 +179,7 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication /** * Assigns extra application-depending data * - * @param $templateInstance An instance of a CompileableTemplate + * @param $templateInstance An instance of a CompileableTemplate class * @return void * @todo Nothing to add? */ diff --git a/application/hub/classes/decoder/class_BaseDecoder.php b/application/hub/classes/decoder/class_BaseDecoder.php index 8dc5285d9..1f3d61a82 100644 --- a/application/hub/classes/decoder/class_BaseDecoder.php +++ b/application/hub/classes/decoder/class_BaseDecoder.php @@ -8,7 +8,7 @@ use Org\Shipsimu\Hub\Network\Delivery\Deliverable; // Import framework stuff use Org\Mxchange\CoreFramework\Traits\Handler\HandleableTrait; -use Org\Mxchange\CoreFramework\Traits\Stacker\StackableTrait; +use Org\Mxchange\CoreFramework\Traits\Stack\StackableTrait; /** * A general Decoder class diff --git a/application/hub/classes/dht/class_BaseDht.php b/application/hub/classes/dht/class_BaseDht.php index 9ba58d1a3..fd6be0a38 100644 --- a/application/hub/classes/dht/class_BaseDht.php +++ b/application/hub/classes/dht/class_BaseDht.php @@ -12,7 +12,7 @@ use Org\Shipsimu\Hub\Helper\Dht\HelpableDht; use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap; use Org\Mxchange\CoreFramework\Factory\ObjectFactory; use Org\Mxchange\CoreFramework\Result\Search\SearchableResult; -use Org\Mxchange\CoreFramework\Traits\Stacker\StackableTrait; +use Org\Mxchange\CoreFramework\Traits\Stack\StackableTrait; use Org\Mxchange\CoreFramework\Traits\State\StateableTrait; // Import SPL stuff diff --git a/application/hub/classes/handler/class_BaseHubHandler.php b/application/hub/classes/handler/class_BaseHubHandler.php index cc3cbe8e1..b108990a3 100644 --- a/application/hub/classes/handler/class_BaseHubHandler.php +++ b/application/hub/classes/handler/class_BaseHubHandler.php @@ -16,7 +16,7 @@ use Org\Mxchange\CoreFramework\Generic\UnsupportedOperationException; use Org\Mxchange\CoreFramework\Handler\BaseHandler; use Org\Mxchange\CoreFramework\Handler\Handleable; use Org\Mxchange\CoreFramework\Traits\Registry\RegisterTrait; -use Org\Mxchange\CoreFramework\Traits\Stacker\StackableTrait; +use Org\Mxchange\CoreFramework\Traits\Stack\StackableTrait; /** * A general hub handler diff --git a/application/hub/classes/package/assembler/class_PackageAssembler.php b/application/hub/classes/package/assembler/class_PackageAssembler.php index 36be091c1..1ba9b9d45 100644 --- a/application/hub/classes/package/assembler/class_PackageAssembler.php +++ b/application/hub/classes/package/assembler/class_PackageAssembler.php @@ -19,7 +19,7 @@ use Org\Mxchange\CoreFramework\EntryPoint\ApplicationEntryPoint; use Org\Mxchange\CoreFramework\Factory\ObjectFactory; use Org\Mxchange\CoreFramework\Registry\Registerable; use Org\Mxchange\CoreFramework\Traits\Handler\HandleableTrait; -use Org\Mxchange\CoreFramework\Traits\Stacker\StackableTrait; +use Org\Mxchange\CoreFramework\Traits\Stack\StackableTrait; use Org\Mxchange\CoreFramework\Traits\Stream\Input\InputStreamTrait; use Org\Mxchange\CoreFramework\Utils\String\StringUtils; use Org\Mxchange\CoreFramework\Visitor\Visitable; diff --git a/application/hub/classes/producer/class_BaseProducer.php b/application/hub/classes/producer/class_BaseProducer.php index 9525ba37d..4676cb028 100644 --- a/application/hub/classes/producer/class_BaseProducer.php +++ b/application/hub/classes/producer/class_BaseProducer.php @@ -8,7 +8,7 @@ use Org\Shipsimu\Hub\Generic\BaseHubSystem; // Import framework stuff use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap; use Org\Mxchange\CoreFramework\Factory\ObjectFactory; -use Org\Mxchange\CoreFramework\Stacker\Stackable; +use Org\Mxchange\CoreFramework\Stack\Stackable; /** * A general Producer class diff --git a/application/hub/classes/source/class_BaseUrlSource.php b/application/hub/classes/source/class_BaseUrlSource.php index 9b521d10b..b390782fd 100644 --- a/application/hub/classes/source/class_BaseUrlSource.php +++ b/application/hub/classes/source/class_BaseUrlSource.php @@ -7,7 +7,7 @@ use Org\Shipsimu\Hub\Crawler\Source\BaseSource; // Import framework stuff use Org\Mxchange\CoreFramework\Factory\Stack\FileStackFactory; -use Org\Mxchange\CoreFramework\Traits\Stacker\StackableTrait; +use Org\Mxchange\CoreFramework\Traits\Stack\StackableTrait; /** * A general URL source class diff --git a/application/hub/config.php b/application/hub/config.php index 08245c48a..0846cafb9 100644 --- a/application/hub/config.php +++ b/application/hub/config.php @@ -316,31 +316,31 @@ $cfg->setConfigEntry('node_announcement_answer_template_extension', '.xml'); $cfg->setConfigEntry('node_announcement_template_type', 'xml/announcement'); // CFG: NODE-ANNOUNCEMENT-STACKER-CLASS -$cfg->setConfigEntry('node_announcement_stacker_class', 'Org\Mxchange\CoreFramework\Stacker\FiLoStacker'); +$cfg->setConfigEntry('node_announcement_stacker_class', 'Org\Mxchange\CoreFramework\Stack\FiLoStacker'); // CFG: NODE-ANNOUNCEMENT-ANSWER-STACKER-CLASS -$cfg->setConfigEntry('node_announcement_answer_stacker_class', 'Org\Mxchange\CoreFramework\Stacker\FiLoStacker'); +$cfg->setConfigEntry('node_announcement_answer_stacker_class', 'Org\Mxchange\CoreFramework\Stack\FiLoStacker'); // CFG: NODE-DHT-BOOTSTRAP-STACKER-CLASS -$cfg->setConfigEntry('node_dht_bootstrap_stacker_class', 'Org\Mxchange\CoreFramework\Stacker\FiLoStacker'); +$cfg->setConfigEntry('node_dht_bootstrap_stacker_class', 'Org\Mxchange\CoreFramework\Stack\FiLoStacker'); // CFG: NODE-DHT-BOOTSTRAP-ANSWER-STACKER-CLASS -$cfg->setConfigEntry('node_dht_bootstrap_answer_stacker_class', 'Org\Mxchange\CoreFramework\Stacker\FiLoStacker'); +$cfg->setConfigEntry('node_dht_bootstrap_answer_stacker_class', 'Org\Mxchange\CoreFramework\Stack\FiLoStacker'); // CFG: NODE-REQUEST-NODE-LIST-ANSWER-STACKER-CLASS -$cfg->setConfigEntry('node_request_node_list_answer_stacker_class', 'Org\Mxchange\CoreFramework\Stacker\FiLoStacker'); +$cfg->setConfigEntry('node_request_node_list_answer_stacker_class', 'Org\Mxchange\CoreFramework\Stack\FiLoStacker'); // CFG: NODE-REQUEST-NODE-LIST-ENTRY-STACKER-CLASS -$cfg->setConfigEntry('node_request_node_list_entry_stacker_class', 'Org\Mxchange\CoreFramework\Stacker\FiLoStacker'); +$cfg->setConfigEntry('node_request_node_list_entry_stacker_class', 'Org\Mxchange\CoreFramework\Stack\FiLoStacker'); // CFG: DHT-STACKER-CLASS -$cfg->setConfigEntry('dht_stacker_class', 'Org\Mxchange\CoreFramework\Stacker\FiLoStacker'); +$cfg->setConfigEntry('dht_stacker_class', 'Org\Mxchange\CoreFramework\Stack\FiLoStacker'); // CFG: RAW-DATA-STACKER-CLASS -$cfg->setConfigEntry('raw_data_stacker_class', 'Org\Mxchange\CoreFramework\Stacker\FiLoStacker'); +$cfg->setConfigEntry('raw_data_stacker_class', 'Org\Mxchange\CoreFramework\Stack\FiLoStacker'); // CFG: MULTIPLE-MESSAGE-STACKER-CLASS -$cfg->setConfigEntry('multiple_message_stacker_class', 'Org\Mxchange\CoreFramework\Stacker\FiFoStacker'); +$cfg->setConfigEntry('multiple_message_stacker_class', 'Org\Mxchange\CoreFramework\Stack\FiFoStacker'); // CFG: NODE-ANNOUNCEMENT-ANSWER-TEMPLATE-TYPE $cfg->setConfigEntry('node_announcement_answer_template_type', 'xml/answer/announcement'); @@ -361,10 +361,10 @@ $cfg->setConfigEntry('node_self_connect_template_type', 'xml/self_connect'); $cfg->setConfigEntry('node_request_node_list_template_type', 'xml/requests'); // CFG: NODE-SELF-CONNECT-STACKER-CLASS -$cfg->setConfigEntry('node_self_connect_stacker_class', 'Org\Mxchange\CoreFramework\Stacker\FiLoStacker'); +$cfg->setConfigEntry('node_self_connect_stacker_class', 'Org\Mxchange\CoreFramework\Stack\FiLoStacker'); // CFG: NODE-REQUEST-NODE_LIST-STACKER-CLASS -$cfg->setConfigEntry('node_request_node_list_stacker_class', 'Org\Mxchange\CoreFramework\Stacker\FiLoStacker'); +$cfg->setConfigEntry('node_request_node_list_stacker_class', 'Org\Mxchange\CoreFramework\Stack\FiLoStacker'); // CFG: NODE-OBJECT-REGISTRY-TEMPLATE-CLASS $cfg->setConfigEntry('node_object_registry_template_class', 'Org\Shipsimu\Hub\Template\Engine\Xml\ObjectRegistry\XmlObjectRegistryTemplateEngine'); @@ -376,7 +376,7 @@ $cfg->setConfigEntry('node_object_registry_template_extension', '.xml'); $cfg->setConfigEntry('node_object_registry_template_type', 'xml/object_registry'); // CFG: NODE-OBJECT-REGISTRY-STACKER-CLASS -$cfg->setConfigEntry('node_object_registry_stacker_class', 'Org\Mxchange\CoreFramework\Stacker\FiLoStacker'); +$cfg->setConfigEntry('node_object_registry_stacker_class', 'Org\Mxchange\CoreFramework\Stack\FiLoStacker'); // CFG: NODE-OBJECT-TYPE-REGISTRY-CLASS $cfg->setConfigEntry('node_object_type_registry_class', 'Org\Shipsimu\Hub\Registry\Object\ObjectTypeRegistry'); @@ -391,25 +391,25 @@ $cfg->setConfigEntry('node_dht_publish_template_type', 'xml/dht_publish'); $cfg->setConfigEntry('raw_template_extension', '.xml'); // CFG: PACKAGE-STACKER-CLASS -$cfg->setConfigEntry('network_package_stacker_class', 'Org\Mxchange\CoreFramework\Stacker\FiFoStacker'); +$cfg->setConfigEntry('network_package_stacker_class', 'Org\Mxchange\CoreFramework\Stack\FiFoStacker'); // CFG: NODE-RAW-DATA-STACKER-CLASS -$cfg->setConfigEntry('node_raw_data_stacker_class', 'Org\Mxchange\CoreFramework\Stacker\FiFoStacker'); +$cfg->setConfigEntry('node_raw_data_stacker_class', 'Org\Mxchange\CoreFramework\Stack\FiFoStacker'); // CFG: CHUNK-HANDLER-STACKER-CLASS -$cfg->setConfigEntry('chunk_handler_stacker_class', 'Org\Mxchange\CoreFramework\Stacker\FiFoStacker'); +$cfg->setConfigEntry('chunk_handler_stacker_class', 'Org\Mxchange\CoreFramework\Stack\FiFoStacker'); // CFG: DHT-BOOTSTRAP-STACKER-CLASS -$cfg->setConfigEntry('dht_bootstrap_stacker_class', 'Org\Mxchange\CoreFramework\Stacker\FiFoStacker'); +$cfg->setConfigEntry('dht_bootstrap_stacker_class', 'Org\Mxchange\CoreFramework\Stack\FiFoStacker'); // CFG: DHT-PUBLISH-STACKER-CLASS -$cfg->setConfigEntry('dht_publish_stacker_class', 'Org\Mxchange\CoreFramework\Stacker\FiFoStacker'); +$cfg->setConfigEntry('dht_publish_stacker_class', 'Org\Mxchange\CoreFramework\Stack\FiFoStacker'); // CFG: PRODUCER-OUTGOING-QUEUE -$cfg->setConfigEntry('producer_outgoing_queue', 'Org\Mxchange\CoreFramework\Stacker\FiFoStacker'); +$cfg->setConfigEntry('producer_outgoing_queue', 'Org\Mxchange\CoreFramework\Stack\FiFoStacker'); // CFG: PRODUCER-INCOMING-QUEUE -$cfg->setConfigEntry('producer_incoming_queue', 'Org\Mxchange\CoreFramework\Stacker\FiFoStacker'); +$cfg->setConfigEntry('producer_incoming_queue', 'Org\Mxchange\CoreFramework\Stack\FiFoStacker'); // CFG: STACKER-NODE-ANNOUNCEMENT-MAX-SIZE $cfg->setConfigEntry('stacker_node_announcement_max_size', 20); @@ -954,7 +954,7 @@ $cfg->setConfigEntry('upper_recipient_class', 'Org\Shipsimu\Hub\Network\Recipien $cfg->setConfigEntry('miner_default_mode', 'coin'); // CFG: MINER-BUFFER-STACKER-CLASS -$cfg->setConfigEntry('miner_buffer_stacker_class', 'Org\Mxchange\CoreFramework\Stacker\FiFoStacker'); +$cfg->setConfigEntry('miner_buffer_stacker_class', 'Org\Mxchange\CoreFramework\Stack\FiFoStacker'); // CFG: HUB-CONSOLE-CMD-CRUNCHER-RESOLVER-CLASS $cfg->setConfigEntry('hub_console_cmd_miner_resolver_class', 'Org\Shipsimu\Hub\Resolver\Command\HubConsoleCommandResolver'); @@ -1066,7 +1066,7 @@ $cfg->setConfigEntry('cruncher_default_mode', 'openssl'); $cfg->setConfigEntry('hub_openssl_cruncher_mode_class', 'Org\Shipsimu\Hub\Cruncher\OpenSsl\HubOpenSslCruncher'); // CFG: CRUNCHER-BUFFER-STACKER-CLASS -$cfg->setConfigEntry('cruncher_buffer_stacker_class', 'Org\Mxchange\CoreFramework\Stacker\FiFoStacker'); +$cfg->setConfigEntry('cruncher_buffer_stacker_class', 'Org\Mxchange\CoreFramework\Stack\FiFoStacker'); // CFG: HUB-CONSOLE-CMD-CRUNCHER-RESOLVER-CLASS $cfg->setConfigEntry('hub_console_cmd_cruncher_resolver_class', 'Org\Shipsimu\Hub\Resolver\Command\HubConsoleCommandResolver'); @@ -1159,7 +1159,7 @@ $cfg->setConfigEntry('cruncher_message_template_extension', '.xml'); $cfg->setConfigEntry('cruncher_test_unit_template_extension', '.xml'); // CFG: CRUNCHER-TEST-UNIT-STACKER-CLASS -$cfg->setConfigEntry('cruncher_test_unit_stacker_class', 'Org\Mxchange\CoreFramework\Stacker\FiLoStacker'); +$cfg->setConfigEntry('cruncher_test_unit_stacker_class', 'Org\Mxchange\CoreFramework\Stack\FiLoStacker'); // CFG: CRUNCHER-TEST-UNIT-TEMPLATE-TYPE $cfg->setConfigEntry('cruncher_test_unit_template_type', 'xml/cruncher/producer'); @@ -1317,16 +1317,16 @@ $cfg->setConfigEntry('crawler_url_stacks', 'local_start:uploaded_list:rss_start: $cfg->setConfigEntry('crawler_node_communicator_task_class', 'Org\Shipsimu\Hub\Crawler\Task\Communicator\Node\CrawlerNodeCommunicatorTask'); // CFG: CRAWLER-URL-LOCAL-START-STACK-CLASS -$cfg->setConfigEntry('crawler_url_local_start_stack_class', 'Org\Mxchange\CoreFramework\Stacker\Filesystem\FiFoFileStack'); +$cfg->setConfigEntry('crawler_url_local_start_stack_class', 'Org\Mxchange\CoreFramework\Stack\File\FiFoFileStack'); // CFG: CRAWLER-URL-UPLOADED-LIST-STACK-CLASS -$cfg->setConfigEntry('crawler_url_uploaded_list_stack_class', 'Org\Mxchange\CoreFramework\Stacker\Filesystem\FiFoFileStack'); +$cfg->setConfigEntry('crawler_url_uploaded_list_stack_class', 'Org\Mxchange\CoreFramework\Stack\File\FiFoFileStack'); // CFG: CRAWLER-URL-RSS-START-STACK-CLASS -$cfg->setConfigEntry('crawler_url_rss_start_stack_class', 'Org\Mxchange\CoreFramework\Stacker\Filesystem\FiFoFileStack'); +$cfg->setConfigEntry('crawler_url_rss_start_stack_class', 'Org\Mxchange\CoreFramework\Stack\File\FiFoFileStack'); // CFG: CRAWLER-URL-FOUND-RSS-STACK-CLASS -$cfg->setConfigEntry('crawler_url_found_rss_stack_class', 'Org\Mxchange\CoreFramework\Stacker\Filesystem\FiFoFileStack'); +$cfg->setConfigEntry('crawler_url_found_rss_stack_class', 'Org\Mxchange\CoreFramework\Stack\File\FiFoFileStack'); // CFG: CRAWLER-URL-LOCAL-START-FILE-STACK-INDEX-CLASS $cfg->setConfigEntry('crawler_url_local_start_file_stack_index_class', 'Org\Mxchange\CoreFramework\Index\Stack\FileStackIndex'); @@ -1341,7 +1341,7 @@ $cfg->setConfigEntry('crawler_url_rss_start_file_stack_index_class', 'Org\Mxchan $cfg->setConfigEntry('crawler_url_found_rss_file_stack_index_class', 'Org\Mxchange\CoreFramework\Index\Stack\FileStackIndex'); // CFG: CRAWLER-URL-UPLOADED-LIST-URL-SOURCE-STACK-CLASS -$cfg->setConfigEntry('crawler_uploaded_list_url_source_stack_class', 'Org\Mxchange\CoreFramework\Stacker\FiFoStacker'); +$cfg->setConfigEntry('crawler_uploaded_list_url_source_stack_class', 'Org\Mxchange\CoreFramework\Stack\FiFoStacker'); // CFG: STACKER-CSV-FILE-MAX-SIZE $cfg->setConfigEntry('stacker_csv_file_max_size', 10); diff --git a/core b/core index 6305d3a9d..c1841c5d8 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 6305d3a9d677845ba03079483afb4756764cb42c +Subproject commit c1841c5d8ad644456ea408caf315e858d89fc555