Next wave:

- imported HelpableTemplate
- imported Requestable
- imported ProtocolResolverFactory, (Base)ProtocolResolver
- imported LocateableNode
- added namespace
- updated core framework

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

diff --git a/application/hub/classes/discovery/class_BaseNodeDiscovery.php b/application/hub/classes/discovery/class_BaseNodeDiscovery.php
index 8623bdbabe50c02ee6a70600247fe9b09d798517..c429b1b090e8a50e445c1bb614bfd06a1ee1a42a 100644 (file)
--- a/application/hub/classes/discovery/class_BaseNodeDiscovery.php
+++ b/application/hub/classes/discovery/class_BaseNodeDiscovery.php
@@ -6,6 +6,8 @@ namespace Hub\Discovery\Node;
 use CoreFramework\Discovery\BaseDiscovery;
 use CoreFramework\Discovery\Discoverable;
 use CoreFramework\Generic\UnsupportedOperationException;
+use CoreFramework\Helper\Template\HelpableTemplate;
+use CoreFramework\Request\Requestable;
 
 /**
  * A general node discovery class

diff --git a/application/hub/classes/discovery/node/class_UniversalNodeLocatorDiscovery.php b/application/hub/classes/discovery/node/class_UniversalNodeLocatorDiscovery.php
index 73f162d6fa2b328f021b14f6a2993b95e449642b..105a66f9966835d7ea053758a98b6dc9984438a7 100644 (file)
--- a/application/hub/classes/discovery/node/class_UniversalNodeLocatorDiscovery.php
+++ b/application/hub/classes/discovery/node/class_UniversalNodeLocatorDiscovery.php
@@ -4,6 +4,7 @@ namespace Hub\Discovery\Locator;
 
 // Import application-specific stuff
 use Hub\Discovery\Node\BaseNodeDiscovery;
+use Hub\Factory\Resolver\Protocol\ProtocolResolverFactory;
 use Hub\Helper\Node\NodeHelper;
 
 // Import framework stuff

diff --git a/application/hub/classes/factories/resolver/class_ProtocolResolverFactory.php b/application/hub/classes/factories/resolver/class_ProtocolResolverFactory.php
index 9ff8107ae77bded80cd5d8b68cf9ce501eb342f3..9034f83a38a8b625f6c1874cd86fd9bfea7a599d 100644 (file)
--- a/application/hub/classes/factories/resolver/class_ProtocolResolverFactory.php
+++ b/application/hub/classes/factories/resolver/class_ProtocolResolverFactory.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace Hub\Factory\Resolver;
+namespace Hub\Factory\Resolver\Protocol;
 
 // Import framework stuff
 use CoreFramework\Configuration\FrameworkConfiguration;

diff --git a/application/hub/classes/nodes/class_BaseHubNode.php b/application/hub/classes/nodes/class_BaseHubNode.php
index 201fd91bff67d33324c1f76cfc5d59b85c2ca380..644bb960815f25995927683a24d6c13e548fe745 100644 (file)
--- a/application/hub/classes/nodes/class_BaseHubNode.php
+++ b/application/hub/classes/nodes/class_BaseHubNode.php
@@ -5,6 +5,7 @@ namespace Hub\Node;
 // Import hub-specific stuff
 use Hub\Database\Frontend\Node\Information\NodeInformationDatabaseWrapper;
 use Hub\Factory\State\Node\NodeStateFactory;
+use Hub\Locator\Node\LocateableNode;
 use Hub\Generic\BaseHubSystem;
 use Hub\Network\Receive\Receivable;
 use Hub\Tools\HubTools;

diff --git a/application/hub/classes/resolver/protocol/class_ b/application/hub/classes/resolver/protocol/class_
index a3711c28103d9fe169877c75d649b60e2b313817..da22550f8f1eec8d192e13dd187911a37c7928f6 100644 (file)
--- a/application/hub/classes/resolver/protocol/class_
+++ b/application/hub/classes/resolver/protocol/class_
@@ -4,6 +4,8 @@ namespace Hub\Resolver\Protocol\;
 
 // Import application-specific stuff
 use Hub\Helper\Node\NodeHelper;
+use Hub\Resolver\Protocol\BaseProtocolResolver;
+use Hub\Resolver\Protocol\ProtocolResolver;
 
 /**
  * A !!! protocol resolver class

diff --git a/application/hub/classes/resolver/protocol/class_BaseProtocolResolver.php b/application/hub/classes/resolver/protocol/class_BaseProtocolResolver.php
index 09cb6bf881ff55c46d7bce36602584c786d53d3c..c7c40df2466f4c7ac5d48071a7e646fe982f1155 100644 (file)
--- a/application/hub/classes/resolver/protocol/class_BaseProtocolResolver.php
+++ b/application/hub/classes/resolver/protocol/class_BaseProtocolResolver.php
@@ -27,7 +27,7 @@ use Hub\Generic\BaseHubSystem;
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-class BaseProtocolResolver extends BaseHubSystem {
+abstract class BaseProtocolResolver extends BaseHubSystem implements ProtocolResolver {
        /**
         * Protected constructor
         *
@@ -38,7 +38,5 @@ class BaseProtocolResolver extends BaseHubSystem {
                // Call parent constructor
                parent::__construct($className);
        }
-}
 
-// [EOF]
-?>
+}

diff --git a/application/hub/classes/resolver/protocol/tcp/class_TcpProtocolResolver.php b/application/hub/classes/resolver/protocol/tcp/class_TcpProtocolResolver.php
index 24bdce6efbd77bff89d593a707a201746a0bedde..9b6842d468b4f879bfc5e15fefdaa4d5102123a2 100644 (file)
--- a/application/hub/classes/resolver/protocol/tcp/class_TcpProtocolResolver.php
+++ b/application/hub/classes/resolver/protocol/tcp/class_TcpProtocolResolver.php
@@ -5,6 +5,8 @@ namespace Hub\Resolver\Protocol\Tcp;
 // Import application-specific stuff
 use Hub\Database\Frontend\Node\Information\NodeInformationDatabaseWrapper;
 use Hub\Helper\Node\NodeHelper;
+use Hub\Resolver\Protocol\BaseProtocolResolver;
+use Hub\Resolver\Protocol\ProtocolResolver;
 
 // Import framework stuff
 use CoreFramework\Console\Tools\ConsoleTools;

diff --git a/application/hub/classes/tools/class_HubTools.php b/application/hub/classes/tools/class_HubTools.php
index d76a87b6ac784240924a026304a7c2da0257aca7..2c72f0a2a2ba8a88ce0d9d759e438ba68efe9d70 100644 (file)
--- a/application/hub/classes/tools/class_HubTools.php
+++ b/application/hub/classes/tools/class_HubTools.php
@@ -6,6 +6,7 @@ namespace Hub\Tools;
 use Hub\Factory\Dht\DhtObjectFactory;
 use Hub\Factory\Node\NodeObjectFactory;
 use Hub\Generic\BaseHubSystem;
+use Hub\Locator\Node\LocateableNode;
 
 // Import framework stuff
 use CoreFramework\Configuration\FrameworkConfiguration;
@@ -329,7 +330,5 @@ class HubTools extends BaseHubSystem {
                //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('NODE[' . __METHOD__ . ':' . __LINE__ . ']: unl=' . $GLOBALS[__METHOD__] . ' - EXIT!');
                return $GLOBALS[__METHOD__];
        }
-}
 
-// [EOF]
-?>
+}

diff --git a/application/hub/config.php b/application/hub/config.php
index a45a14971b9a11bade7dc83eda603177371875b1..1ba392d32dac6bb5159ac17e892cb4044c1b7a2b 100644 (file)
--- a/application/hub/config.php
+++ b/application/hub/config.php
@@ -730,7 +730,7 @@ $cfg->setConfigEntry('unl_discovery_class', 'Hub\Discovery\Locator\UniversalNode
 $cfg->setConfigEntry('tcp_protocol_handler_class', 'TcpProtocolHandler');
 
 // CFG: UNIVERSAL-NODE-LOCATOR-CLASS
-$cfg->setConfigEntry('universal_node_locator_class', 'UniversalNodeLocator');
+$cfg->setConfigEntry('universal_node_locator_class', 'Hub\Locator\Node\UniversalNodeLocator');
 
 // CFG: RECIPIENT-LIST-CLASS
 $cfg->setConfigEntry('recipient_list_class', 'RecipientList');
@@ -748,7 +748,7 @@ $cfg->setConfigEntry('udp_connection_helper_class', 'UdpConnectionHelper');
 $cfg->setConfigEntry('hub_communication_protocol_type', 'tcp');
 
 // CFG: TCP-PROTOCOL-RESOLVER-CLASS
-$cfg->setConfigEntry('tcp_protocol_resolver_class', 'TcpProtocolResolver');
+$cfg->setConfigEntry('tcp_protocol_resolver_class', 'Hub\Resolver\Protocol\Tcp\TcpProtocolResolver');
 
 // CFG: TCP-BUFFER-LENGTH
 $cfg->setConfigEntry('tcp_buffer_length', 1024);

diff --git a/core b/core
index de0fb4d6e2785338f2ba881761efc7b15c4a9530..aa425d10f8eef36160fcfd87bcd9a7d44af9ff16 160000 (submodule)
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit de0fb4d6e2785338f2ba881761efc7b15c4a9530
+Subproject commit aa425d10f8eef36160fcfd87bcd9a7d44af9ff16