MFB: Remove dependency on the Kolab package within the task handler.

diff --git a/framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Task.php b/framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Task.php
index 527f324..ca11f29 100644 (file)
--- a/framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Task.php
+++ b/framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Task.php
@@ -160,7 +160,7 @@ class Horde_Kolab_Format_Xml_Task extends Horde_Kolab_Format_Xml
             $object['parent'] = null;
         }
 
-        $object['completed'] = (bool) Kolab::percentageToBoolean($object['completed']);
+        $object['completed'] = (bool) $this->percentageToBoolean($object['completed']);
 
         if (isset($object['organizer'])
             && isset($object['organizer']['smtp-address'])) {
@@ -193,8 +193,18 @@ class Horde_Kolab_Format_Xml_Task extends Horde_Kolab_Format_Xml
 
         $object['estimate'] = number_format($object['estimate'], 2);
 
-        $object['completed'] = Kolab::BooleanToPercentage($object['completed']);
+        $object['completed'] = $this->booleanToPercentage($object['completed']);
 
         return $this->_saveArray($root, $object, $this->_fields_specific);
     }
+
+    function percentageToBoolean($percentage)
+    {
+        return $percentage == 100 ? '1' : '0';
+    }
+
+    function booleanToPercentage($boolean)
+    {
+        return $boolean ? '100' : '0';
+    }
 }

diff --git a/framework/Kolab_Format/package.xml b/framework/Kolab_Format/package.xml
index 2a6862b..958f5f5 100644 (file)
--- a/framework/Kolab_Format/package.xml
+++ b/framework/Kolab_Format/package.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<package packagerversion="1.4.9" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
-http://pear.php.net/dtd/tasks-1.0.xsd
-http://pear.php.net/dtd/package-2.0
-http://pear.php.net/dtd/package-2.0.xsd">
+<package packagerversion="1.9.0" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd">
  <name>Kolab_Format</name>
  <channel>pear.horde.org</channel>
  <summary>A package for reading/writing Kolab data formats</summary>
@@ -32,7 +29,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
   <email>jan@horde.org</email>
   <active>yes</active>
  </lead>
- <date>2009-04-02</date>
+ <date>2010-06-23</date>
+ <time>10:35:06</time>
  <version>
   <release>1.0.2</release>
   <api>1.0.0</api>
@@ -43,12 +41,12 @@ http://pear.php.net/dtd/package-2.0.xsd">
  </stability>
  <license uri="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html">LGPL</license>
  <notes>
-   * Converted to Horde4/PHP5
-   * Removed Horde_DOM dependency.
+* Remove dependency on the Kolab package within the task handler.
+* Converted to Horde4/PHP5
+* Removed Horde_DOM dependency.
  </notes>
  <contents>
-  <dir name="/">
-   <file name="COPYING" role="doc" />
+  <dir baseinstalldir="/" name="/">
    <dir name="doc">
     <dir name="Horde">
      <dir name="Kolab">
@@ -71,11 +69,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
    <dir name="lib">
     <dir name="Horde">
      <dir name="Kolab">
-      <file name="Format.php" role="php" />
       <dir name="Format">
-       <file name="Date.php" role="php" />
-       <file name="Exception.php" role="php" />
-       <file name="Xml.php" role="php" />
        <dir name="Xml">
         <file name="Annotation.php" role="php" />
         <file name="Contact.php" role="php" />
@@ -85,7 +79,11 @@ http://pear.php.net/dtd/package-2.0.xsd">
         <file name="Note.php" role="php" />
         <file name="Task.php" role="php" />
        </dir> <!-- /lib/Horde/Kolab/Format/Xml -->
+       <file name="Date.php" role="php" />
+       <file name="Exception.php" role="php" />
+       <file name="Xml.php" role="php" />
       </dir> <!-- /lib/Horde/Kolab/Format -->
+      <file name="Format.php" role="php" />
      </dir> <!-- /lib/Horde/Kolab -->
     </dir> <!-- /lib/Horde -->
    </dir> <!-- /lib -->
