You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@shindig.apache.org by ch...@apache.org on 2008/09/13 12:59:27 UTC

svn commit: r694927 [1/2] - in /incubator/shindig/trunk/php: external/Zend/ external/Zend/Feed/ external/Zend/Feed/Builder/ external/Zend/Feed/Builder/Header/ external/Zend/Feed/Entry/ external/Zend/Http/ external/Zend/Http/Client/ external/Zend/Http/C...

Author: chabotc
Date: Sat Sep 13 03:59:25 2008
New Revision: 694927

URL: http://svn.apache.org/viewvc?rev=694927&view=rev
Log:
Move src/common/Zend to external/Zend, where it belongs

Added:
    incubator/shindig/trunk/php/external/Zend/
      - copied from r694923, incubator/shindig/trunk/php/src/common/Zend/
Removed:
    incubator/shindig/trunk/php/src/common/Zend/
Modified:
    incubator/shindig/trunk/php/external/Zend/Feed.php
    incubator/shindig/trunk/php/external/Zend/Feed/Abstract.php
    incubator/shindig/trunk/php/external/Zend/Feed/Atom.php
    incubator/shindig/trunk/php/external/Zend/Feed/Builder.php
    incubator/shindig/trunk/php/external/Zend/Feed/Builder/Entry.php
    incubator/shindig/trunk/php/external/Zend/Feed/Builder/Exception.php
    incubator/shindig/trunk/php/external/Zend/Feed/Builder/Header.php
    incubator/shindig/trunk/php/external/Zend/Feed/Builder/Header/Itunes.php
    incubator/shindig/trunk/php/external/Zend/Feed/Element.php
    incubator/shindig/trunk/php/external/Zend/Feed/Entry/Abstract.php
    incubator/shindig/trunk/php/external/Zend/Feed/Entry/Atom.php
    incubator/shindig/trunk/php/external/Zend/Feed/Entry/Rss.php
    incubator/shindig/trunk/php/external/Zend/Feed/Exception.php
    incubator/shindig/trunk/php/external/Zend/Feed/Rss.php
    incubator/shindig/trunk/php/external/Zend/Http/Client.php
    incubator/shindig/trunk/php/external/Zend/Http/Client/Adapter/Exception.php
    incubator/shindig/trunk/php/external/Zend/Http/Client/Adapter/Proxy.php
    incubator/shindig/trunk/php/external/Zend/Http/Client/Adapter/Socket.php
    incubator/shindig/trunk/php/external/Zend/Http/Client/Adapter/Test.php
    incubator/shindig/trunk/php/external/Zend/Http/Client/Exception.php
    incubator/shindig/trunk/php/external/Zend/Http/Cookie.php
    incubator/shindig/trunk/php/external/Zend/Http/CookieJar.php
    incubator/shindig/trunk/php/external/Zend/Http/Exception.php
    incubator/shindig/trunk/php/external/Zend/Http/Response.php
    incubator/shindig/trunk/php/external/Zend/Loader.php
    incubator/shindig/trunk/php/external/Zend/Loader/Exception.php
    incubator/shindig/trunk/php/external/Zend/Loader/PluginLoader.php
    incubator/shindig/trunk/php/external/Zend/Loader/PluginLoader/Exception.php
    incubator/shindig/trunk/php/external/Zend/README
    incubator/shindig/trunk/php/external/Zend/Registry.php
    incubator/shindig/trunk/php/external/Zend/Uri.php
    incubator/shindig/trunk/php/external/Zend/Uri/Exception.php
    incubator/shindig/trunk/php/external/Zend/Uri/Http.php
    incubator/shindig/trunk/php/external/Zend/Validate.php
    incubator/shindig/trunk/php/external/Zend/Validate/Abstract.php
    incubator/shindig/trunk/php/external/Zend/Validate/Alnum.php
    incubator/shindig/trunk/php/external/Zend/Validate/Alpha.php
    incubator/shindig/trunk/php/external/Zend/Validate/Barcode.php
    incubator/shindig/trunk/php/external/Zend/Validate/Barcode/Ean13.php
    incubator/shindig/trunk/php/external/Zend/Validate/Barcode/UpcA.php
    incubator/shindig/trunk/php/external/Zend/Validate/Between.php
    incubator/shindig/trunk/php/external/Zend/Validate/Ccnum.php
    incubator/shindig/trunk/php/external/Zend/Validate/Date.php
    incubator/shindig/trunk/php/external/Zend/Validate/Digits.php
    incubator/shindig/trunk/php/external/Zend/Validate/EmailAddress.php
    incubator/shindig/trunk/php/external/Zend/Validate/Exception.php
    incubator/shindig/trunk/php/external/Zend/Validate/Float.php
    incubator/shindig/trunk/php/external/Zend/Validate/GreaterThan.php
    incubator/shindig/trunk/php/external/Zend/Validate/Hex.php
    incubator/shindig/trunk/php/external/Zend/Validate/Hostname.php
    incubator/shindig/trunk/php/external/Zend/Validate/Hostname/At.php
    incubator/shindig/trunk/php/external/Zend/Validate/Hostname/Ch.php
    incubator/shindig/trunk/php/external/Zend/Validate/Hostname/De.php
    incubator/shindig/trunk/php/external/Zend/Validate/Hostname/Fi.php
    incubator/shindig/trunk/php/external/Zend/Validate/Hostname/Hu.php
    incubator/shindig/trunk/php/external/Zend/Validate/Hostname/Li.php
    incubator/shindig/trunk/php/external/Zend/Validate/Hostname/No.php
    incubator/shindig/trunk/php/external/Zend/Validate/Hostname/Se.php
    incubator/shindig/trunk/php/external/Zend/Validate/Identical.php
    incubator/shindig/trunk/php/external/Zend/Validate/InArray.php
    incubator/shindig/trunk/php/external/Zend/Validate/Int.php
    incubator/shindig/trunk/php/external/Zend/Validate/Ip.php
    incubator/shindig/trunk/php/external/Zend/Validate/LessThan.php
    incubator/shindig/trunk/php/external/Zend/Validate/NotEmpty.php
    incubator/shindig/trunk/php/external/Zend/Validate/Regex.php
    incubator/shindig/trunk/php/external/Zend/Validate/StringLength.php
    incubator/shindig/trunk/php/src/gadgets/ProxyHandler.php

Modified: incubator/shindig/trunk/php/external/Zend/Feed.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/Zend/Feed.php?rev=694927&r1=694923&r2=694927&view=diff
==============================================================================
--- incubator/shindig/trunk/php/external/Zend/Feed.php (original)
+++ incubator/shindig/trunk/php/external/Zend/Feed.php Sat Sep 13 03:59:25 2008
@@ -84,7 +84,7 @@
             /**
              * @see Zend_Http_Client
              */
-            require_once 'src/common/Zend/Http/Client.php';
+            require_once 'external/Zend/Http/Client.php';
             self::$_httpClient = new Zend_Http_Client();
         }
 
@@ -173,7 +173,7 @@
             /**
              * @see Zend_Feed_Exception
              */
-            require_once 'src/common/Zend/Feed/Exception.php';
+            require_once 'external/Zend/Feed/Exception.php';
             throw new Zend_Feed_Exception('Feed failed to load, got response code ' . $response->getStatus());
         }
         $feed = $response->getBody();
@@ -208,7 +208,7 @@
             /**
              * @see Zend_Feed_Exception
              */
-            require_once 'src/common/Zend/Feed/Exception.php';
+            require_once 'external/Zend/Feed/Exception.php';
             throw new Zend_Feed_Exception("DOMDocument cannot parse XML: $php_errormsg");
         }
 
@@ -218,7 +218,7 @@
             /**
              * @see Zend_Feed_Atom
              */
-            require_once 'src/common/Zend/Feed/Atom.php';
+            require_once 'external/Zend/Feed/Atom.php';
             // return a newly created Zend_Feed_Atom object
             return new Zend_Feed_Atom(null, $string);
         }
@@ -228,7 +228,7 @@
             /**
              * @see Zend_Feed_Rss
              */
-            require_once 'src/common/Zend/Feed/Rss.php';
+            require_once 'external/Zend/Feed/Rss.php';
             // return a newly created Zend_Feed_Rss object
             return new Zend_Feed_Rss(null, $string);
         }
@@ -237,7 +237,7 @@
         /**
          * @see Zend_Feed_Exception
          */
-        require_once 'src/common/Zend/Feed/Exception.php';
+        require_once 'external/Zend/Feed/Exception.php';
         throw new Zend_Feed_Exception('Invalid or unsupported feed format');
     }
 
@@ -258,7 +258,7 @@
             /**
              * @see Zend_Feed_Exception
              */
-            require_once 'src/common/Zend/Feed/Exception.php';
+            require_once 'external/Zend/Feed/Exception.php';
             throw new Zend_Feed_Exception("File could not be loaded: $php_errormsg");
         }
         return self::importString($feed);
@@ -285,7 +285,7 @@
             /**
              * @see Zend_Feed_Exception
              */
-            require_once 'src/common/Zend/Feed/Exception.php';
+            require_once 'external/Zend/Feed/Exception.php';
             throw new Zend_Feed_Exception("Failed to access $uri, got response code " . $response->getStatus());
         }
         $contents = $response->getBody();
@@ -299,7 +299,7 @@
             /**
              * @see Zend_Feed_Exception
              */
-            require_once 'src/common/Zend/Feed/Exception.php';
+            require_once 'external/Zend/Feed/Exception.php';
             throw new Zend_Feed_Exception("Internal error: $php_errormsg");
         }
 
@@ -375,7 +375,7 @@
         /**
          * @see Zend_Loader
          */
-        require_once 'src/common/Zend/Loader.php';
+        require_once 'external/Zend/Loader.php';
         Zend_Loader::loadClass($obj);
         Zend_Loader::loadClass('Zend_Feed_Builder');
 
@@ -395,7 +395,7 @@
         /**
          * @see Zend_Loader
          */
-        require_once 'src/common/Zend/Loader.php';
+        require_once 'external/Zend/Loader.php';
         Zend_Loader::loadClass($obj);
 
         return new $obj(null, null, $builder);

Modified: incubator/shindig/trunk/php/external/Zend/Feed/Abstract.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/Zend/Feed/Abstract.php?rev=694927&r1=694923&r2=694927&view=diff
==============================================================================
--- incubator/shindig/trunk/php/external/Zend/Feed/Abstract.php (original)
+++ incubator/shindig/trunk/php/external/Zend/Feed/Abstract.php Sat Sep 13 03:59:25 2008
@@ -24,7 +24,7 @@
 /**
  * @see Zend_Feed_Element
  */
-require_once 'src/common/Zend/Feed/Element.php';
+require_once 'external/Zend/Feed/Element.php';
 
 
 /**
@@ -80,7 +80,7 @@
                 /** 
                  * @see Zend_Feed_Exception
                  */
-                require_once 'src/common/Zend/Feed/Exception.php';
+                require_once 'external/Zend/Feed/Exception.php';
             	throw new Zend_Feed_Exception('Feed failed to load, got response code ' . $response->getStatus());
             }
             $this->_element = $response->getBody();
@@ -126,7 +126,7 @@
             /** 
              * @see Zend_Feed_Exception
              */
