Continued:

- imported BaseStream, InputStream
- imported Assembler
- imported (Base|Framework)Feature
- imported Scrypt
- imported DecoderFactory, ChunkHandlerFactory, HandleableChunks
- imported BaseDecoder, Decodeable
- imported BaseDecorator
- added namespaces to configuration entries
- updated core framework

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/application/hub/classes/class_BaseHubSystem.php b/application/hub/classes/class_BaseHubSystem.php
index 47f4c6f80314aa759b07d5d38c77bd56548584cf..76e8b27aaf885d33f247a2398fa1fcd9811ed290 100644 (file)
--- a/application/hub/classes/class_BaseHubSystem.php
+++ b/application/hub/classes/class_BaseHubSystem.php
@@ -9,6 +9,7 @@ use Hub\Information\ShareableInfo;
 use Hub\Listener\BaseListener;
 use Hub\Listener\Listenable;
 use Hub\Network\Deliver\Deliverable;
+use Hub\Network\Package\Assembler\Assembler;
 use Hub\Network\Package\Fragment\Fragmentable;
 use Hub\Network\Receive\Receivable;
 use Hub\Pool\Poolable;

diff --git a/application/hub/classes/decoder/class_ b/application/hub/classes/decoder/class_
index a9d980b8bf751dfaeabefaf85c60ddef4f128a6b..00d19f96ff1e96d060598f8ffe873f6f186fec75 100644 (file)
--- a/application/hub/classes/decoder/class_
+++ b/application/hub/classes/decoder/class_
@@ -1,4 +1,11 @@
 <?php