@@ -93,24 +91,32 @@ http://pear.php.net/dtd/package-2.0.xsd">
     <dir name="Horde">
      <dir name="Kolab">
       <dir name="Format">
-       <file name="AllTests.php" role="test" />
-       <file name="ContactTest.php" role="test" />
-       <file name="PreferencesTest.php" role="test" />
-       <file name="RecurrenceTest.php" role="test" />
-       <file name="XmlTest.php" role="test" />
        <dir name="fixtures">
         <file name="contact_category.xml" role="test" />
         <file name="contact_mail.xml" role="test" />
         <file name="contact_pgp.xml" role="test" />
+        <file name="event_umlaut.xml" role="test" />
+        <file name="event_umlaut_broken.xml" role="test" />
         <file name="preferences_read_old.xml" role="test" />
         <file name="preferences_write_old.xml" role="test" />
-        <file name="recur_fail.xml" role="test" />
         <file name="recur.xml" role="test" />
+        <file name="recur_fail.xml" role="test" />
+        <file name="task.xml" role="test" />
        </dir> <!-- /test/Horde/Kolab/Format/fixtures -->
+       <file name="AllTests.php" role="test" />
+       <file name="ContactTest.php" role="test" />
+       <file name="EventTest.php" role="test" />
+       <file name="MimeAttrTest.php" role="test" />
+       <file name="PreferencesTest.php" role="test" />
+       <file name="RecurrenceTest.php" role="test" />
+       <file name="TaskTest.php" role="test" />
+       <file name="XmlTest.php" role="test" />
       </dir> <!-- /test/Horde/Kolab/Format -->
      </dir> <!-- /test/Horde/Kolab -->
     </dir> <!-- /test/Horde -->
    </dir> <!-- /test -->
+   <file name="COPYING" role="doc" />
+   <file name="TODO" role="data" />
   </dir> <!-- / -->
  </contents>
  <dependencies>
@@ -147,85 +153,86 @@ http://pear.php.net/dtd/package-2.0.xsd">
  </dependencies>
  <phprelease>
   <filelist>