-            require_once 'src/common/Zend/Feed/Exception.php';
+            require_once 'external/Zend/Feed/Exception.php';
             throw new Zend_Feed_Exception("DOMDocument cannot parse XML: $php_errormsg");
         }
 

Modified: incubator/shindig/trunk/php/external/Zend/Feed/Atom.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/Zend/Feed/Atom.php?rev=694927&r1=694923&r2=694927&view=diff
==============================================================================
--- incubator/shindig/trunk/php/external/Zend/Feed/Atom.php (original)
+++ incubator/shindig/trunk/php/external/Zend/Feed/Atom.php Sat Sep 13 03:59:25 2008
@@ -24,12 +24,12 @@
 /**
  * @see Zend_Feed_Abstract
  */
-require_once 'src/common/Zend/Feed/Abstract.php';
+require_once 'external/Zend/Feed/Abstract.php';
 
 /**
  * @see Zend_Feed_Entry_Atom
  */
-require_once 'src/common/Zend/Feed/Entry/Atom.php';
+require_once 'external/Zend/Feed/Entry/Atom.php';
 
 
 /**
@@ -92,7 +92,7 @@
                 /** 
                  * @see Zend_Feed_Exception
                  */
-                require_once 'src/common/Zend/Feed/Exception.php';
+                require_once 'external/Zend/Feed/Exception.php';
                 throw new Zend_Feed_Exception('No root <feed> or <' . $this->_entryElementName
                                               . '> element found, cannot parse feed.');
             }
@@ -379,7 +379,7 @@
             /** 
              * @see Zend_Feed_Exception
              */
-            require_once 'src/common/Zend/Feed/Exception.php';
+            require_once 'external/Zend/Feed/Exception.php';
             throw new Zend_Feed_Exception('Cannot send ATOM because headers have already been sent.');
         }
 

Modified: incubator/shindig/trunk/php/external/Zend/Feed/Builder.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/Zend/Feed/Builder.php?rev=694927&r1=694923&r2=694927&view=diff
==============================================================================
--- incubator/shindig/trunk/php/external/Zend/Feed/Builder.php (original)
+++ incubator/shindig/trunk/php/external/Zend/Feed/Builder.php Sat Sep 13 03:59:25 2008
@@ -24,17 +24,17 @@
 /**
  * @see Zend_Feed_Builder_Interface
  */
-require_once 'src/common/Zend/Feed/Builder/Interface.php';
+require_once 'external/Zend/Feed/Builder/Interface.php';
 
 /**
  * @see Zend_Feed_Builder_Header
  */
-require_once 'src/common/Zend/Feed/Builder/Header.php';
+require_once 'external/Zend/Feed/Builder/Header.php';
 
 /**
  * @see Zend_Feed_Builder_Entry
  */
-require_once 'src/common/Zend/Feed/Builder/Entry.php';
+require_once 'external/Zend/Feed/Builder/Entry.php';
 
 
 /**
@@ -220,7 +220,7 @@
                 /**
                  * @see Zend_Feed_Builder_Exception
                  */
-                require_once 'src/common/Zend/Feed/Builder/Exception.php';
+                require_once 'external/Zend/Feed/Builder/Exception.php';
                 throw new Zend_Feed_Builder_Exception("$mandatory key is missing");
             }
         }
@@ -268,7 +268,7 @@
                     /**
                      * @see Zend_Feed_Builder_Exception
                      */
-                    require_once 'src/common/Zend/Feed/Builder/Exception.php';
+                    require_once 'external/Zend/Feed/Builder/Exception.php';
                     throw new Zend_Feed_Builder_Exception("you have to define $mandatory property of your cloud");
                 }
             }
@@ -282,7 +282,7 @@
                     /**
                      * @see Zend_Feed_Builder_Exception
                      */
-                    require_once 'src/common/Zend/Feed/Builder/Exception.php';
+                    require_once 'external/Zend/Feed/Builder/Exception.php';
                     throw new Zend_Feed_Builder_Exception("you have to define $mandatory property of your textInput");
                 }
             }
@@ -349,7 +349,7 @@
                     /**
                      * @see Zend_Feed_Builder_Exception
                      */
-                    require_once 'src/common/Zend/Feed/Builder/Exception.php';
+                    require_once 'external/Zend/Feed/Builder/Exception.php';
                     throw new Zend_Feed_Builder_Exception("$mandatory key is missing");
                 }
             }
@@ -376,7 +376,7 @@
                         /**
                          * @see Zend_Feed_Builder_Exception
                          */
-                        require_once 'src/common/Zend/Feed/Builder/Exception.php';
+                        require_once 'external/Zend/Feed/Builder/Exception.php';
                         throw new Zend_Feed_Builder_Exception("$mandatory key of source property is missing");
                     }
                 }

Modified: incubator/shindig/trunk/php/external/Zend/Feed/Builder/Entry.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/Zend/Feed/Builder/Entry.php?rev=694927&r1=694923&r2=694927&view=diff
==============================================================================
--- incubator/shindig/trunk/php/external/Zend/Feed/Builder/Entry.php (original)
+++ incubator/shindig/trunk/php/external/Zend/Feed/Builder/Entry.php Sat Sep 13 03:59:25 2008
@@ -212,7 +212,7 @@
             /**
              * @see Zend_Feed_Builder_Exception
              */
-            require_once 'src/common/Zend/Feed/Builder/Exception.php';
+            require_once 'external/Zend/Feed/Builder/Exception.php';
             throw new Zend_Feed_Builder_Exception("you have to define the name of the category");
         }
 
@@ -251,7 +251,7 @@
                 /**
                  * @see Zend_Feed_Builder_Exception
                  */
-                require_once 'src/common/Zend/Feed/Builder/Exception.php';
+                require_once 'external/Zend/Feed/Builder/Exception.php';
                 throw new Zend_Feed_Builder_Exception("you have to supply an url for your enclosure");
             }
             $type = isset($enclosure['type']) ? $enclosure['type'] : '';

Modified: incubator/shindig/trunk/php/external/Zend/Feed/Builder/Exception.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/Zend/Feed/Builder/Exception.php?rev=694927&r1=694923&r2=694927&view=diff
==============================================================================
--- incubator/shindig/trunk/php/external/Zend/Feed/Builder/Exception.php (original)
+++ incubator/shindig/trunk/php/external/Zend/Feed/Builder/Exception.php Sat Sep 13 03:59:25 2008
@@ -24,7 +24,7 @@
 /**
  * @see Zend_Feed_Exception
  */
-require_once 'src/common/Zend/Feed/Exception.php';
+require_once 'external/Zend/Feed/Exception.php';
 
 
 /**

Modified: incubator/shindig/trunk/php/external/Zend/Feed/Builder/Header.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/Zend/Feed/Builder/Header.php?rev=694927&r1=694923&r2=694927&view=diff
==============================================================================
--- incubator/shindig/trunk/php/external/Zend/Feed/Builder/Header.php (original)
+++ incubator/shindig/trunk/php/external/Zend/Feed/Builder/Header.php Sat Sep 13 03:59:25 2008
@@ -24,17 +24,17 @@
 /**
  * @see Zend_Loader
  */
-require_once 'src/common/Zend/Loader.php';
+require_once 'external/Zend/Loader.php';
 
 /**
  * @see Zend_Feed_Builder_Header_Itunes
  */
-require_once 'src/common/Zend/Feed/Builder/Header/Itunes.php';
+require_once 'external/Zend/Feed/Builder/Header/Itunes.php';
 
 /**
  * @see Zend_Uri
  */
-require_once 'src/common/Zend/Uri.php';
+require_once 'external/Zend/Uri.php';
 
 
 /**
@@ -181,7 +181,7 @@
             /**
              * @see Zend_Feed_Builder_Exception
              */
-            require_once 'src/common/Zend/Feed/Builder/Exception.php';
+            require_once 'external/Zend/Feed/Builder/Exception.php';
             throw new Zend_Feed_Builder_Exception("you have to set a valid email address into the email property");
         }
         $this->offsetSet('email', $email);
@@ -252,7 +252,7 @@
             /**
              * @see Zend_Feed_Builder_Exception
              */
-            require_once 'src/common/Zend/Feed/Builder/Exception.php';
+            require_once 'external/Zend/Feed/Builder/Exception.php';
             throw new Zend_Feed_Builder_Exception("you have to set a valid email address into the webmaster property");
         }
         $this->offsetSet('webmaster', $webmaster);
@@ -275,7 +275,7 @@
             /**
              * @see Zend_Feed_Builder_Exception
              */
-            require_once 'src/common/Zend/Feed/Builder/Exception.php';
+            require_once 'external/Zend/Feed/Builder/Exception.php';
             throw new Zend_Feed_Builder_Exception("you have to set an integer value to the ttl property");
         }
         $this->offsetSet('ttl', $ttl);
@@ -314,7 +314,7 @@
             /**
              * @see Zend_Feed_Builder_Exception
              */
-            require_once 'src/common/Zend/Feed/Builder/Exception.php';
+            require_once 'external/Zend/Feed/Builder/Exception.php';
             throw new Zend_Feed_Builder_Exception('Passed parameter is not a valid HTTP URI');
         }
         if (!$uri->getPort()) {
@@ -359,7 +359,7 @@
             /**
              * @see Zend_Feed_Builder_Exception
              */
-            require_once 'src/common/Zend/Feed/Builder/Exception.php';
+            require_once 'external/Zend/Feed/Builder/Exception.php';
             throw new Zend_Feed_Builder_Exception("you can not have more than 24 rows in the skipHours property");
         }
         foreach ($hours as $hour) {
@@ -367,7 +367,7 @@
                 /**
                  * @see Zend_Feed_Builder_Exception
                  */
-                require_once 'src/common/Zend/Feed/Builder/Exception.php';
+                require_once 'external/Zend/Feed/Builder/Exception.php';
                 throw new Zend_Feed_Builder_Exception("$hour has te be between 0 and 23");
             }
         }
@@ -389,7 +389,7 @@
             /**
              * @see Zend_Feed_Builder_Exception
              */
-            require_once 'src/common/Zend/Feed/Builder/Exception.php';
+            require_once 'external/Zend/Feed/Builder/Exception.php';
             throw new Zend_Feed_Builder_Exception("you can not have more than 7 days in the skipDays property");
         }
         $valid = array('monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday', 'sunday');
@@ -398,7 +398,7 @@
                 /**
                  * @see Zend_Feed_Builder_Exception
                  */
-                require_once 'src/common/Zend/Feed/Builder/Exception.php';
+                require_once 'external/Zend/Feed/Builder/Exception.php';
                 throw new Zend_Feed_Builder_Exception("$day is not a valid day");
             }
         }

Modified: incubator/shindig/trunk/php/external/Zend/Feed/Builder/Header/Itunes.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/Zend/Feed/Builder/Header/Itunes.php?rev=694927&r1=694923&r2=694927&view=diff
==============================================================================
--- incubator/shindig/trunk/php/external/Zend/Feed/Builder/Header/Itunes.php (original)
+++ incubator/shindig/trunk/php/external/Zend/Feed/Builder/Header/Itunes.php Sat Sep 13 03:59:25 2008
@@ -66,14 +66,14 @@
             /**
              * @see Zend_Feed_Builder_Exception
              */
