From a0f16724d5b8976dd207abc5d39a00b2f55fec58 Mon Sep 17 00:00:00 2001
From: Chuck Hagenbuch <chuck@bluestatedigital.com>
Date: Sun, 25 Apr 2010 10:33:18 -0400
Subject: [PATCH] Move the autogenerated thrift code into
 Horde/Thrift/thrift_root to avoid any confusion if we add any Horde-written
 classes in the future.

---
 framework/Thrift/lib/Horde/Thrift.php              |  2 +-
 .../lib/Horde/Thrift/{ => thrift_root}/Thrift.php  |  0
 .../packages/fb303/FacebookBase.php                |  0
 .../packages/fb303/FacebookService.php             |  0
 .../packages/fb303/fb303_types.php                 |  0
 .../reflection_limited_types.php                   |  0
 .../packages/scribe/scribe_types.php               |  0
 .../{ => thrift_root}/protocol/TBinaryProtocol.php |  0
 .../{ => thrift_root}/protocol/TProtocol.php       |  0
 .../transport/TBufferedTransport.php               |  0
 .../transport/TFramedTransport.php                 |  0
 .../{ => thrift_root}/transport/THttpClient.php    |  0
 .../{ => thrift_root}/transport/TMemoryBuffer.php  |  0
 .../{ => thrift_root}/transport/TNullTransport.php |  0
 .../{ => thrift_root}/transport/TPhpStream.php     |  0
 .../Thrift/{ => thrift_root}/transport/TSocket.php |  0
 .../{ => thrift_root}/transport/TSocketPool.php    |  0
 .../{ => thrift_root}/transport/TTransport.php     |  0
 framework/Thrift/package.xml                       | 86 +++++++++++-----------
 19 files changed, 45 insertions(+), 43 deletions(-)
 rename framework/Thrift/lib/Horde/Thrift/{ => thrift_root}/Thrift.php (100%)
 rename framework/Thrift/lib/Horde/Thrift/{ => thrift_root}/packages/fb303/FacebookBase.php (100%)
 rename framework/Thrift/lib/Horde/Thrift/{ => thrift_root}/packages/fb303/FacebookService.php (100%)
 rename framework/Thrift/lib/Horde/Thrift/{ => thrift_root}/packages/fb303/fb303_types.php (100%)
 rename framework/Thrift/lib/Horde/Thrift/{ => thrift_root}/packages/reflection_limited/reflection_limited_types.php (100%)
 rename framework/Thrift/lib/Horde/Thrift/{ => thrift_root}/packages/scribe/scribe_types.php (100%)
 rename framework/Thrift/lib/Horde/Thrift/{ => thrift_root}/protocol/TBinaryProtocol.php (100%)
 rename framework/Thrift/lib/Horde/Thrift/{ => thrift_root}/protocol/TProtocol.php (100%)
 rename framework/Thrift/lib/Horde/Thrift/{ => thrift_root}/transport/TBufferedTransport.php (100%)
 rename framework/Thrift/lib/Horde/Thrift/{ => thrift_root}/transport/TFramedTransport.php (100%)
 rename framework/Thrift/lib/Horde/Thrift/{ => thrift_root}/transport/THttpClient.php (100%)
 rename framework/Thrift/lib/Horde/Thrift/{ => thrift_root}/transport/TMemoryBuffer.php (100%)
 rename framework/Thrift/lib/Horde/Thrift/{ => thrift_root}/transport/TNullTransport.php (100%)
 rename framework/Thrift/lib/Horde/Thrift/{ => thrift_root}/transport/TPhpStream.php (100%)
 rename framework/Thrift/lib/Horde/Thrift/{ => thrift_root}/transport/TSocket.php (100%)
 rename framework/Thrift/lib/Horde/Thrift/{ => thrift_root}/transport/TSocketPool.php (100%)
 rename framework/Thrift/lib/Horde/Thrift/{ => thrift_root}/transport/TTransport.php (100%)

diff --git a/framework/Thrift/lib/Horde/Thrift.php b/framework/Thrift/lib/Horde/Thrift.php
index 21c2bcefc..8e5442209 100644
--- a/framework/Thrift/lib/Horde/Thrift.php
+++ b/framework/Thrift/lib/Horde/Thrift.php
@@ -6,7 +6,7 @@ class Horde_Thrift
 {
 }
 