-   <install name="doc/Horde/Kolab/Format/usage.txt" as="Horde/Kolab/Format/usage.txt" />
-   <install name="examples/Horde/Kolab/Format/event.php" as="Horde/Kolab/Format/event.php" />
-   <install name="examples/Horde/Kolab/Format/new_type.php" as="Horde/Kolab/Format/new_type.php" />
-   <install name="lib/Horde/Kolab/Format.php" as="Horde/Kolab/Format.php" />
-   <install name="lib/Horde/Kolab/Format/Date.php" as="Horde/Kolab/Format/Date.php" />
-   <install name="lib/Horde/Kolab/Format/Exception.php" as="Horde/Kolab/Format/Exception.php" />
-   <install name="lib/Horde/Kolab/Format/Xml.php" as="Horde/Kolab/Format/Xml.php" />
-   <install name="lib/Horde/Kolab/Format/Xml/Annotation.php" as="Horde/Kolab/Format/Xml/Annotation.php" />
-   <install name="lib/Horde/Kolab/Format/Xml/Contact.php" as="Horde/Kolab/Format/Xml/Contact.php" />
-   <install name="lib/Horde/Kolab/Format/Xml/Distributionlist.php" as="Horde/Kolab/Format/Xml/Distributionlist.php" />
-   <install name="lib/Horde/Kolab/Format/Xml/Event.php" as="Horde/Kolab/Format/Xml/Event.php" />
-   <install name="lib/Horde/Kolab/Format/Xml/Hprefs.php" as="Horde/Kolab/Format/Xml/Hprefs.php" />
-   <install name="lib/Horde/Kolab/Format/Xml/Note.php" as="Horde/Kolab/Format/Xml/Note.php" />
-   <install name="lib/Horde/Kolab/Format/Xml/Task.php" as="Horde/Kolab/Format/Xml/Task.php" />
-   <install name="test/Horde/Kolab/Format/AllTests.php" as="Horde/Kolab/Format/AllTests.php" />
-   <install name="test/Horde/Kolab/Format/ContactTest.php" as="Horde/Kolab/Format/ContactTest.php" />
-   <install name="test/Horde/Kolab/Format/PreferencesTest.php" as="Horde/Kolab/Format/PreferencesTest.php" />
-   <install name="test/Horde/Kolab/Format/RecurrenceTest.php" as="Horde/Kolab/Format/RecurrenceTest.php" />
-   <install name="test/Horde/Kolab/Format/XmlTest.php" as="Horde/Kolab/Format/XmlTest.php" />
-   <install name="test/Horde/Kolab/Format/fixtures/contact_category.xml" as="Horde/Kolab/Format/fixtures/contact_category.xml" />
-   <install name="test/Horde/Kolab/Format/fixtures/contact_mail.xml" as="Horde/Kolab/Format/fixtures/contact_mail.xml" />
-   <install name="test/Horde/Kolab/Format/fixtures/contact_pgp.xml" as="Horde/Kolab/Format/fixtures/contact_pgp.xml" />
-   <install name="test/Horde/Kolab/Format/fixtures/preferences_read_old.xml" as="Horde/Kolab/Format/fixtures/preferences_read_old.xml" />
-   <install name="test/Horde/Kolab/Format/fixtures/preferences_write_old.xml" as="Horde/Kolab/Format/fixtures/preferences_write_old.xml" />
-   <install name="test/Horde/Kolab/Format/fixtures/recur.xml" as="Horde/Kolab/Format/fixtures/recur.xml" />
-   <install name="test/Horde/Kolab/Format/fixtures/recur_fail.xml" as="Horde/Kolab/Format/fixtures/recur_fail.xml" />
+   <install as="Horde/Kolab/Format/usage.txt" name="doc/Horde/Kolab/Format/usage.txt" />
+   <install as="Horde/Kolab/Format.php" name="lib/Horde/Kolab/Format.php" />
+   <install as="Horde/Kolab/Format/Date.php" name="lib/Horde/Kolab/Format/Date.php" />
+   <install as="Horde/Kolab/Format/Exception.php" name="lib/Horde/Kolab/Format/Exception.php" />
+   <install as="Horde/Kolab/Format/Xml.php" name="lib/Horde/Kolab/Format/Xml.php" />
+   <install as="Horde/Kolab/Format/Xml/Annotation.php" name="lib/Horde/Kolab/Format/Xml/Annotation.php" />
+   <install as="Horde/Kolab/Format/Xml/Contact.php" name="lib/Horde/Kolab/Format/Xml/Contact.php" />
+   <install as="Horde/Kolab/Format/Xml/Distributionlist.php" name="lib/Horde/Kolab/Format/Xml/Distributionlist.php" />
+   <install as="Horde/Kolab/Format/Xml/Event.php" name="lib/Horde/Kolab/Format/Xml/Event.php" />
+   <install as="Horde/Kolab/Format/Xml/Hprefs.php" name="lib/Horde/Kolab/Format/Xml/Hprefs.php" />
+   <install as="Horde/Kolab/Format/Xml/Note.php" name="lib/Horde/Kolab/Format/Xml/Note.php" />
+   <install as="Horde/Kolab/Format/Xml/Task.php" name="lib/Horde/Kolab/Format/Xml/Task.php" />
+   <install as="Horde/Kolab/Format/AllTests.php" name="test/Horde/Kolab/Format/AllTests.php" />
+   <install as="Horde/Kolab/Format/ContactTest.php" name="test/Horde/Kolab/Format/ContactTest.php" />
+   <install as="Horde/Kolab/Format/EventTest.php" name="test/Horde/Kolab/Format/EventTest.php" />
+   <install as="Horde/Kolab/Format/MimeAttrTest.php" name="test/Horde/Kolab/Format/MimeAttrTest.php" />
+   <install as="Horde/Kolab/Format/PreferencesTest.php" name="test/Horde/Kolab/Format/PreferencesTest.php" />
+   <install as="Horde/Kolab/Format/RecurrenceTest.php" name="test/Horde/Kolab/Format/RecurrenceTest.php" />
+   <install as="Horde/Kolab/Format/TaskTest.php" name="test/Horde/Kolab/Format/TaskTest.php" />
+   <install as="Horde/Kolab/Format/XmlTest.php" name="test/Horde/Kolab/Format/XmlTest.php" />
+   <install as="Horde/Kolab/Format/fixtures/contact_category.xml" name="test/Horde/Kolab/Format/fixtures/contact_category.xml" />
+   <install as="Horde/Kolab/Format/fixtures/contact_mail.xml" name="test/Horde/Kolab/Format/fixtures/contact_mail.xml" />
+   <install as="Horde/Kolab/Format/fixtures/contact_pgp.xml" name="test/Horde/Kolab/Format/fixtures/contact_pgp.xml" />
+   <install as="Horde/Kolab/Format/fixtures/event_umlaut.xml" name="test/Horde/Kolab/Format/fixtures/event_umlaut.xml" />
+   <install as="Horde/Kolab/Format/fixtures/event_umlaut_broken.xml" name="test/Horde/Kolab/Format/fixtures/event_umlaut_broken.xml" />
+   <install as="Horde/Kolab/Format/fixtures/preferences_read_old.xml" name="test/Horde/Kolab/Format/fixtures/preferences_read_old.xml" />
+   <install as="Horde/Kolab/Format/fixtures/preferences_write_old.xml" name="test/Horde/Kolab/Format/fixtures/preferences_write_old.xml" />
+   <install as="Horde/Kolab/Format/fixtures/recur.xml" name="test/Horde/Kolab/Format/fixtures/recur.xml" />
+   <install as="Horde/Kolab/Format/fixtures/recur_fail.xml" name="test/Horde/Kolab/Format/fixtures/recur_fail.xml" />
+   <install as="Horde/Kolab/Format/fixtures/task.xml" name="test/Horde/Kolab/Format/fixtures/task.xml" />
   </filelist>
  </phprelease>
  <changelog>
   <release>