-            require_once 'src/common/Zend/Feed/Builder/Exception.php';
+            require_once 'external/Zend/Feed/Builder/Exception.php';
             throw new Zend_Feed_Builder_Exception("you have to set at least one itunes category");
         }
         if ($nb > 3) {
             /**
              * @see Zend_Feed_Builder_Exception
              */
-            require_once 'src/common/Zend/Feed/Builder/Exception.php';
+            require_once 'external/Zend/Feed/Builder/Exception.php';
             throw new Zend_Feed_Builder_Exception("you have to set at most three itunes categories");
         }
         foreach ($categories as $i => $category) {
@@ -81,7 +81,7 @@
                 /**
                  * @see Zend_Feed_Builder_Exception
                  */
-                require_once 'src/common/Zend/Feed/Builder/Exception.php';
+                require_once 'external/Zend/Feed/Builder/Exception.php';
                 throw new Zend_Feed_Builder_Exception("you have to set the main category (category #$i)");
             }
         }
@@ -118,7 +118,7 @@
                 /**
                  * @see Zend_Feed_Builder_Exception
                  */
-                require_once 'src/common/Zend/Feed/Builder/Exception.php';
+                require_once 'external/Zend/Feed/Builder/Exception.php';
                 throw new Zend_Feed_Builder_Exception("you have to set a valid email address into the itunes owner's email property");
             }
         }
@@ -179,7 +179,7 @@
             /**
              * @see Zend_Feed_Builder_Exception
              */
-            require_once 'src/common/Zend/Feed/Builder/Exception.php';
+            require_once 'external/Zend/Feed/Builder/Exception.php';
             throw new Zend_Feed_Builder_Exception("you have to set yes or no to the itunes block property");
         }
         $this->offsetSet('block', $block);
@@ -200,7 +200,7 @@
             /**
              * @see Zend_Feed_Builder_Exception
              */
-            require_once 'src/common/Zend/Feed/Builder/Exception.php';
+            require_once 'external/Zend/Feed/Builder/Exception.php';
             throw new Zend_Feed_Builder_Exception("you have to set yes, no or clean to the itunes explicit property");
         }
         $this->offsetSet('explicit', $explicit);

Modified: incubator/shindig/trunk/php/external/Zend/Feed/Element.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/Zend/Feed/Element.php?rev=694927&r1=694923&r2=694927&view=diff
==============================================================================
--- incubator/shindig/trunk/php/external/Zend/Feed/Element.php (original)
+++ incubator/shindig/trunk/php/external/Zend/Feed/Element.php Sat Sep 13 03:59:25 2008
@@ -214,7 +214,7 @@
             /** 
              * @see Zend_Feed_Exception
              */
-            require_once 'src/common/Zend/Feed/Exception.php';
+            require_once 'external/Zend/Feed/Exception.php';
             throw new Zend_Feed_Exception('Cannot set the value of multiple tags simultaneously.');
         } else {
             $nodes[0]->nodeValue = $val;

Modified: incubator/shindig/trunk/php/external/Zend/Feed/Entry/Abstract.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/Zend/Feed/Entry/Abstract.php?rev=694927&r1=694923&r2=694927&view=diff
==============================================================================
--- incubator/shindig/trunk/php/external/Zend/Feed/Entry/Abstract.php (original)
+++ incubator/shindig/trunk/php/external/Zend/Feed/Entry/Abstract.php Sat Sep 13 03:59:25 2008
@@ -24,12 +24,12 @@
 /**
  * @see Zend_Feed
  */
-require_once 'src/common/Zend/Feed.php';
+require_once 'external/Zend/Feed.php';
 
 /**
  * @see Zend_Feed_Element
  */
-require_once 'src/common/Zend/Feed/Element.php';
+require_once 'external/Zend/Feed/Element.php';
 
 
 /**
@@ -95,7 +95,7 @@
                     /** 
                      * @see Zend_Feed_Exception
                      */
-                    require_once 'src/common/Zend/Feed/Exception.php';
+                    require_once 'external/Zend/Feed/Exception.php';
                     throw new Zend_Feed_Exception("DOMDocument cannot parse XML: $php_errormsg");
                 }
 
@@ -104,7 +104,7 @@
                     /** 
                      * @see Zend_Feed_Exception
                      */
-                    require_once 'src/common/Zend/Feed/Exception.php';
+                    require_once 'external/Zend/Feed/Exception.php';
                     throw new Zend_Feed_Exception('No root <' . $this->_rootElement . '> element found, cannot parse feed.');
                 }
             } else {

Modified: incubator/shindig/trunk/php/external/Zend/Feed/Entry/Atom.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/Zend/Feed/Entry/Atom.php?rev=694927&r1=694923&r2=694927&view=diff
==============================================================================
--- incubator/shindig/trunk/php/external/Zend/Feed/Entry/Atom.php (original)
+++ incubator/shindig/trunk/php/external/Zend/Feed/Entry/Atom.php Sat Sep 13 03:59:25 2008
@@ -24,7 +24,7 @@
 /**
  * @see Zend_Feed_Entry_Abstract
  */
-require_once 'src/common/Zend/Feed/Entry/Abstract.php';
+require_once 'external/Zend/Feed/Entry/Abstract.php';
 
 
 /**
@@ -74,7 +74,7 @@
             /** 
              * @see Zend_Feed_Exception
              */
-            require_once 'src/common/Zend/Feed/Exception.php';
+            require_once 'external/Zend/Feed/Exception.php';
             throw new Zend_Feed_Exception('Cannot delete entry; no link rel="edit" is present.');
         }
 
@@ -102,7 +102,7 @@
                     /** 
                      * @see Zend_Feed_Exception
                      */
-                    require_once 'src/common/Zend/Feed/Exception.php';
+                    require_once 'external/Zend/Feed/Exception.php';
                     throw new Zend_Feed_Exception("Expected response code 2xx, got $httpStatus");
             }
         } while (true);
@@ -139,7 +139,7 @@
                 /** 
                  * @see Zend_Feed_Exception
                  */
-                require_once 'src/common/Zend/Feed/Exception.php';
+                require_once 'external/Zend/Feed/Exception.php';
                 throw new Zend_Feed_Exception('Cannot edit entry; no link rel="edit" is present.');
             }
 
@@ -159,7 +159,7 @@
                 /** 
                  * @see Zend_Feed_Exception
                  */
-                require_once 'src/common/Zend/Feed/Exception.php';
+                require_once 'external/Zend/Feed/Exception.php';
                 throw new Zend_Feed_Exception('Expected response code 200, got ' . $response->getStatus());
             }
         } else {
@@ -167,7 +167,7 @@
                 /** 
                  * @see Zend_Feed_Exception
                  */
-                require_once 'src/common/Zend/Feed/Exception.php';
+                require_once 'external/Zend/Feed/Exception.php';
                 throw new Zend_Feed_Exception('PostURI must be specified to save new entries.');
             }
             $client = Zend_Feed::getHttpClient();
@@ -179,7 +179,7 @@
                 /** 
                  * @see Zend_Feed_Exception
                  */
-                require_once 'src/common/Zend/Feed/Exception.php';
+                require_once 'external/Zend/Feed/Exception.php';
                 throw new Zend_Feed_Exception('Expected response code 201, got '
                                               . $response->getStatus());
             }
@@ -203,7 +203,7 @@
             /** 
              * @see Zend_Feed_Exception
              */
-            require_once 'src/common/Zend/Feed/Exception.php';
+            require_once 'external/Zend/Feed/Exception.php';
             throw new Zend_Feed_Exception('XML cannot be parsed: ' . $php_errormsg);
         }
 
@@ -212,7 +212,7 @@
             /** 
              * @see Zend_Feed_Exception
              */
-            require_once 'src/common/Zend/Feed/Exception.php';
+            require_once 'external/Zend/Feed/Exception.php';
             throw new Zend_Feed_Exception('No root <feed> element found in server response:'
                                           . "\n\n" . $client->responseBody);
         }

Modified: incubator/shindig/trunk/php/external/Zend/Feed/Entry/Rss.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/Zend/Feed/Entry/Rss.php?rev=694927&r1=694923&r2=694927&view=diff
==============================================================================
--- incubator/shindig/trunk/php/external/Zend/Feed/Entry/Rss.php (original)
+++ incubator/shindig/trunk/php/external/Zend/Feed/Entry/Rss.php Sat Sep 13 03:59:25 2008
@@ -24,7 +24,7 @@
 /**
  * @see Zend_Feed_Entry_Abstract
  */
-require_once 'src/common/Zend/Feed/Entry/Abstract.php';
+require_once 'external/Zend/Feed/Entry/Abstract.php';
 
 
 /**

Modified: incubator/shindig/trunk/php/external/Zend/Feed/Exception.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/Zend/Feed/Exception.php?rev=694927&r1=694923&r2=694927&view=diff
==============================================================================
--- incubator/shindig/trunk/php/external/Zend/Feed/Exception.php (original)
+++ incubator/shindig/trunk/php/external/Zend/Feed/Exception.php Sat Sep 13 03:59:25 2008
@@ -24,7 +24,7 @@
 /**
  * @see Zend_Exception
  */
-require_once 'src/common/Zend/Exception.php';
+require_once 'external/Zend/Exception.php';
 
 
 /**

Modified: incubator/shindig/trunk/php/external/Zend/Feed/Rss.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/Zend/Feed/Rss.php?rev=694927&r1=694923&r2=694927&view=diff
==============================================================================
--- incubator/shindig/trunk/php/external/Zend/Feed/Rss.php (original)
+++ incubator/shindig/trunk/php/external/Zend/Feed/Rss.php Sat Sep 13 03:59:25 2008
@@ -24,12 +24,12 @@
 /**
  * @see Zend_Feed_Abstract
  */
-require_once 'src/common/Zend/Feed/Abstract.php';
+require_once 'external/Zend/Feed/Abstract.php';
 
 /**
  * @see Zend_Feed_Entry_Rss
  */
-require_once 'src/common/Zend/Feed/Entry/Rss.php';
+require_once 'external/Zend/Feed/Entry/Rss.php';
 
 
 /**
@@ -85,7 +85,7 @@
             /** 
              * @see Zend_Feed_Exception
              */
-            require_once 'src/common/Zend/Feed/Exception.php';
+            require_once 'external/Zend/Feed/Exception.php';
             throw new Zend_Feed_Exception('No root <channel> element found, cannot parse channel.');
         }
 
@@ -492,7 +492,7 @@
             /** 
              * @see Zend_Feed_Exception
              */
-            require_once 'src/common/Zend/Feed/Exception.php';
+            require_once 'external/Zend/Feed/Exception.php';
             throw new Zend_Feed_Exception('Cannot send RSS because headers have already been sent.');
         }
 