-$GLOBALS['THRIFT_ROOT'] = 'Horde/Thrift';
+$GLOBALS['THRIFT_ROOT'] = 'Horde/Thrift/thrift_root';
 include_once $GLOBALS['THRIFT_ROOT'] . '/Thrift.php';
 include_once $GLOBALS['THRIFT_ROOT'] . '/transport/TSocket.php';
 include_once $GLOBALS['THRIFT_ROOT'] . '/transport/TFramedTransport.php';
diff --git a/framework/Thrift/lib/Horde/Thrift/Thrift.php b/framework/Thrift/lib/Horde/Thrift/thrift_root/Thrift.php
similarity index 100%
rename from framework/Thrift/lib/Horde/Thrift/Thrift.php
rename to framework/Thrift/lib/Horde/Thrift/thrift_root/Thrift.php
diff --git a/framework/Thrift/lib/Horde/Thrift/packages/fb303/FacebookBase.php b/framework/Thrift/lib/Horde/Thrift/thrift_root/packages/fb303/FacebookBase.php
similarity index 100%
rename from framework/Thrift/lib/Horde/Thrift/packages/fb303/FacebookBase.php
rename to framework/Thrift/lib/Horde/Thrift/thrift_root/packages/fb303/FacebookBase.php
diff --git a/framework/Thrift/lib/Horde/Thrift/packages/fb303/FacebookService.php b/framework/Thrift/lib/Horde/Thrift/thrift_root/packages/fb303/FacebookService.php
similarity index 100%
rename from framework/Thrift/lib/Horde/Thrift/packages/fb303/FacebookService.php
rename to framework/Thrift/lib/Horde/Thrift/thrift_root/packages/fb303/FacebookService.php
diff --git a/framework/Thrift/lib/Horde/Thrift/packages/fb303/fb303_types.php b/framework/Thrift/lib/Horde/Thrift/thrift_root/packages/fb303/fb303_types.php
similarity index 100%
rename from framework/Thrift/lib/Horde/Thrift/packages/fb303/fb303_types.php
rename to framework/Thrift/lib/Horde/Thrift/thrift_root/packages/fb303/fb303_types.php
diff --git a/framework/Thrift/lib/Horde/Thrift/packages/reflection_limited/reflection_limited_types.php b/framework/Thrift/lib/Horde/Thrift/thrift_root/packages/reflection_limited/reflection_limited_types.php
similarity index 100%
rename from framework/Thrift/lib/Horde/Thrift/packages/reflection_limited/reflection_limited_types.php
rename to framework/Thrift/lib/Horde/Thrift/thrift_root/packages/reflection_limited/reflection_limited_types.php
diff --git a/framework/Thrift/lib/Horde/Thrift/packages/scribe/scribe_types.php b/framework/Thrift/lib/Horde/Thrift/thrift_root/packages/scribe/scribe_types.php
similarity index 100%
rename from framework/Thrift/lib/Horde/Thrift/packages/scribe/scribe_types.php
rename to framework/Thrift/lib/Horde/Thrift/thrift_root/packages/scribe/scribe_types.php
diff --git a/framework/Thrift/lib/Horde/Thrift/protocol/TBinaryProtocol.php b/framework/Thrift/lib/Horde/Thrift/thrift_root/protocol/TBinaryProtocol.php
similarity index 100%
rename from framework/Thrift/lib/Horde/Thrift/protocol/TBinaryProtocol.php
rename to framework/Thrift/lib/Horde/Thrift/thrift_root/protocol/TBinaryProtocol.php
diff --git a/framework/Thrift/lib/Horde/Thrift/protocol/TProtocol.php b/framework/Thrift/lib/Horde/Thrift/thrift_root/protocol/TProtocol.php
similarity index 100%
rename from framework/Thrift/lib/Horde/Thrift/protocol/TProtocol.php
rename to framework/Thrift/lib/Horde/Thrift/thrift_root/protocol/TProtocol.php
diff --git a/framework/Thrift/lib/Horde/Thrift/transport/TBufferedTransport.php b/framework/Thrift/lib/Horde/Thrift/thrift_root/transport/TBufferedTransport.php
similarity index 100%
rename from framework/Thrift/lib/Horde/Thrift/transport/TBufferedTransport.php
rename to framework/Thrift/lib/Horde/Thrift/thrift_root/transport/TBufferedTransport.php
diff --git a/framework/Thrift/lib/Horde/Thrift/transport/TFramedTransport.php b/framework/Thrift/lib/Horde/Thrift/thrift_root/transport/TFramedTransport.php
similarity index 100%
rename from framework/Thrift/lib/Horde/Thrift/transport/TFramedTransport.php
rename to framework/Thrift/lib/Horde/Thrift/thrift_root/transport/TFramedTransport.php
diff --git a/framework/Thrift/lib/Horde/Thrift/transport/THttpClient.php b/framework/Thrift/lib/Horde/Thrift/thrift_root/transport/THttpClient.php
similarity index 100%
rename from framework/Thrift/lib/Horde/Thrift/transport/THttpClient.php
rename to framework/Thrift/lib/Horde/Thrift/thrift_root/transport/THttpClient.php
diff --git a/framework/Thrift/lib/Horde/Thrift/transport/TMemoryBuffer.php b/framework/Thrift/lib/Horde/Thrift/thrift_root/transport/TMemoryBuffer.php
similarity index 100%
rename from framework/Thrift/lib/Horde/Thrift/transport/TMemoryBuffer.php
rename to framework/Thrift/lib/Horde/Thrift/thrift_root/transport/TMemoryBuffer.php
diff --git a/framework/Thrift/lib/Horde/Thrift/transport/TNullTransport.php b/framework/Thrift/lib/Horde/Thrift/thrift_root/transport/TNullTransport.php
similarity index 100%
rename from framework/Thrift/lib/Horde/Thrift/transport/TNullTransport.php
rename to framework/Thrift/lib/Horde/Thrift/thrift_root/transport/TNullTransport.php
diff --git a/framework/Thrift/lib/Horde/Thrift/transport/TPhpStream.php b/framework/Thrift/lib/Horde/Thrift/thrift_root/transport/TPhpStream.php
similarity index 100%
rename from framework/Thrift/lib/Horde/Thrift/transport/TPhpStream.php
rename to framework/Thrift/lib/Horde/Thrift/thrift_root/transport/TPhpStream.php
diff --git a/framework/Thrift/lib/Horde/Thrift/transport/TSocket.php b/framework/Thrift/lib/Horde/Thrift/thrift_root/transport/TSocket.php
similarity index 100%
rename from framework/Thrift/lib/Horde/Thrift/transport/TSocket.php
rename to framework/Thrift/lib/Horde/Thrift/thrift_root/transport/TSocket.php
diff --git a/framework/Thrift/lib/Horde/Thrift/transport/TSocketPool.php b/framework/Thrift/lib/Horde/Thrift/thrift_root/transport/TSocketPool.php
similarity index 100%
rename from framework/Thrift/lib/Horde/Thrift/transport/TSocketPool.php
rename to framework/Thrift/lib/Horde/Thrift/thrift_root/transport/TSocketPool.php
diff --git a/framework/Thrift/lib/Horde/Thrift/transport/TTransport.php b/framework/Thrift/lib/Horde/Thrift/thrift_root/transport/TTransport.php
similarity index 100%
rename from framework/Thrift/lib/Horde/Thrift/transport/TTransport.php
rename to framework/Thrift/lib/Horde/Thrift/thrift_root/transport/TTransport.php
diff --git a/framework/Thrift/package.xml b/framework/Thrift/package.xml
index f5ebfeae1..b32193646 100644
--- a/framework/Thrift/package.xml
+++ b/framework/Thrift/package.xml
@@ -38,32 +38,34 @@ http://pear.php.net/dtd/package-2.0.xsd">
    <dir name="lib">
     <dir name="Horde">
      <dir name="Thrift">