-   <date>2009-04-02</date>
    <version>
-    <release>1.0.1</release>
-    <api>1.0.0</api>
+    <release>0.1.0</release>
+    <api>0.1.0</api>
    </version>
    <stability>
-    <release>stable</release>
-    <api>stable</api>
+    <release>alpha</release>
+    <api>alpha</api>
    </stability>
-   <license uri="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html">LGPL</license>
+   <date>2008-07-11</date>
+   <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
    <notes>
-     * Handle parsing errors within the DOM XML extension correctly
-       kolab/issue3520 (calendar with certain entries does not display in web client)
-       https://www.intevation.de/roundup/kolab/issue3520
-       kolab/issue3525 (free/busy regeneration aborts for unparsable events)
-       https://www.intevation.de/roundup/kolab/issue3525
-     * Accept ISO-8859-1 encoding even if advertised as UTF-8
-       kolab/issue3528 (Events with broken encoding should work)
-       https://www.intevation.de/roundup/kolab/issue3528
+* Initial release.
    </notes>
   </release>
   <release>
-   <date>2008-12-12</date>
    <version>
-    <release>1.0.0</release>
-    <api>1.0.0</api>
+    <release>0.1.1</release>
+    <api>0.1.0</api>
    </version>
    <stability>
-    <release>stable</release>
-    <api>stable</api>
+    <release>alpha</release>
+    <api>alpha</api>
    </stability>
-   <license uri="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html">LGPL</license>
+   <date>2008-07-29</date>
+   <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
    <notes>
-     * Fixed copyright information.
+* Estimated amount of required time in tasks is a float.
+* Only convert recurrence end of type date to a date.
+* Fixed calls to _loadArray/_saveArray.
+* Added experimental annotations format.
    </notes>
   </release>
   <release>
-   <date>2008-11-07</date>
    <version>
-    <release>1.0.0RC2</release>
-    <api>0.2.0</api>
+    <release>0.1.2</release>
+    <api>0.1.0</api>
    </version>
    <stability>
