Static method getInstance() conflicts with getInstance() in class BaseRegistry,

[core.git] / inc / config.php

diff --git a/inc/config.php b/inc/config.php
index e023b96603e56f274bd8ac45a4f4bb00cc56bfe7..8e9c3d4f4acb323a9338cb6d3e3517a593a437d2 100644 (file)
--- a/inc/config.php
+++ b/inc/config.php
@@ -6,7 +6,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2011 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -24,13 +24,13 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-// Load the class from inc/config direktory
+// Load very basic classes, required to bootstrap
 require(ApplicationEntryPoint::detectCorePath() . '/inc/classes/interfaces/class_FrameworkInterface.php');
 require(ApplicationEntryPoint::detectCorePath() . '/inc/classes/interfaces/registry/class_Registerable.php');
 require(ApplicationEntryPoint::detectCorePath() . '/inc/config/class_FrameworkConfiguration.php');
 
 // Get a new configuration instance
-$cfg = FrameworkConfiguration::getInstance();
+$cfg = FrameworkConfiguration::getSelfInstance();
 
 // CFG: SERVER-PATH
 $cfg->setConfigEntry('base_path', ApplicationEntryPoint::detectCorePath() . '/');
@@ -92,6 +92,9 @@ $cfg->setConfigEntry('compile_output_path', 'templates/_compiled/');
 // CFG: TEMPLATE-CLASS
 $cfg->setConfigEntry('web_template_class', 'WebTemplateEngine');
 
+// CFG: DECO-XML-REWRITER-TEMPLATE-CLASS
+$cfg->setConfigEntry('deco_xml_rewriter_template_class', 'XmlRewriterTemplateDecorator');
+
 // CFG: DEBUG-CLASS
 $cfg->setConfigEntry('debug_class', 'DebugWebOutput');
 
@@ -251,6 +254,9 @@ $cfg->setConfigEntry('mailer_class', 'DebugMailer');
 // CFG: XML-PARSER-CLASS
 $cfg->setConfigEntry('xml_parser_class', 'XmlParser');
 
+// CFG: DECO-COMPACTING-XML-PARSER-CLASS
+$cfg->setConfigEntry('deco_compacting_xml_parser_class', 'XmlCompactorDecorator');
+
 // CFG: MATH-PRIME
 $cfg->setConfigEntry('math_prime', 591623);
 
@@ -314,5 +320,14 @@ $cfg->setConfigEntry('stacker_generic_max_size', 100);
 // CFG: STACKER-CURRENT-NODE-MAX-SIZE
 $cfg->setConfigEntry('stacker_current_node_max_size', 20);
 
+// CFG: LOCAL-FILE-DATABASE-CLASS
+$cfg->setConfigEntry('local_file_database_class', 'LocalFileDatabase');
+
+// CFG: COMPRESSOR-CHANNEL-CLASS
+$cfg->setConfigEntry('compressor_channel_class', 'CompressorChannel');
+
+// CFG: DEBUG-OUTPUT-TIMINGS
+$cfg->setConfigEntry('debug_output_timings', 'N');
+
 // [EOF]
 ?>