Partial fix for CMISSpaces browsing - now getting right hand side content includ…

…ing display of documents but tree is broken on left hand side. Committing to allow me to go back to code which worked for the lest hand side and see what is different Committed by: Paul Barrett

Partial fix for CMISSpaces browsing - now getting right hand side content includ…
…ing display of documents but tree is broken on left hand side. Committing to allow me to go back to code which worked for the lest hand side and see what is different Committed by: Paul Barrett
Paul Barrett
1 parent bcc3eb6e
Showing 11 changed files with 475 additions and 669 deletions
lib/api/ktcmis/classes/CMISPropertyCollection.inc.php
lib/api/ktcmis/objecttypes/CMISDocumentObject.inc.php
lib/api/ktcmis/objecttypes/CMISFolderObject.inc.php
lib/api/ktcmis/util/CMISUtil.inc.php
webservice/atompub/cmis/KT_cmis_atom_server.services.inc.php
webservice/atompub/cmis/KT_cmis_atom_service_helper.inc.php
webservice/atompub/cmis/index.php
webservice/classes/atompub/cmis/KT_cmis_atom_responseFeed.inc.php
webservice/classes/atompub/cmis/KT_cmis_atom_server.inc.php
webservice/classes/atompub/cmis/KT_cmis_atom_serviceDoc.inc.php
webservice/classes/soap/IPPhpDoc.class.php
@@ -47,14 +47,14 @@ abstract class CMISPropertyCollection {
     static $ObjectId;
     static $BaseType;
-    static $URI;
+    static $Uri;
     static $ObjectTypeId;
     static $CreatedBy;
     static $CreationDate;
     static $LastModifiedBy;
     static $LastModificationDate;
     static $ChangeToken;
-    // TODO these definitions probably belong elsewhere, but here will do for now
+    // TODO these definitions belong in their own classe definition (see property type definions,) but here will do for now
     static $propertyTypes;
     function __construct()
@@ -69,6 +69,11 @@ abstract class CMISPropertyCollection {
                                     'Name' => 'propertyString',
                                     'ContentStreamLength' => 'propertyInteger',
                                     'ContentStreamMimeType' => 'propertyString',
+                                    'Uri' => 'propertyUri',
+                                    'AllowedChildObjectTypeIds' => 'propertyId',
+                                    'CreatedBy' => 'propertyString',
+                                    'CreationDate' => 'propertyDateTime',
+                                    'ChangeToken' => 'propertyString',
                                     'ParentId' => 'propertyId');
     }
@@ -121,7 +121,7 @@ class CMISDocumentObject extends CMISBaseObject {
                                      . $objectProperties['document_id']);
         // NOTE what about instead creating a downloadable version with appropriate link?  see ktapi::download_document
         //      also ktapidocument::get_download_url
-        $this->_setPropertyInternal('URI', $uri);
+        $this->_setPropertyInternal('Uri', $uri);
         // TODO what is this?  Assuming it is the object type id, and not OUR document type?
         $this->_setPropertyInternal('ObjectTypeId', $this->getAttribute('typeId'));
         // Needed to distinguish type
@@ -99,7 +99,7 @@ class CMISFolderObject extends CMISBaseObject {
                                      . '/browse.php?fFolderId='
                                      . $objectProperties['id']);
         // TODO this url is probably incorrect...needs to be checked
-        $this->_setPropertyInternal('URI', $uri);
+        $this->_setPropertyInternal('Uri', $uri);
         // TODO what is this?  Assuming it is the object type id, and not OUR document type?
         $this->_setPropertyInternal('ObjectTypeId', $this->getAttribute('typeId'));
         // Needed to distinguish type
