From f403a97ccc47cc7a58b28dbe455b04166df96d6e Mon Sep 17 00:00:00 2001
From: "Michael J. Rubinsky" <mrubinsk@horde.org>
Date: Mon, 25 Oct 2010 14:13:16 -0400
Subject: [PATCH] Move Horde specific ActiveSync driver classes to Horde/Core

---
 framework/ActiveSync/package.xml                           | 14 +++-----------
 .../lib/Horde/Core/ActiveSync/Connector.php}               |  2 +-
 .../lib/Horde/Core/ActiveSync/Driver.php}                  |  6 +++---
 .../Core/lib/Horde/Core/Factory/ActiveSyncBackend.php      |  4 ++--
 framework/Core/package.xml                                 |  8 +++++++-
 5 files changed, 16 insertions(+), 18 deletions(-)
 rename framework/{ActiveSync/lib/Horde/ActiveSync/Driver/Horde/Connector/Registry.php => Core/lib/Horde/Core/ActiveSync/Connector.php} (99%)
 rename framework/{ActiveSync/lib/Horde/ActiveSync/Driver/Horde.php => Core/lib/Horde/Core/ActiveSync/Driver.php} (98%)

diff --git a/framework/ActiveSync/package.xml b/framework/ActiveSync/package.xml
index b583d6583..9f0b30208 100644
--- a/framework/ActiveSync/package.xml
+++ b/framework/ActiveSync/package.xml
@@ -10,8 +10,8 @@
   <email>mrubinsk@horde.org</email>
   <active>yes</active>
  </lead>
- <date>2010-10-22</date>
- <time>13:14:23</time>
+ <date>2010-10-25</date>
+ <time>14:01:04</time>
  <version>
   <release>0.1.0</release>
   <api>0.1.0</api>
@@ -37,13 +37,7 @@
        <file name="Importer.php" role="php" />
       </dir> <!-- /lib/Horde/ActiveSync/Connector -->
       <dir name="Driver">
-       <dir name="Horde">
-        <dir name="Connector">
-         <file name="Registry.php" role="php" />
-        </dir> <!-- /lib/Horde/ActiveSync/Driver/Horde/Connector -->
-       </dir> <!-- /lib/Horde/ActiveSync/Driver/Horde -->
        <file name="Base.php" role="php" />
-       <file name="Horde.php" role="php" />
       </dir> <!-- /lib/Horde/ActiveSync/Driver -->
       <dir name="Message">
        <file name="Appointment.php" role="php" />
@@ -133,8 +127,6 @@
    <install as="Horde/ActiveSync/Connector/Exporter.php" name="lib/Horde/ActiveSync/Connector/Exporter.php" />
    <install as="Horde/ActiveSync/Connector/Importer.php" name="lib/Horde/ActiveSync/Connector/Importer.php" />
    <install as="Horde/ActiveSync/Driver/Base.php" name="lib/Horde/ActiveSync/Driver/Base.php" />
-   <install as="Horde/ActiveSync/Driver/Horde.php" name="lib/Horde/ActiveSync/Driver/Horde.php" />
-   <install as="Horde/ActiveSync/Driver/Horde/Connector/Registry.php" name="lib/Horde/ActiveSync/Driver/Horde/Connector/Registry.php" />
    <install as="Horde/ActiveSync/Message/Appointment.php" name="lib/Horde/ActiveSync/Message/Appointment.php" />
    <install as="Horde/ActiveSync/Message/Attendee.php" name="lib/Horde/ActiveSync/Message/Attendee.php" />
    <install as="Horde/ActiveSync/Message/Base.php" name="lib/Horde/ActiveSync/Message/Base.php" />
@@ -184,7 +176,7 @@
     <release>alpha</release>
     <api>alpha</api>
    </stability>
-   <date>2010-10-22</date>
+   <date>2010-10-25</date>
    <license uri="http://www.gnu.org/licenses/gpl-2.0.html">GPLv2</license>
    <notes>
 * Initial release
diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Horde/Connector/Registry.php b/framework/Core/lib/Horde/Core/ActiveSync/Connector.php
similarity index 99%
rename from framework/ActiveSync/lib/Horde/ActiveSync/Driver/Horde/Connector/Registry.php
rename to framework/Core/lib/Horde/Core/ActiveSync/Connector.php
index cb1d2f239..c91fe2e90 100644
--- a/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Horde/Connector/Registry.php
+++ b/framework/Core/lib/Horde/Core/ActiveSync/Connector.php
@@ -11,7 +11,7 @@
  * @author Michael J. Rubinsky <mrubinsk@horde.org>
  * @package Horde_ActiveSync
  */