+// Own namespace
+namespace Hub\Decoder\;
+
+// Import application-specific stuff
+use Hub\Decoder\BaseDecoder;
+use Hub\Decoder\Decodeable;
+
 /**
  * A ??? decoder class
  *

diff --git a/application/hub/classes/decoder/class_BaseDecoder.php b/application/hub/classes/decoder/class_BaseDecoder.php
index 2170964c14361cf1808aeb5b169bdac62c31e85c..bb2263ccecfbd361c2a0372568db5ab74143ef9b 100644 (file)
--- a/application/hub/classes/decoder/class_BaseDecoder.php
+++ b/application/hub/classes/decoder/class_BaseDecoder.php
@@ -38,7 +38,5 @@ class BaseDecoder extends BaseHubSystem {
                // Call parent constructor
                parent::__construct($className);
        }
-}
 
-// [EOF]
-?>
+}

diff --git a/application/hub/classes/decoder/package/class_PackageDecoder.php b/application/hub/classes/decoder/package/class_PackageDecoder.php
index 3079a1a75a124d18c824682e2b22195c65698456..a5b689e66b68d26e8b85631bfcd71e1c6b495e41 100644 (file)
--- a/application/hub/classes/decoder/package/class_PackageDecoder.php
+++ b/application/hub/classes/decoder/package/class_PackageDecoder.php
@@ -1,10 +1,13 @@
 <?php
 // Own namespace
-namespace Hub\Decoder;
+namespace Hub\Network\Decoder\Package;
 
 // Import application-specific stuff
+use Hub\Decoder\BaseDecoder;
+use Hub\Decoder\Decodeable;
 use Hub\Factory\Network\NetworkPackageFactory;
 use Hub\Handler\Network\RawData\Chunks\ChunkHandler;
+use Hub\Handler\Network\RawData\Chunks\HandleableChunks;
 use Hub\Network\Package\NetworkPackage;
 
 // Import framework stuff

diff --git a/application/hub/classes/factories/decoder/class_DecoderFactory.php b/application/hub/classes/factories/decoder/class_DecoderFactory.php
index ff8236f2d8852c88bff1913eea4c739bec6b6f37..c55d505bf42b761e18442359d59db4ff01246d4a 100644 (file)
--- a/application/hub/classes/factories/decoder/class_DecoderFactory.php
+++ b/application/hub/classes/factories/decoder/class_DecoderFactory.php
@@ -3,6 +3,7 @@
 namespace Hub\Factory\Decoder;
 
 // Import application-specific stuff
+use Hub\Factory\Handler\Chunk\ChunkHandlerFactory;
 use Hub\Handler\Network\RawData\Chunks\ChunkHandler;
 
 // Import framework stuff

diff --git a/application/hub/classes/feature/hubcoin_reward/class_HubcoinRewardFeature.php b/application/hub/classes/feature/hubcoin_reward/class_HubcoinRewardFeature.php
index ea6bf3229880ddacf225b2267197ab84acc95b85..9e3b94d5a7e0cecd67f3350740c9de0b32566378 100644 (file)
--- a/application/hub/classes/feature/hubcoin_reward/class_HubcoinRewardFeature.php
+++ b/application/hub/classes/feature/hubcoin_reward/class_HubcoinRewardFeature.php
@@ -1,4 +1,15 @@
 <?php
+// Own namespace
+namespace Hub\Feature\CoinReward;
+
+// Import framework stuff
+use CoreFramework\Feature\BaseFeature;
+use CoreFramework\Feature\Feature;
+use CoreFramework\Feature\FrameworkFeature;
+
+// Import other libraries
+use DomBlack\Scrypt\Scrypt;
+
 /**
  * A HubcoinReward Feature class
  *

diff --git a/application/hub/classes/package/class_NetworkPackage.php b/application/hub/classes/package/class_NetworkPackage.php
index 867461c63ca0b36c89fc592ebdf746ca1b2e82bb..83820a27910287a972cd089881061d0e07c9f6f2 100644 (file)
--- a/application/hub/classes/package/class_NetworkPackage.php
+++ b/application/hub/classes/package/class_NetworkPackage.php
@@ -25,6 +25,7 @@ use Hub\Tools\HubTools;
 use CoreFramework\Compressor\Compressor;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Factory\Registry\Socket\SocketRegistryFactory;
+use CoreFramework\Feature\FrameworkFeature;
 use CoreFramework\Registry\Registry;
 use CoreFramework\Registry\Registerable;
 use CoreFramework\Socket\InvalidSocketException;

diff --git a/application/hub/classes/streams/raw_data/input/class_RawDataInputStream.php b/application/hub/classes/streams/raw_data/input/class_RawDataInputStream.php
index 31f2d84bfd50faba8e096e8ed9d8fe37cf4ae651..27d937c84da06fab57288d2fe2b118455bdaf252 100644 (file)
--- a/application/hub/classes/streams/raw_data/input/class_RawDataInputStream.php
+++ b/application/hub/classes/streams/raw_data/input/class_RawDataInputStream.php
@@ -1,10 +1,14 @@
 <?php
 // Own namespace
-namespace Hub\Stream\Input\RawData;
+namespace Hub\Stream\Network\Input\RawData;
 
-// Import hub-specific stuff
+// Import application-specific stuff
 use Hub\Generic\BaseHubSystem;
 
+// Import framework stuff
+use CoreFramework\Stream\BaseStream;
+use CoreFramework\Stream\Input\InputStream;
+
 /**
  * A class for handling incoming (encoded) raw data with start and end markers.
  * The "stream" is being verified by its length (if modulo 4 of it is always

diff --git a/application/hub/classes/streams/raw_data/output/class_RawDataOutputStream.php b/application/hub/classes/streams/raw_data/output/class_RawDataOutputStream.php
index c7ff58ebbb22a4ec0331ac1af2f33f9d9a5cdb5d..e692fa81bf5c1eb2bf0cc24334331582f321fa42 100644 (file)
--- a/application/hub/classes/streams/raw_data/output/class_RawDataOutputStream.php
+++ b/application/hub/classes/streams/raw_data/output/class_RawDataOutputStream.php
@@ -1,10 +1,13 @@
 <?php
 // Own namespace
-namespace Hub\Stream\Output\RawData;
+namespace Hub\Stream\Network\Output\RawData;
 
 // Import application-specific stuff
 use Hub\Handler\Network\RawData\BaseRawDataHandler;
 
+// Import framework stuff
+use CoreFramework\Stream\BaseStream;
+
 /**
  * A RawDataOutputStream class
  *

diff --git a/application/hub/classes/tasks/node/decoder/class_NodePackageDecoderTask.php b/application/hub/classes/tasks/node/decoder/class_NodePackageDecoderTask.php
index c653d2761ee042ff8fdad7e0a0f549cd6b611ee4..bcbaa61955c413a244943845816e3fbd43a9c51b 100644 (file)
--- a/application/hub/classes/tasks/node/decoder/class_NodePackageDecoderTask.php
+++ b/application/hub/classes/tasks/node/decoder/class_NodePackageDecoderTask.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace Hub\Node\Task\Decoder;
 
+// Import application-specific stuff
+use Hub\Factory\Decoder\DecoderFactory;
+
 // Import framework stuff
 use CoreFramework\Task\BaseTask;
 use CoreFramework\Task\Taskable;

diff --git a/application/hub/classes/visitor/pool/monitor/class_RawDataPoolMonitorVisitor.php b/application/hub/classes/visitor/pool/monitor/class_RawDataPoolMonitorVisitor.php
index a70420caff34101be7c72d773fcb0eeb37d4e52d..e6609bf146e7f04ddb9c0f02bfc30e11182f873b 100644 (file)
--- a/application/hub/classes/visitor/pool/monitor/class_RawDataPoolMonitorVisitor.php
+++ b/application/hub/classes/visitor/pool/monitor/class_RawDataPoolMonitorVisitor.php
@@ -10,6 +10,7 @@ use Hub\Visitor\Listener\ListenerVisitor;
 use Hub\Visitor\Pool\PoolVisitor;
 
 // Import framework stuff
+use CoreFramework\Generic\BaseDecorator;
 use CoreFramework\Visitor\BaseVisitor;
 
 /**

diff --git a/application/hub/config.php b/application/hub/config.php
index fabb8afcd0122b286224eb8299a087c2d1c16da5..60a10358894e9f186e66fd6e4f18f5f6afa68066 100644 (file)
--- a/application/hub/config.php
+++ b/application/hub/config.php
@@ -43,7 +43,7 @@ $cfg->setConfigEntry('node_default_mode', 'regular');
 $cfg->setConfigEntry('enable_feature_hubcoin_reward', 'Y');
 
 // CFG: FEATURE-HUBCOIN-REWARD-CLASS
-$cfg->setConfigEntry('feature_hubcoin_reward_class', 'HubcoinRewardFeature');
+$cfg->setConfigEntry('feature_hubcoin_reward_class', 'Hub\Feature\CoinReward\HubcoinRewardFeature');
 
 // CFG: TEMPLATE-ENGINE
 $cfg->setConfigEntry('tpl_engine', 'ConsoleOutput');
@@ -688,7 +688,7 @@ $cfg->setConfigEntry('task_dht_publication_max_runs', 0);
 $cfg->setConfigEntry('task_pool_iterator_class', 'TaskPoolIterator');
 
 // CFG: MONITOR-POOL-ITERATOR-CLASS
-$cfg->setConfigEntry('monitor_pool_iterator_class', 'MonitorPoolIterator');
+$cfg->setConfigEntry('monitor_pool_iterator_class', 'Hub\Iterator\Pool\Monitor\MonitorPoolIterator');
 
 // CFG: QUERY-ITERATOR-CLASS
 $cfg->setConfigEntry('query_iterator_class', 'CoreFramework\Iterator\DefaultIterator');
@@ -809,10 +809,10 @@ $cfg->setConfigEntry('package_assembler_class', 'Hub\Network\Package\Assembler\P
 $cfg->setConfigEntry('package_chunk_size', 256*8);
 
 // CFG: NODE-RAW-DATA-OUTPUT-STREAM-CLASS
-$cfg->setConfigEntry('node_raw_data_output_stream_class', 'RawDataOutputStream');
+$cfg->setConfigEntry('node_raw_data_output_stream_class', 'Hub\Stream\Network\Output\RawData\RawDataOutputStream');
 
 // CFG: NODE-RAW-DATA-INPUT-STREAM-CLASS
-$cfg->setConfigEntry('node_raw_data_input_stream_class', 'RawDataInputStream');
+$cfg->setConfigEntry('node_raw_data_input_stream_class', 'Hub\Stream\Network\Input\RawData\RawDataInputStream');
 
 // CFG: SOCKET-TIMEOUT-SECONDS
 $cfg->setConfigEntry('socket_timeout_seconds', 3);
@@ -824,7 +824,7 @@ $cfg->setConfigEntry('socket_timeout_microseconds', 0);
 $cfg->setConfigEntry('chunk_handler_class', 'Hub\Handler\Network\RawData\Chunks\ChunkHandler');
 
 // CFG: PACKAGE-DECODER-CLASS
-$cfg->setConfigEntry('package_decoder_class', 'PackageDecoder');
+$cfg->setConfigEntry('package_decoder_class', 'Hub\Network\Decoder\Package\PackageDecoder');
 
 // CFG: PACKAGE-RECIPIENT-MAX-COUNT
 // @TODO This is very static, rewrite it to more flexible

diff --git a/core b/core
index 7c1f6da0bb508c369410ff7fed93395bd9a9e65a..eb04c4ff13087f8e0ca96168e3d718761bedabdb 160000 (submodule)
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 7c1f6da0bb508c369410ff7fed93395bd9a9e65a
+Subproject commit eb04c4ff13087f8e0ca96168e3d718761bedabdb