-      <dir name="packages">
-       <dir name="reflection_limited">
-        <file name="reflection_limited_types.php" role="php" />
-       </dir> <!-- /lib/Horde/Thrift/packages/reflection_limited -->
-       <dir name="fb303">
-        <file name="fb303_types.php" role="php" />
-        <file name="FacebookBase.php" role="php" />
-        <file name="FacebookService.php" role="php" />
-       </dir> <!-- /lib/Horde/Thrift/packages/fb303 -->
-      </dir> <!-- /lib/Horde/Thrift/packages -->
-      <dir name="protocol">
-       <file name="TBinaryProtocol.php" role="php" />
-       <file name="TProtocol.php" role="php" />
-      </dir> <!-- /lib/Horde/Thrift/protocol -->
-      <dir name="transport">
-       <file name="TBufferedTransport.php" role="php" />
-       <file name="TFramedTransport.php" role="php" />
-       <file name="TNullTransport.php" role="php" />
-       <file name="TPhpStream.php" role="php" />
-       <file name="THttpClient.php" role="php" />
-       <file name="TMemoryBuffer.php" role="php" />
-       <file name="TSocketPool.php" role="php" />
-       <file name="TSocket.php" role="php" />
-       <file name="TTransport.php" role="php" />
-      </dir> <!-- /lib/Horde/Thrift/transport -->
-      <file name="Thrift.php" role="php" />
+      <dir name="thrift_root">
+       <dir name="packages">
+        <dir name="reflection_limited">
+         <file name="reflection_limited_types.php" role="php" />
+        </dir> <!-- /lib/Horde/Thrift/thrift_root/packages/reflection_limited -->
+        <dir name="fb303">
+         <file name="fb303_types.php" role="php" />
+         <file name="FacebookBase.php" role="php" />
+         <file name="FacebookService.php" role="php" />
+        </dir> <!-- /lib/Horde/Thrift/thrift_root/packages/fb303 -->
+       </dir> <!-- /lib/Horde/Thrift/thrift_root/packages -->
+       <dir name="protocol">
+        <file name="TBinaryProtocol.php" role="php" />
+        <file name="TProtocol.php" role="php" />
+       </dir> <!-- /lib/Horde/Thrift/thrift_root/protocol -->
+       <dir name="transport">
+        <file name="TBufferedTransport.php" role="php" />
+        <file name="TFramedTransport.php" role="php" />
+        <file name="TNullTransport.php" role="php" />
+        <file name="TPhpStream.php" role="php" />
+        <file name="THttpClient.php" role="php" />
+        <file name="TMemoryBuffer.php" role="php" />
+        <file name="TSocketPool.php" role="php" />
+        <file name="TSocket.php" role="php" />
+        <file name="TTransport.php" role="php" />
+       </dir> <!-- /lib/Horde/Thrift/thrift_root/transport -->
+       <file name="Thrift.php" role="php" />
+      </dir> <!-- /lib/Horde/Thrift/thrift_root -->
      </dir> <!-- /lib/Horde/Thrift -->
      <file name="Thrift.php" role="php" />
     </dir> <!-- /lib/Horde -->