@@ -82,7 +82,8 @@ class CMISUtil {
      * The decoded object ID is returned by reference via the argument list
      *
      * @param string $objectId
-     * @return string $typeId
+     * @param string &$typeId
+     * @return string $objectId
      */
     static public function decodeObjectId($objectId, &$typeId = null)
     {
@@ -94,6 +95,25 @@ class CMISUtil {
         $typeId = null;
+        // NOTE Not sure whether this really belongs here, but probably this is the safest and most reliable place
+        // If we find that the folderId is in fact the name of the repository root folder, we will not be able to
+        // decode it, but we still need to return a valid id :).  This is because the root folder name is returned
+        // by the repository configuration rather than the actual CMIS folder id.
+        // TODO consider just setting F1 as the root in the config?  Originally didn't based on Alfresco, but...
+        $RepositoryService = new CMISRepositoryService();
+        $repositories = $RepositoryService->getRepositories();
+        $repositoryInfo = $repositories[0]->getRepositoryInfo();
+        // the string replace is a hack for the drupal module, yay...
+        if ($repositoryInfo->getRootFolderId() == urldecode(str_replace('%2520', '%20', $objectId))) {
+            // NOTE that we may want to check the KnowledgeTree (not CMIS) repository for the root folder id.
+            //      This will be vital if we ever implement a way for people to have multiple roots depending
+            //      on who is logged in or what they select.  Obviously the CMIS API in general will need a
+            //      method of doing this.
+            //      meantime this minor hack will get things working for the existing system structure, as the root
+            //      folder should always be id 1.
+            return '1';
+        }
+
         preg_match('/(\D)(\d*)/', $objectId, $matches);
         $type = $matches[1];
         $objectId = $matches[2];
@@ -233,29 +253,59 @@ class CMISUtil {
     static public function createObjectPropertiesEntry($properties)
     {
+        // TODO better dynamic style fetching of object properties into array for output
         $object = array();
+        $object['Author'] = array('value' => $properties->getValue('Author'));
+        
         // TODO additional properties to be returned
-        $object['properties']['ObjectId'] = array('type' => $properties->getFieldType('ObjectId'),
-                                                           'value' => $properties->getValue('ObjectId'));
         $object['properties']['BaseType'] = array('type' => $properties->getFieldType('BaseType'),
                                                            'value' => $properties->getValue('BaseType'));
+        $object['properties']['ObjectId'] = array('type' => $properties->getFieldType('ObjectId'),
+                                                           'value' => $properties->getValue('ObjectId'));
         $object['properties']['ObjectTypeId'] = array('type' => $properties->getFieldType('ObjectTypeId'),
                                                            'value' => $properties->getValue('ObjectTypeId'));
         $object['properties']['Name'] = array('type' => $properties->getFieldType('Name'),
                                                            'value' => $properties->getValue('Name'));
-        $object['Author'] = array('value' => $properties->getValue('Author'));
+        // TODO ensure format of date is always correct
+        $object['properties']['LastModificationDate'] = array('type' => $properties->getFieldType('LastModificationDate'),
+                                                           'value' => $properties->getValue('LastModificationDate'));
+        $object['properties']['Uri'] = array('type' => $properties->getFieldType('Uri'),
+                               'value' => $properties->getValue('Uri'));
         $object['properties']['ParentId'] = array('type' => $properties->getFieldType('ParentId'),
                                                   'value' => CMISUtil::encodeObjectId('Folder',
                                                   $properties->getValue('ParentId')));
-        // TODO should check for content stream data before filling these in
+
+        $object['properties']['AllowedChildObjectTypeIds'] = array('type' => $properties->getFieldType('AllowedChildObjectTypeIds'),
+                                                                   'value' => $properties->getValue('AllowedChildObjectTypeIds'));
+        
+//        $object['properties']['AllowedChildObjectTypeIds'] = array('type' => $properties->getFieldType('AllowedChildObjectTypeIds'),
+//                                                                   'value' => $properties->getValue('AllowedChildObjectTypeIds'));
+
+        $object['properties']['CreatedBy'] = array('type' => $properties->getFieldType('CreatedBy'),
+                                                   'value' => $properties->getValue('CreatedBy'));
+
+        $object['properties']['CreationDate'] = array('type' => $properties->getFieldType('CreationDate'),
+                                                       'value' => $properties->getValue('CreationDate'));
+
+        $object['properties']['ChangeToken'] = array('type' => $properties->getFieldType('ChangeToken'),
+                                                       'value' => $properties->getValue('ChangeToken'));
+
         if (strtolower($properties->getValue('ObjectTypeId')) == 'document')
         {
-            $object['properties']['ContentStreamLength'] = array('type' => $properties->getFieldType('ContentStreamLength'),
-                                                           'value' => $properties->getValue('ContentStreamLength'));
-            $object['properties']['ContentStreamMimeType'] = array('type' => $properties->getFieldType('ContentStreamMimeType'),
-                                                           'value' => $properties->getValue('ContentStreamMimeType'));
+
+        $object['properties']['ChangeToken'] = array('type' => $properties->getFieldType('ChangeToken'),
+                                                                   'value' => $properties->getValue('ChangeToken'));
+            $contentStreamLength = $properties->getValue('ContentStreamLength');
+            if (!empty($contentStreamLength))
+            {
+                $contentStreamLength = $properties->getValue('ContentStreamLength');
+                $object['properties']['ContentStreamLength'] = array('type' => $properties->getFieldType('ContentStreamLength'),
+                                                               'value' => $properties->getValue('ContentStreamLength'));
+                $object['properties']['ContentStreamMimeType'] = array('type' => $properties->getFieldType('ContentStreamMimeType'),
+                                                               'value' => $properties->getValue('ContentStreamMimeType'));
+            }
         }
         // if we have found a child/parent with one or more children/parents, recurse into the child/parent object
 <?php
+/**
+ * Any feed must be a valid atom Feed document and conform to the guidelines below:
+1.	Updated will be the latest time the folder or its contents was updated. If unknown by the underlying repository, it should be the current time.
+2.	Author/name will be the CMIS property createdBy
+3.	Title will be the CMIS property name
+4.	App:edited will be the CMIS property lastModifiedDate
+5.	Link with relation self will be generated to return the uri of the feed
+ */
+
+/**
+ * At any point where an Atom document of type Entry is sent or returned, it must be a valid Atom Entry document and conform to the guidelines below:
+1.	Atom:Title will be best efforts by the repository.  The repository should chose a property closest to Title.
+2.	App:edited will be CMIS:lastModifiedDate
+3.	Link with relation self will be the URI that returns the Atom Entry document
+4.	Published will be CMIS:createdDate
+5.	Atom:author will be CMIS:creator
+6.	For content tags
+7.	Documents with content
+a.	Leverage the src attribute to point to the same link as stream
+b.	The repository SHOULD populate the summary tag with text that at best efforts represents the documents.  For example, an HTML table containing the properties and their values for simple feed readers
+i.	Other (Content-less document, Folder, Relationship, Type, etc) – best efforts at generating HTML text that represents the object.  That text would normally go into the summary tag, but since there is no content, goes in the content tag.
+8.	If content src is specified, the summary SHOULD contain a text or html representation of the object.
+9.	Links will be used to provide URIs to CMIS functionality
+10.	Link relations may be omitted if the function is not allowed and that function would not show up on getAllowableActions.
+11.	Links may be omitted if the repository does not support that capability
+12.	All CMIS properties will be exposed in CMIS properties tag even if they are duplicated in an atom element
+
+When POSTing an Atom Document, the atom fields take precedence over the CMIS property field for writeable properties.  For example, atom:title will overwrite cmis:name
+ */
+
 include_once CMIS_ATOM_LIB_FOLDER . 'RepositoryService.inc.php';
 include_once CMIS_ATOM_LIB_FOLDER . 'NavigationService.inc.php';
 include_once CMIS_ATOM_LIB_FOLDER . 'ObjectService.inc.php';
@@ -142,7 +172,7 @@ class KT_cmis_atom_service_folder extends KT_cmis_atom_service {
         //      perhaps because the content is text/plain once base64 encoded?
         //      How to determine the actual content type?
         /*
-         * <atom:entry xmlns:atom="http://www.w3.org/2005/Atom" xmlns:cmis="http://www.cmis.org/2008/05">
+         * <atom:entry xmlns:atom="http://www.w3.org/2005/Atom" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901">
          * <atom:title>setup.txt</atom:title>
          * <atom:summary>setup.txt</atom:summary>
          * <atom:content type="text/plain">dGhpcyBiZSBzb21lIHRlc3QgY29udGVudCBmb3IgYSBkb2N1bWVudCwgeWVzPw==</atom:content>
@@ -239,7 +269,20 @@ class KT_cmis_atom_service_folder extends KT_cmis_atom_service {
         // $baseURI=NULL,$title=NULL,$link=NULL,$updated=NULL,$author=NULL,$id=NULL
         $feed = new KT_cmis_atom_responseFeed(CMIS_APP_BASE_URI, $folderName . ' ' . ucwords($feedType), null, null, null,
-                                              'urn:uuid:' . $folderName . '-' . $feedType);
+                                              'urn:uuid:' . $folderId . '-' . $feedType);
+
+        // TODO dynamic?
+        $feedElement = $feed->newField('author');
+        $element = $feed->newField('name', 'System', $feedElement);
+        $feed->appendChild($feedElement);
+
+        // TODO get actual most recent update time, only use current if no other available
+        $feed->appendChild($feed->newElement('updated', KT_cmis_atom_service_helper::formatDatestamp()));
+        
+        $link = $feed->newElement('link');
+        $link->appendChild($feed->newAttr('rel','source'));
+        $link->appendChild($feed->newAttr('href', CMIS_APP_BASE_URI . $feed->workspace . '/folder/' . $folderId));
+        $feed->appendChild($link);
         foreach($entries as $cmisEntry)
         {
@@ -405,7 +448,7 @@ class KT_cmis_atom_service_type extends KT_cmis_atom_service {
 /*
         // TODO need to create this dynamically now, will no longer work with static output
         $output = '<?xml version="1.0" encoding="UTF-8"?>
-                    <feed xmlns="http://www.w3.org/2005/Atom" xmlns:app="http://www.w3.org/2007/app" xmlns:cmis="http://www.cmis.org/2008/05">
+                    <feed xmlns="http://www.w3.org/2005/Atom" xmlns:app="http://www.w3.org/2007/app" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901">
                     <id>urn:uuid:type-' . $type . '-children</id>
                     <link rel="self" href="' . CMIS_APP_BASE_URI . 'type/document/children"/>
                     <link rel="first" href="' . CMIS_APP_BASE_URI . 'type/document/children?pageNo=1&amp;pageSize=0&amp;guest=" type="application/atom+xml;type=feed"/>
@@ -526,462 +569,4 @@ class KT_cmis_atom_service_document extends KT_cmis_atom_service {
 }
-$childrenFeed[] = '<?xml version="1.0" encoding="utf-8"?>
-        <feed xmlns="http://www.w3.org/2005/Atom" xmlns:cmis="http://www.cmis.org/2008/05">
-         <id>urn:uuid:28537649-8af2-4c74-aa92-5d8bbecac9ce-children</id>
-         <link rel="self" href="http://10.33.4.34/ktatompub/?/cmis/folder/F1/children"/>
-         <title>Root Folder Children</title>
-         <entry>
-          <id>urn:uuid:86224486-b7ae-4074-a793-82cd259b0026-folder</id>
-          <link rel="cmis-children" href="http://10.33.4.34/ktatompub/?cmis/folder/F2/children"/>
-
-          <link rel="cmis-descendants" href="http://10.33.4.34/ktatompub/?cmis/folder/F2/descendants"/>
-          <link rel="cmis-type" href="http://10.33.4.34:8080/alfresco/service/api/type/folder"/>
-          <link rel="cmis-repository" href="http://10.33.4.34:8080/alfresco/service/api/repository"/>
-          <summary>DroppedDocuments</summary>
-          <title>DroppedDocuments</title>
-          <cmis:object>
-           <cmis:properties>
-            <cmis:propertyId cmis:name="ObjectId">
-
-             <cmis:value>F2</cmis:value>
-            </cmis:propertyId>
-            <cmis:propertyString cmis:name="ObjectTypeId">
-             <cmis:value>Folder</cmis:value>
-            </cmis:propertyString>
-            <cmis:propertyString cmis:name="Name">
-             <cmis:value>DroppedDocuments</cmis:value>
-
-            </cmis:propertyString>
-           </cmis:properties>
-          </cmis:object>
-         </entry>
-         <entry>
-          <id>urn:uuid:86224486-b7ae-4074-a793-82cd259b0026-folder</id>
-          <link rel="cmis-children" href="http://10.33.4.34/ktatompub/?cmis/folder/F4/children"/>
-          <link rel="cmis-descendants" href="http://10.33.4.34/ktatompub/?cmis/folder/F4/descendants"/>
-
-          <link rel="cmis-type" href="http://10.33.4.34:8080/alfresco/service/api/type/folder"/>
-          <link rel="cmis-repository" href="http://10.33.4.34:8080/alfresco/service/api/repository"/>
-          <summary>Test KT Folder</summary>
-          <title>Test KT Folder</title>
-          <cmis:object>
-           <cmis:properties>
-            <cmis:propertyId cmis:name="ObjectId">
-             <cmis:value>F4</cmis:value>
-
-            </cmis:propertyId>
-            <cmis:propertyString cmis:name="ObjectTypeId">
-             <cmis:value>Folder</cmis:value>
-            </cmis:propertyString>
-            <cmis:propertyString cmis:name="Name">
-             <cmis:value>Test KT Folder</cmis:value>
-            </cmis:propertyString>
-           </cmis:properties>
-
-          </cmis:object>
-         </entry>
-        <entry>
-         <author><name>admin</name></author>
-        <content type="application/pdf" src="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/2df9d676-f173-47bb-8ec1-41fa1186b66d/content.h4555-cmis-so.pdf"/><id>urn:uuid:2df9d676-f173-47bb-8ec1-41fa1186b66d</id>
-        <link rel="self" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/2df9d676-f173-47bb-8ec1-41fa1186b66d"/>
-
-        <link rel="enclosure" type="application/pdf" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/2df9d676-f173-47bb-8ec1-41fa1186b66d/content.h4555-cmis-so.pdf"/><link rel="edit" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/2df9d676-f173-47bb-8ec1-41fa1186b66d"/>
-        <link rel="edit-media" type="application/pdf" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/2df9d676-f173-47bb-8ec1-41fa1186b66d/content.h4555-cmis-so.pdf"/><link rel="cmis-allowableactions" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/2df9d676-f173-47bb-8ec1-41fa1186b66d/permissions"/>
-        <link rel="cmis-relationships" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/2df9d676-f173-47bb-8ec1-41fa1186b66d/associations"/>
-        <link rel="cmis-parents" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/2df9d676-f173-47bb-8ec1-41fa1186b66d/parents"/>
-        <link rel="cmis-allversions" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/2df9d676-f173-47bb-8ec1-41fa1186b66d/versions"/>
-        <link rel="cmis-stream" type="application/pdf" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/2df9d676-f173-47bb-8ec1-41fa1186b66d/content.h4555-cmis-so.pdf"/><link rel="cmis-type" href="http://10.33.4.34:8080/alfresco/service/api/type/document"/>
-        <link rel="cmis-repository" href="http://10.33.4.34:8080/alfresco/service/api/repository"/>
-        <published>2009-06-23T09:40:47.889+02:00</published>
-        <summary></summary>
-        <title>h4555-cmis-so.pdf</title>
-        <updated>2009-06-23T09:40:58.524+02:00</updated>
-
-        <cmis:object>
-        <cmis:properties>
-        <cmis:propertyId cmis:name="ObjectId"><cmis:value>workspace://SpacesStore/2df9d676-f173-47bb-8ec1-41fa1186b66d</cmis:value></cmis:propertyId>
-        <cmis:propertyString cmis:name="BaseType"><cmis:value>document</cmis:value></cmis:propertyString>
-        <cmis:propertyString cmis:name="ObjectTypeId"><cmis:value>document</cmis:value></cmis:propertyString>
-        <cmis:propertyString cmis:name="CreatedBy"><cmis:value>admin</cmis:value></cmis:propertyString>
-
-        <cmis:propertyDateTime cmis:name="CreationDate"><cmis:value>2009-06-23T09:40:47.889+02:00</cmis:value></cmis:propertyDateTime>
-        <cmis:propertyString cmis:name="LastModifiedBy"><cmis:value>admin</cmis:value></cmis:propertyString>
-        <cmis:propertyDateTime cmis:name="LastModificationDate"><cmis:value>2009-06-23T09:40:58.524+02:00</cmis:value></cmis:propertyDateTime>
-        <cmis:propertyString cmis:name="Name"><cmis:value>h4555-cmis-so.pdf</cmis:value></cmis:propertyString>
-        <cmis:propertyBoolean cmis:name="IsImmutable"><cmis:value>false</cmis:value></cmis:propertyBoolean>
-
-        <cmis:propertyBoolean cmis:name="IsLatestVersion"><cmis:value>true</cmis:value></cmis:propertyBoolean>
-        <cmis:propertyBoolean cmis:name="IsMajorVersion"><cmis:value>false</cmis:value></cmis:propertyBoolean>
-        <cmis:propertyBoolean cmis:name="IsLatestMajorVersion"><cmis:value>false</cmis:value></cmis:propertyBoolean>
-        <cmis:propertyString cmis:name="VersionLabel"/>
-        <cmis:propertyId cmis:name="VersionSeriesId"><cmis:value>workspace://SpacesStore/2df9d676-f173-47bb-8ec1-41fa1186b66d</cmis:value></cmis:propertyId>
-
-        <cmis:propertyBoolean cmis:name="IsVersionSeriesCheckedOut"><cmis:value>false</cmis:value></cmis:propertyBoolean>
-        <cmis:propertyString cmis:name="VersionSeriesCheckedOutBy"/>
-        <cmis:propertyId cmis:name="VersionSeriesCheckedOutId"/>
-        <cmis:propertyString cmis:name="CheckinComment"/>
-        <cmis:propertyInteger cmis:name="ContentStreamLength"><cmis:value>343084</cmis:value></cmis:propertyInteger>
-        <cmis:propertyString cmis:name="ContentStreamMimeType"><cmis:value>application/pdf</cmis:value></cmis:propertyString>
-        <cmis:propertyString cmis:name="ContentStreamFilename"><cmis:value>h4555-cmis-so.pdf</cmis:value></cmis:propertyString>
-
-        <cmis:propertyString cmis:name="ContentStreamURI"><cmis:value>http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/2df9d676-f173-47bb-8ec1-41fa1186b66d/content.h4555-cmis-so.pdf</cmis:value></cmis:propertyString>
-        </cmis:properties>
-        </cmis:object>
-
-
-         </entry>
-        </feed>';
-
-$childrenFeed[] = '<?xml version="1.0" encoding="UTF-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom" xmlns:app="http://www.w3.org/2007/app" xmlns:cmis="http://www.cmis.org/2008/05" xmlns:alf="http://www.alfresco.org" xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/">
-<author><name>System</name></author>
-<generator version="3.0.0 (Stable 1526)">Alfresco (Labs)</generator>
-<icon>http://10.33.4.34:8080/alfresco/images/logo/AlfrescoLogo16.ico</icon>
-<id>urn:uuid:28537649-8af2-4c74-aa92-5d8bbecac9ce-children</id>
-<link rel="self" href="http://10.33.4.34:8080/alfresco/service/api/path/workspace/SpacesStore/Company%20Home/children"/>
-<link rel="cmis-source" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/28537649-8af2-4c74-aa92-5d8bbecac9ce"/>
-<link rel="first" href="http://10.33.4.34:8080/alfresco/service/api/path/workspace/SpacesStore/Company%20Home/children?pageNo=1&amp;pageSize=0&amp;guest=&amp;format=atomfeed" type="application/atom+xml;type=feed"/>
-
-<link rel="last" href="http://10.33.4.34:8080/alfresco/service/api/path/workspace/SpacesStore/Company%20Home/children?pageNo=1&amp;pageSize=0&amp;guest=&amp;format=atomfeed" type="application/atom+xml;type=feed"/>
-<title>Company Home Children</title>
-<updated>2009-06-18T10:20:29.937+02:00</updated>
-<entry>
-<author><name>System</name></author>
-<content>e98319fa-76e4-478f-8ce8-a3a0fd683e2c</content>
-<id>urn:uuid:e98319fa-76e4-478f-8ce8-a3a0fd683e2c</id>
-
-<link rel="self" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/e98319fa-76e4-478f-8ce8-a3a0fd683e2c"/>
-<link rel="edit" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/e98319fa-76e4-478f-8ce8-a3a0fd683e2c"/>
-<link rel="cmis-allowableactions" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/e98319fa-76e4-478f-8ce8-a3a0fd683e2c/permissions"/>
-<link rel="cmis-relationships" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/e98319fa-76e4-478f-8ce8-a3a0fd683e2c/associations"/>
-<link rel="cmis-parent" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/28537649-8af2-4c74-aa92-5d8bbecac9ce"/>
-<link rel="cmis-folderparent" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/e98319fa-76e4-478f-8ce8-a3a0fd683e2c/parent"/>
-<link rel="cmis-children" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/e98319fa-76e4-478f-8ce8-a3a0fd683e2c/children"/>
-<link rel="cmis-descendants" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/e98319fa-76e4-478f-8ce8-a3a0fd683e2c/descendants"/>
-<link rel="cmis-type" href="http://10.33.4.34:8080/alfresco/service/api/type/F/st_sites"/>
-<link rel="cmis-repository" href="http://10.33.4.34:8080/alfresco/service/api/repository"/>
-<published>2009-06-18T10:20:37.788+02:00</published>
-<summary>Site Collaboration Spaces</summary>
-<title>Sites</title>
-<updated>2009-06-18T10:20:37.874+02:00</updated>
-
-<cmis:object>
-<cmis:properties>
-<cmis:propertyId cmis:name="ObjectId"><cmis:value>workspace://SpacesStore/e98319fa-76e4-478f-8ce8-a3a0fd683e2c</cmis:value></cmis:propertyId>
-<cmis:propertyString cmis:name="BaseType"><cmis:value>folder</cmis:value></cmis:propertyString>
-<cmis:propertyString cmis:name="ObjectTypeId"><cmis:value>F/st_sites</cmis:value></cmis:propertyString>
-<cmis:propertyString cmis:name="CreatedBy"><cmis:value>System</cmis:value></cmis:propertyString>
-
-<cmis:propertyDateTime cmis:name="CreationDate"><cmis:value>2009-06-18T10:20:37.788+02:00</cmis:value></cmis:propertyDateTime>
-<cmis:propertyString cmis:name="LastModifiedBy"><cmis:value>System</cmis:value></cmis:propertyString>
-<cmis:propertyDateTime cmis:name="LastModificationDate"><cmis:value>2009-06-18T10:20:37.874+02:00</cmis:value></cmis:propertyDateTime>
-<cmis:propertyString cmis:name="Name"><cmis:value>Sites</cmis:value></cmis:propertyString>
-<cmis:propertyId cmis:name="ParentId"><cmis:value>workspace://SpacesStore/28537649-8af2-4c74-aa92-5d8bbecac9ce</cmis:value></cmis:propertyId>
-
-</cmis:properties>
-</cmis:object>
-<cmis:terminator/>
-<app:edited>2009-06-18T10:20:37.874+02:00</app:edited>
-<alf:icon>http://10.33.4.34:8080/alfresco/images/icons/space-icon-default-16.gif</alf:icon>
-</entry>
-<entry>
-<author><name>System</name></author>
-<content>8c80a0f7-74b4-4bd8-bb76-a2464e4b2d10</content>
-<id>urn:uuid:8c80a0f7-74b4-4bd8-bb76-a2464e4b2d10</id>
-
-<link rel="self" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/8c80a0f7-74b4-4bd8-bb76-a2464e4b2d10"/>
-<link rel="edit" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/8c80a0f7-74b4-4bd8-bb76-a2464e4b2d10"/>
-<link rel="cmis-allowableactions" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/8c80a0f7-74b4-4bd8-bb76-a2464e4b2d10/permissions"/>
-<link rel="cmis-relationships" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/8c80a0f7-74b4-4bd8-bb76-a2464e4b2d10/associations"/>
-<link rel="cmis-parent" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/28537649-8af2-4c74-aa92-5d8bbecac9ce"/>
-<link rel="cmis-folderparent" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/8c80a0f7-74b4-4bd8-bb76-a2464e4b2d10/parent"/>
-<link rel="cmis-children" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/8c80a0f7-74b4-4bd8-bb76-a2464e4b2d10/children"/>
-<link rel="cmis-descendants" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/8c80a0f7-74b4-4bd8-bb76-a2464e4b2d10/descendants"/>
-<link rel="cmis-type" href="http://10.33.4.34:8080/alfresco/service/api/type/folder"/>
-<link rel="cmis-repository" href="http://10.33.4.34:8080/alfresco/service/api/repository"/>
-<published>2009-06-18T10:20:29.939+02:00</published>
-<summary>User managed definitions</summary>
-<title>Data Dictionary</title>
-<updated>2009-06-18T10:20:30.004+02:00</updated>
-
-<cmis:object>
-<cmis:properties>
-<cmis:propertyId cmis:name="ObjectId"><cmis:value>workspace://SpacesStore/8c80a0f7-74b4-4bd8-bb76-a2464e4b2d10</cmis:value></cmis:propertyId>
-<cmis:propertyString cmis:name="BaseType"><cmis:value>folder</cmis:value></cmis:propertyString>
-<cmis:propertyString cmis:name="ObjectTypeId"><cmis:value>folder</cmis:value></cmis:propertyString>
-<cmis:propertyString cmis:name="CreatedBy"><cmis:value>System</cmis:value></cmis:propertyString>
-
-<cmis:propertyDateTime cmis:name="CreationDate"><cmis:value>2009-06-18T10:20:29.939+02:00</cmis:value></cmis:propertyDateTime>
-<cmis:propertyString cmis:name="LastModifiedBy"><cmis:value>System</cmis:value></cmis:propertyString>
-<cmis:propertyDateTime cmis:name="LastModificationDate"><cmis:value>2009-06-18T10:20:30.004+02:00</cmis:value></cmis:propertyDateTime>
-<cmis:propertyString cmis:name="Name"><cmis:value>Data Dictionary</cmis:value></cmis:propertyString>
-<cmis:propertyId cmis:name="ParentId"><cmis:value>workspace://SpacesStore/28537649-8af2-4c74-aa92-5d8bbecac9ce</cmis:value></cmis:propertyId>
-
-</cmis:properties>
-</cmis:object>
-<cmis:terminator/>
-<app:edited>2009-06-18T10:20:30.004+02:00</app:edited>
-<alf:icon>http://10.33.4.34:8080/alfresco/images/icons/space-icon-default-16.gif</alf:icon>
-</entry>
-<entry>
-<author><name>System</name></author>
-<content>ba2524ef-7f3d-4ed4-84a0-8d99b6524737</content>
-<id>urn:uuid:ba2524ef-7f3d-4ed4-84a0-8d99b6524737</id>
-
-<link rel="self" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/ba2524ef-7f3d-4ed4-84a0-8d99b6524737"/>
-<link rel="edit" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/ba2524ef-7f3d-4ed4-84a0-8d99b6524737"/>
-<link rel="cmis-allowableactions" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/ba2524ef-7f3d-4ed4-84a0-8d99b6524737/permissions"/>
-<link rel="cmis-relationships" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/ba2524ef-7f3d-4ed4-84a0-8d99b6524737/associations"/>
-<link rel="cmis-parent" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/28537649-8af2-4c74-aa92-5d8bbecac9ce"/>
-<link rel="cmis-folderparent" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/ba2524ef-7f3d-4ed4-84a0-8d99b6524737/parent"/>
-<link rel="cmis-children" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/ba2524ef-7f3d-4ed4-84a0-8d99b6524737/children"/>
-<link rel="cmis-descendants" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/ba2524ef-7f3d-4ed4-84a0-8d99b6524737/descendants"/>
-<link rel="cmis-type" href="http://10.33.4.34:8080/alfresco/service/api/type/folder"/>
-<link rel="cmis-repository" href="http://10.33.4.34:8080/alfresco/service/api/repository"/>
-<published>2009-06-18T10:20:30.312+02:00</published>
-<summary>The guest root space</summary>
-<title>Guest Home</title>
-
-<updated>2009-06-18T10:20:30.400+02:00</updated>
-<cmis:object>
-<cmis:properties>
-<cmis:propertyId cmis:name="ObjectId"><cmis:value>workspace://SpacesStore/ba2524ef-7f3d-4ed4-84a0-8d99b6524737</cmis:value></cmis:propertyId>
-<cmis:propertyString cmis:name="BaseType"><cmis:value>folder</cmis:value></cmis:propertyString>
-<cmis:propertyString cmis:name="ObjectTypeId"><cmis:value>folder</cmis:value></cmis:propertyString>
-<cmis:propertyString cmis:name="CreatedBy"><cmis:value>System</cmis:value></cmis:propertyString>
-
-<cmis:propertyDateTime cmis:name="CreationDate"><cmis:value>2009-06-18T10:20:30.312+02:00</cmis:value></cmis:propertyDateTime>
-<cmis:propertyString cmis:name="LastModifiedBy"><cmis:value>System</cmis:value></cmis:propertyString>
-<cmis:propertyDateTime cmis:name="LastModificationDate"><cmis:value>2009-06-18T10:20:30.400+02:00</cmis:value></cmis:propertyDateTime>
-<cmis:propertyString cmis:name="Name"><cmis:value>Guest Home</cmis:value></cmis:propertyString>
-<cmis:propertyId cmis:name="ParentId"><cmis:value>workspace://SpacesStore/28537649-8af2-4c74-aa92-5d8bbecac9ce</cmis:value></cmis:propertyId>
-
-</cmis:properties>
-</cmis:object>
-<cmis:terminator/>
-<app:edited>2009-06-18T10:20:30.400+02:00</app:edited>
-<alf:icon>http://10.33.4.34:8080/alfresco/images/icons/space-icon-default-16.gif</alf:icon>
-</entry>
-<entry>
-<author><name>System</name></author>
-<content>86224486-b7ae-4074-a793-82cd259b0026</content>
-<id>urn:uuid:86224486-b7ae-4074-a793-82cd259b0026</id>
-
-<link rel="self" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/86224486-b7ae-4074-a793-82cd259b0026"/>
-<link rel="edit" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/86224486-b7ae-4074-a793-82cd259b0026"/>
-<link rel="cmis-allowableactions" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/86224486-b7ae-4074-a793-82cd259b0026/permissions"/>
-<link rel="cmis-relationships" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/86224486-b7ae-4074-a793-82cd259b0026/associations"/>
-<link rel="cmis-parent" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/28537649-8af2-4c74-aa92-5d8bbecac9ce"/>
-<link rel="cmis-folderparent" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/86224486-b7ae-4074-a793-82cd259b0026/parent"/>
-<link rel="cmis-children" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/86224486-b7ae-4074-a793-82cd259b0026/children"/>
-<link rel="cmis-descendants" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/86224486-b7ae-4074-a793-82cd259b0026/descendants"/>
-<link rel="cmis-type" href="http://10.33.4.34:8080/alfresco/service/api/type/folder"/>
-<link rel="cmis-repository" href="http://10.33.4.34:8080/alfresco/service/api/repository"/>
-<published>2009-06-18T10:20:30.402+02:00</published>
-<summary>User Homes</summary>
-<title>User Homes</title>
-<updated>2009-06-18T10:20:30.428+02:00</updated>
-
-<cmis:object>
-<cmis:properties>
-<cmis:propertyId cmis:name="ObjectId"><cmis:value>workspace://SpacesStore/86224486-b7ae-4074-a793-82cd259b0026</cmis:value></cmis:propertyId>
-<cmis:propertyString cmis:name="BaseType"><cmis:value>folder</cmis:value></cmis:propertyString>
-<cmis:propertyString cmis:name="ObjectTypeId"><cmis:value>folder</cmis:value></cmis:propertyString>
-<cmis:propertyString cmis:name="CreatedBy"><cmis:value>System</cmis:value></cmis:propertyString>
-
-<cmis:propertyDateTime cmis:name="CreationDate"><cmis:value>2009-06-18T10:20:30.402+02:00</cmis:value></cmis:propertyDateTime>
-<cmis:propertyString cmis:name="LastModifiedBy"><cmis:value>System</cmis:value></cmis:propertyString>
-<cmis:propertyDateTime cmis:name="LastModificationDate"><cmis:value>2009-06-18T10:20:30.428+02:00</cmis:value></cmis:propertyDateTime>
-<cmis:propertyString cmis:name="Name"><cmis:value>User Homes</cmis:value></cmis:propertyString>
-<cmis:propertyId cmis:name="ParentId"><cmis:value>workspace://SpacesStore/28537649-8af2-4c74-aa92-5d8bbecac9ce</cmis:value></cmis:propertyId>
-
-</cmis:properties>
-</cmis:object>
-<cmis:terminator/>
-<app:edited>2009-06-18T10:20:30.428+02:00</app:edited>
-<alf:icon>http://10.33.4.34:8080/alfresco/images/icons/space-icon-default-16.gif</alf:icon>
-</entry>
-<entry>
-<author><name>System</name></author>
-<content>0df9087f-e334-4890-a467-b60e3d6be92c</content>
-<id>urn:uuid:0df9087f-e334-4890-a467-b60e3d6be92c</id>
-
-<link rel="self" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/0df9087f-e334-4890-a467-b60e3d6be92c"/>
-<link rel="edit" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/0df9087f-e334-4890-a467-b60e3d6be92c"/>
-<link rel="cmis-allowableactions" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/0df9087f-e334-4890-a467-b60e3d6be92c/permissions"/>
-<link rel="cmis-relationships" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/0df9087f-e334-4890-a467-b60e3d6be92c/associations"/>
-<link rel="cmis-parent" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/28537649-8af2-4c74-aa92-5d8bbecac9ce"/>
-<link rel="cmis-folderparent" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/0df9087f-e334-4890-a467-b60e3d6be92c/parent"/>
-<link rel="cmis-children" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/0df9087f-e334-4890-a467-b60e3d6be92c/children"/>
-<link rel="cmis-descendants" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/0df9087f-e334-4890-a467-b60e3d6be92c/descendants"/>
-<link rel="cmis-type" href="http://10.33.4.34:8080/alfresco/service/api/type/folder"/>
-<link rel="cmis-repository" href="http://10.33.4.34:8080/alfresco/service/api/repository"/>
-<published>2009-06-18T10:20:45.115+02:00</published>
-<summary>Web Content Management Spaces</summary>
-<title>Web Projects</title>
-<updated>2009-06-18T10:20:45.137+02:00</updated>
-
-<cmis:object>
-<cmis:properties>
-<cmis:propertyId cmis:name="ObjectId"><cmis:value>workspace://SpacesStore/0df9087f-e334-4890-a467-b60e3d6be92c</cmis:value></cmis:propertyId>
-<cmis:propertyString cmis:name="BaseType"><cmis:value>folder</cmis:value></cmis:propertyString>
-<cmis:propertyString cmis:name="ObjectTypeId"><cmis:value>folder</cmis:value></cmis:propertyString>
-<cmis:propertyString cmis:name="CreatedBy"><cmis:value>System</cmis:value></cmis:propertyString>
-
-<cmis:propertyDateTime cmis:name="CreationDate"><cmis:value>2009-06-18T10:20:45.115+02:00</cmis:value></cmis:propertyDateTime>
-<cmis:propertyString cmis:name="LastModifiedBy"><cmis:value>System</cmis:value></cmis:propertyString>
-<cmis:propertyDateTime cmis:name="LastModificationDate"><cmis:value>2009-06-18T10:20:45.137+02:00</cmis:value></cmis:propertyDateTime>
-<cmis:propertyString cmis:name="Name"><cmis:value>Web Projects</cmis:value></cmis:propertyString>
-<cmis:propertyId cmis:name="ParentId"><cmis:value>workspace://SpacesStore/28537649-8af2-4c74-aa92-5d8bbecac9ce</cmis:value></cmis:propertyId>
-
-</cmis:properties>
-</cmis:object>
-<cmis:terminator/>
-<app:edited>2009-06-18T10:20:45.137+02:00</app:edited>
-<alf:icon>http://10.33.4.34:8080/alfresco/images/icons/space-icon-default-16.gif</alf:icon>
-</entry>
-<entry>
-<author><name>admin</name></author>
-<content type="application/pdf" src="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/2df9d676-f173-47bb-8ec1-41fa1186b66d/content.h4555-cmis-so.pdf"/><id>urn:uuid:2df9d676-f173-47bb-8ec1-41fa1186b66d</id>
-<link rel="self" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/2df9d676-f173-47bb-8ec1-41fa1186b66d"/>
-
-<link rel="enclosure" type="application/pdf" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/2df9d676-f173-47bb-8ec1-41fa1186b66d/content.h4555-cmis-so.pdf"/><link rel="edit" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/2df9d676-f173-47bb-8ec1-41fa1186b66d"/>
-<link rel="edit-media" type="application/pdf" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/2df9d676-f173-47bb-8ec1-41fa1186b66d/content.h4555-cmis-so.pdf"/><link rel="cmis-allowableactions" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/2df9d676-f173-47bb-8ec1-41fa1186b66d/permissions"/>
-<link rel="cmis-relationships" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/2df9d676-f173-47bb-8ec1-41fa1186b66d/associations"/>
-<link rel="cmis-parents" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/2df9d676-f173-47bb-8ec1-41fa1186b66d/parents"/>
-<link rel="cmis-allversions" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/2df9d676-f173-47bb-8ec1-41fa1186b66d/versions"/>
-<link rel="cmis-stream" type="application/pdf" href="http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/2df9d676-f173-47bb-8ec1-41fa1186b66d/content.h4555-cmis-so.pdf"/><link rel="cmis-type" href="http://10.33.4.34:8080/alfresco/service/api/type/document"/>
-<link rel="cmis-repository" href="http://10.33.4.34:8080/alfresco/service/api/repository"/>
-<published>2009-06-23T09:40:47.889+02:00</published>
-<summary></summary>
-<title>h4555-cmis-so.pdf</title>
-<updated>2009-06-23T09:40:58.524+02:00</updated>
-
-<cmis:object>
-<cmis:properties>
-<cmis:propertyId cmis:name="ObjectId"><cmis:value>workspace://SpacesStore/2df9d676-f173-47bb-8ec1-41fa1186b66d</cmis:value></cmis:propertyId>
-<cmis:propertyString cmis:name="BaseType"><cmis:value>document</cmis:value></cmis:propertyString>
-<cmis:propertyString cmis:name="ObjectTypeId"><cmis:value>document</cmis:value></cmis:propertyString>
-<cmis:propertyString cmis:name="CreatedBy"><cmis:value>admin</cmis:value></cmis:propertyString>
-
-<cmis:propertyDateTime cmis:name="CreationDate"><cmis:value>2009-06-23T09:40:47.889+02:00</cmis:value></cmis:propertyDateTime>
-<cmis:propertyString cmis:name="LastModifiedBy"><cmis:value>admin</cmis:value></cmis:propertyString>
-<cmis:propertyDateTime cmis:name="LastModificationDate"><cmis:value>2009-06-23T09:40:58.524+02:00</cmis:value></cmis:propertyDateTime>
-<cmis:propertyString cmis:name="Name"><cmis:value>h4555-cmis-so.pdf</cmis:value></cmis:propertyString>
-<cmis:propertyBoolean cmis:name="IsImmutable"><cmis:value>false</cmis:value></cmis:propertyBoolean>
-
-<cmis:propertyBoolean cmis:name="IsLatestVersion"><cmis:value>true</cmis:value></cmis:propertyBoolean>
-<cmis:propertyBoolean cmis:name="IsMajorVersion"><cmis:value>false</cmis:value></cmis:propertyBoolean>
-<cmis:propertyBoolean cmis:name="IsLatestMajorVersion"><cmis:value>false</cmis:value></cmis:propertyBoolean>
-<cmis:propertyString cmis:name="VersionLabel"/>
-<cmis:propertyId cmis:name="VersionSeriesId"><cmis:value>workspace://SpacesStore/2df9d676-f173-47bb-8ec1-41fa1186b66d</cmis:value></cmis:propertyId>
-
-<cmis:propertyBoolean cmis:name="IsVersionSeriesCheckedOut"><cmis:value>false</cmis:value></cmis:propertyBoolean>
-<cmis:propertyString cmis:name="VersionSeriesCheckedOutBy"/>
-<cmis:propertyId cmis:name="VersionSeriesCheckedOutId"/>
-<cmis:propertyString cmis:name="CheckinComment"/>
-<cmis:propertyInteger cmis:name="ContentStreamLength"><cmis:value>343084</cmis:value></cmis:propertyInteger>
-<cmis:propertyString cmis:name="ContentStreamMimeType"><cmis:value>application/pdf</cmis:value></cmis:propertyString>
-<cmis:propertyString cmis:name="ContentStreamFilename"><cmis:value>h4555-cmis-so.pdf</cmis:value></cmis:propertyString>
-
-<cmis:propertyString cmis:name="ContentStreamURI"><cmis:value>http://10.33.4.34:8080/alfresco/service/api/node/workspace/SpacesStore/2df9d676-f173-47bb-8ec1-41fa1186b66d/content.h4555-cmis-so.pdf</cmis:value></cmis:propertyString>
-</cmis:properties>
-</cmis:object>
-<cmis:terminator/>
-<app:edited>2009-06-23T09:40:58.524+02:00</app:edited>
-<alf:icon>http://10.33.4.34:8080/alfresco/images/filetypes/pdf.gif</alf:icon>
-</entry>
-<cmis:hasMoreItems>false</cmis:hasMoreItems>
-<opensearch:totalResults>6</opensearch:totalResults>
-<opensearch:startIndex>0</opensearch:startIndex>
-
-<opensearch:itemsPerPage>0</opensearch:itemsPerPage>
-</feed>';
-
-$folderFeed = '<?xml version="1.0" encoding="UTF-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom" xmlns:cmis="http://www.cmis.org/2008/05">
-<entry>
-<author><name>System</name></author>
-<content>28537649-8af2-4c74-aa92-5d8bbecac9ce</content>
-<id>urn:uuid:28537649-8af2-4c74-aa92-5d8bbecac9ce</id>
-<link rel="self" href="http://127.0.0.1:8080/alfresco/service/api/node/workspace/SpacesStore/28537649-8af2-4c74-aa92-5d8bbecac9ce"/>
-<link rel="edit" href="http://127.0.0.1:8080/alfresco/service/api/node/workspace/SpacesStore/28537649-8af2-4c74-aa92-5d8bbecac9ce"/>
-<link rel="cmis-allowableactions" href="http://127.0.0.1:8080/alfresco/service/api/node/workspace/SpacesStore/28537649-8af2-4c74-aa92-5d8bbecac9ce/permissions"/>
-<link rel="cmis-relationships" href="http://127.0.0.1:8080/alfresco/service/api/node/workspace/SpacesStore/28537649-8af2-4c74-aa92-5d8bbecac9ce/associations"/>
-<link rel="cmis-children" href="http://127.0.0.1:8080/alfresco/service/api/node/workspace/SpacesStore/28537649-8af2-4c74-aa92-5d8bbecac9ce/children"/>
-<link rel="cmis-descendants" href="http://127.0.0.1:8080/alfresco/service/api/node/workspace/SpacesStore/28537649-8af2-4c74-aa92-5d8bbecac9ce/descendants"/>
-<link rel="cmis-type" href="http://127.0.0.1:8080/alfresco/service/api/type/folder"/>
-<link rel="cmis-repository" href="http://127.0.0.1:8080/alfresco/service/api/repository"/>
-<published>2009-06-18T10:20:29.871+02:00</published>
-<summary>The company root space</summary>
-<title>Company Home</title>
-<updated>2009-06-18T10:20:29.937+02:00</updated>
-<cmis:object>
-<cmis:properties>
-<cmis:propertyId cmis:name="ObjectId"><cmis:value>workspace://SpacesStore/28537649-8af2-4c74-aa92-5d8bbecac9ce</cmis:value></cmis:propertyId>
-<cmis:propertyString cmis:name="BaseType"><cmis:value>folder</cmis:value></cmis:propertyString>
-<cmis:propertyString cmis:name="ObjectTypeId"><cmis:value>folder</cmis:value></cmis:propertyString>
-<cmis:propertyString cmis:name="CreatedBy"><cmis:value>System</cmis:value></cmis:propertyString>
-<cmis:propertyDateTime cmis:name="CreationDate"><cmis:value>2009-06-18T10:20:29.871+02:00</cmis:value></cmis:propertyDateTime>
-<cmis:propertyString cmis:name="LastModifiedBy"><cmis:value>System</cmis:value></cmis:propertyString>
-<cmis:propertyDateTime cmis:name="LastModificationDate"><cmis:value>2009-06-18T10:20:29.937+02:00</cmis:value></cmis:propertyDateTime>
-<cmis:propertyString cmis:name="Name"><cmis:value>Company Home</cmis:value></cmis:propertyString>
-<cmis:propertyId cmis:name="ParentId"/>
-</cmis:properties>
-</cmis:object>
-<cmis:terminator/>
-<app:edited>2009-06-18T10:20:29.937+02:00</app:edited>
-<alf:icon>http://127.0.0.1:8080/alfresco/images/icons/space-icon-default-16.gif</alf:icon>
-</entry>
-</feed>';
-
-$docFeed = '<?xml version="1.0" encoding="UTF-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom" xmlns:cmis="http://www.cmis.org/2008/05">
-<entry>
-<author><name>admin</name></author>
-<content type="application/pdf" src="http://127.0.0.1:8080/alfresco/service/api/node/workspace/SpacesStore/2df9d676-f173-47bb-8ec1-41fa1186b66d/content.h4555-cmis-so.pdf"/><id>urn:uuid:2df9d676-f173-47bb-8ec1-41fa1186b66d</id>
-<link rel="self" href="http://127.0.0.1:8080/alfresco/service/api/node/workspace/SpacesStore/2df9d676-f173-47bb-8ec1-41fa1186b66d"/>
-<link rel="enclosure" type="application/pdf" href="http://127.0.0.1:8080/alfresco/service/api/node/workspace/SpacesStore/2df9d676-f173-47bb-8ec1-41fa1186b66d/content.h4555-cmis-so.pdf"/><link rel="edit" href="http://127.0.0.1:8080/alfresco/service/api/node/workspace/SpacesStore/2df9d676-f173-47bb-8ec1-41fa1186b66d"/>
-<link rel="edit-media" type="application/pdf" href="http://127.0.0.1:8080/alfresco/service/api/node/workspace/SpacesStore/2df9d676-f173-47bb-8ec1-41fa1186b66d/content.h4555-cmis-so.pdf"/><link rel="cmis-allowableactions" href="http://127.0.0.1:8080/alfresco/service/api/node/workspace/SpacesStore/2df9d676-f173-47bb-8ec1-41fa1186b66d/permissions"/>
-<link rel="cmis-relationships" href="http://127.0.0.1:8080/alfresco/service/api/node/workspace/SpacesStore/2df9d676-f173-47bb-8ec1-41fa1186b66d/associations"/>
-<link rel="cmis-parents" href="http://127.0.0.1:8080/alfresco/service/api/node/workspace/SpacesStore/2df9d676-f173-47bb-8ec1-41fa1186b66d/parents"/>
-<link rel="cmis-allversions" href="http://127.0.0.1:8080/alfresco/service/api/node/workspace/SpacesStore/2df9d676-f173-47bb-8ec1-41fa1186b66d/versions"/>
-<link rel="cmis-stream" type="application/pdf" href="http://127.0.0.1:8080/alfresco/service/api/node/workspace/SpacesStore/2df9d676-f173-47bb-8ec1-41fa1186b66d/content.h4555-cmis-so.pdf"/><link rel="cmis-type" href="http://127.0.0.1:8080/alfresco/service/api/type/document"/>
-<link rel="cmis-repository" href="http://127.0.0.1:8080/alfresco/service/api/repository"/>
-<published>2009-06-23T09:40:47.889+02:00</published>
-<summary></summary>
-<title>h4555-cmis-so.pdf</title>
-<updated>2009-06-23T09:40:58.524+02:00</updated>
-<cmis:object>
-<cmis:properties>
-<cmis:propertyId cmis:name="ObjectId"><cmis:value>workspace://SpacesStore/2df9d676-f173-47bb-8ec1-41fa1186b66d</cmis:value></cmis:propertyId>
-<cmis:propertyString cmis:name="BaseType"><cmis:value>document</cmis:value></cmis:propertyString>
-<cmis:propertyString cmis:name="ObjectTypeId"><cmis:value>document</cmis:value></cmis:propertyString>
-<cmis:propertyString cmis:name="CreatedBy"><cmis:value>admin</cmis:value></cmis:propertyString>
-<cmis:propertyDateTime cmis:name="CreationDate"><cmis:value>2009-06-23T09:40:47.889+02:00</cmis:value></cmis:propertyDateTime>
-<cmis:propertyString cmis:name="LastModifiedBy"><cmis:value>admin</cmis:value></cmis:propertyString>
-<cmis:propertyDateTime cmis:name="LastModificationDate"><cmis:value>2009-06-23T09:40:58.524+02:00</cmis:value></cmis:propertyDateTime>
-<cmis:propertyString cmis:name="Name"><cmis:value>h4555-cmis-so.pdf</cmis:value></cmis:propertyString>
-<cmis:propertyBoolean cmis:name="IsImmutable"><cmis:value>false</cmis:value></cmis:propertyBoolean>
-<cmis:propertyBoolean cmis:name="IsLatestVersion"><cmis:value>true</cmis:value></cmis:propertyBoolean>
-<cmis:propertyBoolean cmis:name="IsMajorVersion"><cmis:value>false</cmis:value></cmis:propertyBoolean>
-<cmis:propertyBoolean cmis:name="IsLatestMajorVersion"><cmis:value>false</cmis:value></cmis:propertyBoolean>
-<cmis:propertyString cmis:name="VersionLabel"/>
-<cmis:propertyId cmis:name="VersionSeriesId"><cmis:value>workspace://SpacesStore/2df9d676-f173-47bb-8ec1-41fa1186b66d</cmis:value></cmis:propertyId>
-<cmis:propertyBoolean cmis:name="IsVersionSeriesCheckedOut"><cmis:value>false</cmis:value></cmis:propertyBoolean>
-<cmis:propertyString cmis:name="VersionSeriesCheckedOutBy"/>
-<cmis:propertyId cmis:name="VersionSeriesCheckedOutId"/>
-<cmis:propertyString cmis:name="CheckinComment"/>
-<cmis:propertyInteger cmis:name="ContentStreamLength"><cmis:value>343084</cmis:value></cmis:propertyInteger>
-<cmis:propertyString cmis:name="ContentStreamMimeType"><cmis:value>application/pdf</cmis:value></cmis:propertyString>
-<cmis:propertyString cmis:name="ContentStreamFilename"><cmis:value>h4555-cmis-so.pdf</cmis:value></cmis:propertyString>
-<cmis:propertyString cmis:name="ContentStreamURI"><cmis:value>http://127.0.0.1:8080/alfresco/service/api/node/workspace/SpacesStore/2df9d676-f173-47bb-8ec1-41fa1186b66d/content.h4555-cmis-so.pdf</cmis:value></cmis:propertyString>
-</cmis:properties>
-</cmis:object>
-<cmis:terminator/>
-<app:edited>2009-06-23T09:40:58.524+02:00</app:edited>
-<alf:icon>http://127.0.0.1:8080/alfresco/images/filetypes/pdf.gif</alf:icon>
-</entry>
-</feed>';
 ?>
 \ No newline at end of file
@@ -28,45 +28,156 @@ class KT_cmis_atom_service_helper {
         $id = $cmisEntry['properties']['ObjectId']['value'];
         $entry = $feed->newEntry();
         $feed->newField('id', 'urn:uuid:' . $id, $entry);
-//        print_r($cmisEntry);
+
+        // TODO dynamic actual creator name
+        $feedElement = $feed->newField('author');
+        $element = $feed->newField('name', 'admin', $feedElement);
+        $entry->appendChild($feedElement);
+        
+        $entry->appendChild($feed->newField('content', $id));
+        // TODO proper date
+        $entry->appendChild($feed->newField('published', self::formatDatestamp()));
+        $entry->appendChild($feed->newField('updated', self::formatDatestamp()));
+
+//        $entry->appendChild($feed->newField('summary', $cmisEntry['properties']['Name']['value']));
+
         // links
+        /*
+<link rel="allowableactions" href="http://127.0.0.1:8080/alfresco/service/api/node/workspace/SpacesStore/66f02c27-379e-4782-a0c4-b12f2d5bc543/permissions"/>
+<link rel="relationships" href="http://127.0.0.1:8080/alfresco/service/api/node/workspace/SpacesStore/66f02c27-379e-4782-a0c4-b12f2d5bc543/rels"/>
+<link rel="parents" href="http://127.0.0.1:8080/alfresco/service/api/node/workspace/SpacesStore/66f02c27-379e-4782-a0c4-b12f2d5bc543/parent"/>
+
+        */
+        //
+
+        /*
+<cmis:propertyUri cmis:name="Uri"/>
+<cmis:propertyId cmis:name="AllowedChildObjectTypeIds"/>
+<cmis:propertyString cmis:name="CreatedBy"><cmis:value>System</cmis:value></cmis:propertyString>
+<cmis:propertyDateTime cmis:name="CreationDate"><cmis:value>2009-07-13T13:59:20.724+02:00</cmis:value></cmis:propertyDateTime>
+<cmis:propertyString cmis:name="ChangeToken"/>
+<cmis:propertyString cmis:name="LastModifiedBy"><cmis:value>System</cmis:value></cmis:propertyString>
+<cmis:propertyId cmis:name="ObjectTypeId"><cmis:value>folder</cmis:value></cmis:propertyId>
+
+<cmis:propertyId cmis:name="ObjectId"><cmis:value>workspace://SpacesStore/b30ea6e5-1e3f-4133-82f4-172bc240a9a2</cmis:value></cmis:propertyId>
+         */
+
+        $type = strtolower($cmisEntry['properties']['ObjectTypeId']['value']);
+
+        $link = $feed->newElement('link');
+        $link->appendChild($feed->newAttr('rel','self'));
+        $link->appendChild($feed->newAttr('href', CMIS_APP_BASE_URI . $feed->workspace . '/' . $type . '/' . $cmisEntry['properties']['ObjectId']['value']));
+        $entry->appendChild($link);
+
+        $link = $feed->newElement('link');
+        $link->appendChild($feed->newAttr('rel','edit'));
+        $link->appendChild($feed->newAttr('href', CMIS_APP_BASE_URI . $feed->workspace . '/' . $type . '/' . $cmisEntry['properties']['ObjectId']['value']));
+        $entry->appendChild($link);
+        
         // TODO check parent link is correct, fix if needed
+        // TODO leave out if at root folder
+        $link = $feed->newElement('link');
+        $link->appendChild($feed->newAttr('rel', 'parents'));
+        $link->appendChild($feed->newAttr('href', CMIS_APP_BASE_URI . $feed->workspace . '/folder/' 
+                                                . $cmisEntry['properties']['ObjectId']['value'] . '/parent'));
+        $entry->appendChild($link);
+
+        // according to spec this MUST be present, but spec says that links for function which are not supported
+        // do not need to be present, so unsure for the moment
         $link = $feed->newElement('link');
-        $link->appendChild($feed->newAttr('rel','cmis-parent'));
-        $link->appendChild($feed->newAttr('href', CMIS_APP_BASE_URI . $feed->workspace . '/folder/' . $cmisEntry['properties']['ParentId']['value']));
+        $link->appendChild($feed->newAttr('rel', 'allowableactions'));
+        $link->appendChild($feed->newAttr('href', CMIS_APP_BASE_URI . $feed->workspace . '/' . $type . '/' 
+                                                . $cmisEntry['properties']['ObjectId']['value'] . '/permissions'));
         $entry->appendChild($link);
+        // Folder/Document specific links
         if (strtolower($cmisEntry['properties']['ObjectTypeId']['value']) == 'folder')
         {
-            // TODO check parent link is correct, fix if needed
-            $link = $feed->newElement('link');
-            $link->appendChild($feed->newAttr('rel','cmis-folderparent'));
-            $link->appendChild($feed->newAttr('href', CMIS_APP_BASE_URI . $feed->workspace . '/folder/' . $cmisEntry['properties']['ParentId']['value']));
-            $entry->appendChild($link);
+            // no longer valid, remove...
+//            // TODO check parent link is correct, fix if needed
+//            $link = $feed->newElement('link');
+//            $link->appendChild($feed->newAttr('rel','folderparent'));
+//            $link->appendChild($feed->newAttr('href', CMIS_APP_BASE_URI . $feed->workspace . '/folder/' . $cmisEntry['properties']['ParentId']['value']));
+//            $entry->appendChild($link);
+
             $link = $feed->newElement('link');
-            $link->appendChild($feed->newAttr('rel','cmis-children'));
+            $link->appendChild($feed->newAttr('rel','children'));
             $link->appendChild($feed->newAttr('href', CMIS_APP_BASE_URI . $feed->workspace . '/'
-                                                    . strtolower($cmisEntry['properties']['ObjectTypeId']['value'])
+                                                    . $type
                                                     . '/' . $cmisEntry['properties']['ObjectId']['value']
                                                     . '/children'));
             $entry->appendChild($link);
             $link = $feed->newElement('link');
-            $link->appendChild($feed->newAttr('rel','cmis-descendants'));
+            $link->appendChild($feed->newAttr('rel','descendants'));
             $link->appendChild($feed->newAttr('href', CMIS_APP_BASE_URI . $feed->workspace . '/'
-                                                    . strtolower($cmisEntry['properties']['ObjectTypeId']['value'])
+                                                    . $type
                                                     . '/' . $cmisEntry['properties']['ObjectId']['value']
                                                     . '/descendants'));
             $entry->appendChild($link);
         }
+        else if (strtolower($cmisEntry['properties']['ObjectTypeId']['value']) == 'document')
+        {
+            // according to spec this MUST be present, but spec says that links for function which are not supported
+            // do not need to be present, so unsure for the moment
+//            $link = $feed->newElement('link');
+//            $link->appendChild($feed->newAttr('rel', 'allversions'));
+//            $link->appendChild($feed->newAttr('href', CMIS_APP_BASE_URI . $feed->workspace . '/' . $type . '/' . $cmisEntry['properties']['ParentId']['value']));
+//            $entry->appendChild($link);
+
+            // according to spec this MUST be present, but spec says that links for function which are not supported
+            // do not need to be present, so unsure for the moment
+//            $link = $feed->newElement('link');
+//            $link->appendChild($feed->newAttr('rel', 'latestversion'));
+//            $link->appendChild($feed->newAttr('href', CMIS_APP_BASE_URI . $feed->workspace . '/' . $type . '/' . $cmisEntry['properties']['ParentId']['value']));
+//            $entry->appendChild($link);
+
+            // if there is a content stream, this link MUST be present
+            // not sure yet where it must point...
+            if (!empty($cmisEntry['properties']['ContentStreamLength']['value']))
+            {
+                $link = $feed->newElement('link');
+                $link->appendChild($feed->newAttr('rel', 'stream'));
+                $link->appendChild($feed->newAttr('href', CMIS_APP_BASE_URI . $feed->workspace . '/' . $type . '/'
+                                                        . $cmisEntry['properties']['ObjectId']['value']));
+                $entry->appendChild($link);
+            }
+
+            // if the document is checked out and this is NOT the PWC, this link MUST be present
+//            if (!empty($cmisEntry['properties']['ContentStreamLength']['value']))
+//            {
+//                $link = $feed->newElement('link');
+//                $link->appendChild($feed->newAttr('rel', 'stream'));
+//                $link->appendChild($feed->newAttr('href', CMIS_APP_BASE_URI . $feed->workspace . '/' . $type . '/' . $cmisEntry['properties']['ParentId']['value']));
+//                $entry->appendChild($link);
+//            }
+        }
+
+
+        // according to spec this MUST be present, but spec says that links for function which are not supported
+        // do not need to be present, so unsure for the moment
+          $link = $feed->newElement('link');
+          $link->appendChild($feed->newAttr('rel', 'relationships'));
+          $link->appendChild($feed->newAttr('href', CMIS_APP_BASE_URI . $feed->workspace . '/' . $type . '/' 
+                                                  . $cmisEntry['properties']['ObjectId']['value'] . '/rels'));
+          $entry->appendChild($link);
+        
         $link = $feed->newElement('link');
-        $link->appendChild($feed->newAttr('rel','cmis-type'));
-        $link->appendChild($feed->newAttr('href', CMIS_APP_BASE_URI . $feed->workspace . '/type/' . strtolower($cmisEntry['properties']['ObjectTypeId']['value'])));
+        $link->appendChild($feed->newAttr('rel','type'));
+        $link->appendChild($feed->newAttr('href', CMIS_APP_BASE_URI . $feed->workspace . '/type/' . $type));
         $entry->appendChild($link);
+
         $link = $feed->newElement('link');
-        $link->appendChild($feed->newAttr('rel','cmis-repository'));
-        $link->appendChild($feed->newAttr('href', CMIS_APP_BASE_URI . $feed->workspace . '/servicedocument'));
+        $link->appendChild($feed->newAttr('rel','repository'));
+        $link->appendChild($feed->newAttr('href', CMIS_APP_BASE_URI . '/servicedocument'));
         $entry->appendChild($link);
+
+        // according to spec this MUST be present, but spec says that links for function which are not supported
+        // do not need to be present, so unsure for the moment - policies are being abandoned, or so I thought...
+//        $link = $feed->newElement('link');
+//        $link->appendChild($feed->newAttr('rel', 'policies'));
+//        $link->appendChild($feed->newAttr('href', CMIS_APP_BASE_URI . $feed->workspace . '/' . $type . '/' . $cmisEntry['properties']['ParentId']['value']));
+//        $entry->appendChild($link);
         // end links
         $entry->appendChild($feed->newElement('summary', $cmisEntry['properties']['Name']['value']));
@@ -86,6 +197,9 @@ class KT_cmis_atom_service_helper {
         $objectElement->appendChild($propertiesElement);
         $entry->appendChild($objectElement);
+        
+        // after every entry, append a cmis:terminator tag
+        $entry->appendChild($feed->newElement('cmis:terminator'));
     }
     /**
@@ -116,35 +230,67 @@ class KT_cmis_atom_service_helper {
         //Create a new response feed
         $feed = new KT_cmis_atom_responseFeed(CMIS_APP_BASE_URI, $typesHeading, null, null, null, 'urn:uuid:' . $typesString);
+        // TODO set page number correctly - to be done when we support paging the the API
+        
+        // author
+        // TODO generate this dynamically (based on???)\
+        $feedElement = $feed->newField('author');
+        $element = $feed->newField('name', 'admin', $feedElement);
+        $feed->appendChild($feedElement);
+
+        // NOTE spec says this link MUST be present but is vague on where it points
+        //      as of 0.61c:
+        //      "The source link relation points to the underlying CMIS Type Definition as Atom Entry"
+        //      so what is the underlying CMIS Type Definition for a collection of base types?
+        //      suspect that it only applies when not listing all types, i.e. a base type is asked for
+        /*
+        $link = $feed->newElement('link');
+        $link->appendChild($feed->newAttr('rel','source'));
+        $link->appendChild($feed->newAttr('href', CMIS_APP_BASE_URI . $feed->workspace . '/type/' . strtolower($type['typeId'])));
+        $feed->appendChild($link);
+         */
+
+        // current time: format = 2009-07-13T14:49:27.659+02:00
+        $feed->appendChild($feed->newElement('updated', self::formatDatestamp()));
+
         foreach($types as $type)
         {
             $entry = $feed->newEntry();
+            
+            $feedElement = $feed->newField('author');
+            $element = $feed->newField('name', 'admin', $feedElement);
+            $entry->appendChild($feedElement);
+            $feedElement = $feed->newField('content', $type['typeId']);
+            $entry->appendChild($feedElement);
+
+            // NOTE should this be strtolower?  thought so but maybe not always, Alfresco is not consistent...
             $feed->newId('urn:uuid:type-' . strtolower($type['typeId']), $entry);
+            // TODO add parents link when not selecting a base type.
+            // TODO add children link when type has children
+            // TODO add descendants link when type has children
+            // NOTE KnowledgeTree currently only supports base types so these are not important at the present time.
+
             // links
+//            $link = $feed->newElement('link');
+//            $link->appendChild($feed->newAttr('rel','self'));
+//            $link->appendChild($feed->newAttr('href', CMIS_APP_BASE_URI . $feed->workspace . '/type/' . strtolower($type['typeId'])));
+//            $entry->appendChild($link);
+            // TODO type link MUST point to base type
+            //      KnowledgeTree currently only supports base types so this is not important
+            //      at the present time as it will always point at the base type.
             $link = $feed->newElement('link');
-            $link->appendChild($feed->newAttr('rel','self'));
-            $link->appendChild($feed->newAttr('href', CMIS_APP_BASE_URI . $feed->workspace . '/type/' . strtolower($type['typeId'])));
-            $entry->appendChild($link);
-            $link = $feed->newElement('link');
-            $link->appendChild($feed->newAttr('rel','cmis-type'));
+            $link->appendChild($feed->newAttr('rel','type'));
             $link->appendChild($feed->newAttr('href', CMIS_APP_BASE_URI . $feed->workspace . '/type/' . strtolower($type['typeId'])));
             $entry->appendChild($link);
             $link = $feed->newElement('link');
-            $link->appendChild($feed->newAttr('rel','cmis-children'));
-            $link->appendChild($feed->newAttr('href', CMIS_APP_BASE_URI . $feed->workspace . '/type/' . strtolower($type['typeId']) . '/children'));
-            $entry->appendChild($link);
-            $link = $feed->newElement('link');
-            $link->appendChild($feed->newAttr('rel','cmis-descendants'));
-            $link->appendChild($feed->newAttr('href', CMIS_APP_BASE_URI . $feed->workspace . '/type/' . strtolower($type['typeId']) . '/descendants'));
-            $entry->appendChild($link);
-            $link = $feed->newElement('link');
-            $link->appendChild($feed->newAttr('rel','cmis-repository'));
-            $link->appendChild($feed->newAttr('href', CMIS_APP_BASE_URI . $feed->workspace . '/servicedocument'));
+            $link->appendChild($feed->newAttr('rel','repository'));
+            $link->appendChild($feed->newAttr('href', CMIS_APP_BASE_URI . '/servicedocument'));
             $entry->appendChild($link);
             $entry->appendChild($feed->newElement('summary', $type['typeId'] . ' Type'));
             $entry->appendChild($feed->newElement('title', $type['typeId']));
+            $entry->appendChild($feed->newElement('updated', self::formatDatestamp()));
             // main CMIS entry
             $feedElement = $feed->newElement('cmis:' . strtolower($type['typeId']) . 'Type');
@@ -154,6 +300,9 @@ class KT_cmis_atom_service_helper {
             }
             $entry->appendChild($feedElement);
+            
+            // after every entry, append a cmis:terminator tag
+            $entry->appendChild($feed->newElement('cmis:terminator'));
         }
         return $feed;
@@ -234,7 +383,7 @@ class KT_cmis_atom_service_helper {
 	 * @param string $ip
 	 * @return object Containing the status_code of the login and session id
 	 */
-	function login($username, $password, $ip=null){
+	static public function login($username, $password, $ip=null){
 		$kt = self::getKt();
 		$session = $kt->start_session($username,$password, $ip);
@@ -256,7 +405,7 @@ class KT_cmis_atom_service_helper {
 	 * @param string $session_id
 	 * @return object Containing the status_code of the logout attempt
 	 */
-	function logout($session_id){
+	static public function logout($session_id){
 		$kt = self::getKt();
 		$session = $kt->get_active_session($session_id, null);
@@ -284,6 +433,13 @@ class KT_cmis_atom_service_helper {
 		return self::$kt;
 	}
+    // TODO adjust for time zones?
+    static public function formatDatestamp($time = null)
+    {
+        if (is_null($time)) $time = time();
+        return date('Y-m-d H:i:s', $time);
+    }
+
 }
 ?>
@@ -93,22 +93,21 @@ if ($workspace == &#39;servicedocument&#39;)
 */
 // TODO consider a registerServices function which will, dependant on what is requested, register the appropriate services, keep the logic out of the index file
 $APP->registerService('dms', 'folder', 'KT_cmis_atom_service_folder', 'Root Folder Children Collection',
-                      array(rawurlencode($APP->repositoryInfo['rootFolderId']), 'children'), 'root-children');
+                      array(rawurlencode($APP->repositoryInfo['rootFolderId']), 'children'), 'rootchildren');
 $APP->registerService('dms', 'folder', 'KT_cmis_atom_service_folder', 'Root Folder Children Collection',
-                      array(rawurlencode($APP->repositoryInfo['rootFolderId']), 'descendants'), 'root-descendants');
-$APP->registerService('dms', 'checkedout', 'KT_cmis_atom_service_checkedout', 'Checked Out Document Collection', null, 'checkedout');
-$APP->registerService('dms', 'types', 'KT_cmis_atom_service_types', 'Object Type Collection', null, 'types-children');
-$APP->registerService('dms', 'types', 'KT_cmis_atom_service_types', 'Object Type Collection', null, 'types-descendants');
+                      array(rawurlencode($APP->repositoryInfo['rootFolderId']), 'descendants'), 'rootdescendants');
+$APP->registerService('dms', 'checkedout', 'KT_cmis_atom_service_checkedout', 'Checked Out Document Collection', null, 
+                      'checkedout', 'application/atom+xml;type=entry');
+$APP->registerService('dms', 'types', 'KT_cmis_atom_service_types', 'Object Type Collection', null, 'typeschildren');
+$APP->registerService('dms', 'types', 'KT_cmis_atom_service_types', 'Object Type Collection', null, 'typesdescendants');
-// FIXME HACK! this should not happen every time, ONLY on a specific request, should NOT appear in service document as this is not definable at that time;
-//             SHOULD be appearing in types listing feed
 // NOTE $requestParams is meaningless if not actually requesting this service, so not a good way to register the service really
 if ($workspace != 'servicedocument')
 {
     // should check this per workspace???
-    $APP->registerService('dms', 'type', 'KT_cmis_atom_service_type', 'Object Type Collection', explode('/', $requestParams), 'types-descendants');
+    $APP->registerService('dms', 'type', 'KT_cmis_atom_service_type', 'Object Type Collection', explode('/', $requestParams), 'typesdescendants');
     // FIXME HACK! see above, this one for documents
-    $APP->registerService('dms', 'document', 'KT_cmis_atom_service_document', 'Object Type Collection', explode('/', $requestParams), 'types-descendants');
+    $APP->registerService('dms', 'document', 'KT_cmis_atom_service_document', 'Object Type Collection', explode('/', $requestParams), 'typesdescendants');
 }
 //Execute the current url/header request
@@ -24,7 +24,7 @@ class KT_cmis_atom_responseFeed extends KT_atom_responseFeed {
 //		$feed->appendChild($this->newAttr('xmlns','http://www.w3.org/2007/app'));
 //		$feed->appendChild($this->newAttr('xmlns:atom','http://www.w3.org/2005/Atom'));
 		$feed->appendChild($this->newAttr('xmlns','http://www.w3.org/2005/Atom'));
-		$feed->appendChild($this->newAttr('xmlns:cmis','http://www.cmis.org/2008/05'));
+		$feed->appendChild($this->newAttr('xmlns:cmis','http://docs.oasis-open.org/ns/cmis/core/200901'));
 		$this->feed = &$feed;
         if (!is_null($this->id))
@@ -52,22 +52,27 @@ class KT_cmis_atom_responseFeed extends KT_atom_responseFeed {
 		return $id;
 	}
-//    public function &newField($name = NULL, $value = NULL, &$entry = NULL)
-//    {
-//        $append = false;
-//
-//        if(func_num_args() > 3)
-//        {
-//            $append = ((func_get_arg(3) === true) ? true : false);
-//		}
-//
-//        $field = $this->newElement('cmis:' . $name, $value);
-//
-//		if (isset($entry)) $entry->appendChild($field);
-//        else if ($append) $this->feed->appendChild($field);
-//
-//		return $field;
-//	}
+    public function &newField($name = NULL, $value = NULL, &$entry = NULL)
+    {
+        $append = false;
+
+        if(func_num_args() > 3)
+        {
+            $append = ((func_get_arg(3) === true) ? true : false);
+		}
+
+        $field = $this->newElement($name, $value);
+
+		if (isset($entry)) $entry->appendChild($field);
+        else if ($append) $this->feed->appendChild($field);
+
+		return $field;
+	}
+
+    function appendChild($element)
+    {
+        $this->feed->appendChild($element);
+    }
     /*
 	public function &newEntry()
@@ -77,13 +77,13 @@ class KT_cmis_atom_server extends KT_atom_server {
             }
             $ws->appendChild($element);
-			foreach($collection as $serviceName => $serviceInstance)
+            foreach($collection as $serviceName => $serviceInstance)
             {
                 foreach($serviceInstance as $instance)
                 {
                     $collectionStr = CMIS_APP_BASE_URI . $workspace . '/' . $serviceName . '/'
                                    . (is_array($instance['parameters']) ? implode('/', $instance['parameters']).'/' : '');
-                    $col = $service->newCollection($collectionStr, $instance['title'], $instance['collectionType'], $ws);
+                    $col = $service->newCollection($collectionStr, $instance['title'], $instance['collectionType'], $instance['accept'], $ws);
                 }
 			}
 		}
@@ -92,17 +92,18 @@ class KT_cmis_atom_server extends KT_atom_server {
 	}
     public function registerService($workspace = NULL, $serviceName = NULL, $serviceClass = NULL, $title = NULL, 
-                                    $serviceParameters = NULL, $collectionType = NULL)
+                                    $serviceParameters = NULL, $collectionType = NULL, $accept = null)
     {
 		$workspace = strtolower(trim($workspace));
 		$serviceName = strtolower(trim($serviceName));
 		$serviceRecord = array(
-			'fileName'		=> $fileName,
-			'serviceClass'	=> $serviceClass,
-			'title'			=> $title,
-            'parameters'    => $serviceParameters,
-            'collectionType'    => $collectionType
+			'fileName' => $fileName,
+			'serviceClass' => $serviceClass,
+			'title' => $title,
+            'parameters' => $serviceParameters,
+            'collectionType' => $collectionType,
+            'accept' => $accept
 		);
 		$this->services[$workspace][$serviceName][] = $serviceRecord;
@@ -119,23 +120,25 @@ class KT_cmis_atom_server extends KT_atom_server {
 		return false;
 	}
-    // TODO we probably want this version in the base class for auth purposes
-    public function render()
-    {
-		ob_end_clean();
-        // possible additional headers, e.g. basic auth request
-        // FIXME this won't work with the service document as no service object exists
-        if (!is_null($this->serviceObject))
-        {
-            $headers = $this->serviceObject->getHeaders();
-            foreach ($headers as $header)
-            {
-                header($header);
-            }
-        }
-		header('Content-type: text/xml');
-        echo $this->output;
-	}
+//    // TODO we probably want this version in the base class for auth purposes
+//    public function render()
+//    {
+//		ob_end_clean();
+////        // possible additional headers, e.g. basic auth request
+////        // FIXME this won't work with the service document as no service object exists
+////        if (!is_null($this->serviceObject))
+////        {
+////            $headers = $this->serviceObject->getHeaders();
+////            foreach ($headers as $header)
+////            {
+////                header($header);
+////            }
+////        }
+//
+//        // TODO header: application/atom+xml for service doc?  is how Alfresco does it but is it needed?
+//        header('Content-type: text/xml');
+//        echo $this->output;
+//	}
 }
@@ -75,17 +75,20 @@ class KT_cmis_atom_serviceDoc extends KT_atom_serviceDoc {
         $service = $this->newElement('service');
         $service->appendChild($this->newAttr('xmlns', 'http://www.w3.org/2007/app'));
         $service->appendChild($this->newAttr('xmlns:atom', 'http://www.w3.org/2005/Atom'));
-        $service->appendChild($this->newAttr('xmlns:cmis', 'http://www.cmis.org/2008/05'));
+        $service->appendChild($this->newAttr('xmlns:cmis', 'http://docs.oasis-open.org/ns/cmis/core/200901'));
         $this->service =& $service;
         $this->DOM->appendChild($this->service);
     }
-    public function &newCollection($url = NULL, $title = NULL, $cmisCollectionType = NULL, &$ws = NULL)
+    public function &newCollection($url = NULL, $title = NULL, $cmisCollectionType = NULL, $accept = null, &$ws = NULL)
     {
         $collection=$this->newElement('collection');
         $collection->appendChild($this->newAttr('href', $url));
         $collection->appendChild($this->newAttr('cmis:collectionType', $cmisCollectionType));
         $collection->appendChild($this->newElement('atom:title', $title));
+        if (!is_null($accept)) {
+            $collection->appendChild($this->newElement('accept', $accept));
+        }
         if(isset($ws))$ws->appendChild($collection);
         return $collection;
     }
-<?PHP
-
-/**
- * The base phpdoc class searches for available classes
- *
- *@author KnowledgeTree Team
- *@package Webservice
- *@version Version 0.9
- */
-class IPPhpDoc{
-	/** @var IPReflectionClass[] Array with available classes */
-	public $classes = array();
-
-	/** @var IPReflectionClass The current class */
-	public $class = "";
-
-	/**
-	* Constructor, initiates the getClasses() method
-	*
-	* @return void
-	*/
-	function __construct() {
-		$this->getClasses();
-	}
-
-	/** Sets the current class
-	 * @param string The class name
-	 * @return void
-	 */
-	public function setClass($class) {
-		$this->class = new IPReflectionClass($class);
-	}
-	/**
-	 * Get all classes
-	 *
-	 * @return IPReflectionClass[]
-	 */
-	function getClasses() {
-		$ar = get_declared_classes();
-		foreach($ar as $class){
-			$c = new reflectionClass($class);
-			if($c->isUserDefined()){//add only when class is user-defined
-				$this->classes[$class] = new IPReflectionClass($class);
-			}
-		}
-		ksort($this->classes);
-		return $this->classes;
-	}
-	/**
-	 * Generates the documentation page with all classes, methods etc.
-	 * @TODO FIXME: use the new template class
-	 * @param string Template file (optional)
-	 * @return string
-	 */
-	public function getDocumentation($template="classes/soap/templates/docclass.xsl")	{
-		if(!is_file($template))
-			throw new WSException("Could not find the template file: '$template'");
-		$xtpl = new IPXSLTemplate($template);
-		$documentation = Array();
-		$documentation['menu'] = Array();
-		//loop menu items
-		$documentation['menu'] = $this->getClasses();
-
-		if($this->class){
-			if($this->class->isUserDefined()) {
-				$this->class->properties = $this->class->getProperties(false, false);
-				$this->class->methods = $this->class->getMethods(false, false);
-				foreach((array)$this->class->methods as $method) {
-					$method->params = $method->getParameters();
-				}
-			} else {
-				$documentation['fault'] = "Native class";
-			}
-			$documentation['class'] = $this->class;
-		}
-		echo $xtpl->execute($documentation);
-	}
-
-
-	/**
-	 *
-	 * @param $comment String The doccomment
-	 * @param $annotationName String the annotation name
-	 * @param $annotationClass String the annotation class
-	 * @return void
-	 */
-	public static function getAnnotation($comment, $annotationName, $annotationClass = null){
-		if(!$annotationClass){
-			$annotationClass = $annotationName;
-		}
-		$start = 0;
-		if($start = stripos($comment, "@".$annotationName)){
-			$obi = new $annotationClass();
-			$start = strpos($comment, "(", $start);
-			$end = strpos($comment, ")", $start);
-			$propString = substr($comment, $start, ($end-$start) + 1);
-			$eval = "return Array$propString;";
-			$arr = @eval($eval);
-			if($arr === false) throw new Exception("Error parsing annotation: $propString");
-
-			foreach ((Array)$arr as $name => $value){
-				$obi->$name= $value;
-			}
-			return $obi;
-		}
-		throw new Exception("Cannot find annotation @$annotationName ($start, $end): {$this->comment} ");
-	}
-
-}
+<?PHP
+
+/**
+ * The base phpdoc class searches for available classes
+ *
+ *@author KnowledgeTree Team
+ *@package Webservice
+ *@version Version 0.9
+ */
+class IPPhpDoc{
+	/** @var IPReflectionClass[] Array with available classes */
+	public $classes = array();
+
+	/** @var IPReflectionClass The current class */
+	public $class = "";
+
+	/**
+	* Constructor, initiates the getClasses() method
+	*
+	* @return void
+	*/
+	function __construct() {
+		$this->getClasses();
+	}
+
+	/** Sets the current class
+	 * @param string The class name
+	 * @return void
+	 */
+	public function setClass($class) {
+		$this->class = new IPReflectionClass($class);
+	}
+	/**
+	 * Get all classes
+	 *
+	 * @return IPReflectionClass[]
+	 */
+	function getClasses() {
+		$ar = get_declared_classes();
+		foreach($ar as $class){
+			$c = new reflectionClass($class);
+			if($c->isUserDefined()){//add only when class is user-defined
+				$this->classes[$class] = new IPReflectionClass($class);
+			}
+		}
+		ksort($this->classes);
+		return $this->classes;
+	}
+	/**
+	 * Generates the documentation page with all classes, methods etc.
+	 * @TODO FIXME: use the new template class
+	 * @param string Template file (optional)
+	 * @return string
+	 */
+	public function getDocumentation($template="classes/soap/templates/docclass.xsl")	{
+		if(!is_file($template))
+			throw new WSException("Could not find the template file: '$template'");
+		$xtpl = new IPXSLTemplate($template);
+		$documentation = Array();
+		$documentation['menu'] = Array();
+		//loop menu items
+		$documentation['menu'] = $this->getClasses();
+
+		if($this->class){
+			if($this->class->isUserDefined()) {
+				$this->class->properties = $this->class->getProperties(false, false);
+				$this->class->methods = $this->class->getMethods(false, false);
+				foreach((array)$this->class->methods as $method) {
+					$method->params = $method->getParameters();
+				}
+			} else {
+				$documentation['fault'] = "Native class";
+			}
+			$documentation['class'] = $this->class;
+		}
+		echo $xtpl->execute($documentation);
+	}
+
+
+	/**
+	 *
+	 * @param $comment String The doccomment
+	 * @param $annotationName String the annotation name
+	 * @param $annotationClass String the annotation class
+	 * @return void
+	 */
+	public static function getAnnotation($comment, $annotationName, $annotationClass = null){
+		if(!$annotationClass){
+			$annotationClass = $annotationName;
+		}
+		$start = 0;
+		if($start = stripos($comment, "@".$annotationName)){
+			$obi = new $annotationClass();
+			$start = strpos($comment, "(", $start);
+			$end = strpos($comment, ")", $start);
+			$propString = substr($comment, $start, ($end-$start) + 1);
+			$eval = "return Array$propString;";
+			$arr = @eval($eval);
+			if($arr === false) throw new Exception("Error parsing annotation: $propString");
+
+			foreach ((Array)$arr as $name => $value){
+				$obi->$name= $value;
+			}
+			return $obi;
+		}
+		throw new Exception("Cannot find annotation @$annotationName ($start, $end): {$this->comment} ");
+	}
+
+}
 ?>
 \ No newline at end of file