Modified: incubator/shindig/trunk/php/external/Zend/Http/Client.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/Zend/Http/Client.php?rev=694927&r1=694923&r2=694927&view=diff
==============================================================================
--- incubator/shindig/trunk/php/external/Zend/Http/Client.php (original)
+++ incubator/shindig/trunk/php/external/Zend/Http/Client.php Sat Sep 13 03:59:25 2008
@@ -21,10 +21,10 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-require_once 'src/common/Zend/Loader.php';
-require_once 'src/common/Zend/Uri.php';
-require_once 'src/common/Zend/Http/Client/Adapter/Interface.php';
-require_once 'src/common/Zend/Http/Response.php';
+require_once 'external/Zend/Loader.php';
+require_once 'external/Zend/Uri.php';
+require_once 'external/Zend/Http/Client/Adapter/Interface.php';
+require_once 'external/Zend/Http/Response.php';
 
 /**
  * Zend_Http_Client is an implemetation of an HTTP client in PHP. The client
@@ -224,7 +224,7 @@
         }
 
         if (!$uri instanceof Zend_Uri_Http) {
-            require_once 'src/common/Zend/Http/Client/Exception.php';
+            require_once 'external/Zend/Http/Client/Exception.php';
             throw new Zend_Http_Client_Exception('Passed parameter is not a valid HTTP URI.');
         }
 
@@ -262,7 +262,7 @@
     public function setConfig($config = array())
     {
         if (! is_array($config)) {
-            require_once 'src/common/Zend/Http/Client/Exception.php';
+            require_once 'external/Zend/Http/Client/Exception.php';
             throw new Zend_Http_Client_Exception('Expected array parameter, given ' . gettype($config));
         }
 
@@ -285,7 +285,7 @@
     public function setMethod($method = self::GET)
     {
         if (! preg_match('/^[A-Za-z_]+$/', $method)) {
-            require_once 'src/common/Zend/Http/Client/Exception.php';
+            require_once 'external/Zend/Http/Client/Exception.php';
             throw new Zend_Http_Client_Exception("'{$method}' is not a valid HTTP request method.");
         }
 
@@ -333,7 +333,7 @@
 
             // Make sure the name is valid if we are in strict mode
             if ($this->config['strict'] && (! preg_match('/^[a-zA-Z0-9-]+$/', $name))) {
-                require_once 'src/common/Zend/Http/Client/Exception.php';
+                require_once 'external/Zend/Http/Client/Exception.php';
                 throw new Zend_Http_Client_Exception("{$name} is not a valid HTTP header name");
             }
             
@@ -480,7 +480,7 @@
         } else {
             // Check we got a proper authentication type
             if (! defined('self::AUTH_' . strtoupper($type))) {
-                require_once 'src/common/Zend/Http/Client/Exception.php';
+                require_once 'external/Zend/Http/Client/Exception.php';
                 throw new Zend_Http_Client_Exception("Invalid or not supported authentication type: '$type'");
             }
 
@@ -506,7 +506,7 @@
     public function setCookieJar($cookiejar = true)
     {
         if (! class_exists('Zend_Http_CookieJar'))
-            require_once 'src/common/Zend/Http/CookieJar.php';
+            require_once 'external/Zend/Http/CookieJar.php';
 
         if ($cookiejar instanceof Zend_Http_CookieJar) {
             $this->cookiejar = $cookiejar;
@@ -515,7 +515,7 @@
         } elseif (! $cookiejar) {
             $this->cookiejar = null;
         } else {
-            require_once 'src/common/Zend/Http/Client/Exception.php';
+            require_once 'external/Zend/Http/Client/Exception.php';
             throw new Zend_Http_Client_Exception('Invalid parameter type passed as CookieJar');
         }
 
@@ -543,7 +543,7 @@
     public function setCookie($cookie, $value = null)
     {
         if (! class_exists('Zend_Http_Cookie'))
-            require_once 'src/common/Zend/Http/Cookie.php';
+            require_once 'external/Zend/Http/Cookie.php';
 
         if (is_array($cookie)) {
             foreach ($cookie as $c => $v) {
@@ -574,7 +574,7 @@
             }
 
             if (preg_match("/[=,; \t\r\n\013\014]/", $cookie)) {
-                require_once 'src/common/Zend/Http/Client/Exception.php';
+                require_once 'external/Zend/Http/Client/Exception.php';
                 throw new Zend_Http_Client_Exception("Cookie name cannot contain these characters: =,; \t\r\n\013\014 ({$cookie})");
             }
 
@@ -610,7 +610,7 @@
     {
         if ($data === null) {
             if (($data = @file_get_contents($filename)) === false) {
-                require_once 'src/common/Zend/Http/Client/Exception.php';
+                require_once 'external/Zend/Http/Client/Exception.php';
                 throw new Zend_Http_Client_Exception("Unable to read file '{$filename}' for upload");
             }
 
@@ -719,7 +719,7 @@
             try {
                 Zend_Loader::loadClass($adapter);
             } catch (Zend_Exception $e) {
-                require_once 'src/common/Zend/Http/Client/Exception.php';
+                require_once 'external/Zend/Http/Client/Exception.php';
                 throw new Zend_Http_Client_Exception("Unable to load adapter '$adapter': {$e->getMessage()}");
             }
 
@@ -727,7 +727,7 @@
         }
 
         if (! $adapter instanceof Zend_Http_Client_Adapter_Interface) {
-            require_once 'src/common/Zend/Http/Client/Exception.php';
+            require_once 'external/Zend/Http/Client/Exception.php';
             throw new Zend_Http_Client_Exception('Passed adapter is not a HTTP connection adapter');
         }
 
@@ -746,7 +746,7 @@
     public function request($method = null)
     {
         if (! $this->uri instanceof Zend_Uri_Http) {
-            require_once 'src/common/Zend/Http/Client/Exception.php';
+            require_once 'external/Zend/Http/Client/Exception.php';
             throw new Zend_Http_Client_Exception('No valid URI has been passed to the client');
         }
 
@@ -781,7 +781,7 @@
 
             $response = $this->adapter->read();
             if (! $response) {
-                require_once 'src/common/Zend/Http/Client/Exception.php';
+                require_once 'external/Zend/Http/Client/Exception.php';
                 throw new Zend_Http_Client_Exception('Unable to read response, or response is empty');
             }
 
@@ -971,7 +971,7 @@
                     break;
 
                 default:
-                    require_once 'src/common/Zend/Http/Client/Exception.php';
+                    require_once 'external/Zend/Http/Client/Exception.php';
                     throw new Zend_Http_Client_Exception("Cannot handle content type '{$this->enctype}' automatically." .
                         " Please use Zend_Http_Client::setRawData to send this kind of content.");
                     break;
@@ -1063,7 +1063,7 @@
             case self::AUTH_BASIC:
                 // In basic authentication, the user name cannot contain ":"
                 if (strpos($user, ':') !== false) {
-                    require_once 'src/common/Zend/Http/Client/Exception.php';
+                    require_once 'external/Zend/Http/Client/Exception.php';
                     throw new Zend_Http_Client_Exception("The user name cannot contain ':' in 'Basic' HTTP authentication");
                 }
 
@@ -1077,7 +1077,7 @@
             //    break;
 
             default:
-                require_once 'src/common/Zend/Http/Client/Exception.php';
+                require_once 'external/Zend/Http/Client/Exception.php';
                 throw new Zend_Http_Client_Exception("Not a supported HTTP authentication type: '$type'");
         }
 

Modified: incubator/shindig/trunk/php/external/Zend/Http/Client/Adapter/Exception.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/Zend/Http/Client/Adapter/Exception.php?rev=694927&r1=694923&r2=694927&view=diff
==============================================================================
--- incubator/shindig/trunk/php/external/Zend/Http/Client/Adapter/Exception.php (original)
+++ incubator/shindig/trunk/php/external/Zend/Http/Client/Adapter/Exception.php Sat Sep 13 03:59:25 2008
@@ -20,7 +20,7 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-require_once 'src/common/Zend/Http/Client/Exception.php';
+require_once 'external/Zend/Http/Client/Exception.php';
 
 /**
  * @category   Zend

Modified: incubator/shindig/trunk/php/external/Zend/Http/Client/Adapter/Proxy.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/Zend/Http/Client/Adapter/Proxy.php?rev=694927&r1=694923&r2=694927&view=diff
==============================================================================
--- incubator/shindig/trunk/php/external/Zend/Http/Client/Adapter/Proxy.php (original)
+++ incubator/shindig/trunk/php/external/Zend/Http/Client/Adapter/Proxy.php Sat Sep 13 03:59:25 2008
@@ -21,9 +21,9 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-require_once 'src/common/Zend/Uri/Http.php';
-require_once 'src/common/Zend/Http/Client.php';
-require_once 'src/common/Zend/Http/Client/Adapter/Socket.php';
+require_once 'external/Zend/Uri/Http.php';
+require_once 'external/Zend/Http/Client.php';
+require_once 'external/Zend/Http/Client/Adapter/Socket.php';
 
 /**
  * HTTP Proxy-supporting Zend_Http_Client adapter class, based on the default
@@ -93,14 +93,14 @@
             $this->socket = @fsockopen($host, $port, $errno, $errstr, (int) $this->config['timeout']);
             if (! $this->socket) {
                 $this->close();
-                require_once 'src/common/Zend/Http/Client/Adapter/Exception.php';
+                require_once 'external/Zend/Http/Client/Adapter/Exception.php';
 		throw new Zend_Http_Client_Adapter_Exception(
                     'Unable to Connect to proxy server ' . $host . ':' . $port . '. Error #' . $errno . ': ' . $errstr);
             }
 
             // Set the stream timeout
             if (!stream_set_timeout($this->socket, (int) $this->config['timeout'])) {
-                require_once 'src/common/Zend/Http/Client/Adapter/Exception.php';
+                require_once 'external/Zend/Http/Client/Adapter/Exception.php';
                 throw new Zend_Http_Client_Adapter_Exception('Unable to set the connection timeout');
             }
 
@@ -126,7 +126,7 @@
 
         // Make sure we're properly connected
         if (! $this->socket) {
-            require_once 'src/common/Zend/Http/Client/Adapter/Exception.php';
+            require_once 'external/Zend/Http/Client/Adapter/Exception.php';
             throw new Zend_Http_Client_Adapter_Exception("Trying to write but we are not connected");
 	}
 
@@ -134,7 +134,7 @@
         $port = $this->config['proxy_port'];
 
         if ($this->connected_to[0] != $host || $this->connected_to[1] != $port) {
-            require_once 'src/common/Zend/Http/Client/Adapter/Exception.php';
+            require_once 'external/Zend/Http/Client/Adapter/Exception.php';
             throw new Zend_Http_Client_Adapter_Exception("Trying to write but we are connected to the wrong proxy server");
 	}
 
@@ -167,7 +167,7 @@
 
         // Send the request
         if (! @fwrite($this->socket, $request)) {
-            require_once 'src/common/Zend/Http/Client/Adapter/Exception.php';
+            require_once 'external/Zend/Http/Client/Adapter/Exception.php';
             throw new Zend_Http_Client_Adapter_Exception("Error writing request to proxy server");
         }
 
@@ -203,7 +203,7 @@
 
         // Send the request
         if (! @fwrite($this->socket, $request)) {
-            require_once 'src/common/Zend/Http/Client/Adapter/Exception.php';
+            require_once 'external/Zend/Http/Client/Adapter/Exception.php';
             throw new Zend_Http_Client_Adapter_Exception("Error writing request to proxy server");
         }
 
@@ -220,7 +220,7 @@
         
         // Check that the response from the proxy is 200
         if (Zend_Http_Response::extractCode($response) != 200) {
-                require_once 'src/common/Zend/Http/Client/Adapter/Exception.php';
+                require_once 'external/Zend/Http/Client/Adapter/Exception.php';
         	throw new Zend_Http_Client_Adapter_Exception("Unable to connect to HTTPS proxy. Server response: " . $response);
         }
         
@@ -240,7 +240,7 @@
         }
         
         if (! $success) {
-                require_once 'src/common/Zend/Http/Client/Adapter/Exception.php';
+                require_once 'external/Zend/Http/Client/Adapter/Exception.php';
         	throw new Zend_Http_Client_Adapter_Exception("Unable to connect to" . 
         	    " HTTPS server through proxy: could not negotiate secure connection.");
         }

Modified: incubator/shindig/trunk/php/external/Zend/Http/Client/Adapter/Socket.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/Zend/Http/Client/Adapter/Socket.php?rev=694927&r1=694923&r2=694927&view=diff
==============================================================================
--- incubator/shindig/trunk/php/external/Zend/Http/Client/Adapter/Socket.php (original)
+++ incubator/shindig/trunk/php/external/Zend/Http/Client/Adapter/Socket.php Sat Sep 13 03:59:25 2008
@@ -21,8 +21,8 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-require_once 'src/common/Zend/Uri/Http.php';
-require_once 'src/common/Zend/Http/Client/Adapter/Interface.php';
+require_once 'external/Zend/Uri/Http.php';
+require_once 'external/Zend/Http/Client/Adapter/Interface.php';
 
 /**
  * A sockets based (stream_socket_client) adapter class for Zend_Http_Client. Can be used
@@ -84,7 +84,7 @@
     public function setConfig($config = array())
     {
         if (! is_array($config)) {
-            require_once 'src/common/Zend/Http/Client/Adapter/Exception.php';
+            require_once 'external/Zend/Http/Client/Adapter/Exception.php';
             throw new Zend_Http_Client_Adapter_Exception(
                 '$config expects an array, ' . gettype($config) . ' recieved.');
         }
@@ -119,14 +119,14 @@
                 if ($this->config['sslcert'] !== null) {
                     if (! stream_context_set_option($context, 'ssl', 'local_cert',
                                                     $this->config['sslcert'])) {
-                        require_once 'src/common/Zend/Http/Client/Adapter/Exception.php';
+                        require_once 'external/Zend/Http/Client/Adapter/Exception.php';
                         throw new Zend_Http_Client_Adapter_Exception('Unable to set sslcert option');
                     }
                 }
                 if ($this->config['sslpassphrase'] !== null) {
                     if (! stream_context_set_option($context, 'ssl', 'passphrase',
                                                     $this->config['sslpassphrase'])) {
-                        require_once 'src/common/Zend/Http/Client/Adapter/Exception.php';
+                        require_once 'external/Zend/Http/Client/Adapter/Exception.php';
                         throw new Zend_Http_Client_Adapter_Exception('Unable to set sslpassphrase option');
                     }
                 }
@@ -140,14 +140,14 @@
                                                   $context);
             if (! $this->socket) {
                 $this->close();
-                require_once 'src/common/Zend/Http/Client/Adapter/Exception.php';
+                require_once 'external/Zend/Http/Client/Adapter/Exception.php';
                 throw new Zend_Http_Client_Adapter_Exception(
                     'Unable to Connect to ' . $host . ':' . $port . '. Error #' . $errno . ': ' . $errstr);
             }
 
             // Set the stream timeout
             if (! stream_set_timeout($this->socket, (int) $this->config['timeout'])) {
-                require_once 'src/common/Zend/Http/Client/Adapter/Exception.php';
+                require_once 'external/Zend/Http/Client/Adapter/Exception.php';
                 throw new Zend_Http_Client_Adapter_Exception('Unable to set the connection timeout');
             }
 
@@ -170,14 +170,14 @@
     {
         // Make sure we're properly connected
         if (! $this->socket) {
-            require_once 'src/common/Zend/Http/Client/Adapter/Exception.php';
+            require_once 'external/Zend/Http/Client/Adapter/Exception.php';
             throw new Zend_Http_Client_Adapter_Exception('Trying to write but we are not connected');
         }
 
         $host = $uri->getHost();
         $host = (strtolower($uri->getScheme()) == 'https' ? $this->config['ssltransport'] : 'tcp') . '://' . $host;
         if ($this->connected_to[0] != $host || $this->connected_to[1] != $uri->getPort()) {
-            require_once 'src/common/Zend/Http/Client/Adapter/Exception.php';
+            require_once 'external/Zend/Http/Client/Adapter/Exception.php';
             throw new Zend_Http_Client_Adapter_Exception('Trying to write but we are connected to the wrong host');
         }
 
@@ -198,7 +198,7 @@
 
         // Send the request
         if (! @fwrite($this->socket, $request)) {
-            require_once 'src/common/Zend/Http/Client/Adapter/Exception.php';
+            require_once 'external/Zend/Http/Client/Adapter/Exception.php';
             throw new Zend_Http_Client_Adapter_Exception('Error writing request to server');
         }
 
@@ -255,7 +255,7 @@
                     $chunksize = hexdec(chop($line));
                     if (dechex($chunksize) != $hexchunksize) {
                         @fclose($this->socket);
-                        require_once 'src/common/Zend/Http/Client/Adapter/Exception.php';
+                        require_once 'external/Zend/Http/Client/Adapter/Exception.php';
                         throw new Zend_Http_Client_Adapter_Exception('Invalid chunk size "' .
                             $hexchunksize . '" unable to read chunked body');
                     }

Modified: incubator/shindig/trunk/php/external/Zend/Http/Client/Adapter/Test.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/Zend/Http/Client/Adapter/Test.php?rev=694927&r1=694923&r2=694927&view=diff
==============================================================================
--- incubator/shindig/trunk/php/external/Zend/Http/Client/Adapter/Test.php (original)
+++ incubator/shindig/trunk/php/external/Zend/Http/Client/Adapter/Test.php Sat Sep 13 03:59:25 2008
@@ -20,9 +20,9 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-require_once 'src/common/Zend/Uri/Http.php';
-require_once 'src/common/Zend/Http/Response.php';
-require_once 'src/common/Zend/Http/Client/Adapter/Interface.php';
+require_once 'external/Zend/Uri/Http.php';
+require_once 'external/Zend/Http/Response.php';
+require_once 'external/Zend/Http/Client/Adapter/Interface.php';
 
 /**
  * A testing-purposes adapter.
@@ -77,7 +77,7 @@
     public function setConfig($config = array())
     {
         if (! is_array($config)) {
-            require_once 'src/common/Zend/Http/Client/Adapter/Exception.php';
+            require_once 'external/Zend/Http/Client/Adapter/Exception.php';
             throw new Zend_Http_Client_Adapter_Exception(
                 '$config expects an array, ' . gettype($config) . ' recieved.');
         }
@@ -184,7 +184,7 @@
     public function setResponseIndex($index)
     {
         if ($index < 0 || $index >= count($this->responses)) {
-            require_once 'src/common/Zend/Http/Client/Adapter/Exception.php';
+            require_once 'external/Zend/Http/Client/Adapter/Exception.php';
             throw new Zend_Http_Client_Adapter_Exception(
                 'Index out of range of response buffer size');
         }

Modified: incubator/shindig/trunk/php/external/Zend/Http/Client/Exception.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/Zend/Http/Client/Exception.php?rev=694927&r1=694923&r2=694927&view=diff
==============================================================================
--- incubator/shindig/trunk/php/external/Zend/Http/Client/Exception.php (original)
+++ incubator/shindig/trunk/php/external/Zend/Http/Client/Exception.php Sat Sep 13 03:59:25 2008
@@ -20,7 +20,7 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-require_once 'src/common/Zend/Http/Exception.php';
+require_once 'external/Zend/Http/Exception.php';
 
 /**
  * @category   Zend

Modified: incubator/shindig/trunk/php/external/Zend/Http/Cookie.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/Zend/Http/Cookie.php?rev=694927&r1=694923&r2=694927&view=diff
==============================================================================
--- incubator/shindig/trunk/php/external/Zend/Http/Cookie.php (original)
+++ incubator/shindig/trunk/php/external/Zend/Http/Cookie.php Sat Sep 13 03:59:25 2008
@@ -20,7 +20,7 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-require_once 'src/common/Zend/Uri/Http.php';
+require_once 'external/Zend/Uri/Http.php';
 
 /**
  * Zend_Http_Cookie is a class describing an HTTP cookie and all it's parameters.
@@ -98,17 +98,17 @@
     public function __construct($name, $value, $domain, $expires = null, $path = null, $secure = false)
     {
         if (preg_match("/[=,; \t\r\n\013\014]/", $name)) {
-            require_once 'src/common/Zend/Http/Exception.php';
+            require_once 'external/Zend/Http/Exception.php';
             throw new Zend_Http_Exception("Cookie name cannot contain these characters: =,; \\t\\r\\n\\013\\014 ({$name})");
         }
 
         if (! $this->name = (string) $name) {
-            require_once 'src/common/Zend/Http/Exception.php';
+            require_once 'external/Zend/Http/Exception.php';
             throw new Zend_Http_Exception('Cookies must have a name');
         }
 
         if (! $this->domain = (string) $domain) {
-            require_once 'src/common/Zend/Http/Exception.php';
+            require_once 'external/Zend/Http/Exception.php';
             throw new Zend_Http_Exception('Cookies must have a domain');
         }
 
@@ -222,7 +222,7 @@
 
         // Make sure we have a valid Zend_Uri_Http object
         if (! ($uri->valid() && ($uri->getScheme() == 'http' || $uri->getScheme() =='https'))) {
-            require_once 'src/common/Zend/Http/Exception.php';    
+            require_once 'external/Zend/Http/Exception.php';    
             throw new Zend_Http_Exception('Passed URI is not a valid HTTP or HTTPS URI');
         }
 

Modified: incubator/shindig/trunk/php/external/Zend/Http/CookieJar.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/Zend/Http/CookieJar.php?rev=694927&r1=694923&r2=694927&view=diff
==============================================================================
--- incubator/shindig/trunk/php/external/Zend/Http/CookieJar.php (original)
+++ incubator/shindig/trunk/php/external/Zend/Http/CookieJar.php Sat Sep 13 03:59:25 2008
@@ -114,7 +114,7 @@
             if (! isset($this->cookies[$domain][$path])) $this->cookies[$domain][$path] = array();
             $this->cookies[$domain][$path][$cookie->getName()] = $cookie;
         } else {
-            require_once 'src/common/Zend/Http/Exception.php';
+            require_once 'external/Zend/Http/Exception.php';
             throw new Zend_Http_Exception('Supplient argument is not a valid cookie string or object');
         }
     }
@@ -129,7 +129,7 @@
     public function addCookiesFromResponse($response, $ref_uri)
     {
         if (! $response instanceof Zend_Http_Response) {
-            require_once 'src/common/Zend/Http/Exception.php';        
+            require_once 'external/Zend/Http/Exception.php';        
             throw new Zend_Http_Exception('$response is expected to be a Response object, ' .
                 gettype($response) . ' was passed');
         }
@@ -173,7 +173,7 @@
     {
         if (is_string($uri)) $uri = Zend_Uri::factory($uri);
         if (! $uri instanceof Zend_Uri_Http) {
-            require_once 'src/common/Zend/Http/Exception.php';    
+            require_once 'external/Zend/Http/Exception.php';    
             throw new Zend_Http_Exception("Invalid URI string or object passed");
         }
 
@@ -214,7 +214,7 @@
         }
 
         if (! $uri instanceof Zend_Uri_Http) {
-            require_once 'src/common/Zend/Http/Exception.php';
+            require_once 'external/Zend/Http/Exception.php';
             throw new Zend_Http_Exception('Invalid URI specified');
         }
 
@@ -237,7 +237,7 @@
                     break;
 
                 default:
-                    require_once 'src/common/Zend/Http/Exception.php';
+                    require_once 'external/Zend/Http/Exception.php';
                     throw new Zend_Http_Exception("Invalid value passed for \$ret_as: {$ret_as}");
                     break;
             }

Modified: incubator/shindig/trunk/php/external/Zend/Http/Exception.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/Zend/Http/Exception.php?rev=694927&r1=694923&r2=694927&view=diff
==============================================================================
--- incubator/shindig/trunk/php/external/Zend/Http/Exception.php (original)
+++ incubator/shindig/trunk/php/external/Zend/Http/Exception.php Sat Sep 13 03:59:25 2008
@@ -20,7 +20,7 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-require_once 'src/common/Zend/Exception.php';
+require_once 'external/Zend/Exception.php';
 
 /**
  * @category   Zend

Modified: incubator/shindig/trunk/php/external/Zend/Http/Response.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/Zend/Http/Response.php?rev=694927&r1=694923&r2=694927&view=diff
==============================================================================
--- incubator/shindig/trunk/php/external/Zend/Http/Response.php (original)
+++ incubator/shindig/trunk/php/external/Zend/Http/Response.php Sat Sep 13 03:59:25 2008
@@ -152,7 +152,7 @@
     {
         // Make sure the response code is valid and set it
         if (self::responseCodeAsText($code) === null) {
-            require_once 'src/common/Zend/Http/Exception.php';
+            require_once 'external/Zend/Http/Exception.php';
             throw new Zend_Http_Exception("{$code} is not a valid HTTP response code");
         }
 
@@ -160,7 +160,7 @@
 
         // Make sure we got valid headers and set them
         if (! is_array($headers)) {
-            require_once 'src/common/Zend/Http/Exception.php';
+            require_once 'external/Zend/Http/Exception.php';
             throw new Zend_Http_Exception('No valid headers were passed');
 	}
 
@@ -176,7 +176,7 @@
 
         // Set the HTTP version
         if (! preg_match('|^\d\.\d$|', $version)) {
-            require_once 'src/common/Zend/Http/Exception.php';
+            require_once 'external/Zend/Http/Exception.php';
             throw new Zend_Http_Exception("Invalid HTTP response version: $version");
         }
 
@@ -554,7 +554,7 @@
         
         while (trim($body)) {
             if (! preg_match("/^([\da-fA-F]+)[^\r\n]*\r\n/sm", $body, $m)) {
-                require_once 'src/common/Zend/Http/Exception.php';
+                require_once 'external/Zend/Http/Exception.php';
                 throw new Zend_Http_Exception("Error parsing body - doesn't seem to be a chunked message");
             }
 
@@ -579,7 +579,7 @@
     public static function decodeGzip($body)
     {
         if (! function_exists('gzinflate')) {
-            require_once 'src/common/Zend/Http/Exception.php';
+            require_once 'external/Zend/Http/Exception.php';
             throw new Zend_Http_Exception('Unable to decode gzipped response ' . 
                 'body: perhaps the zlib extension is not loaded?'); 
         }
@@ -598,7 +598,7 @@
     public static function decodeDeflate($body)
     {
         if (! function_exists('gzuncompress')) {
-            require_once 'src/common/Zend/Http/Exception.php';
+            require_once 'external/Zend/Http/Exception.php';
             throw new Zend_Http_Exception('Unable to decode deflated response ' . 
                 'body: perhaps the zlib extension is not loaded?'); 
         }

Modified: incubator/shindig/trunk/php/external/Zend/Loader.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/Zend/Loader.php?rev=694927&r1=694923&r2=694927&view=diff
==============================================================================
--- incubator/shindig/trunk/php/external/Zend/Loader.php (original)
+++ incubator/shindig/trunk/php/external/Zend/Loader.php Sat Sep 13 03:59:25 2008
@@ -57,7 +57,7 @@
 		}
 		
 		if ((null !== $dirs) && ! is_string($dirs) && ! is_array($dirs)) {
-			require_once 'src/common/Zend/Exception.php';
+			require_once 'external/Zend/Exception.php';
 			throw new Zend_Exception('Directory argument must be a string or an array');
 		}
 		
@@ -85,7 +85,7 @@
 		}
 		
 		if (! class_exists($class, false) && ! interface_exists($class, false)) {
-			require_once 'src/common/Zend/Exception.php';
+			require_once 'external/Zend/Exception.php';
 			throw new Zend_Exception("File \"$file\" does not exist or class \"$class\" was not found in the file");
 		}
 	}
@@ -198,14 +198,14 @@
 	public static function registerAutoload($class = 'Zend_Loader', $enabled = true)
 	{
 		if (! function_exists('spl_autoload_register')) {
-			require_once 'src/common/Zend/Exception.php';
+			require_once 'external/Zend/Exception.php';
 			throw new Zend_Exception('spl_autoload does not exist in this PHP installation');
 		}
 		
 		self::loadClass($class);
 		$methods = get_class_methods($class);
 		if (! in_array('autoload', (array)$methods)) {
-			require_once 'src/common/Zend/Exception.php';
+			require_once 'external/Zend/Exception.php';
 			throw new Zend_Exception("The class \"$class\" does not have an autoload() method");
 		}
 		
@@ -229,7 +229,7 @@
 		 * Security check
 		 */
 		if (preg_match('/[^a-z0-9\\/\\\\_.-]/i', $filename)) {
-			require_once 'src/common/Zend/Exception.php';
+			require_once 'external/Zend/Exception.php';
 			throw new Zend_Exception('Security check: Illegal character in filename');
 		}
 	}

