Rewrites, some more methods:

[hub.git] / application / hub / config.php

diff --git a/application/hub/config.php b/application/hub/config.php
index 7b325221154d613adbe17d8800ddd91cdd3f5112..4063d372b44d945deedec469a569444a6ee1987f 100644 (file)
--- a/application/hub/config.php
+++ b/application/hub/config.php
@@ -27,11 +27,8 @@ $cfg = FrameworkConfiguration::getSelfInstance();
 // CFG: NODE-LISTEN-ADDR
 $cfg->setConfigEntry('node_listen_addr', '0.0.0.0');
 
-// CFG: NODE-TCP-LISTEN-PORT
-$cfg->setConfigEntry('node_tcp_listen_port', 9060);
-
-// CFG: NODE-UDP-LISTEN-PORT
-$cfg->setConfigEntry('node_udp_listen_port', 9060);
+// CFG: NODE-LISTEN-PORT
+$cfg->setConfigEntry('node_listen_port', 9060);
 
 // CFG: NODE-DEFAULT-MODE (can be 'regular', 'list', 'master' or 'boot', default is 'regular')
 $cfg->setConfigEntry('node_default_mode', 'regular');
@@ -48,8 +45,8 @@ $cfg->setConfigEntry('debug_class', 'DebugConsoleOutput');
 // CFG: NODE-INFO-DB-WRAPPER-CLASS
 $cfg->setConfigEntry('node_info_db_wrapper_class', 'NodeInformationDatabaseWrapper');
 
-// CFG: NODE-LIST-DB-WRAPPER-CLASS
-$cfg->setConfigEntry('node_list_db_wrapper_class', 'NodeListDatabaseWrapper');
+// CFG: NODE-DHT-DB-WRAPPER-CLASS
+$cfg->setConfigEntry('node_dht_db_wrapper_class', 'NodeDistributedHashTableDatabaseWrapper');
 
 // CFG: PEER-LOOKUP-DB-WRAPPER-CLASS
 $cfg->setConfigEntry('peer_state_lookup_db_wrapper_class', 'PeerStateLookupDatabaseWrapper');
@@ -72,11 +69,11 @@ $cfg->setConfigEntry('tcp_listener_class', 'TcpListener');
 // CFG: UDP-LISTENER-CLASS
 $cfg->setConfigEntry('udp_listener_class', 'UdpListener');
 
-// CFG: HUB-TCP-LISTENER-CLASS
-$cfg->setConfigEntry('hub_tcp_listener_class', 'HubTcpListenerDecorator');
+// CFG: NODE-TCP-LISTENER-CLASS
+$cfg->setConfigEntry('node_tcp_listener_class', 'HubTcpListenerDecorator');
 
-// CFG: HUB-UDP-LISTENER-CLASS
-$cfg->setConfigEntry('hub_udp_listener_class', 'HubUdpListenerDecorator');
+// CFG: NODE-UDP-LISTENER-CLASS
+$cfg->setConfigEntry('node_udp_listener_class', 'HubUdpListenerDecorator');
 
 // CFG: CLIENT-TCP-LISTENER-CLASS
 $cfg->setConfigEntry('client_tcp_listener_class', 'ClientTcpListenerDecorator');