-    <release>beta</release>
+    <release>alpha</release>
     <api>alpha</api>
    </stability>
+   <date>2008-08-01</date>
    <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
    <notes>
-     * Added functions to provide MIME related information.
+* Renamed package to Kolab_Format.
+* Removed some unnecessary translations.
    </notes>
   </release>
   <release>
@@ -240,63 +247,83 @@ http://pear.php.net/dtd/package-2.0.xsd">
    </stability>
    <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
    <notes>
-     * Fixed handling of return values from _load/_saveArray().
-     * Allowed disabling the automatic creation of categories.
-     * Merge a single mail address into the list of mail addresses.
-     * Support storing public gpg keys in the contact format.
-     * Fixed a PHP5 only check when reading XML content.
-     * Use the 'application' instead of the 'categories' element in the 
-       preferences driver.
-     * Fix category handling when no preference backend is available.
+* Fixed handling of return values from _load/_saveArray().
+* Allowed disabling the automatic creation of categories.
+* Merge a single mail address into the list of mail addresses.
+* Support storing public gpg keys in the contact format.
+* Fixed a PHP5 only check when reading XML content.
+* Use the &apos;application&apos; instead of the &apos;categories&apos; element in the 
+  preferences driver.
+* Fix category handling when no preference backend is available.
    </notes>
   </release>
   <release>
+   <date>2008-11-07</date>
    <version>
-    <release>0.1.2</release>
-    <api>0.1.0</api>
+    <release>1.0.0RC2</release>
+    <api>0.2.0</api>
    </version>
    <stability>
-    <release>alpha</release>
+    <release>beta</release>
     <api>alpha</api>
    </stability>
-   <date>2008-08-01</date>
    <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
    <notes>
-     * Renamed package to Kolab_Format.
-     * Removed some unnecessary translations.
+* Added functions to provide MIME related information.
    </notes>
   </release>
   <release>
+   <date>2008-12-12</date>
    <version>
-    <release>0.1.1</release>
-    <api>0.1.0</api>
+    <release>1.0.0</release>
+    <api>1.0.0</api>
    </version>
    <stability>
-    <release>alpha</release>
-    <api>alpha</api>
+    <release>stable</release>
+    <api>stable</api>
    </stability>
-   <date>2008-07-29</date>
-   <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
+   <license uri="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html">LGPL</license>
    <notes>
-    * Estimated amount of required time in tasks is a float.
-    * Only convert recurrence end of type date to a date.
-    * Fixed calls to _loadArray/_saveArray.
-    * Added experimental annotations format.
+* Fixed copyright information.
    </notes>
   </release>
   <release>
+   <date>2009-04-02</date>
    <version>
-    <release>0.1.0</release>
-    <api>0.1.0</api>
+    <release>1.0.1</release>
+    <api>1.0.0</api>
    </version>
    <stability>
-    <release>alpha</release>
-    <api>alpha</api>
+    <release>stable</release>
+    <api>stable</api>
    </stability>
-   <date>2008-07-11</date>
-   <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
+   <license uri="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html">LGPL</license>
+   <notes>
+* Handle parsing errors within the DOM XML extension correctly
+  kolab/issue3520 (calendar with certain entries does not display in web client)
+  https://www.intevation.de/roundup/kolab/issue3520
+  kolab/issue3525 (free/busy regeneration aborts for unparsable events)
+  https://www.intevation.de/roundup/kolab/issue3525
+* Accept ISO-8859-1 encoding even if advertised as UTF-8
+  kolab/issue3528 (Events with broken encoding should work)
+  https://www.intevation.de/roundup/kolab/issue3528
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>1.0.2</release>
+    <api>1.0.0</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <date>2010-06-23</date>
+   <license uri="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html">LGPL</license>
    <notes>
-     * Initial release.
+* Remove dependency on the Kolab package within the task handler.
+* Converted to Horde4/PHP5
+* Removed Horde_DOM dependency.
    </notes>
   </release>
  </changelog>