Modified: incubator/shindig/trunk/php/external/Zend/Loader/Exception.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/Zend/Loader/Exception.php?rev=694927&r1=694923&r2=694927&view=diff
==============================================================================
--- incubator/shindig/trunk/php/external/Zend/Loader/Exception.php (original)
+++ incubator/shindig/trunk/php/external/Zend/Loader/Exception.php Sat Sep 13 03:59:25 2008
@@ -1,6 +1,6 @@
 <?php
 
-require_once 'src/common/Zend/Exception.php';
+require_once 'external/Zend/Exception.php';
 
 class Zend_Loader_Exception extends Zend_Exception 
 {

Modified: incubator/shindig/trunk/php/external/Zend/Loader/PluginLoader.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/Zend/Loader/PluginLoader.php?rev=694927&r1=694923&r2=694927&view=diff
==============================================================================
--- incubator/shindig/trunk/php/external/Zend/Loader/PluginLoader.php (original)
+++ incubator/shindig/trunk/php/external/Zend/Loader/PluginLoader.php Sat Sep 13 03:59:25 2008
@@ -20,10 +20,10 @@
  */
 
 /** Zend_Loader_PluginLoader_Interface */
-require_once 'src/common/Zend/Loader/PluginLoader/Interface.php';
+require_once 'external/Zend/Loader/PluginLoader/Interface.php';
 
 /** Zend_Loader */
-require_once 'src/common/Zend/Loader.php';
+require_once 'external/Zend/Loader.php';
 
 /**
  * Generic plugin class loader
@@ -111,7 +111,7 @@
     public function addPrefixPath($prefix, $path)
     {
         if (!is_string($prefix) || !is_string($path)) {
-            require_once 'src/common/Zend/Loader/PluginLoader/Exception.php';
+            require_once 'external/Zend/Loader/PluginLoader/Exception.php';
             throw new Zend_Loader_PluginLoader_Exception('Zend_Loader_PluginLoader::addPrefixPath() method only takes strings for prefix and path.');
         }
 
@@ -211,7 +211,7 @@
         }
 
         if (!isset($registry[$prefix])) {
-            require_once 'src/common/Zend/Loader/PluginLoader/Exception.php';
+            require_once 'external/Zend/Loader/PluginLoader/Exception.php';
             throw new Zend_Loader_PluginLoader_Exception('Prefix ' . $prefix . ' was not found in the PluginLoader.');
         }
 
@@ -331,7 +331,7 @@
             return $className;
         }
 
-        require_once 'src/common/Zend/Loader/PluginLoader/Exception.php';
+        require_once 'external/Zend/Loader/PluginLoader/Exception.php';
         throw new Zend_Loader_PluginLoader_Exception('Plugin by name ' . $name . ' was not found in the registry.');
     }
 }

Modified: incubator/shindig/trunk/php/external/Zend/Loader/PluginLoader/Exception.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/Zend/Loader/PluginLoader/Exception.php?rev=694927&r1=694923&r2=694927&view=diff
==============================================================================
--- incubator/shindig/trunk/php/external/Zend/Loader/PluginLoader/Exception.php (original)
+++ incubator/shindig/trunk/php/external/Zend/Loader/PluginLoader/Exception.php Sat Sep 13 03:59:25 2008
@@ -22,7 +22,7 @@
 /**
  * @see Zend_Loader_Exception
  */
-require_once 'src/common/Zend/Loader/Exception.php';
+require_once 'external/Zend/Loader/Exception.php';
 
 /**
  * Plugin class loader exceptions

Modified: incubator/shindig/trunk/php/external/Zend/README
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/Zend/README?rev=694927&r1=694923&r2=694927&view=diff
==============================================================================
--- incubator/shindig/trunk/php/external/Zend/README (original)
+++ incubator/shindig/trunk/php/external/Zend/README Sat Sep 13 03:59:25 2008
@@ -2,5 +2,5 @@
 Which is licensed under the New BSD license: http://framework.zend.com/license
 
 To prevent having to modify the include_path, the require_once 'Zend/<file>.php' statements were rewritten using:
-# find . -type f -name "*.php" | xargs grep -l "require_once 'Zend" | xargs sed -i '' -e "s/require_once \'Zend/require_once 'src\/common\/Zend/g"
+# find . -type f -name "*.php" | xargs grep -l "require_once 'Zend" | xargs sed -i '' -e "s/require_once \'Zend/require_once 'external\/Zend/g"
 

Modified: incubator/shindig/trunk/php/external/Zend/Registry.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/Zend/Registry.php?rev=694927&r1=694923&r2=694927&view=diff
==============================================================================
--- incubator/shindig/trunk/php/external/Zend/Registry.php (original)
+++ incubator/shindig/trunk/php/external/Zend/Registry.php Sat Sep 13 03:59:25 2008
@@ -66,7 +66,7 @@
     public static function setInstance(Zend_Registry $registry)
     {
         if (self::$_registry !== null) {
-            require_once 'src/common/Zend/Exception.php';
+            require_once 'external/Zend/Exception.php';
             throw new Zend_Exception('Registry is already initialized');
         }
 
@@ -97,19 +97,19 @@
     public static function setClassName($registryClassName = 'Zend_Registry')
     {
         if (self::$_registry !== null) {
-            require_once 'src/common/Zend/Exception.php';
+            require_once 'external/Zend/Exception.php';
             throw new Zend_Exception('Registry is already initialized');
         }
 
         if (!is_string($registryClassName)) {
-            require_once 'src/common/Zend/Exception.php';
+            require_once 'external/Zend/Exception.php';
             throw new Zend_Exception("Argument is not a class name");
         }
 
         /**
          * @see Zend_Loader
          */
-        require_once 'src/common/Zend/Loader.php';
+        require_once 'external/Zend/Loader.php';
         Zend_Loader::loadClass($registryClassName);
 
         self::$_registryClassName = $registryClassName;
@@ -141,7 +141,7 @@
         $instance = self::getInstance();
 
         if (!$instance->offsetExists($index)) {
-            require_once 'src/common/Zend/Exception.php';
+            require_once 'external/Zend/Exception.php';
             throw new Zend_Exception("No entry is registered for key '$index'");
         }
 

Modified: incubator/shindig/trunk/php/external/Zend/Uri.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/Zend/Uri.php?rev=694927&r1=694923&r2=694927&view=diff
==============================================================================
--- incubator/shindig/trunk/php/external/Zend/Uri.php (original)
+++ incubator/shindig/trunk/php/external/Zend/Uri.php Sat Sep 13 03:59:25 2008
@@ -23,7 +23,7 @@
 /**
  * @see Zend_Loader
  */
-require_once 'src/common/Zend/Loader.php';
+require_once 'external/Zend/Loader.php';
 
 /**
  * @category   Zend
@@ -88,13 +88,13 @@
         $schemeSpecific = isset($uri[1]) ? $uri[1] : '';
 
         if (!strlen($scheme)) {
-            require_once 'src/common/Zend/Uri/Exception.php';   
+            require_once 'external/Zend/Uri/Exception.php';   
             throw new Zend_Uri_Exception('An empty string was supplied for the scheme');
         }
 
         // Security check: $scheme is used to load a class file, so only alphanumerics are allowed.
         if (!ctype_alnum($scheme)) {
-            require_once 'src/common/Zend/Uri/Exception.php';   
+            require_once 'external/Zend/Uri/Exception.php';   
             throw new Zend_Uri_Exception('Illegal scheme supplied, only alphanumeric characters are permitted');
         }
 
@@ -110,7 +110,7 @@
             case 'mailto':
                 // @todo
             default:
-                require_once 'src/common/Zend/Uri/Exception.php';   
+                require_once 'external/Zend/Uri/Exception.php';   
                 throw new Zend_Uri_Exception("Scheme \"$scheme\" is not supported");
         }
         Zend_Loader::loadClass($className);

Modified: incubator/shindig/trunk/php/external/Zend/Uri/Exception.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/Zend/Uri/Exception.php?rev=694927&r1=694923&r2=694927&view=diff
==============================================================================
--- incubator/shindig/trunk/php/external/Zend/Uri/Exception.php (original)
+++ incubator/shindig/trunk/php/external/Zend/Uri/Exception.php Sat Sep 13 03:59:25 2008
@@ -22,7 +22,7 @@
 /**
  * @see Zend_Exception
  */
-require_once 'src/common/Zend/Exception.php';
+require_once 'external/Zend/Exception.php';
 
 
 /**

Modified: incubator/shindig/trunk/php/external/Zend/Uri/Http.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/Zend/Uri/Http.php?rev=694927&r1=694923&r2=694927&view=diff
==============================================================================
--- incubator/shindig/trunk/php/external/Zend/Uri/Http.php (original)
+++ incubator/shindig/trunk/php/external/Zend/Uri/Http.php Sat Sep 13 03:59:25 2008
@@ -24,13 +24,13 @@
 /**
  * @see Zend_Uri
  */
-require_once 'src/common/Zend/Uri.php';
+require_once 'external/Zend/Uri.php';
 
 
 /**
  * @see Zend_Validate_Hostname
  */
-require_once 'src/common/Zend/Validate/Hostname.php';
+require_once 'external/Zend/Validate/Hostname.php';
 
 
 /**
@@ -94,7 +94,7 @@
 
         // Validate the URI
         if (!$this->valid()) {
-	    require_once 'src/common/Zend/Uri/Exception.php';
+	    require_once 'external/Zend/Uri/Exception.php';
             throw new Zend_Uri_Exception('Invalid URI supplied');
         }
     }
@@ -112,7 +112,7 @@
         $pattern = '~^((//)([^/?#]*))([^?#]*)(\?([^#]*))?(#(.*))?$~';
         $status = @preg_match($pattern, $schemeSpecific, $matches);
         if ($status === false) {
-	    require_once 'src/common/Zend/Uri/Exception.php';
+	    require_once 'external/Zend/Uri/Exception.php';
             throw new Zend_Uri_Exception('Internal error: scheme-specific decomposition failed');
         }
 
@@ -131,7 +131,7 @@
         $pattern = '~^(([^:@]*)(:([^@]*))?@)?([^:]+)(:(.*))?$~';
         $status = @preg_match($pattern, $combo, $matches);
         if ($status === false) {
-	    require_once 'src/common/Zend/Uri/Exception.php';
+	    require_once 'external/Zend/Uri/Exception.php';
             throw new Zend_Uri_Exception('Internal error: authority decomposition failed');
         }
 
@@ -158,7 +158,7 @@
     public function getUri()
     {
         if (!$this->valid()) {
-	    require_once 'src/common/Zend/Uri/Exception.php';
+	    require_once 'external/Zend/Uri/Exception.php';
             throw new Zend_Uri_Exception('One or more parts of the URI are invalid');
         }
         $password = strlen($this->_password) ? ":$this->_password" : '';
@@ -225,7 +225,7 @@
         $status = @preg_match('/^(' . $this->_regex['alphanum']  . '|' . $this->_regex['mark'] . '|'
                             . $this->_regex['escaped'] . '|[;:&=+$,])+$/', $username);
         if ($status === false) {
-	    require_once 'src/common/Zend/Uri/Exception.php';
+	    require_once 'external/Zend/Uri/Exception.php';
             throw new Zend_Uri_Exception('Internal error: username validation failed');
         }
 
@@ -242,7 +242,7 @@
     public function setUsername($username)
     {
         if (!$this->validateUsername($username)) {
-	    require_once 'src/common/Zend/Uri/Exception.php';
+	    require_once 'external/Zend/Uri/Exception.php';
             throw new Zend_Uri_Exception("Username \"$username\" is not a valid HTTP username");
         }
         $oldUsername = $this->_username;
@@ -292,7 +292,7 @@
         $status = @preg_match('/^(' . $this->_regex['alphanum']  . '|' . $this->_regex['mark'] . '|'
                              . $this->_regex['escaped'] . '|[;:&=+$,])+$/', $password);
         if ($status === false) {
-	    require_once 'src/common/Zend/Uri/Exception.php';
+	    require_once 'external/Zend/Uri/Exception.php';
             throw new Zend_Uri_Exception('Internal error: password validation failed.');
         }
         return $status == 1;
@@ -308,7 +308,7 @@
     public function setPassword($password)
     {
         if (!$this->validatePassword($password)) {
-	    require_once 'src/common/Zend/Uri/Exception.php';
+	    require_once 'external/Zend/Uri/Exception.php';
             throw new Zend_Uri_Exception("Password \"$password\" is not a valid HTTP password.");
         }
         $oldPassword = $this->_password;
@@ -364,7 +364,7 @@
     public function setHost($host)
     {
         if (!$this->validateHost($host)) {
-	    require_once 'src/common/Zend/Uri/Exception.php';
+	    require_once 'external/Zend/Uri/Exception.php';
             throw new Zend_Uri_Exception("Host \"$host\" is not a valid HTTP host");
         }
         $oldHost = $this->_host;
@@ -414,7 +414,7 @@
     public function setPort($port)
     {
         if (!$this->validatePort($port)) {
-	    require_once 'src/common/Zend/Uri/Exception.php';
+	    require_once 'external/Zend/Uri/Exception.php';
             throw new Zend_Uri_Exception("Port \"$port\" is not a valid HTTP port.");
         }
         $oldPort = $this->_port;
@@ -457,7 +457,7 @@
         $pattern = '/^' . $this->_regex['path'] . '$/';
         $status = @preg_match($pattern, $path);
         if ($status === false) {
-	    require_once 'src/common/Zend/Uri/Exception.php';
+	    require_once 'external/Zend/Uri/Exception.php';
             throw new Zend_Uri_Exception('Internal error: path validation failed');
         }
         return (boolean) $status;
@@ -473,7 +473,7 @@
     public function setPath($path)
     {
         if (!$this->validatePath($path)) {
-	    require_once 'src/common/Zend/Uri/Exception.php';
+	    require_once 'external/Zend/Uri/Exception.php';
             throw new Zend_Uri_Exception("Path \"$path\" is not a valid HTTP path");
         }
         $oldPath = $this->_path;
@@ -518,7 +518,7 @@
         $pattern = '/^' . $this->_regex['uric'] . '*$/';
         $status = @preg_match($pattern, $query);
         if ($status === false) {
-	    require_once 'src/common/Zend/Uri/Exception.php';
+	    require_once 'external/Zend/Uri/Exception.php';
             throw new Zend_Uri_Exception('Internal error: query validation failed');
         }
 
@@ -557,7 +557,7 @@
 
         // Make sure the query is valid, and set it
         if (! $this->validateQuery($query)) {
-	    require_once 'src/common/Zend/Uri/Exception.php';
+	    require_once 'external/Zend/Uri/Exception.php';
             throw new Zend_Uri_Exception("'$query' is not a valid query string");
         }
         
@@ -603,7 +603,7 @@
         $pattern = '/^' . $this->_regex['uric'] . '*$/';
         $status = @preg_match($pattern, $fragment);
         if ($status === false) {
-	    require_once 'src/common/Zend/Uri/Exception.php';
+	    require_once 'external/Zend/Uri/Exception.php';
             throw new Zend_Uri_Exception('Internal error: fragment validation failed');
         }
 
@@ -620,7 +620,7 @@
     public function setFragment($fragment)
     {
         if (!$this->validateFragment($fragment)) {
-	    require_once 'src/common/Zend/Uri/Exception.php';
+	    require_once 'external/Zend/Uri/Exception.php';
             throw new Zend_Uri_Exception("Fragment \"$fragment\" is not a valid HTTP fragment");
         }
         $oldFragment = $this->_fragment;

Modified: incubator/shindig/trunk/php/external/Zend/Validate.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/Zend/Validate.php?rev=694927&r1=694923&r2=694927&view=diff
==============================================================================
--- incubator/shindig/trunk/php/external/Zend/Validate.php (original)
+++ incubator/shindig/trunk/php/external/Zend/Validate.php Sat Sep 13 03:59:25 2008
@@ -24,7 +24,7 @@
 /**
  * @see Zend_Validate_Interface
  */
-require_once 'src/common/Zend/Validate/Interface.php';
+require_once 'external/Zend/Validate/Interface.php';
 
 
 /**
@@ -144,7 +144,7 @@
         foreach ($namespaces as $namespace) {
             $className = $namespace . '_' . ucfirst($classBaseName);
             try {
-                require_once 'src/common/Zend/Loader.php';
+                require_once 'external/Zend/Loader.php';
                 @Zend_Loader::loadClass($className);
                 if (class_exists($className, false)) {
                     $class = new ReflectionClass($className);
@@ -164,7 +164,7 @@
                 // fallthrough and continue for missing validation classes
             }
         }
-        require_once 'src/common/Zend/Validate/Exception.php';
+        require_once 'external/Zend/Validate/Exception.php';
         throw new Zend_Validate_Exception("Validate class not found from basename '$classBaseName'");
     }
 

Modified: incubator/shindig/trunk/php/external/Zend/Validate/Abstract.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/Zend/Validate/Abstract.php?rev=694927&r1=694923&r2=694927&view=diff
==============================================================================
--- incubator/shindig/trunk/php/external/Zend/Validate/Abstract.php (original)
+++ incubator/shindig/trunk/php/external/Zend/Validate/Abstract.php Sat Sep 13 03:59:25 2008
@@ -24,7 +24,7 @@
 /**
  * @see Zend_Validate_Interface
  */
-require_once 'src/common/Zend/Validate/Interface.php';
+require_once 'external/Zend/Validate/Interface.php';
 
 
 /**
@@ -125,7 +125,7 @@
             $messageKey = current($keys);
         }
         if (!isset($this->_messageTemplates[$messageKey])) {
-            require_once 'src/common/Zend/Validate/Exception.php';
+            require_once 'external/Zend/Validate/Exception.php';
             throw new Zend_Validate_Exception("No message template exists for key '$messageKey'");
         }
         $this->_messageTemplates[$messageKey] = $messageString;
@@ -166,7 +166,7 @@
         /**
          * @see Zend_Validate_Exception
          */
-        require_once 'src/common/Zend/Validate/Exception.php';
+        require_once 'external/Zend/Validate/Exception.php';
         throw new Zend_Validate_Exception("No property exists by the name '$property'");
     }
 