-class Horde_ActiveSync_Driver_Horde_Connector_Registry
+class Horde_Core_ActiveSync_Connector
 {
     /**
      * Horde registry
diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Horde.php b/framework/Core/lib/Horde/Core/ActiveSync/Driver.php
similarity index 98%
rename from framework/ActiveSync/lib/Horde/ActiveSync/Driver/Horde.php
rename to framework/Core/lib/Horde/Core/ActiveSync/Driver.php
index a63efda10..07b18f91f 100644
--- a/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Horde.php
+++ b/framework/Core/lib/Horde/Core/ActiveSync/Driver.php
@@ -19,7 +19,7 @@
 * This file is distributed under GPL v2.
 * Consult LICENSE file for details
 ************************************************/
-class Horde_ActiveSync_Driver_Horde extends Horde_ActiveSync_Driver_Base
+class Horde_Core_ActiveSync_Driver extends Horde_ActiveSync_Driver_Base
 {
     /** Constants **/
     const APPOINTMENTS_FOLDER = 'Calendar';
@@ -55,11 +55,11 @@ class Horde_ActiveSync_Driver_Horde extends Horde_ActiveSync_Driver_Base
     public function __construct($params = array())
     {
         parent::__construct($params);
-        if (empty($this->_params['connector'])) {
+        if (empty($this->_params['connector']) || !($this->_params['connector'] instanceof Horde_Core_ActiveSync_Connector)) {
             throw new InvalidArgumentException('Missing required connector object.');
         }
 
-        if (empty($this->_params['auth'])) {
+        if (empty($this->_params['auth']) || !($this->_params['auth'] instanceof Horde_Auth_Base)) {
             throw new InvalidArgumentException('Missing required Auth object');
         }
 
diff --git a/framework/Core/lib/Horde/Core/Factory/ActiveSyncBackend.php b/framework/Core/lib/Horde/Core/Factory/ActiveSyncBackend.php
index 1b03ac111..8b6b1a28a 100644
--- a/framework/Core/lib/Horde/Core/Factory/ActiveSyncBackend.php
+++ b/framework/Core/lib/Horde/Core/Factory/ActiveSyncBackend.php
@@ -21,7 +21,7 @@ class Horde_Core_Factory_ActiveSyncBackend
         // Backend driver and dependencies
         $params['registry'] = $GLOBALS['registry'];
         $driver_params = array(
-            'connector' => new Horde_ActiveSync_Driver_Horde_Connector_Registry($params),
+            'connector' => new Horde_Core_ActiveSync_Connector($params),
             'ping' => $conf['activesync']['ping'],
             'state_basic' => $injector->getInstance('Horde_ActiveSyncState'),
             'auth' => $injector->getInstance('Horde_Core_Factory_Auth')->create());
@@ -29,7 +29,7 @@ class Horde_Core_Factory_ActiveSyncBackend
             $driver_params['policies'] = $conf['activesync']['securitypolicies'];
         }
 
-        return new Horde_ActiveSync_Driver_Horde($driver_params);
+        return new Horde_Core_ActiveSync_Driver($driver_params);
     }
 
 }
\ No newline at end of file
diff --git a/framework/Core/package.xml b/framework/Core/package.xml
index 761282035..61fdd825f 100644
--- a/framework/Core/package.xml
+++ b/framework/Core/package.xml
@@ -24,7 +24,7 @@ Application Framework.</description>
   <active>yes</active>
  </developer>
  <date>2010-10-25</date>
- <time>09:15:23</time>
+ <time>14:04:39</time>
  <version>
   <release>0.1.0</release>
   <api>0.1.0</api>
@@ -79,6 +79,10 @@ Application Framework.</description>
       <file name="Form.php" role="php" />
      </dir> <!-- /lib/Horde/Config -->
      <dir name="Core">
+      <dir name="ActiveSync">
+       <file name="Connector.php" role="php" />
+       <file name="Driver.php" role="php" />
+      </dir> <!-- /lib/Horde/Core/ActiveSync -->
       <dir name="Ajax">
        <dir name="Imple">
         <dir name="Geocoder">
@@ -674,6 +678,8 @@ Application Framework.</description>
    <install as="Horde/Core/Prefs.php" name="lib/Horde/Core/Prefs.php" />
    <install as="Horde/Core/Sidebar.php" name="lib/Horde/Core/Sidebar.php" />
    <install as="Horde/Core/Translation.php" name="lib/Horde/Core/Translation.php" />
+   <install as="Horde/Core/ActiveSync/Connector.php" name="lib/Horde/Core/ActiveSync/Connector.php" />
+   <install as="Horde/Core/ActiveSync/Driver.php" name="lib/Horde/Core/ActiveSync/Driver.php" />
    <install as="Horde/Core/Ajax/Application.php" name="lib/Horde/Core/Ajax/Application.php" />
    <install as="Horde/Core/Ajax/Imple.php" name="lib/Horde/Core/Ajax/Imple.php" />
    <install as="Horde/Core/Ajax/Imple/AutoCompleter.php" name="lib/Horde/Core/Ajax/Imple/AutoCompleter.php" />
-- 
2.11.0