@@ -82,22 +84,22 @@ http://pear.php.net/dtd/package-2.0.xsd">
  </dependencies>
  <phprelease>
   <filelist>
-   <install name="lib/Horde/Thrift/packages/reflection_limited/reflection_limited_types.php" as="Horde/Thrift/packages/reflection_limited/reflection_limited_types.php" />
-   <install name="lib/Horde/Thrift/packages/fb303/fb303_types.php" as="Horde/Thrift/packages/fb303/fb303_types.php" />
-   <install name="lib/Horde/Thrift/packages/fb303/FacebookBase.php" as="Horde/Thrift/packages/fb303/FacebookBase.php" />
-   <install name="lib/Horde/Thrift/packages/fb303/FacebookService.php" as="Horde/Thrift/packages/fb303/FacebookService.php" />
-   <install name="lib/Horde/Thrift/protocol/TBinaryProtocol.php" as="Horde/Thrift/protocol/TBinaryProtocol.php" />
-   <install name="lib/Horde/Thrift/protocol/TProtocol.php" as="Horde/Thrift/protocol/TProtocol.php" />
-   <install name="lib/Horde/Thrift/transport/TBufferedTransport.php" as="Horde/Thrift/transport/TBufferedTransport.php" />
-   <install name="lib/Horde/Thrift/transport/TFramedTransport.php" as="Horde/Thrift/transport/TFramedTransport.php" />
-   <install name="lib/Horde/Thrift/transport/TNullTransport.php" as="Horde/Thrift/transport/TNullTransport.php" />
-   <install name="lib/Horde/Thrift/transport/TPhpStream.php" as="Horde/Thrift/transport/TPhpStream.php" />
-   <install name="lib/Horde/Thrift/transport/THttpClient.php" as="Horde/Thrift/transport/THttpClient.php" />
-   <install name="lib/Horde/Thrift/transport/TMemoryBuffer.php" as="Horde/Thrift/transport/TMemoryBuffer.php" />
-   <install name="lib/Horde/Thrift/transport/TSocketPool.php" as="Horde/Thrift/transport/TSocketPool.php" />
-   <install name="lib/Horde/Thrift/transport/TSocket.php" as="Horde/Thrift/transport/TSocket.php" />
-   <install name="lib/Horde/Thrift/transport/TTransport.php" as="Horde/Thrift/transport/TTransport.php" />
-   <install name="lib/Horde/Thrift/Thrift.php" as="Horde/Thrift/Thrift.php" />
+   <install name="lib/Horde/Thrift/thrift_root/packages/reflection_limited/reflection_limited_types.php" as="Horde/Thrift/thrift_root/packages/reflection_limited/reflection_limited_types.php" />
+   <install name="lib/Horde/Thrift/thrift_root/packages/fb303/fb303_types.php" as="Horde/Thrift/thrift_root/packages/fb303/fb303_types.php" />
+   <install name="lib/Horde/Thrift/thrift_root/packages/fb303/FacebookBase.php" as="Horde/Thrift/thrift_root/packages/fb303/FacebookBase.php" />
+   <install name="lib/Horde/Thrift/thrift_root/packages/fb303/FacebookService.php" as="Horde/Thrift/thrift_root/packages/fb303/FacebookService.php" />
+   <install name="lib/Horde/Thrift/thrift_root/protocol/TBinaryProtocol.php" as="Horde/Thrift/thrift_root/protocol/TBinaryProtocol.php" />
+   <install name="lib/Horde/Thrift/thrift_root/protocol/TProtocol.php" as="Horde/Thrift/thrift_root/protocol/TProtocol.php" />
+   <install name="lib/Horde/Thrift/thrift_root/transport/TBufferedTransport.php" as="Horde/Thrift/thrift_root/transport/TBufferedTransport.php" />
+   <install name="lib/Horde/Thrift/thrift_root/transport/TFramedTransport.php" as="Horde/Thrift/thrift_root/transport/TFramedTransport.php" />
+   <install name="lib/Horde/Thrift/thrift_root/transport/TNullTransport.php" as="Horde/Thrift/thrift_root/transport/TNullTransport.php" />
+   <install name="lib/Horde/Thrift/thrift_root/transport/TPhpStream.php" as="Horde/Thrift/thrift_root/transport/TPhpStream.php" />
+   <install name="lib/Horde/Thrift/thrift_root/transport/THttpClient.php" as="Horde/Thrift/thrift_root/transport/THttpClient.php" />
+   <install name="lib/Horde/Thrift/thrift_root/transport/TMemoryBuffer.php" as="Horde/Thrift/thrift_root/transport/TMemoryBuffer.php" />
+   <install name="lib/Horde/Thrift/thrift_root/transport/TSocketPool.php" as="Horde/Thrift/thrift_root/transport/TSocketPool.php" />
+   <install name="lib/Horde/Thrift/thrift_root/transport/TSocket.php" as="Horde/Thrift/thrift_root/transport/TSocket.php" />
+   <install name="lib/Horde/Thrift/thrift_root/transport/TTransport.php" as="Horde/Thrift/thrift_root/transport/TTransport.php" />
+   <install name="lib/Horde/Thrift/thrift_root/Thrift.php" as="Horde/Thrift/thrift_root/Thrift.php" />
    <install name="lib/Horde/Thrift.php" as="Horde/Thrift.php" />
   </filelist>
  </phprelease>
-- 
2.11.0