@@ -285,7 +285,7 @@
         } elseif ($translator instanceof Zend_Translate) {
             $this->_translator = $translator->getAdapter();
         } else {
-            require_once 'src/common/Zend/Validate/Exception.php';
+            require_once 'external/Zend/Validate/Exception.php';
             throw new Zend_Validate_Exception('Invalid translator specified');
         }
         return $this;
@@ -318,7 +318,7 @@
         } elseif ($translator instanceof Zend_Translate) {
             self::$_defaultTranslator = $translator->getAdapter();
         } else {
-            require_once 'src/common/Zend/Validate/Exception.php';
+            require_once 'external/Zend/Validate/Exception.php';
             throw new Zend_Validate_Exception('Invalid translator specified');
         }
     }
@@ -331,7 +331,7 @@
     public static function getDefaultTranslator()
     {
         if (null === self::$_defaultTranslator) {
-            require_once 'src/common/Zend/Registry.php';
+            require_once 'external/Zend/Registry.php';
             if (Zend_Registry::isRegistered('Zend_Translate')) {
                 $translator = Zend_Registry::get('Zend_Translate');
                 if ($translator instanceof Zend_Translate_Adapter) {

Modified: incubator/shindig/trunk/php/external/Zend/Validate/Alnum.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/Zend/Validate/Alnum.php?rev=694927&r1=694923&r2=694927&view=diff
==============================================================================
--- incubator/shindig/trunk/php/external/Zend/Validate/Alnum.php (original)
+++ incubator/shindig/trunk/php/external/Zend/Validate/Alnum.php Sat Sep 13 03:59:25 2008
@@ -24,7 +24,7 @@
 /**
  * @see Zend_Validate_Abstract
  */
-require_once 'src/common/Zend/Validate/Abstract.php';
+require_once 'external/Zend/Validate/Abstract.php';
 
 
 /**
@@ -103,7 +103,7 @@
             /**
              * @see Zend_Filter_Alnum
              */
-            require_once 'src/common/Zend/Filter/Alnum.php';
+            require_once 'external/Zend/Filter/Alnum.php';
             self::$_filter = new Zend_Filter_Alnum();
         }
 

Modified: incubator/shindig/trunk/php/external/Zend/Validate/Alpha.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/Zend/Validate/Alpha.php?rev=694927&r1=694923&r2=694927&view=diff
==============================================================================
--- incubator/shindig/trunk/php/external/Zend/Validate/Alpha.php (original)
+++ incubator/shindig/trunk/php/external/Zend/Validate/Alpha.php Sat Sep 13 03:59:25 2008
@@ -24,7 +24,7 @@
 /**
  * @see Zend_Validate_Abstract
  */
-require_once 'src/common/Zend/Validate/Abstract.php';
+require_once 'external/Zend/Validate/Abstract.php';
 
 
 /**
@@ -103,7 +103,7 @@
             /**
              * @see Zend_Filter_Alpha
              */
-            require_once 'src/common/Zend/Filter/Alpha.php';
+            require_once 'external/Zend/Filter/Alpha.php';
             self::$_filter = new Zend_Filter_Alpha();
         }
 

Modified: incubator/shindig/trunk/php/external/Zend/Validate/Barcode.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/Zend/Validate/Barcode.php?rev=694927&r1=694923&r2=694927&view=diff
==============================================================================
--- incubator/shindig/trunk/php/external/Zend/Validate/Barcode.php (original)
+++ incubator/shindig/trunk/php/external/Zend/Validate/Barcode.php Sat Sep 13 03:59:25 2008
@@ -24,7 +24,7 @@
 /**
  * @see Zend_Validate_Abstract
  */
-require_once 'src/common/Zend/Validate/Abstract.php';
+require_once 'external/Zend/Validate/Abstract.php';
 
 
 /**
@@ -73,12 +73,12 @@
                 $className = 'Ean13';
                 break;
             default:
-                require_once 'src/common/Zend/Validate/Exception.php';
+                require_once 'external/Zend/Validate/Exception.php';
                 throw new Zend_Validate_Exception("Barcode type '$barcodeType' is not supported'");
                 break;
         }
 
-        require_once 'src/common/Zend/Validate/Barcode/' . $className . '.php';
+        require_once 'external/Zend/Validate/Barcode/' . $className . '.php';
 
         $class = 'Zend_Validate_Barcode_' . $className;
         $this->_barcodeValidator = new $class;

Modified: incubator/shindig/trunk/php/external/Zend/Validate/Barcode/Ean13.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/Zend/Validate/Barcode/Ean13.php?rev=694927&r1=694923&r2=694927&view=diff
==============================================================================
--- incubator/shindig/trunk/php/external/Zend/Validate/Barcode/Ean13.php (original)
+++ incubator/shindig/trunk/php/external/Zend/Validate/Barcode/Ean13.php Sat Sep 13 03:59:25 2008
@@ -24,7 +24,7 @@
 /**
  * @see Zend_Validate_Abstract
  */
-require_once 'src/common/Zend/Validate/Abstract.php';
+require_once 'external/Zend/Validate/Abstract.php';
 
 
 /**

Modified: incubator/shindig/trunk/php/external/Zend/Validate/Barcode/UpcA.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/Zend/Validate/Barcode/UpcA.php?rev=694927&r1=694923&r2=694927&view=diff
==============================================================================
--- incubator/shindig/trunk/php/external/Zend/Validate/Barcode/UpcA.php (original)
+++ incubator/shindig/trunk/php/external/Zend/Validate/Barcode/UpcA.php Sat Sep 13 03:59:25 2008
@@ -24,7 +24,7 @@
 /**
  * @see Zend_Validate_Abstract
  */
-require_once 'src/common/Zend/Validate/Abstract.php';
+require_once 'external/Zend/Validate/Abstract.php';
 
 
 /**

Modified: incubator/shindig/trunk/php/external/Zend/Validate/Between.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/Zend/Validate/Between.php?rev=694927&r1=694923&r2=694927&view=diff
==============================================================================
--- incubator/shindig/trunk/php/external/Zend/Validate/Between.php (original)
+++ incubator/shindig/trunk/php/external/Zend/Validate/Between.php Sat Sep 13 03:59:25 2008
@@ -24,7 +24,7 @@
 /**
  * @see Zend_Validate_Abstract
  */
-require_once 'src/common/Zend/Validate/Abstract.php';
+require_once 'external/Zend/Validate/Abstract.php';
 
 
 /**

Modified: incubator/shindig/trunk/php/external/Zend/Validate/Ccnum.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/Zend/Validate/Ccnum.php?rev=694927&r1=694923&r2=694927&view=diff
==============================================================================
--- incubator/shindig/trunk/php/external/Zend/Validate/Ccnum.php (original)
+++ incubator/shindig/trunk/php/external/Zend/Validate/Ccnum.php Sat Sep 13 03:59:25 2008
@@ -24,7 +24,7 @@
 /**
  * @see Zend_Validate_Abstract
  */
-require_once 'src/common/Zend/Validate/Abstract.php';
+require_once 'external/Zend/Validate/Abstract.php';
 
 
 /**
@@ -78,7 +78,7 @@
             /**
              * @see Zend_Filter_Digits
              */
-            require_once 'src/common/Zend/Filter/Digits.php';
+            require_once 'external/Zend/Filter/Digits.php';
             self::$_filter = new Zend_Filter_Digits();
         }
 

Modified: incubator/shindig/trunk/php/external/Zend/Validate/Date.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/external/Zend/Validate/Date.php?rev=694927&r1=694923&r2=694927&view=diff
==============================================================================
--- incubator/shindig/trunk/php/external/Zend/Validate/Date.php (original)
+++ incubator/shindig/trunk/php/external/Zend/Validate/Date.php Sat Sep 13 03:59:25 2008
@@ -24,7 +24,7 @@
 /**
  * @see Zend_Validate_Abstract
  */
-require_once 'src/common/Zend/Validate/Abstract.php';
+require_once 'external/Zend/Validate/Abstract.php';
 
 
 /**
@@ -107,9 +107,9 @@
     public function setLocale($locale = null)
     {
         if ($locale !== null) {
-            require_once 'src/common/Zend/Locale.php';
+            require_once 'external/Zend/Locale.php';
             if (!Zend_Locale::isLocale($locale)) {
-                require_once 'src/common/Zend/Validate/Exception.php';
+                require_once 'external/Zend/Validate/Exception.php';
                 throw new Zend_Validate_Exception("The locale '$locale' is no known locale");
             }
         }
@@ -156,7 +156,7 @@
         $this->_setValue($valueString);
 
         if (($this->_format !== null) or ($this->_locale !== null)) {
-            require_once 'src/common/Zend/Date.php';
+            require_once 'external/Zend/Date.php';
             if (!Zend_Date::isDate($value, $this->_format, $this->_locale)) {
                 $this->_error(self::FALSEFORMAT);
                 return false;