diff --git a/framework/Kolab_Format/test/Horde/Kolab/Format/TaskTest.php b/framework/Kolab_Format/test/Horde/Kolab/Format/TaskTest.php
new file mode 100644 (file)
index 0000000..2bc67f1
--- /dev/null
+++ b/framework/Kolab_Format/test/Horde/Kolab/Format/TaskTest.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Test task handling within the Kolab format implementation.
+ *
+ * $Horde: framework/Kolab_Format/test/Horde/Kolab/Format/TaskTest.php,v 1.1.2.1 2009/04/02 20:14:52 wrobel Exp $
+ *
+ * @package Kolab_Format
+ */
+
+/**
+ * The Autoloader allows us to omit "require/include" statements.
+ */
+require_once 'Horde/Autoloader.php';
+
+/**
+ * Test task handling.
+ *
+ * $Horde: framework/Kolab_Format/test/Horde/Kolab/Format/TaskTest.php,v 1.1.2.1 2009/04/02 20:14:52 wrobel Exp $
+ *
+ * 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.
+ *
+ * @author  Gunnar Wrobel <wrobel@pardus.de>
+ * @package Kolab_Format
+ */
+class Horde_Kolab_Format_TaskTest extends PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Test basic task handling
+     */
+    public function testBasicTask()
+    {
+        $xml = Horde_Kolab_Format::factory('XML', 'task');
+
+        // Load XML
+        $task = file_get_contents(dirname(__FILE__) . '/fixtures/task.xml');
+        $result = $xml->load($task);
+        // Check that the xml loads fine
+        $this->assertEquals($result['body'], 'TEST');
+    }
+}

diff --git a/framework/Kolab_Format/test/Horde/Kolab/Format/fixtures/task.xml b/framework/Kolab_Format/test/Horde/Kolab/Format/fixtures/task.xml
new file mode 100644 (file)
index 0000000..38b693a
--- /dev/null
+++ b/framework/Kolab_Format/test/Horde/Kolab/Format/fixtures/task.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<task version="1.0">
+  <uid>1e2f91e4977abfec573916f351db3e14</uid>
+  <body>TEST</body>
+  <categories>Variable</categories>
+  <creation-date>2007-10-29T06:32:14Z</creation-date>
+  <last-modification-date>2007-11-12T15:40:04Z</last-modification-date>
+  <sensitivity>public</sensitivity>
+  <product-id>Horde::Kolab</product-id>
+  <summary>Finish project description</summary>
+  <location></location>
+  <creator>
+    <display-name></display-name>
+    <smtp-address></smtp-address>
+  </creator>
+  <organizer>
+    <display-name></display-name>
+    <smtp-address></smtp-address>
+  </organizer>
+  <start-date>2007-11-06T23:00:00Z</start-date>
+  <recurrence cycle="daily">
+    <interval>1</interval>
+    <range type="none"></range>
+  </recurrence>
+  <priority>1</priority>
+  <completed>100</completed>
+  <status>not-started</status>
+  <due-date>2007-11-07T18:00:00Z</due-date>
+  <estimate>30</estimate>
+</task>

diff --git a/framework/Packaging/script/horde-pear-release.php b/framework/Packaging/script/horde-pear-release.php
index 5187a6e..6399852 100755 (executable)
--- a/framework/Packaging/script/horde-pear-release.php
+++ b/framework/Packaging/script/horde-pear-release.php
@@ -1,6 +1,6 @@
 #!/usr/bin/php
 <?php
-require_once('Horde/Autoloader.php');
+require_once('Horde/Core/Autoloader.php');
 
 PEAR::setErrorHandling(PEAR_ERROR_DIE);
 
@@ -44,7 +44,7 @@ $package = PEAR_PackageFileManager2::importOptions(
         'clearcontents' => false,
         'clearchangelog' => false,
         'simpleoutput' => true,
-        'ignore' => array('*~', 'conf.php'),
+        'ignore' => array('*~', 'conf.php', 'CVS/*'),
         'include' => '*',
         'dir_roles' =>
         array(