--- nfo/php/libs/org.netfrag.glib/includes.php	2003/02/03 14:39:58	1.1
+++ nfo/php/libs/org.netfrag.glib/includes.php	2003/02/09 16:52:08	1.4
@@ -1,23 +1,30 @@
 <?
 // ---------------------------------------------------------------------------
-//  $Id: includes.php,v 1.1 2003/02/03 14:39:58 joko Exp $
+//  $Id: includes.php,v 1.4 2003/02/09 16:52:08 joko Exp $
 // ---------------------------------------------------------------------------
 //  $Log: includes.php,v $
+//  Revision 1.4  2003/02/09 16:52:08  joko
+//  + updated, new modules in this library
+//
+//  Revision 1.3  2003/02/04 08:26:18  joko
+//  + fixed comment
+//
+//  Revision 1.2  2003/02/04 08:25:43  joko
+//  + minor modification regarding configuration/resource variable hierarchy
+//
 //  Revision 1.1  2003/02/03 14:39:58  joko
 //  + initial commit
 //
 // ---------------------------------------------------------------------------
 
 
-$smarty = $config['_startup'][path][smarty];
-$pear = $config['_startup'][path][pear];
-$flib = $config['_startup'][path][flib];
-$glib = $config['_startup'][path][glib];
-
+$smarty = $config['_startup'][path][lib][smarty];
+$pear = $config['_startup'][path][lib][pear];
+$flib = $config['_startup'][path][lib][flib];
+$glib = $config['_startup'][path][lib][glib];
 
-// ================== includes =================
 
-  // ------ override localized pear-libraries ------
+  // ------ override/expand php's 'include_path' setting ------
   // determine OS
   $os = 'linux';
   if (stristr($_SERVER["SERVER_SOFTWARE"], 'win32')) {
@@ -32,6 +39,7 @@
   ini_set("include_path", $path_new);
 
 
+// =======================================
 // ------ pear libs ------
   // benchmarking
     require_once("Benchmark/Timer.php");
@@ -52,26 +60,43 @@
     $timer->setMarker("pear libraries: ready");
 
 
-// ------ glib libraries/classes ------
-   
-   // abstract base classes
-   require_once("DesignPattern/Object.php");
-   loadModule('DesignPattern::Logger');
-   loadModule('DesignPattern::Bridge');
-   loadModule('DesignPattern::Loader');
+
+// =======================================
+// ------ glib libraries/classes/components ------
    
-   loadModule('Data::Encode');
-   loadModule('Data::Deep');
+  // abstract base classes - lowlevel
+    require_once("DesignPattern/Object.php");
+    loadModule('DesignPattern::Logger');
+    loadModule('DesignPattern::Bridge');
+    loadModule('DesignPattern::Loader');
+  
+  // abstract base classes - application level
+    loadModule('Application::AbstractBase');
+    loadModule('Application::AbstractRequest');
+    loadModule('Application::AbstractHandler');
+  
+  // concrete classes
+
+    // helper: data-manipulation and -encoding
+    loadModule('Data::Encode');
+    loadModule('Data::Deep');
+
+    // helper: CreditCard Validator
+    loadModule('Data::Validator::CreditCard');
+
+    // core/transport: rpc-xml communication
+    loadModule('Data::Driver::Proxy');
+    loadModule('Data::Driver::RPC::Remote');
+
 
 
+// =======================================
 // ------ flib libraries/classes ------
   // error handling
    require_once("Application/ErrorHandler.php");
   // misc
    require_once("utils/helper.php");
    require_once("utils/shortcuts.php");
-   // CreditCard class (some useful functions)
-   require_once("utils/CreditCard.php");
   // array manipulation
    require_once("utils/Array_Manip.php");
 
@@ -88,14 +113,6 @@
   // tablebrowser
    require_once("$flib/Site/Widget/TableBrowser.php");
 
-
-
-// ------ middleware libs ------
-  // rpc via mysql
-  //require_once ("$lib"."message/msgpd.php.inc");
-  require_once("Application/RPC/Remote.php");
-  require_once("Application/RPC/ProxyObject.php");
-
 // ------ local libs - abstract ------
   // site
   //require_once ("$lib"."content/Site.class.php");
@@ -104,5 +121,6 @@
    //define(SMARTY_DIR, $lib . 'external/smarty/');
    define(SMARTY_DIR, $smarty);
    require_once(SMARTY_DIR . 'Smarty.class.php');
-   
+
+
 ?>
\ No newline at end of file