From d9cdd828c3293ec11321cbeabb78ac3cbdcc4bdd Mon Sep 17 00:00:00 2001
From: Gunnar Wrobel <p@rdus.de>
Date: Wed, 28 Apr 2010 00:54:04 +0200
Subject: [PATCH] The namespace handler is part of the driver.

---
 .../lib/Horde/Kolab/Storage/Driver.php             |  2 +-
 .../lib/Horde/Kolab/Storage/Driver/Base.php        |  6 +--
 .../Horde/Kolab/Storage/Driver/Decorator/Base.php  |  2 +-
 .../Horde/Kolab/Storage/Driver/Decorator/Log.php   |  2 +-
 .../lib/Horde/Kolab/Storage/Driver/Imap.php        |  4 +-
 .../Horde/Kolab/Storage/{ => Driver}/Namespace.php | 12 ++---
 .../Storage/{ => Driver}/Namespace/Config.php      | 14 ++---
 .../Storage/{ => Driver}/Namespace/Element.php     |  2 +-
 .../{ => Driver}/Namespace/Element/Other.php       |  8 +--
 .../{ => Driver}/Namespace/Element/Personal.php    |  8 +--
 .../{ => Driver}/Namespace/Element/Shared.php      |  8 +--
 .../Namespace/Element/SharedWithPrefix.php         |  4 +-
 .../Kolab/Storage/{ => Driver}/Namespace/Fixed.php | 14 ++---
 .../Kolab/Storage/{ => Driver}/Namespace/Imap.php  |  8 +--
 .../lib/Horde/Kolab/Storage/Driver/Pear.php        |  4 +-
 .../lib/Horde/Kolab/Storage/Folder/Base.php        |  4 +-
 framework/Kolab_Storage/package.xml                | 60 ++++++++++++----------
 .../test/Horde/Kolab/Storage/AclTest.php           |  6 +--
 .../Kolab/Storage/Class/Driver/CclientTest.php     |  2 +-
 .../Horde/Kolab/Storage/Class/Driver/ImapTest.php  |  2 +-
 .../Horde/Kolab/Storage/Class/Driver/MockTest.php  |  2 +-
 .../Horde/Kolab/Storage/Class/Driver/PearTest.php  |  2 +-
 .../test/Horde/Kolab/Storage/FolderTest.php        |  4 +-
 .../test/Horde/Kolab/Storage/NamespaceTest.php     | 18 +++----
 .../test/Horde/Kolab/Storage/PermissionTest.php    |  8 +--
 25 files changed, 105 insertions(+), 101 deletions(-)
 rename framework/Kolab_Storage/lib/Horde/Kolab/Storage/{ => Driver}/Namespace.php (93%)
 rename framework/Kolab_Storage/lib/Horde/Kolab/Storage/{ => Driver}/Namespace/Config.php (74%)
 rename framework/Kolab_Storage/lib/Horde/Kolab/Storage/{ => Driver}/Namespace/Element.php (98%)
 rename framework/Kolab_Storage/lib/Horde/Kolab/Storage/{ => Driver}/Namespace/Element/Other.php (80%)
 rename framework/Kolab_Storage/lib/Horde/Kolab/Storage/{ => Driver}/Namespace/Element/Personal.php (61%)
 rename framework/Kolab_Storage/lib/Horde/Kolab/Storage/{ => Driver}/Namespace/Element/Shared.php (62%)
 rename framework/Kolab_Storage/lib/Horde/Kolab/Storage/{ => Driver}/Namespace/Element/SharedWithPrefix.php (88%)
 rename framework/Kolab_Storage/lib/Horde/Kolab/Storage/{ => Driver}/Namespace/Fixed.php (69%)
 rename framework/Kolab_Storage/lib/Horde/Kolab/Storage/{ => Driver}/Namespace/Imap.php (82%)

diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver.php
index 1f5ef55df..8ae25f5de 100644
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver.php
@@ -219,7 +219,7 @@ interface Horde_Kolab_Storage_Driver
     /**
      * Retrieve the namespace information for this connection.
      *
-     * @return Horde_Kolab_Storage_Namespace The initialized namespace handler.
+     * @return Horde_Kolab_Storage_Driver_Namespace The initialized namespace handler.
      */
     public function getNamespace();
 
diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Base.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Base.php
index 33af192e4..08ee39591 100644
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Base.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Base.php
@@ -70,16 +70,16 @@ implements Horde_Kolab_Storage_Driver
     /**
      * Retrieve the namespace information for this connection.
      *
-     * @return Horde_Kolab_Storage_Namespace The initialized namespace handler.
+     * @return Horde_Kolab_Storage_Driver_Namespace The initialized namespace handler.
      */
     public function getNamespace()
     {
         if (isset($this->_params['namespaces'])) {
-            return new Horde_Kolab_Storage_Namespace_Config(
+            return new Horde_Kolab_Storage_Driver_Namespace_Config(
                 $this->_params['namespaces']
             );
         }
-        return new Horde_Kolab_Storage_Namespace_Fixed();
+        return new Horde_Kolab_Storage_Driver_Namespace_Fixed();
     }
 
     /**
diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Decorator/Base.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Decorator/Base.php
index 87b061ec6..e7aef4e5d 100644
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Decorator/Base.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Decorator/Base.php
@@ -258,7 +258,7 @@ implements Horde_Kolab_Storage_Driver
     /**
      * Retrieve the namespace information for this connection.
      *
-     * @return Horde_Kolab_Storage_Namespace The initialized namespace handler.
+     * @return Horde_Kolab_Storage_Driver_Namespace The initialized namespace handler.
      */
     public function getNamespace()
     {
diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Decorator/Log.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Decorator/Log.php
index 0f118f9b9..1f9c8b938 100644
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Decorator/Log.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Decorator/Log.php
@@ -258,7 +258,7 @@ extends Horde_Kolab_Storage_Driver_Decorator_Base
     /**
      * Retrieve the namespace information for this connection.
      *
-     * @return Horde_Kolab_Storage_Namespace The initialized namespace handler.
+     * @return Horde_Kolab_Storage_Driver_Namespace The initialized namespace handler.
      */
     public function getNamespace()
     {
diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Imap.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Imap.php
index 1f1bf10fd..1dc0e8c51 100644
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Imap.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Imap.php
@@ -403,12 +403,12 @@ extends Horde_Kolab_Storage_Driver_Base
     /**
      * Retrieve the namespace information for this connection.
      *
-     * @return Horde_Kolab_Storage_Namespace The initialized namespace handler.
+     * @return Horde_Kolab_Storage_Driver_Namespace The initialized namespace handler.
      */
     public function getNamespace()
     {
         if ($this->_imap->queryCapability('NAMESPACE') === true) {
-            return new Horde_Kolab_Storage_Namespace_Imap(
+            return new Horde_Kolab_Storage_Driver_Namespace_Imap(
                 $this->_imap->getNamespaces(),
                 $this->getParam('namespaces', array())
             );
diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Namespace.php
similarity index 93%
rename from framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace.php
rename to framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Namespace.php
index d162881f5..a3a2639a2 100644
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Namespace.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The Horde_Kolab_Storage_Namespace:: class handles IMAP namespaces and allows
+ * The Horde_Kolab_Storage_Driver_Namespace:: class handles IMAP namespaces and allows
  * to derive folder information from folder names.
  *
  * PHP version 5
@@ -13,7 +13,7 @@
  */
 
 /**
- * The Horde_Kolab_Storage_Namespace:: class handles IMAP namespaces and allows
+ * The Horde_Kolab_Storage_Driver_Namespace:: class handles IMAP namespaces and allows
  * to derive folder information from folder names.
  *
  * Copyright 2004-2010 The Horde Project (http://www.horde.org/)
@@ -27,7 +27,7 @@
  * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
  * @link     http://pear.horde.org/index.php?package=Kolab_Storage
  */
-abstract class Horde_Kolab_Storage_Namespace
+abstract class Horde_Kolab_Storage_Driver_Namespace
 implements Iterator
 {
     /** The possible namespace types (RFC 2342 [5]) */
@@ -60,7 +60,7 @@ implements Iterator
      * The namespace that matches any folder name not matching to another
      * namespace.
      *
-     * @var Horde_Kolab_Storage_Namespace_Element
+     * @var Horde_Kolab_Storage_Driver_Namespace_Element
      */
     protected $_any;
 
@@ -68,7 +68,7 @@ implements Iterator
      * Indicates the personal namespace that the class will use to create new
      * folders.
      *
-     * @var Horde_Kolab_Storage_Namespace_Element
+     * @var Horde_Kolab_Storage_Driver_Namespace_Element
      */
     protected $_primaryPersonalNamespace;
 
@@ -107,7 +107,7 @@ implements Iterator
      *
      * @param string $name The name of the folder.
      *
-     * @return Horde_Kolab_Storage_Namespace_Element The corresponding namespace.
+     * @return Horde_Kolab_Storage_Driver_Namespace_Element The corresponding namespace.
      *
      * @throws Horde_Kolab_Storage_Exception If the namespace of the folder
      *                                       cannot be determined.
diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Config.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Namespace/Config.php
similarity index 74%
rename from framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Config.php
rename to framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Namespace/Config.php
index e4e6ffdee..05f98a2d4 100644
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Config.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Namespace/Config.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The Horde_Kolab_Storage_Namespace_Config:: allows to configure the available
+ * The Horde_Kolab_Storage_Driver_Namespace_Config:: allows to configure the available
  * IMAP namespaces on the Kolab server.
  *
  * PHP version 5
@@ -13,7 +13,7 @@
  */
 
 /**
- * The Horde_Kolab_Storage_Namespace_Config:: allows to configure the available
+ * The Horde_Kolab_Storage_Driver_Namespace_Config:: allows to configure the available
  * IMAP namespaces on the Kolab server.
  *
  * Copyright 2004-2010 The Horde Project (http://www.horde.org/)
@@ -27,8 +27,8 @@
  * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
  * @link     http://pear.horde.org/index.php?package=Kolab_Storage
  */
-class Horde_Kolab_Storage_Namespace_Config
-extends  Horde_Kolab_Storage_Namespace
+class Horde_Kolab_Storage_Driver_Namespace_Config
+extends  Horde_Kolab_Storage_Driver_Namespace
 {
     /**
      * Constructor.
@@ -37,14 +37,14 @@ extends  Horde_Kolab_Storage_Namespace
     {
         parent::__construct();
         foreach ($configuration as $element) {
-            if ($element['type'] == Horde_Kolab_Storage_Namespace::SHARED
+            if ($element['type'] == Horde_Kolab_Storage_Driver_Namespace::SHARED
                 && isset($element['prefix'])) {
-                $namespace_element = new Horde_Kolab_Storage_Namespace_Element_SharedWithPrefix(
+                $namespace_element = new Horde_Kolab_Storage_Driver_Namespace_Element_SharedWithPrefix(
                     $element['name'], $element['delimiter'], $element['prefix']
                 );
                 $this->_sharedPrefix = $element['prefix'];
             } else {
-                $class = 'Horde_Kolab_Storage_Namespace_Element_' . ucfirst($element['type']);
+                $class = 'Horde_Kolab_Storage_Driver_Namespace_Element_' . ucfirst($element['type']);
                 $namespace_element = new $class($element['name'], $element['delimiter']);
             }
             if (empty($element['name'])) {
diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Element.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Namespace/Element.php
similarity index 98%
rename from framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Element.php
rename to framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Namespace/Element.php
index fb1ab2e7c..86c6ecd9b 100644
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Element.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Namespace/Element.php
@@ -1,6 +1,6 @@
 <?php
 
-abstract class Horde_Kolab_Storage_Namespace_Element
+abstract class Horde_Kolab_Storage_Driver_Namespace_Element
 {
     /**
      * The prefix identifying this namespace.
diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Element/Other.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Namespace/Element/Other.php
similarity index 80%
rename from framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Element/Other.php
rename to framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Namespace/Element/Other.php
index e363d669d..f0921a736 100644
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Element/Other.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Namespace/Element/Other.php
@@ -1,7 +1,7 @@
 <?php
 
-class Horde_Kolab_Storage_Namespace_Element_Other
-extends Horde_Kolab_Storage_Namespace_Element
+class Horde_Kolab_Storage_Driver_Namespace_Element_Other
+extends Horde_Kolab_Storage_Driver_Namespace_Element
 {
     /**
      * Return the type of this namespace (personal, other, or shared).
@@ -10,7 +10,7 @@ extends Horde_Kolab_Storage_Namespace_Element
      */
     public function getType()
     {
-        return Horde_Kolab_Storage_Namespace::OTHER;
+        return Horde_Kolab_Storage_Driver_Namespace::OTHER;
     }
 
     /**
@@ -30,7 +30,7 @@ extends Horde_Kolab_Storage_Namespace_Element
                 $user .= $domain;
             }
         }
-        return Horde_Kolab_Storage_Namespace::OTHER . ':' . $user;
+        return Horde_Kolab_Storage_Driver_Namespace::OTHER . ':' . $user;
     }
 
     /**
diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Element/Personal.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Namespace/Element/Personal.php
similarity index 61%
rename from framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Element/Personal.php
rename to framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Namespace/Element/Personal.php
index a0f368691..dfe2c8586 100644
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Element/Personal.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Namespace/Element/Personal.php
@@ -1,7 +1,7 @@
 <?php
 
-class Horde_Kolab_Storage_Namespace_Element_Personal
-extends Horde_Kolab_Storage_Namespace_Element
+class Horde_Kolab_Storage_Driver_Namespace_Element_Personal
+extends Horde_Kolab_Storage_Driver_Namespace_Element
 {
     /**
      * Return the type of this namespace (personal, other, or shared).
@@ -10,7 +10,7 @@ extends Horde_Kolab_Storage_Namespace_Element
      */
     public function getType()
     {
-        return Horde_Kolab_Storage_Namespace::PERSONAL;
+        return Horde_Kolab_Storage_Driver_Namespace::PERSONAL;
     }
 
     /**
@@ -22,6 +22,6 @@ extends Horde_Kolab_Storage_Namespace_Element
      */
     public function getOwner($name)
     {
-        return Horde_Kolab_Storage_Namespace::PERSONAL;
+        return Horde_Kolab_Storage_Driver_Namespace::PERSONAL;
     }
 }
\ No newline at end of file
diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Element/Shared.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Namespace/Element/Shared.php
similarity index 62%
rename from framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Element/Shared.php
rename to framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Namespace/Element/Shared.php
index 8e63f2183..c6be66b09 100644
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Element/Shared.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Namespace/Element/Shared.php
@@ -1,7 +1,7 @@
 <?php
 
-class Horde_Kolab_Storage_Namespace_Element_Shared
-extends Horde_Kolab_Storage_Namespace_Element
+class Horde_Kolab_Storage_Driver_Namespace_Element_Shared
+extends Horde_Kolab_Storage_Driver_Namespace_Element
 {
     /**
      * Return the type of this namespace (personal, other, or shared).
@@ -10,7 +10,7 @@ extends Horde_Kolab_Storage_Namespace_Element
      */
     public function getType()
     {
-        return Horde_Kolab_Storage_Namespace::SHARED;
+        return Horde_Kolab_Storage_Driver_Namespace::SHARED;
     }
 
     /**
@@ -22,6 +22,6 @@ extends Horde_Kolab_Storage_Namespace_Element
      */
     public function getOwner($name)
     {
-        return Horde_Kolab_Storage_Namespace::SHARED;
+        return Horde_Kolab_Storage_Driver_Namespace::SHARED;
     }
 }
\ No newline at end of file
diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Element/SharedWithPrefix.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Namespace/Element/SharedWithPrefix.php
similarity index 88%
rename from framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Element/SharedWithPrefix.php
rename to framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Namespace/Element/SharedWithPrefix.php
index 053b0dee2..761fd1442 100644
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Element/SharedWithPrefix.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Namespace/Element/SharedWithPrefix.php
@@ -1,7 +1,7 @@
 <?php
 
-class Horde_Kolab_Storage_Namespace_Element_SharedWithPrefix
-extends Horde_Kolab_Storage_Namespace_Element_Shared
+class Horde_Kolab_Storage_Driver_Namespace_Element_SharedWithPrefix
+extends Horde_Kolab_Storage_Driver_Namespace_Element_Shared
 {
     /**
      * The prefix to hide when referencing this namespace.
diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Fixed.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Namespace/Fixed.php
similarity index 69%
rename from framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Fixed.php
rename to framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Namespace/Fixed.php
index 3b170b804..6ab4aa100 100644
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Fixed.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Namespace/Fixed.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The Horde_Kolab_Storage_Namespace_Fixed:: implements the default IMAP
+ * The Horde_Kolab_Storage_Driver_Namespace_Fixed:: implements the default IMAP
  * namespaces on the Kolab server.
  *
  * PHP version 5
@@ -13,7 +13,7 @@
  */
 
 /**
- * The Horde_Kolab_Storage_Namespace_Fixed:: implements the default IMAP
+ * The Horde_Kolab_Storage_Driver_Namespace_Fixed:: implements the default IMAP
  * namespaces on the Kolab server.
  *
  * Copyright 2004-2010 The Horde Project (http://www.horde.org/)
@@ -27,8 +27,8 @@
  * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
  * @link     http://pear.horde.org/index.php?package=Kolab_Storage
  */
-class Horde_Kolab_Storage_Namespace_Fixed
-extends  Horde_Kolab_Storage_Namespace
+class Horde_Kolab_Storage_Driver_Namespace_Fixed
+extends  Horde_Kolab_Storage_Driver_Namespace
 {
     /**
      * Indicates the personal namespace that the class will use to create new
@@ -45,9 +45,9 @@ extends  Horde_Kolab_Storage_Namespace
     {
         parent::__construct();
 
-        $personal = new Horde_Kolab_Storage_Namespace_Element_Personal('INBOX/', '/');
-        $other    = new Horde_Kolab_Storage_Namespace_Element_Other('user/', '/');
-        $shared   = new Horde_Kolab_Storage_Namespace_Element_SharedWithPrefix('', '/', 'shared.');
+        $personal = new Horde_Kolab_Storage_Driver_Namespace_Element_Personal('INBOX/', '/');
+        $other    = new Horde_Kolab_Storage_Driver_Namespace_Element_Other('user/', '/');
+        $shared   = new Horde_Kolab_Storage_Driver_Namespace_Element_SharedWithPrefix('', '/', 'shared.');
 
         $this->_namespaces = array($personal, $other);
         $this->_any = $shared;
diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Imap.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Namespace/Imap.php
similarity index 82%
rename from framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Imap.php
rename to framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Namespace/Imap.php
index b9f41aef0..20d0314c4 100644
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Imap.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Namespace/Imap.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The Horde_Kolab_Storage_Namespace_Config:: allows to use the information from
+ * The Horde_Kolab_Storage_Driver_Namespace_Config:: allows to use the information from
  * the IMAP NAMESPACE command to identify the IMAP namespaces on the Kolab
  * server.
  *
@@ -14,7 +14,7 @@
  */
 
 /**
- * The Horde_Kolab_Storage_Namespace_Config:: allows to use the information from
+ * The Horde_Kolab_Storage_Driver_Namespace_Config:: allows to use the information from
  * the IMAP NAMESPACE command to identify the IMAP namespaces on the Kolab
  * server.
  *
@@ -29,8 +29,8 @@
  * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
  * @link     http://pear.horde.org/index.php?package=Kolab_Storage
  */
-class Horde_Kolab_Storage_Namespace_Imap
-extends  Horde_Kolab_Storage_Namespace_Config
+class Horde_Kolab_Storage_Driver_Namespace_Imap
+extends  Horde_Kolab_Storage_Driver_Namespace_Config
 {
     /**
      * Constructor.
diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Pear.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Pear.php
index a26ff7329..168132d00 100644
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Pear.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Pear.php
@@ -403,7 +403,7 @@ extends Horde_Kolab_Storage_Driver_Base
     /**
      * Retrieve the namespace information for this connection.
      *
-     * @return Horde_Kolab_Storage_Namespace The initialized namespace handler.
+     * @return Horde_Kolab_Storage_Driver_Namespace The initialized namespace handler.
      */
     public function getNamespace()
     {
@@ -426,7 +426,7 @@ extends Horde_Kolab_Storage_Driver_Base
                     $namespaces[] = $namespace;
                 }
             }
-            return new Horde_Kolab_Storage_Namespace_Imap(
+            return new Horde_Kolab_Storage_Driver_Namespace_Imap(
                 $namespaces,
                 $this->getParam('namespaces', array())
             );
diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder/Base.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder/Base.php
index aba5f6f14..8e91fa57f 100644
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder/Base.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder/Base.php
@@ -496,10 +496,10 @@ implements Horde_Kolab_Storage_Folder
              * rather than in a module nearer to the applications.
              */
             switch ($owner) {
-            case Horde_Kolab_Storage_Namespace::PERSONAL:
+            case Horde_Kolab_Storage_Driver_Namespace::PERSONAL:
                 $this->_owner = $this->_driver->getAuth();
                 break;
-            case Horde_Kolab_Storage_Namespace::SHARED:
+            case Horde_Kolab_Storage_Driver_Namespace::SHARED:
                 $this->_owner = 'anonymous';
                 break;
             default:
diff --git a/framework/Kolab_Storage/package.xml b/framework/Kolab_Storage/package.xml
index 4fa835795..4f28ea440 100644
--- a/framework/Kolab_Storage/package.xml
+++ b/framework/Kolab_Storage/package.xml
@@ -31,8 +31,8 @@
   <email>jan@horde.org</email>
   <active>yes</active>
  </lead>
- <date>2010-04-27</date>
- <time>23:01:21</time>
+ <date>2010-04-28</date>
+ <time>00:43:56</time>
  <version>
   <release>0.4.0</release>
   <api>0.1.0</api>
@@ -78,10 +78,23 @@
          <file name="Base.php" role="php" />
          <file name="Log.php" role="php" />
         </dir> <!-- /lib/Horde/Kolab/Storage/Driver/Decorator -->
+        <dir name="Namespace">
+         <dir name="Element">
+          <file name="Other.php" role="php" />
+          <file name="Personal.php" role="php" />
+          <file name="Shared.php" role="php" />
+          <file name="SharedWithPrefix.php" role="php" />
+         </dir> <!-- /lib/Horde/Kolab/Storage/Driver/Namespace/Element -->
+         <file name="Config.php" role="php" />
+         <file name="Element.php" role="php" />
+         <file name="Fixed.php" role="php" />
+         <file name="Imap.php" role="php" />
+        </dir> <!-- /lib/Horde/Kolab/Storage/Driver/Namespace -->
         <file name="Base.php" role="php" />
         <file name="Cclient.php" role="php" />
         <file name="Imap.php" role="php" />
         <file name="Mock.php" role="php" />
+        <file name="Namespace.php" role="php" />
         <file name="Pear.php" role="php" />
        </dir> <!-- /lib/Horde/Kolab/Storage/Driver -->
        <dir name="Folder">
@@ -112,24 +125,11 @@
         <file name="Base.php" role="php" />
         <file name="Permission.php" role="php" />
        </dir> <!-- /lib/Horde/Kolab/Storage/Folder -->
-       <dir name="Namespace">
-        <dir name="Element">
-         <file name="Other.php" role="php" />
-         <file name="Personal.php" role="php" />
-         <file name="Shared.php" role="php" />
-         <file name="SharedWithPrefix.php" role="php" />
-        </dir> <!-- /lib/Horde/Kolab/Storage/Namespace/Element -->
-        <file name="Config.php" role="php" />
-        <file name="Element.php" role="php" />
-        <file name="Fixed.php" role="php" />
-        <file name="Imap.php" role="php" />
-       </dir> <!-- /lib/Horde/Kolab/Storage/Namespace -->
        <file name="Cache.php" role="php" />
        <file name="Data.php" role="php" />
        <file name="Driver.php" role="php" />
        <file name="Exception.php" role="php" />
        <file name="Folder.php" role="php" />
-       <file name="Namespace.php" role="php" />
       </dir> <!-- /lib/Horde/Kolab/Storage -->
       <file name="Storage.php" role="php" />
      </dir> <!-- /lib/Horde/Kolab -->
@@ -139,9 +139,7 @@
     <dir name="Horde">
      <dir name="Kolab">
       <dir name="Storage">
-       <file name="test_drivers.php" role="script">
-	 <tasks:replace from="@PHP-TEST-DIR@" to="test_dir" type="pear-config" />
-       </file>
+       <file name="test_drivers.php" role="script" />
       </dir> <!-- /script/Horde/Kolab/Storage -->
      </dir> <!-- /script/Horde/Kolab -->
     </dir> <!-- /script/Horde -->
@@ -152,7 +150,10 @@
       <dir name="Storage">
        <dir name="Class">
         <dir name="Driver">
+         <file name="CclientTest.php" role="test" />
+         <file name="ImapTest.php" role="test" />
          <file name="MockTest.php" role="test" />
+         <file name="PearTest.php" role="test" />
         </dir> <!-- /test/Horde/Kolab/Storage/Class/Driver -->
        </dir> <!-- /test/Horde/Kolab/Storage/Class -->
        <dir name="Server">
@@ -260,14 +261,22 @@
    <install as="Horde/Kolab/Storage/Driver.php" name="lib/Horde/Kolab/Storage/Driver.php" />
    <install as="Horde/Kolab/Storage/Exception.php" name="lib/Horde/Kolab/Storage/Exception.php" />
    <install as="Horde/Kolab/Storage/Folder.php" name="lib/Horde/Kolab/Storage/Folder.php" />
-   <install as="Horde/Kolab/Storage/Namespace.php" name="lib/Horde/Kolab/Storage/Namespace.php" />
    <install as="Horde/Kolab/Storage/Driver/Base.php" name="lib/Horde/Kolab/Storage/Driver/Base.php" />
    <install as="Horde/Kolab/Storage/Driver/Cclient.php" name="lib/Horde/Kolab/Storage/Driver/Cclient.php" />
    <install as="Horde/Kolab/Storage/Driver/Imap.php" name="lib/Horde/Kolab/Storage/Driver/Imap.php" />
    <install as="Horde/Kolab/Storage/Driver/Mock.php" name="lib/Horde/Kolab/Storage/Driver/Mock.php" />
+   <install as="Horde/Kolab/Storage/Driver/Namespace.php" name="lib/Horde/Kolab/Storage/Driver/Namespace.php" />
    <install as="Horde/Kolab/Storage/Driver/Pear.php" name="lib/Horde/Kolab/Storage/Driver/Pear.php" />
    <install as="Horde/Kolab/Storage/Driver/Decorator/Base.php" name="lib/Horde/Kolab/Storage/Driver/Decorator/Base.php" />
    <install as="Horde/Kolab/Storage/Driver/Decorator/Log.php" name="lib/Horde/Kolab/Storage/Driver/Decorator/Log.php" />
+   <install as="Horde/Kolab/Storage/Driver/Namespace/Config.php" name="lib/Horde/Kolab/Storage/Driver/Namespace/Config.php" />
+   <install as="Horde/Kolab/Storage/Driver/Namespace/Element.php" name="lib/Horde/Kolab/Storage/Driver/Namespace/Element.php" />
+   <install as="Horde/Kolab/Storage/Driver/Namespace/Fixed.php" name="lib/Horde/Kolab/Storage/Driver/Namespace/Fixed.php" />
+   <install as="Horde/Kolab/Storage/Driver/Namespace/Imap.php" name="lib/Horde/Kolab/Storage/Driver/Namespace/Imap.php" />
+   <install as="Horde/Kolab/Storage/Driver/Namespace/Element/Other.php" name="lib/Horde/Kolab/Storage/Driver/Namespace/Element/Other.php" />
+   <install as="Horde/Kolab/Storage/Driver/Namespace/Element/Personal.php" name="lib/Horde/Kolab/Storage/Driver/Namespace/Element/Personal.php" />
+   <install as="Horde/Kolab/Storage/Driver/Namespace/Element/Shared.php" name="lib/Horde/Kolab/Storage/Driver/Namespace/Element/Shared.php" />
+   <install as="Horde/Kolab/Storage/Driver/Namespace/Element/SharedWithPrefix.php" name="lib/Horde/Kolab/Storage/Driver/Namespace/Element/SharedWithPrefix.php" />
    <install as="Horde/Kolab/Storage/Folder/Base.php" name="lib/Horde/Kolab/Storage/Folder/Base.php" />
    <install as="Horde/Kolab/Storage/Folder/Permission.php" name="lib/Horde/Kolab/Storage/Folder/Permission.php" />
    <install as="Horde/Kolab/Storage/Folder/Decorator/Base.php" name="lib/Horde/Kolab/Storage/Folder/Decorator/Base.php" />
@@ -286,14 +295,6 @@
    <install as="Horde/Kolab/Storage/Folder/Permission/Element/Group.php" name="lib/Horde/Kolab/Storage/Folder/Permission/Element/Group.php" />
    <install as="Horde/Kolab/Storage/Folder/Permission/Element/Guest.php" name="lib/Horde/Kolab/Storage/Folder/Permission/Element/Guest.php" />
    <install as="Horde/Kolab/Storage/Folder/Permission/Element/User.php" name="lib/Horde/Kolab/Storage/Folder/Permission/Element/User.php" />
-   <install as="Horde/Kolab/Storage/Namespace/Config.php" name="lib/Horde/Kolab/Storage/Namespace/Config.php" />
-   <install as="Horde/Kolab/Storage/Namespace/Element.php" name="lib/Horde/Kolab/Storage/Namespace/Element.php" />
-   <install as="Horde/Kolab/Storage/Namespace/Fixed.php" name="lib/Horde/Kolab/Storage/Namespace/Fixed.php" />
-   <install as="Horde/Kolab/Storage/Namespace/Imap.php" name="lib/Horde/Kolab/Storage/Namespace/Imap.php" />
-   <install as="Horde/Kolab/Storage/Namespace/Element/Other.php" name="lib/Horde/Kolab/Storage/Namespace/Element/Other.php" />
-   <install as="Horde/Kolab/Storage/Namespace/Element/Personal.php" name="lib/Horde/Kolab/Storage/Namespace/Element/Personal.php" />
-   <install as="Horde/Kolab/Storage/Namespace/Element/Shared.php" name="lib/Horde/Kolab/Storage/Namespace/Element/Shared.php" />
-   <install as="Horde/Kolab/Storage/Namespace/Element/SharedWithPrefix.php" name="lib/Horde/Kolab/Storage/Namespace/Element/SharedWithPrefix.php" />
    <install as="test_drivers" name="script/Horde/Kolab/Storage/test_drivers.php" />
    <install as="Horde/Kolab/Storage/AclTest.php" name="test/Horde/Kolab/Storage/AclTest.php" />
    <install as="Horde/Kolab/Storage/AllTests.php" name="test/Horde/Kolab/Storage/AllTests.php" />
@@ -308,7 +309,10 @@
    <install as="Horde/Kolab/Storage/Scenario.php" name="test/Horde/Kolab/Storage/Scenario.php" />
    <install as="Horde/Kolab/Storage/StorageTest.php" name="test/Horde/Kolab/Storage/StorageTest.php" />
    <install as="Horde/Kolab/Storage/TriggerTest.php" name="test/Horde/Kolab/Storage/TriggerTest.php" />
+   <install as="Horde/Kolab/Storage/Class/Driver/CclientTest.php" name="test/Horde/Kolab/Storage/Class/Driver/CclientTest.php" />
+   <install as="Horde/Kolab/Storage/Class/Driver/ImapTest.php" name="test/Horde/Kolab/Storage/Class/Driver/ImapTest.php" />
    <install as="Horde/Kolab/Storage/Class/Driver/MockTest.php" name="test/Horde/Kolab/Storage/Class/Driver/MockTest.php" />
+   <install as="Horde/Kolab/Storage/Class/Driver/PearTest.php" name="test/Horde/Kolab/Storage/Class/Driver/PearTest.php" />
    <install as="Horde/Kolab/Storage/Server/DriverTest.php" name="test/Horde/Kolab/Storage/Server/DriverTest.php" />
   </filelist>
  </phprelease>
@@ -380,7 +384,7 @@
     <release>alpha</release>
     <api>alpha</api>
    </stability>
-   <date>2010-04-27</date>
+   <date>2010-04-28</date>
    <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
    <notes>
 * Added namespace support (Bug #6691).
diff --git a/framework/Kolab_Storage/test/Horde/Kolab/Storage/AclTest.php b/framework/Kolab_Storage/test/Horde/Kolab/Storage/AclTest.php
index 109d8b28e..f115c1f50 100644
--- a/framework/Kolab_Storage/test/Horde/Kolab/Storage/AclTest.php
+++ b/framework/Kolab_Storage/test/Horde/Kolab/Storage/AclTest.php
@@ -45,17 +45,17 @@ class Horde_Kolab_Storage_AclTest extends PHPUnit_Framework_TestCase
                     array(
                         array(
                             'name'      => 'INBOX/',
-                            'type'      =>  Horde_Kolab_Storage_Namespace::PERSONAL,
+                            'type'      =>  Horde_Kolab_Storage_Driver_Namespace::PERSONAL,
                             'delimiter' => '/',
                         ),
                         array(
                             'name'      => 'user/',
-                            'type'      =>  Horde_Kolab_Storage_Namespace::OTHER,
+                            'type'      =>  Horde_Kolab_Storage_Driver_Namespace::OTHER,
                             'delimiter' => '/',
                         ),
                         array(
                             'name'      => '',
-                            'type'      =>  Horde_Kolab_Storage_Namespace::SHARED,
+                            'type'      =>  Horde_Kolab_Storage_Driver_Namespace::SHARED,
                             'delimiter' => '/',
                         )
                     )
diff --git a/framework/Kolab_Storage/test/Horde/Kolab/Storage/Class/Driver/CclientTest.php b/framework/Kolab_Storage/test/Horde/Kolab/Storage/Class/Driver/CclientTest.php
index 75e96f150..86963780c 100644
--- a/framework/Kolab_Storage/test/Horde/Kolab/Storage/Class/Driver/CclientTest.php
+++ b/framework/Kolab_Storage/test/Horde/Kolab/Storage/Class/Driver/CclientTest.php
@@ -51,7 +51,7 @@ extends PHPUnit_Framework_TestCase
             array()
         );
         $this->assertType(
-            'Horde_Kolab_Storage_Namespace',
+            'Horde_Kolab_Storage_Driver_Namespace',
             $driver->getNamespace()
         );
     }
diff --git a/framework/Kolab_Storage/test/Horde/Kolab/Storage/Class/Driver/ImapTest.php b/framework/Kolab_Storage/test/Horde/Kolab/Storage/Class/Driver/ImapTest.php
index f52ae749c..754643420 100644
--- a/framework/Kolab_Storage/test/Horde/Kolab/Storage/Class/Driver/ImapTest.php
+++ b/framework/Kolab_Storage/test/Horde/Kolab/Storage/Class/Driver/ImapTest.php
@@ -52,7 +52,7 @@ extends PHPUnit_Framework_TestCase
             array()
         );
         $this->assertType(
-            'Horde_Kolab_Storage_Namespace',
+            'Horde_Kolab_Storage_Driver_Namespace',
             $driver->getNamespace()
         );
     }
diff --git a/framework/Kolab_Storage/test/Horde/Kolab/Storage/Class/Driver/MockTest.php b/framework/Kolab_Storage/test/Horde/Kolab/Storage/Class/Driver/MockTest.php
index aaed02546..78a645f50 100644
--- a/framework/Kolab_Storage/test/Horde/Kolab/Storage/Class/Driver/MockTest.php
+++ b/framework/Kolab_Storage/test/Horde/Kolab/Storage/Class/Driver/MockTest.php
@@ -67,7 +67,7 @@ extends PHPUnit_Framework_TestCase
             array()
         );
         $this->assertType(
-            'Horde_Kolab_Storage_Namespace',
+            'Horde_Kolab_Storage_Driver_Namespace',
             $driver->getNamespace()
         );
     }
diff --git a/framework/Kolab_Storage/test/Horde/Kolab/Storage/Class/Driver/PearTest.php b/framework/Kolab_Storage/test/Horde/Kolab/Storage/Class/Driver/PearTest.php
index 17d2224de..5607858e8 100644
--- a/framework/Kolab_Storage/test/Horde/Kolab/Storage/Class/Driver/PearTest.php
+++ b/framework/Kolab_Storage/test/Horde/Kolab/Storage/Class/Driver/PearTest.php
@@ -52,7 +52,7 @@ extends PHPUnit_Framework_TestCase
             array()
         );
         $this->assertType(
-            'Horde_Kolab_Storage_Namespace',
+            'Horde_Kolab_Storage_Driver_Namespace',
             $driver->getNamespace()
         );
     }
diff --git a/framework/Kolab_Storage/test/Horde/Kolab/Storage/FolderTest.php b/framework/Kolab_Storage/test/Horde/Kolab/Storage/FolderTest.php
index 5c6b9fef8..da160bff6 100644
--- a/framework/Kolab_Storage/test/Horde/Kolab/Storage/FolderTest.php
+++ b/framework/Kolab_Storage/test/Horde/Kolab/Storage/FolderTest.php
@@ -66,7 +66,7 @@ class Horde_Kolab_Storage_FolderTest extends PHPUnit_Framework_TestCase
         $GLOBALS['language'] = 'de_DE';
         $folder = new Horde_Kolab_Storage_Folder_Base(
             'INBOX/Contacts',
-            new Horde_Kolab_Storage_Namespace_Fixed()
+            new Horde_Kolab_Storage_Driver_Namespace_Fixed()
         );
         $this->assertEquals('INBOX/Contacts', $folder->name);
         $this->assertTrue(is_array($folder->_data));
@@ -84,7 +84,7 @@ class Horde_Kolab_Storage_FolderTest extends PHPUnit_Framework_TestCase
         $connection = $this->getMock('Horde_Kolab_Storage_Driver');
         $connection->expects($this->once())
             ->method('getNamespace')
-            ->will($this->returnValue(new Horde_Kolab_Storage_Namespace_Fixed()));
+            ->will($this->returnValue(new Horde_Kolab_Storage_Driver_Namespace_Fixed()));
         $folder = new Horde_Kolab_Storage_Folder_Base('INBOX/Contacts');
         $folder->restore($storage, $connection);
         $folder->setName('TestAÖÜ');
diff --git a/framework/Kolab_Storage/test/Horde/Kolab/Storage/NamespaceTest.php b/framework/Kolab_Storage/test/Horde/Kolab/Storage/NamespaceTest.php
index 9af29823a..bbdce741e 100644
--- a/framework/Kolab_Storage/test/Horde/Kolab/Storage/NamespaceTest.php
+++ b/framework/Kolab_Storage/test/Horde/Kolab/Storage/NamespaceTest.php
@@ -266,43 +266,43 @@ class Horde_Kolab_Storage_NamespaceTest extends PHPUnit_Framework_TestCase
     private function _getNamespaces()
     {
         return array(
-            new Horde_Kolab_Storage_Namespace_Fixed(),
-            new Horde_Kolab_Storage_Namespace_Config(
+            new Horde_Kolab_Storage_Driver_Namespace_Fixed(),
+            new Horde_Kolab_Storage_Driver_Namespace_Config(
                 array(
                     array(
-                        'type' => Horde_Kolab_Storage_Namespace::PERSONAL,
+                        'type' => Horde_Kolab_Storage_Driver_Namespace::PERSONAL,
                         'name' => 'INBOX/',
                         'delimiter' => '/',
                         'add' => true,
                     ),
                     array(
-                        'type' => Horde_Kolab_Storage_Namespace::OTHER,
+                        'type' => Horde_Kolab_Storage_Driver_Namespace::OTHER,
                         'name' => 'user/',
                         'delimiter' => '/',
                     ),
                     array(
-                        'type' => Horde_Kolab_Storage_Namespace::SHARED,
+                        'type' => Horde_Kolab_Storage_Driver_Namespace::SHARED,
                         'name' => '',
                         'delimiter' => '/',
                         'prefix' => 'shared.'
                     ),
                 )
             ),
-            new Horde_Kolab_Storage_Namespace_Imap(
+            new Horde_Kolab_Storage_Driver_Namespace_Imap(
                 array(
                     array(
                         'name'      => 'INBOX/',
-                        'type'      =>  Horde_Kolab_Storage_Namespace::PERSONAL,
+                        'type'      =>  Horde_Kolab_Storage_Driver_Namespace::PERSONAL,
                         'delimiter' => '/',
                     ),
                     array(
                         'name'      => 'user/',
-                        'type'      =>  Horde_Kolab_Storage_Namespace::OTHER,
+                        'type'      =>  Horde_Kolab_Storage_Driver_Namespace::OTHER,
                         'delimiter' => '/',
                     ),
                     array(
                         'name'      => '',
-                        'type'      =>  Horde_Kolab_Storage_Namespace::SHARED,
+                        'type'      =>  Horde_Kolab_Storage_Driver_Namespace::SHARED,
                         'delimiter' => '/',
                     ),
                 ),
diff --git a/framework/Kolab_Storage/test/Horde/Kolab/Storage/PermissionTest.php b/framework/Kolab_Storage/test/Horde/Kolab/Storage/PermissionTest.php
index 47aec9e9d..8add6edd7 100644
--- a/framework/Kolab_Storage/test/Horde/Kolab/Storage/PermissionTest.php
+++ b/framework/Kolab_Storage/test/Horde/Kolab/Storage/PermissionTest.php
@@ -124,10 +124,10 @@ class Horde_Kolab_Storage_PermissionTest extends PHPUnit_Framework_TestCase
             ->method('getNamespace')
             ->will(
                 $this->returnValue(
-                    new Horde_Kolab_Storage_Namespace_Imap(
+                    new Horde_Kolab_Storage_Driver_Namespace_Imap(
                         array(
                             array(
-                                'type' => Horde_Kolab_Storage_Namespace::PERSONAL,
+                                'type' => Horde_Kolab_Storage_Driver_Namespace::PERSONAL,
                                 'name' => 'INBOX/',
                                 'delimiter' => '/',
                                 'add' => true,
@@ -257,10 +257,10 @@ class Horde_Kolab_Storage_PermissionTest extends PHPUnit_Framework_TestCase
             ->method('getNamespace')
             ->will(
                 $this->returnValue(
-                    new Horde_Kolab_Storage_Namespace_Imap(
+                    new Horde_Kolab_Storage_Driver_Namespace_Imap(
                         array(
                             array(
-                                'type' => Horde_Kolab_Storage_Namespace::PERSONAL,
+                                'type' => Horde_Kolab_Storage_Driver_Namespace::PERSONAL,
                                 'name' => 'INBOX/',
                                 'delimiter' => '/',
                                 'add' => true,
-- 
2.11.0