@@ -126,11 +123,11 @@ $cfg->setConfigEntry('node_raw_data_monitor_visitor_class', 'RawDataPoolMonitorV
 // CFG: LIST-GROUP-CLASS
 $cfg->setConfigEntry('list_group_class', 'ListGroupList');
 
-// CFG: HUB-ANNOUNCEMENT-HELPER-CLASS
-$cfg->setConfigEntry('hub_announcement_helper_class', 'HubAnnouncementHelper');
+// CFG: NODE-ANNOUNCEMENT-HELPER-CLASS
+$cfg->setConfigEntry('node_announcement_helper_class', 'HubAnnouncementHelper');
 
-// CFG: HUB-SELF-CONNECT-HELPER-CLASS
-$cfg->setConfigEntry('hub_self_connect_helper_class', 'HubSelfConnectHelper');
+// CFG: NODE-SELF-CONNECT-HELPER-CLASS
+$cfg->setConfigEntry('node_self_connect_helper_class', 'HubSelfConnectHelper');
 
 // CFG: DEFAULT-CONSOLE-COMMAND
 $cfg->setConfigEntry('default_console_command', 'main');
@@ -159,8 +156,8 @@ $cfg->setConfigEntry('node_initializer_filter', 'NodeInitializationFilter');
 // CFG: NODE-ACTIVATION-TASK-HANDLER-INITIALIZER-FILTER
 $cfg->setConfigEntry('node_activation_task_handler_initializer_filter', 'NodeTaskHandlerInitializerFilter');
 
-// CFG: NODE-ACTIVATION-SELF-ANNOUNCEMENT-TASK-FILTER
-$cfg->setConfigEntry('node_activation_self_announcement_task_filter', 'NodeActivationSelfAnnouncementFilter');
+// CFG: NODE-ACTIVATION-ANNOUNCEMENT-TASK-FILTER
+$cfg->setConfigEntry('node_activation_announcement_task_filter', 'NodeActivationAnnouncementFilter');
 
 // CFG: NODE-WELCOME-TEASER-FILTER
 $cfg->setConfigEntry('node_welcome_teaser_filter', 'NodeWelcomeTeaserFilter');
@@ -174,12 +171,6 @@ $cfg->setConfigEntry('node_bootstrap_generate_sessionid_filter', 'NodeBootstrapG
 // CFG: NODE-BOOTSTRAP-GENERATE-PRIVATE-KEY-FILTER
 $cfg->setConfigEntry('node_bootstrap_generate_private_key_filter', 'NodeBootstrapGeneratePrivateKeyFilter');
 
-// CFG: NODE-BOOTSTRAP-RESTORE-NODELIST-FILTER
-$cfg->setConfigEntry('node_bootstrap_restore_nodelist_filter', 'NodeBootstrapRestoreNodeListFilter');
-
-// CFG: NODE-BOOTSTRAP-INIT-QUEUES-FILTER
-$cfg->setConfigEntry('node_bootstrap_init_queues_filter', 'NodeBootstrapInitQueuesFilter');
-
 // CFG: NODE-BOOTSTRAP-EXTRA-BOOTSTRAPPING-FILTER
 $cfg->setConfigEntry('node_bootstrap_extra_bootstrapping_filter', 'NodeBootstrapExtraBootstrappingFilter');
 
@@ -189,9 +180,6 @@ $cfg->setConfigEntry('node_bootstrap_listener_pool_filter', 'NodeBootstrapListen
 // CFG: NODE-SHUTDOWN-FLUSH-NODE-LIST-FILTER
 $cfg->setConfigEntry('node_shutdown_flush_node_list_filter', 'NodeShutdownFlushNodeListFilter');
 
-// CFG: NODE-SHUTDOWN-DEINIT-QUEUES-FILTER
-$cfg->setConfigEntry('node_shutdown_deinit_queues_filter', 'NodeShutdownDeinitQueuesFilter');
-
 // CFG: NODE-SHUTDOWN-TASK-HANDLER-FILTER
 $cfg->setConfigEntry('node_shutdown_task_handler_filter', 'NodeShutdownTaskHandlerFilter');
 
@@ -213,6 +201,9 @@ $cfg->setConfigEntry('package_tag_self_connect_filter', 'PackageSelfConnectTagFi
 // CFG: PACKAGE-TAG-REQUEST-NODE-LIST-FILTER
 $cfg->setConfigEntry('package_tag_request_node_list_filter', 'PackageRequestNodeListTagFilter');
 
+// CFG: PACKAGE-TAG-REQUEST-NODE-LIST-ANSWER-FILTER
+$cfg->setConfigEntry('package_tag_request_node_list_answer_filter', 'PackageRequestNodeListAnswerTagFilter');
+
 // CFG: MESSAGE-TYPE-ANNOUNCEMENT-HANDLER-CLASS
 $cfg->setConfigEntry('message_type_announcement_handler_class', 'NodeMessageAnnouncementHandler');
 
@@ -225,6 +216,9 @@ $cfg->setConfigEntry('message_type_self_connect_handler_class', 'NodeMessageSelf
 // CFG: MESSAGE-TYPE-REQUEST-NODE-LIST-HANDLER-CLASS
 $cfg->setConfigEntry('message_type_request_node_list_handler_class', 'NodeMessageRequestNodeListHandler');
 
+// CFG: MESSAGE-TYPE-REQUEST-NODE-LIST-ANSWER-HANDLER-CLASS
+$cfg->setConfigEntry('message_type_request_node_list_answer_handler_class', 'NodeMessageRequestNodeListAnswerHandler');
+
 // CFG: NODE-ANSWER-MESSAGE-ANNOUNCEMENT-HELPER-CLASS
 $cfg->setConfigEntry('node_answer_message_announcement_helper_class', 'NodeAnnouncementMessageAnswerHelper');
 
@@ -249,6 +243,9 @@ $cfg->setConfigEntry('node_request_node_list_template_class', 'XmlRequestNodeLis
 // CFG: NODE-REQUEST-NODE-LIST-ANSWER-TEMPLATE-CLASS
 $cfg->setConfigEntry('node_request_node_list_answer_template_class', 'XmlRequestNodeListAnswerTemplateEngine');
 
+// CFG: NODE-REQUEST-NODE-LIST-ENTRIES-TEMPLATE-CLASS
+$cfg->setConfigEntry('node_request_node_list_entries_template_class', 'XmlRequestNodeListEntryTemplateEngine');
+
 // CFG: NODE-MESSAGE-TEMPLATE-EXTENSION
 $cfg->setConfigEntry('node_message_template_extension', '.xml');
 
@@ -267,6 +264,9 @@ $cfg->setConfigEntry('node_announcement_answer_stacker_class', 'FiLoStacker');
 // CFG: NODE-REQUEST-NODE-LIST-ANSWER-STACKER-CLASS
 $cfg->setConfigEntry('node_request_node_list_answer_stacker_class', 'FiLoStacker');
 
+// CFG: NODE-REQUEST-NODE-LIST-ENTRY-STACKER-CLASS
+$cfg->setConfigEntry('node_request_node_list_entry_stacker_class', 'FiLoStacker');
+
 // CFG: NODE-ANNOUNCEMENT-ANSWER-TEMPLATE-TYPE
 $cfg->setConfigEntry('node_announcement_answer_template_type', 'xml/answer/announcement');
 
@@ -306,6 +306,9 @@ $cfg->setConfigEntry('node_object_type_registry_class', 'ObjectTypeRegistry');
 // CFG: CODE-TEMPLATE-TYPE
 $cfg->setConfigEntry('code_template_type', 'xml');
 
+// CFG: RAW-TEMPLATE-EXTENSION (to speed-up things)
+$cfg->setConfigEntry('raw_template_extension', '.xml');
+
 // CFG: PACKAGE-STACKER-CLASS
 $cfg->setConfigEntry('network_package_stacker_class', 'FiFoStacker');
 
@@ -321,24 +324,24 @@ $cfg->setConfigEntry('producer_outgoing_queue', 'FiFoStacker');
 // CFG: PRODUCER-INCOMING-QUEUE
 $cfg->setConfigEntry('producer_incoming_queue', 'FiFoStacker');
 
-// CFG: STACKER-ANNOUNCEMENT-MAX-SIZE
-$cfg->setConfigEntry('stacker_announcement_max_size', 20);
-
-// CFG: STACKER-ANNOUNCEMENT-ANSWER-MAX-SIZE
-$cfg->setConfigEntry('stacker_announcement_answer_max_size', 20);
+// CFG: STACKER-NODE-ANNOUNCEMENT-MAX-SIZE
+$cfg->setConfigEntry('stacker_node_announcement_max_size', 20);
 
-// CFG: STACKER-REQUEST-NODE-LIST-ANSWER-MAX-SIZE
-$cfg->setConfigEntry('stacker_request_node_list_answer_max_size', 20);
+// CFG: STACKER-NODE-ANNOUNCEMENT-ANSWER-MAX-SIZE
+$cfg->setConfigEntry('stacker_node_announcement_answer_max_size', 20);
 
-// CFG: STACKER-SELF-CONNECT-MAX-SIZE
-$cfg->setConfigEntry('stacker_self_connect_max_size', 10);
-
-// CFG: STACKER-REQUEST-NODE-LIST-MAX-SIZE
-$cfg->setConfigEntry('stacker_request_node_list_max_size', 10);
+// CFG: STACKER-NODE-SELF-CONNECT-MAX-SIZE
+$cfg->setConfigEntry('stacker_node_self_connect_max_size', 10);
 
 // CFG: STACKER-NODE-REQUEST-NODE-LIST-MAX_SIZE
 $cfg->setConfigEntry('stacker_node_request_node_list_max_size', 10);
 
+// CFG: STACKER-NODE-REQUEST-NODE-LIST-ANSWER-MAX-SIZE
+$cfg->setConfigEntry('stacker_node_request_node_list_answer_max_size', 20);
+
+// CFG: STACKER-NODE-REQUEST-NODE-LIST-ENTRY-MAX_SIZE
+$cfg->setConfigEntry('stacker_node_request_node_list_entry_max_size', 10);
+
 // CFG: STACKER-UNDECLARED-MAX-SIZE
 $cfg->setConfigEntry('stacker_package_undeclared_max_size', 10000);
 
@@ -372,8 +375,8 @@ $cfg->setConfigEntry('stacker_in_queue_max_size', 10000);
 // CFG: STACKER-OUT-QUEUE-MAX-SIZE
 $cfg->setConfigEntry('stacker_out_queue_max_size', 10000);
 
-// CFG: STACKER-OBJECT-REGISTRY-MAX-SIZE
-$cfg->setConfigEntry('stacker_object_registry_max_size', 100);
+// CFG: STACKER-NODE-OBJECT-REGISTRY-MAX-SIZE
+$cfg->setConfigEntry('stacker_node_object_registry_max_size', 100);
 
 // CFG: STACKER-OUTGOING-QUEUE-MAX-SIZE
 $cfg->setConfigEntry('stacker_outgoing_queue_max_size', 100000);
@@ -438,14 +441,14 @@ $cfg->setConfigEntry('task_self_connect_interval_delay', 1000*60*30);
 // CFG: TASK-SELF-CONNECT-MAX-RUNS
 $cfg->setConfigEntry('task_self_connect_max_runs', 0);
 
-// CFG: TASK-SELF-ANNOUNCEMENT-STARTUP-DELAY
-$cfg->setConfigEntry('task_self_announcement_startup_delay', 10000);
+// CFG: TASK-ANNOUNCEMENT-STARTUP-DELAY
+$cfg->setConfigEntry('task_announcement_startup_delay', 10000);
 
-// CFG: TASK-SELF-ANNOUNCEMENT-INTERVAL-DELAY
-$cfg->setConfigEntry('task_self_announcement_interval_delay', 1000);
+// CFG: TASK-ANNOUNCEMENT-INTERVAL-DELAY
+$cfg->setConfigEntry('task_announcement_interval_delay', 1000);
 
-// CFG: TASK-SELF-ANNOUNCEMENT-MAX-RUNS
-$cfg->setConfigEntry('task_self_announcement_max_runs', 1);
+// CFG: TASK-ANNOUNCEMENT-MAX-RUNS
+$cfg->setConfigEntry('task_announcement_max_runs', 1);
 
 // CFG: TASK-UPDATE-CHECK-STARTUP-DELAY
 $cfg->setConfigEntry('task_update_check_startup_delay', 1000*60*60*6);
@@ -468,32 +471,41 @@ $cfg->setConfigEntry('task_ping_max_runs', 0);
 // CFG: IDLE-TASK-CLASS
 $cfg->setConfigEntry('idle_task_class', 'IdleLoopTask');
 
-// CFG: HUB-SELFCONNECT-TASK-CLASS
-$cfg->setConfigEntry('hub_selfconnect_task_class', 'HubSelfConnectTask');
+// CFG: NODE-SELFCONNECT-TASK-CLASS
+$cfg->setConfigEntry('node_selfconnect_task_class', 'NodeSelfConnectTask');
+
+// CFG: NODE-UPDATE-CHECK-TASK-CLASS
+$cfg->setConfigEntry('node_update_check_task_class', 'NodeUpdateCheckTask');
+
+// CFG: NODE-PING-TASK-CLASS
+$cfg->setConfigEntry('node_ping_task_class', 'NodePingTask');
 
-// CFG: HUB-UPDATE-CHECK-TASK-CLASS
-$cfg->setConfigEntry('hub_update_check_task_class', 'HubUpdateCheckTask');
+// CFG: NODE-ANNOUNCEMENT-TASK-CLASS
+$cfg->setConfigEntry('node_announcement_task_class', 'NodeAnnouncementTask');
 
-// CFG: HUB-PING-TASK-CLASS
-$cfg->setConfigEntry('hub_ping_task_class', 'HubPingTask');
+// CFG: NODE-PACKAGE-WRITER-TASK-CLASS
+$cfg->setConfigEntry('node_package_writer_task_class', 'NetworkPackageWriterTask');
 
-// CFG: HUB-SELF-ANNOUNCEMENT-TASK-CLASS
-$cfg->setConfigEntry('hub_self_announcement_task_class', 'HubSelfAnnouncementTask');
+// CFG: NODE-PACKAGE-READER-TASK-CLASS
+$cfg->setConfigEntry('node_package_reader_task_class', 'NetworkPackageReaderTask');
 
-// CFG: HUB-PACKAGE-WRITER-TASK-CLASS
-$cfg->setConfigEntry('hub_package_writer_task_class', 'NetworkPackageWriterTask');
+// CFG: NODE-SOCKET-LISTENER-TASK-CLASS
+$cfg->setConfigEntry('node_socket_listener_task_class', 'NodeSocketListenerTask');
 
-// CFG: HUB-PACKAGE-READER-TASK-CLASS
-$cfg->setConfigEntry('hub_package_reader_task_class', 'NetworkPackageReaderTask');
+// CFG: NODE-CHUNK-ASSEMBLER-TASK-CLASS
+$cfg->setConfigEntry('node_chunk_assembler_task_class', 'NodeChunkAssemblerTask');
 
-// CFG: HUB-SOCKET-LISTENER-TASK-CLASS
-$cfg->setConfigEntry('hub_socket_listener_task_class', 'HubSocketListenerTask');
+// CFG: NODE-PACKAGE-DECODER-TASK-CLASS
+$cfg->setConfigEntry('node_package_decoder_task_class', 'NodePackageDecoderTask');
 
-// CFG: HUB-CHUNK-ASSEMBLER-TASK-CLASS
-$cfg->setConfigEntry('hub_chunk_assembler_task_class', 'HubChunkAssemblerTask');
+// CFG: NODE-DHT-INIT-TASK-CLASS
+$cfg->setConfigEntry('node_dht_init_task_class', 'NodeDhtInitializationTask');
 
-// CFG: HUB-PACKAGE-DECODER-TASK-CLASS
-$cfg->setConfigEntry('hub_package_decoder_task_class', 'HubPackageDecoderTask');
+// CFG: NODE-DHT-BOOTSTRAP-TASK-CLASS
+$cfg->setConfigEntry('node_dht_bootstrap_task_class', 'NodeDhtBootstrapTask');
+
+// CFG: NODE-DHT-QUERY-TASK-CLASS
+$cfg->setConfigEntry('node_dht_query_task_class', 'NodeDhtQueryTask');
 
 // CFG: TASK-NETWORK-PACKAGE-WRITER-STARTUP-DELAY
 $cfg->setConfigEntry('task_network_package_writer_startup_delay', 2500);
@@ -522,23 +534,50 @@ $cfg->setConfigEntry('task_socket_listener_interval_delay', 10);
 // CFG: TASK-SOCKET-LISTENER-MAX-RUNS
 $cfg->setConfigEntry('task_socket_listener_max_runs', 0);
 
-// CFG: TASK-CHUNK-ASSEMBLER-STATUP-DELAY
-$cfg->setConfigEntry('task_chunk_assembler_startup_delay', 1500);
-
 // CFG: TASK-PACKAGE-DECODER-STATUP-DELAY
 $cfg->setConfigEntry('task_package_decoder_startup_delay', 1300);
 
-// CFG: TASK-CHUNK-ASSEMBLER-INTERVAL-DELAY
-$cfg->setConfigEntry('task_chunk_assembler_interval_delay', 10);
-
 // CFG: TASK-PACKAGE-DECODER-INTERVAL-DELAY
-$cfg->setConfigEntry('task_package_decoder_interval_delay', 10);
+$cfg->setConfigEntry('task_package_decoder_interval_delay', 50);
+
+// CFG: TASK-PACKAGE-DECODER-MAX-RUNS
+$cfg->setConfigEntry('task_package_decoder_max_runs', 0);
+
+// CFG: TASK-CHUNK-ASSEMBLER-STATUP-DELAY
+$cfg->setConfigEntry('task_chunk_assembler_startup_delay', 1500);
+
+// CFG: TASK-CHUNK-ASSEMBLER-INTERVAL-DELAY
+$cfg->setConfigEntry('task_chunk_assembler_interval_delay', 50);
 
 // CFG: TASK-CHUNK-ASSEMBLER-MAX-RUNS
 $cfg->setConfigEntry('task_chunk_assembler_max_runs', 0);
 
-// CFG: TASK-PACKAGE-DECODER-MAX-RUNS
-$cfg->setConfigEntry('task_package_decoder_max_runs', 0);
+// CFG: TASK-DHT-INIT-STATUP-DELAY
+$cfg->setConfigEntry('task_dht_init_startup_delay', 100);
+
+// CFG: TASK-DHT-INIT-INTERVAL-DELAY
+$cfg->setConfigEntry('task_dht_init_interval_delay', 86400000); // = 1 day (won't matter anyway)
+
+// CFG: TASK-DHT-INIT-MAX-RUNS
+$cfg->setConfigEntry('task_dht_init_max_runs', 1);
+
+// CFG: TASK-DHT-BOOTSTRAP-STATUP-DELAY
+$cfg->setConfigEntry('task_dht_bootstrap_startup_delay', 100);
+
+// CFG: TASK-DHT-BOOTSTRAP-INTERVAL-DELAY
+$cfg->setConfigEntry('task_dht_bootstrap_interval_delay', 3600000); // = 1 hour (won't matter anyway)
+
+// CFG: TASK-DHT-BOOTSTRAP-MAX-RUNS
+$cfg->setConfigEntry('task_dht_bootstrap_max_runs', 1);
+
+// CFG: TASK-DHT-QUERY-STATUP-DELAY
+$cfg->setConfigEntry('task_dht_query_startup_delay', 1400);
+
+// CFG: TASK-DHT-QUERY-INTERVAL-DELAY
+$cfg->setConfigEntry('task_dht_query_interval_delay', 50);
+
+// CFG: TASK-DHT-QUERY-MAX-RUNS
+$cfg->setConfigEntry('task_dht_query_max_runs', 0);
 
 // CFG: TASK-LIST-CLASS
 $cfg->setConfigEntry('task_list_class', 'TaskList');
@@ -555,8 +594,8 @@ $cfg->setConfigEntry('default_iterator_class', 'DefaultIterator');
 // CFG: QUERY-ITERATOR-CLASS
 $cfg->setConfigEntry('query_iterator_class', 'DefaultIterator');
 
-// CFG: HUB-PING-ITERATOR-CLASS
-$cfg->setConfigEntry('hub_ping_iterator_class', 'HubPingIterator');
+// CFG: NODE-PING-ITERATOR-CLASS
+$cfg->setConfigEntry('node_ping_iterator_class', 'HubPingIterator');
 
 // CFG: LOCAL-QUERY-LIST-CLASS
 $cfg->setConfigEntry('local_query_list_class', 'LocalQueryList');
@@ -698,6 +737,9 @@ $cfg->setConfigEntry('package_decoder_class', 'PackageDecoder');
 // @TODO This is very static, rewrite it to more flexible
 $cfg->setConfigEntry('package_recipient_max_count', 3);
 
+// CFG: NODE-DHT-CLASS
+$cfg->setConfigEntry('node_dht_class', 'NodeDhtFacade');
+
 ///////////////////////////////////////////////////////////////////////////////
 //                              Peer states
 ///////////////////////////////////////////////////////////////////////////////
@@ -733,6 +775,9 @@ $cfg->setConfigEntry('peer_no_route_to_host_state_class', 'NoRouteToHostPeerStat
 // CFG: ANNOUNCEMENT-ANSWER-STATUS-OKAY-HANDLER-CLASS
 $cfg->setConfigEntry('announcement_answer_status_okay_handler_class', 'AnnouncementAnswerOkayHandler');
 
+// CFG: REQUEST-NODE-LIST-ANSWER-STATUS-OKAY-HANDLER-CLASS
+$cfg->setConfigEntry('request_node_list_answer_status_okay_handler_class', 'RequestNodeListAnswerOkayHandler');
+
 ///////////////////////////////////////////////////////////////////////////////
 //                        Cruncher configuration
 ///////////////////////////////////////////////////////////////////////////////
@@ -827,6 +872,9 @@ $cfg->setConfigEntry('cruncher_key_producer_class', 'CruncherKeyProducer');
 // CFG: CRUNCHER-TEST-UNIT-PRODUCER-TEMPLATE-CLASS
 $cfg->setConfigEntry('cruncher_test_unit_producer_template_class', 'XmlCruncherTestUnitTemplateEngine');
 
+// CFG: CRUNCHER-MESSAGE-TEMPLATE-EXTENSION
+$cfg->setConfigEntry('cruncher_message_template_extension', '.xml');
+
 // CFG: CRUNCHER-TEST-UNIT-TEMPLATE-EXTENSION
 $cfg->setConfigEntry('cruncher_test_unit_template_extension', '.xml');
 
@@ -928,5 +976,48 @@ $cfg->setConfigEntry('web_cmd_home_resolver_class', 'WebCommandResolver');
 // CFG: NEWS-HOME-LIMIT
 $cfg->setConfigEntry('news_home_limit', 10);
 
+///////////////////////////////////////////////////////////////////////////////
+//                         Apt-Proxy Configuration
+///////////////////////////////////////////////////////////////////////////////
+
+// CFG: HUBCONSOLE-CMD-APT-PROXY-RESOLVER-CLASS
+$cfg->setConfigEntry('hubconsole_cmd_apt_proxy_resolver_class', 'HubConsoleCommandResolver');
+
+// CFG: APT-PROXY-PHP-REQUIREMENTS-FILTER
+$cfg->setConfigEntry('apt_proxy_php_requirements_filter', 'AptProxyPhpRequirementsFilter');
+
+// CFG: APT-PROXY-INITIALIZER-FILTER
+$cfg->setConfigEntry('apt_proxy_initializer_filter', 'AptProxyInitializationFilter');
+
+// CFG: NODE-CONSOLE-APT-PROXY
+$cfg->setConfigEntry('node_console_apt_proxy_class', 'NodeConsoleAptProxy');
+
+// CFG: APT-PROXY-WELCOME-TEASER-FILTER
+$cfg->setConfigEntry('apt_proxy_welcome_teaser_filter', 'AptProxyWelcomeTeaserFilter');
+
+// CFG: APT-PROXY-BOOTSTRAP-TASK-HANDLER-INITIALIZER-FILTER
+$cfg->setConfigEntry('apt_proxy_bootstrap_task_handler_initializer_filter', 'AptProxyTaskHandlerInitializerFilter');
+
+// CFG: APT-PROXY-BOOTSTRAP-EXTRA-BOOTSTRAPPING-FILTER
+$cfg->setConfigEntry('apt_proxy_bootstrap_extra_bootstrapping_filter', 'AptProxyBootstrapExtraBootstrappingFilter');
+
+// CFG: APT-PROXY-BOOTSTRAP-GENERIC-ACTIVATION-FILTER
+$cfg->setConfigEntry('apt_proxy_bootstrap_generic_activation_filter', 'AptProxyBootstrapGenericActivationFilter');
+
+// CFG: APT-PROXY-SHUTDOWN-FILTER
+$cfg->setConfigEntry('apt_proxy_shutdown_filter', 'AptProxyShutdownFilter');
+
+// CFG: APT-PROXY-LISTENER-TASK-CLASS
+$cfg->setConfigEntry('apt_proxy_listener_task_class', 'AptProxyListenerTask');
+
+// CFG: TASK-APT-PROXY-LISTENER-STARTUP-DELAY
+$cfg->setConfigEntry('task_apt_proxy_listener_startup_delay', 2500);
+
+// CFG: TASK-APT-PROXY-LISTENER-INTERVAL-DELAY
+$cfg->setConfigEntry('task_apt_proxy_listener_interval_delay', 10);
+
+// CFG: TASK-APT-PROXY-LISTENER-MAX-RUNS
+$cfg->setConfigEntry('task_apt_proxy_listener_max_runs', 0);
+
 // [EOF]
 ?>