From 7c963f44ea00118c1afc4d532e3dd97697ba8f58 Mon Sep 17 00:00:00 2001
From: Gunnar Wrobel <p@rdus.de>
Date: Tue, 4 Jan 2011 07:00:41 +0100
Subject: [PATCH] No decorator.

---
 .../Kolab/Storage/List/Query/{Decorator => }/Cache.php     |  2 +-
 framework/Kolab_Storage/package.xml                        | 14 +++++++-------
 .../Kolab_Storage/test/Horde/Kolab/Storage/TestCase.php    |  2 +-
 .../Storage/Unit/List/Query/{Decorator => }/CacheTest.php  |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)
 rename framework/Kolab_Storage/lib/Horde/Kolab/Storage/List/Query/{Decorator => }/Cache.php (98%)
 rename framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/List/Query/{Decorator => }/CacheTest.php (96%)

diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/List/Query/Decorator/Cache.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/List/Query/Cache.php
similarity index 98%
rename from framework/Kolab_Storage/lib/Horde/Kolab/Storage/List/Query/Decorator/Cache.php
rename to framework/Kolab_Storage/lib/Horde/Kolab/Storage/List/Query/Cache.php
index 3fc2c87df..86c43c3e2 100644
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/List/Query/Decorator/Cache.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/List/Query/Cache.php
@@ -25,7 +25,7 @@
  * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
  * @link     http://pear.horde.org/index.php?package=Kolab_Storage
  */
-class Horde_Kolab_Storage_List_Query_Decorator_Cache
+class Horde_Kolab_Storage_List_Query_Cache
 implements Horde_Kolab_Storage_List_Query
 {
     /** The folder type list */
diff --git a/framework/Kolab_Storage/package.xml b/framework/Kolab_Storage/package.xml
index 79a145163..996da58e9 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>2011-01-03</date>
- <time>17:20:40</time>
+ <date>2011-01-04</date>
+ <time>06:58:27</time>
  <version>
   <release>0.4.0</release>
   <api>0.1.0</api>
@@ -145,10 +145,8 @@
          <file name="Log.php" role="php" />
         </dir> <!-- /lib/Horde/Kolab/Storage/List/Decorator -->
         <dir name="Query">
-         <dir name="Decorator">
-          <file name="Cache.php" role="php" />
-         </dir> <!-- /lib/Horde/Kolab/Storage/List/Query/Decorator -->
          <file name="Base.php" role="php" />
+         <file name="Cache.php" role="php" />
         </dir> <!-- /lib/Horde/Kolab/Storage/List/Query -->
         <file name="Base.php" role="php" />
         <file name="Query.php" role="php" />
@@ -469,6 +467,7 @@
          </dir> <!-- /test/Horde/Kolab/Storage/Unit/List/Decorator -->
          <dir name="Query">
           <file name="BaseTest.php" role="test" />
+          <file name="CacheTest.php" role="test" />
          </dir> <!-- /test/Horde/Kolab/Storage/Unit/List/Query -->
          <file name="BaseTest.php" role="test" />
         </dir> <!-- /test/Horde/Kolab/Storage/Unit/List -->
@@ -633,7 +632,7 @@
    <install as="Horde/Kolab/Storage/List/Decorator/Cache.php" name="lib/Horde/Kolab/Storage/List/Decorator/Cache.php" />
    <install as="Horde/Kolab/Storage/List/Decorator/Log.php" name="lib/Horde/Kolab/Storage/List/Decorator/Log.php" />
    <install as="Horde/Kolab/Storage/List/Query/Base.php" name="lib/Horde/Kolab/Storage/List/Query/Base.php" />
-   <install as="Horde/Kolab/Storage/List/Query/Decorator/Cache.php" name="lib/Horde/Kolab/Storage/List/Query/Decorator/Cache.php" />
+   <install as="Horde/Kolab/Storage/List/Query/Cache.php" name="lib/Horde/Kolab/Storage/List/Query/Cache.php" />
    <install as="locale/Horde_Kolab_Storage.pot" name="locale/Horde_Kolab_Storage.pot" />
    <install as="locale/ar/LC_MESSAGES/Horde_Kolab_Storage.mo" name="locale/ar/LC_MESSAGES/Horde_Kolab_Storage.mo" />
    <install as="locale/ar/LC_MESSAGES/Horde_Kolab_Storage.po" name="locale/ar/LC_MESSAGES/Horde_Kolab_Storage.po" />
@@ -753,6 +752,7 @@
    <install as="Horde/Kolab/Storage/Unit/List/Decorator/CacheTest.php" name="test/Horde/Kolab/Storage/Unit/List/Decorator/CacheTest.php" />
    <install as="Horde/Kolab/Storage/Unit/List/Decorator/LogTest.php" name="test/Horde/Kolab/Storage/Unit/List/Decorator/LogTest.php" />
    <install as="Horde/Kolab/Storage/Unit/List/Query/BaseTest.php" name="test/Horde/Kolab/Storage/Unit/List/Query/BaseTest.php" />
+   <install as="Horde/Kolab/Storage/Unit/List/Query/CacheTest.php" name="test/Horde/Kolab/Storage/Unit/List/Query/CacheTest.php" />
    <install as="TODO" name="TODO" />
   </filelist>
  </phprelease>
@@ -824,7 +824,7 @@
     <release>alpha</release>
     <api>alpha</api>
    </stability>
-   <date>2011-01-03</date>
+   <date>2011-01-04</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/TestCase.php b/framework/Kolab_Storage/test/Horde/Kolab/Storage/TestCase.php
index 43eb2b911..835dd67e9 100644
--- a/framework/Kolab_Storage/test/Horde/Kolab/Storage/TestCase.php
+++ b/framework/Kolab_Storage/test/Horde/Kolab/Storage/TestCase.php
@@ -195,7 +195,7 @@ extends PHPUnit_Framework_TestCase
             $bare_list,
             $list_cache
         );
-        $query = new Horde_Kolab_Storage_List_Query_Decorator_Cache(
+        $query = new Horde_Kolab_Storage_List_Query_Cache(
             $list,
             $factory,
             $list_cache
diff --git a/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/List/Query/Decorator/CacheTest.php b/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/List/Query/CacheTest.php
similarity index 96%
rename from framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/List/Query/Decorator/CacheTest.php
rename to framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/List/Query/CacheTest.php
index 22e1265a4..0be91df6f 100644
--- a/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/List/Query/Decorator/CacheTest.php
+++ b/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/List/Query/CacheTest.php
@@ -15,7 +15,7 @@
 /**
  * Prepare the test setup.
  */
-require_once dirname(__FILE__) . '/../../../../Autoload.php';
+require_once dirname(__FILE__) . '/../../../Autoload.php';
 
 /**
  * Test the cached list query.
@@ -32,7 +32,7 @@ require_once dirname(__FILE__) . '/../../../../Autoload.php';
  * @license    http://www.fsf.org/copyleft/lgpl.html LGPL
  * @link       http://pear.horde.org/index.php?package=Kolab_Storage
  */
-class Horde_Kolab_Storage_Unit_List_Query_Decorator_CacheTest
+class Horde_Kolab_Storage_Unit_List_Query_CacheTest
 extends Horde_Kolab_Storage_TestCase
 {
     public function testAnotationsReturnsArray()
-- 
2.11.0