From c226cce87289e30492c895906eb3d127c66adb8c Mon Sep 17 00:00:00 2001 From: Gunnar Wrobel Date: Mon, 2 Mar 2009 07:06:50 +0000 Subject: [PATCH] Split of Kolab_Session from Kolab_Server. --- framework/Kolab_Server/package.xml | 15 +-- .../lib/Horde/Kolab/IMAP.php | 0 .../lib/Horde/Kolab/IMAP/cclient.php | 0 .../lib/Horde/Kolab/IMAP/pear.php | 0 .../lib/Horde/Kolab/IMAP/test.php | 0 .../lib/Horde/Kolab/Session.php | 0 framework/Kolab_Session/package.xml | 114 +++++++++++++++++++++ .../test/Horde/Kolab/Session/AllTests.php | 85 +++++++++++++++ .../test/Horde/Kolab/Session}/SessionTest.php | 26 ++--- 9 files changed, 213 insertions(+), 27 deletions(-) rename framework/{Kolab_Server => Kolab_Session}/lib/Horde/Kolab/IMAP.php (100%) rename framework/{Kolab_Server => Kolab_Session}/lib/Horde/Kolab/IMAP/cclient.php (100%) rename framework/{Kolab_Server => Kolab_Session}/lib/Horde/Kolab/IMAP/pear.php (100%) rename framework/{Kolab_Server => Kolab_Session}/lib/Horde/Kolab/IMAP/test.php (100%) rename framework/{Kolab_Server => Kolab_Session}/lib/Horde/Kolab/Session.php (100%) create mode 100644 framework/Kolab_Session/package.xml create mode 100644 framework/Kolab_Session/test/Horde/Kolab/Session/AllTests.php rename framework/{Kolab_Server/test/Horde/Kolab/Server => Kolab_Session/test/Horde/Kolab/Session}/SessionTest.php (90%) diff --git a/framework/Kolab_Server/package.xml b/framework/Kolab_Server/package.xml index c341544a9..81df488c5 100644 --- a/framework/Kolab_Server/package.xml +++ b/framework/Kolab_Server/package.xml @@ -39,20 +39,14 @@ http://pear.php.net/dtd/package-2.0.xsd"> LGPL * Converted the package to Horde 4 / PHP 5. + * Split the session driver into a separate package (Kolab_Session). - - - - - - - @@ -90,7 +84,6 @@ http://pear.php.net/dtd/package-2.0.xsd"> - @@ -133,12 +126,7 @@ http://pear.php.net/dtd/package-2.0.xsd"> - - - - - @@ -163,7 +151,6 @@ http://pear.php.net/dtd/package-2.0.xsd"> - diff --git a/framework/Kolab_Server/lib/Horde/Kolab/IMAP.php b/framework/Kolab_Session/lib/Horde/Kolab/IMAP.php similarity index 100% rename from framework/Kolab_Server/lib/Horde/Kolab/IMAP.php rename to framework/Kolab_Session/lib/Horde/Kolab/IMAP.php diff --git a/framework/Kolab_Server/lib/Horde/Kolab/IMAP/cclient.php b/framework/Kolab_Session/lib/Horde/Kolab/IMAP/cclient.php similarity index 100% rename from framework/Kolab_Server/lib/Horde/Kolab/IMAP/cclient.php rename to framework/Kolab_Session/lib/Horde/Kolab/IMAP/cclient.php diff --git a/framework/Kolab_Server/lib/Horde/Kolab/IMAP/pear.php b/framework/Kolab_Session/lib/Horde/Kolab/IMAP/pear.php similarity index 100% rename from framework/Kolab_Server/lib/Horde/Kolab/IMAP/pear.php rename to framework/Kolab_Session/lib/Horde/Kolab/IMAP/pear.php diff --git a/framework/Kolab_Server/lib/Horde/Kolab/IMAP/test.php b/framework/Kolab_Session/lib/Horde/Kolab/IMAP/test.php similarity index 100% rename from framework/Kolab_Server/lib/Horde/Kolab/IMAP/test.php rename to framework/Kolab_Session/lib/Horde/Kolab/IMAP/test.php diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Session.php b/framework/Kolab_Session/lib/Horde/Kolab/Session.php similarity index 100% rename from framework/Kolab_Server/lib/Horde/Kolab/Session.php rename to framework/Kolab_Session/lib/Horde/Kolab/Session.php diff --git a/framework/Kolab_Session/package.xml b/framework/Kolab_Session/package.xml new file mode 100644 index 000000000..16e7c46a8 --- /dev/null +++ b/framework/Kolab_Session/package.xml @@ -0,0 +1,114 @@ + + + Kolab_Session + pear.horde.org + A package managing an active Kolab session. + This package handles a Kolab session. It allows to + authenticate against LDAP and provides the users storage locations. + + + Gunnar Wrobel + wrobel + p@rdus.de + yes + + + Chuck Hagenbuch + chuck + chuck@horde.org + yes + + + Jan Schneider + jan + jan@horde.org + yes + + 2009-03-02 + + 0.1.0 + 0.1.0 + + + alpha + alpha + + LGPL + + * Split package from Kolab_Server + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 4.3.0 + + + 1.4.0b1 + + + Auth + pear.horde.org + + + + + Kolab_Server + pear.horde.org + + + Horde_SessionObjects + pear.horde.org + + + PHPUnit + pear.phpunit.de + + + ldap + + + + + + + + + + + + + + + + + diff --git a/framework/Kolab_Session/test/Horde/Kolab/Session/AllTests.php b/framework/Kolab_Session/test/Horde/Kolab/Session/AllTests.php new file mode 100644 index 000000000..7eebe26b1 --- /dev/null +++ b/framework/Kolab_Session/test/Horde/Kolab/Session/AllTests.php @@ -0,0 +1,85 @@ + + * @license http://www.fsf.org/copyleft/lgpl.html LGPL + * @link http://pear.horde.org/index.php?package=Kolab_Session + */ + +/** + * Define the main method + */ +if (!defined('PHPUnit_MAIN_METHOD')) { + define('PHPUnit_MAIN_METHOD', 'Horde_Kolab_Session_AllTests::main'); +} + +/** + * The Autoloader allows us to omit "require/include" statements. + */ +require_once 'Horde/Autoloader.php'; + +/** + * Combine the tests for this package. + * + * + * Copyright 2007-2009 The Horde Project (http://www.horde.org/) + * + * See the enclosed file COPYING for license information (LGPL). If you + * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html. + * + * @category Kolab + * @package Kolab_Session + * @author Gunnar Wrobel + * @license http://www.fsf.org/copyleft/lgpl.html LGPL + * @link http://pear.horde.org/index.php?package=Kolab_Session + */ +class Horde_Kolab_Session_AllTests +{ + + /** + * Main entry point for running the suite. + * + * @return NULL + */ + public static function main() + { + PHPUnit_TextUI_TestRunner::run(self::suite()); + } + + /** + * Collect the unit tests of this directory into a new suite. + * + * @return PHPUnit_Framework_TestSuite The test suite. + */ + public static function suite() + { + $suite = new PHPUnit_Framework_TestSuite('Horde Framework - Kolab_Session'); + + $basedir = dirname(__FILE__); + $baseregexp = preg_quote($basedir . DIRECTORY_SEPARATOR, '/'); + + foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($basedir)) as $file) { + if ($file->isFile() && preg_match('/Test.php$/', $file->getFilename())) { + $pathname = $file->getPathname(); + require $pathname; + + $class = str_replace(DIRECTORY_SEPARATOR, '_', + preg_replace("/^$baseregexp(.*)\.php/", '\\1', $pathname)); + $suite->addTestSuite('Horde_Kolab_Session_' . $class); + } + } + + return $suite; + } + +} + +if (PHPUnit_MAIN_METHOD == 'Horde_Kolab_Session_AllTests::main') { + Horde_Kolab_Session_AllTests::main(); +} diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/SessionTest.php b/framework/Kolab_Session/test/Horde/Kolab/Session/SessionTest.php similarity index 90% rename from framework/Kolab_Server/test/Horde/Kolab/Server/SessionTest.php rename to framework/Kolab_Session/test/Horde/Kolab/Session/SessionTest.php index 8312c1423..eecc1975b 100644 --- a/framework/Kolab_Server/test/Horde/Kolab/Server/SessionTest.php +++ b/framework/Kolab_Session/test/Horde/Kolab/Session/SessionTest.php @@ -5,10 +5,10 @@ * PHP version 5 * * @category Kolab - * @package Kolab_Server + * @package Kolab_Session * @author Gunnar Wrobel * @license http://www.fsf.org/copyleft/lgpl.html LGPL - * @link http://pear.horde.org/index.php?package=Kolab_Server + * @link http://pear.horde.org/index.php?package=Kolab_Session */ /** @@ -25,12 +25,12 @@ require_once 'Horde/Autoloader.php'; * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html. * * @category Kolab - * @package Kolab_Server + * @package Kolab_Session * @author Gunnar Wrobel * @license http://www.fsf.org/copyleft/lgpl.html LGPL - * @link http://pear.horde.org/index.php?package=Kolab_Server + * @link http://pear.horde.org/index.php?package=Kolab_Session */ -class Horde_Kolab_Server_SessionTest extends Horde_Kolab_Test_Server +class Horde_Kolab_Session_SessionTest extends Horde_Kolab_Test_Session { /** * Test class construction. @@ -78,9 +78,9 @@ class Horde_Kolab_Server_SessionTest extends Horde_Kolab_Test_Server * * @return NULL */ - public function testGetServer() + public function testGetSession() { - $server = &$this->prepareEmptyKolabServer(); + $server = &$this->prepareEmptyKolabSession(); $result = $server->add($this->provideBasicUserTwo()); $this->assertNoError($result); $this->assertEquals(1, count($GLOBALS['KOLAB_SERVER_TEST_DATA'])); @@ -116,9 +116,9 @@ class Horde_Kolab_Server_SessionTest extends Horde_Kolab_Test_Server * * @return NULL */ - public function testGetFreeBusyServer() + public function testGetFreeBusySession() { - $server = &$this->prepareEmptyKolabServer(); + $server = &$this->prepareEmptyKolabSession(); $result = $server->add($this->provideBasicUserTwo()); $this->assertNoError($result); $session = &Horde_Kolab_Session::singleton(); @@ -136,7 +136,7 @@ class Horde_Kolab_Server_SessionTest extends Horde_Kolab_Test_Server $conf['kolab']['server']['allow_group'] = 'group2@example.org'; $conf['kolab']['server']['deny_group'] = null; - $server = &$this->prepareEmptyKolabServer(); + $server = &$this->prepareEmptyKolabSession(); $result = $server->add($this->provideBasicUserOne()); $this->assertNoError($result); $result = $server->add($this->provideBasicUserTwo()); @@ -158,7 +158,7 @@ class Horde_Kolab_Server_SessionTest extends Horde_Kolab_Test_Server $session = &Horde_Kolab_Session::singleton('test', array('password' => 'test'), true); - } catch (Horde_Kolab_Server_Exception $e) { + } catch (Horde_Kolab_Session_Exception $e) { $this->assertError($e, 'You are no member of a group that may login on this server.'); } // FIXME: Ensure that the session gets overwritten @@ -176,7 +176,7 @@ class Horde_Kolab_Server_SessionTest extends Horde_Kolab_Test_Server $conf['kolab']['server']['deny_group'] = 'group2@example.org'; unset($conf['kolab']['server']['allow_group']); - $server = &$this->prepareEmptyKolabServer(); + $server = &$this->prepareEmptyKolabSession(); $result = $server->add($this->provideBasicUserOne()); $this->assertNoError($result); $result = $server->add($this->provideBasicUserTwo()); @@ -198,7 +198,7 @@ class Horde_Kolab_Server_SessionTest extends Horde_Kolab_Test_Server $session = &Horde_Kolab_Session::singleton('wrobel', array('password' => 'none'), true); - } catch (Horde_Kolab_Server_Exception $e) { + } catch (Horde_Kolab_Session_Exception $e) { $this->assertError($e, 'You are member of a group that may not login on this server.'); } // FIXME: Ensure that the session gets overwritten -- 2.11.0