diff --git a/webservice/atompub/cmis/KT_cmis_atom_server.services.inc.php b/webservice/atompub/cmis/KT_cmis_atom_server.services.inc.php
new file mode 100644
index 0000000..e439971
--- /dev/null
+++ b/webservice/atompub/cmis/KT_cmis_atom_server.services.inc.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * AtomPub Service: children
+ *
+ * Returns a child tree listing starting at the root document, one level only
+ * Tree structure obtained by referencing parent id
+ *
+ */
+class KT_cmis_atom_service_children extends KT_cmis_atom_service {
+	public function GET_action(){
+//		//Create a new response feed
+		$feed=new KT_atom_ResponseFeed_GET(KT_APP_BASE_URI);
+//
+//		//Invoke the KtAPI to get detail about the referenced document
+//		$tree=KT_atom_service_helper::getFullTree();
+//
+//		//Create the atom response feed
+//		foreach($tree as $item){
+//			$id=$item['id'];
+//			$entry=$feed->newEntry();
+//			$feed->newField('id',$id,$entry);
+//			foreach($item as $property=>$value){
+//				$feed->newField($property,$value,$entry);
+//			}
+//		}
+//		//Expose the responseFeed
+        $feed->newField('bla','bleh',$feed);
+		$this->responseFeed=$feed;
+	}
+
+	public function DELETE_action(){
+//		$feed = new KT_atom_ResponseFeed_DELETE();
+//		$this->responseFeed=$feed;
+	}
+}
+
+
+
+
+/**
+ * AtomPub Service: folder
+ *
+ * Returns detail on a particular folder
+ *
+ */
+class KT_atom_service_folder extends KT_atom_service {
+	public function GET_action(){
+		//Create a new response feed
+		$feed=new KT_atom_responseFeed(KT_APP_BASE_URI);
+
+		//Invoke the KtAPI to get detail about the referenced document
+		$folderDetail=KT_atom_service_helper::getFolderDetail($this->params[0]?$this->params[0]:1);
+
+		//Create the atom response feed
+		$entry=$feed->newEntry();
+		foreach($folderDetail as $property=>$value){
+			$feed->newField($property,$value,$entry);
+		}
+
+		//Expose the responseFeed
+		$this->responseFeed=$feed;
+	}
+}
+
+
+
+
+/**
+ * AtomPub Service: document
+ *
+ * Returns detail on a particular document
+ *
+ */
+class KT_atom_service_document extends KT_atom_service {
+	public function GET_action(){
+		//Create a new response feed
+		$feed=new KT_atom_responseFeed(KT_APP_BASE_URI);
+
+		//Invoke the KtAPI to get detail about the referenced document
+		$docDetail=KT_atom_service_helper::getDocumentDetail($this->params[0]);
+
+		//Create the atom response feed
+		$entry=$feed->newEntry();
+		foreach($docDetail['results'] as $property=>$value){
+			$feed->newField($property,$value,$entry);
+		}
+		//Add a downloaduri field manually
+		$feed->newField('downloaduri',urlencode(KT_APP_SYSTEM_URI.'/action.php?kt_path_info=ktcore.actions.document.view&fDocumentId='.$docDetail['results']['document_id']),$entry);
+
+		//Expose the responseFeed
+		$this->responseFeed=$feed;
+	}
+}
+?>
\ No newline at end of file
diff --git a/webservice/atompub/cmis/NavigationService.inc.php b/webservice/atompub/cmis/NavigationService.inc.php
new file mode 100644
index 0000000..fe47e18
--- /dev/null
+++ b/webservice/atompub/cmis/NavigationService.inc.php
@@ -0,0 +1,124 @@
+<?php
+
+require_once KT_LIB_DIR . '/api/ktcmis/ktcmis.inc.php';
+
+/**
+ * CMIS Service class which hooks into the KnowledgeTree interface
+ * for processing of CMIS queries and responses via atompub/webservices
+ */
+
+class NavigationService extends KTNavigationService {
+
+    /**
+     * Get descendents of the specified folder, up to the depth indicated
+     *
+     * @param string $repositoryId
+     * @param string $folderId
+     * @param boolean $includeAllowableActions
+     * @param boolean $includeRelationships
+     * @param string $typeID
+     * @param int $depth
+     * @param string $filter
+     * @return cmisObjectType[]
+     */
+    public function getDescendants($repositoryId, $folderId, $includeAllowableActions, $includeRelationships,
+                                   $depth = 1, $typeID = 'Any', $filter = '')
+    {
+        $result = parent::getDescendants($repositoryId, $folderId, $includeAllowableActions,
+                                         $includeRelationships, $depth, $typeID, $filter);
+
+        if ($result['status_code'] == 0)
+        {
+            return $result['results'];
+        }
+    }
+
+    /**
+     * Get direct children of the specified folder
+     *
+     * @param string $repositoryId
+     * @param string $folderId
+     * @param boolean $includeAllowableActions
+     * @param boolean $includeRelationships
+     * @param string $typeID
+     * @param string $filter
+     * @param int $maxItems
+     * @param int $skipCount
+     * @return cmisObjectType[]
+     */
+    public function getChildren($repositoryId, $folderId, $includeAllowableActions, $includeRelationships,
+                         $typeID = 'Any', $filter = '', $maxItems = 0, $skipCount = 0)
+    {
+        $result =  parent::getChildren($repositoryId, $folderId, $includeAllowableActions, $includeRelationships,
+                                       $typeID, $filter, $maxItems, $skipCount);
+
+        if ($result['status_code'] == 0)
+        {
+            return $result['results'];
+        }
+    }
+
+    /**
+     * Gets the parent of the selected folder
+     *
+     * @param string $repositoryId
+     * @param string $folderId
+     * @param boolean $includeAllowableActions
+     * @param boolean $includeRelationships
+     * @param boolean $returnToRoot
+     * @param string $filter
+     * @return cmisObjectType[]
+     */
+    public function getFolderParent($repositoryId, $folderId, $includeAllowableActions, $includeRelationships, $returnToRoot, $filter = '')
+    {
+        $result = parent::getFolderParent($repositoryId, $folderId, $includeAllowableActions, $includeRelationships, $returnToRoot, $filter);
+
+        if ($result['status_code'] == 0)
+        {
+            return $result['results'];
+        }
+    }
+
+    /**
+     * Gets the parents for the selected object
+     *
+     * @param string $repositoryId
+     * @param string $folderId
+     * @param boolean $includeAllowableActions
+     * @param boolean $includeRelationships
+     * @param string $filter
+     * @return cmisObjectType[]
+     */
+    public function getObjectParents($repositoryId, $objectId, $includeAllowableActions, $includeRelationships, $filter = '')
+    {
+        $result = parent::getObjectParents($repositoryId, $objectId, $includeAllowableActions, $includeRelationships, $filter);
+
+        if ($result['status_code'] == 0)
+        {
+            return $result['results'];
+        }
+    }
+
+    /**
+     * Returns a list of checked out documents from the selected repository
+     *
+     * @param string $repositoryId
+     * @param string $folderId The folder for which checked out docs are requested
+     * @param string $filter
+     * @param int $maxItems
+     * @param int $skipCount
+     * @return array $checkedout The collection of checked out documents
+     */
+    function getCheckedoutDocs($repositoryId, $folderId = null, $filter = '', $maxItems = 0, $skipCount = 0)
+    {
+        $checkedout = parent::getObjectParents($repositoryId, $folderId, $filter, $maxItems, $skipCount);
+
+        if ($result['status_code'] == 0)
+        {
+            return $result['results'];
+        }
+    }
+
+}
+
+?>
diff --git a/webservice/atompub/cmis/ObjectFeed.inc.php b/webservice/atompub/cmis/ObjectFeed.inc.php
new file mode 100644
index 0000000..5c8d4f4
--- /dev/null
+++ b/webservice/atompub/cmis/ObjectFeed.inc.php
@@ -0,0 +1,92 @@
+<?php
+
+class CMISObjectFeed {
+
+    /**
+     * Creates an AtomPub entry for a CMIS entry and adds it to the supplied feed
+     *
+     * @param object $feed The feed to which we add the entry
+     * @param array $cmisEntry The entry data
+     * @param string $parent The parent folder
+     */
+    static public function createEntry(&$feed, $cmisEntry, $parent, $path)
+    {
+        preg_match('/^\/?cmis\/folder\/(.*)\/[^\/]*\/?$/', trim($_SERVER['QUERY_STRING'], '/'), $matches);
+        $path = $matches[1];
+        $parent = preg_replace('/\/[^\/]*$/', '', $path);
+        
+        $entry = $feed->newEntry();
+        $feed->newId('urn:uuid:' . $cmisEntry['properties']['Name']['value'] . '-'
+                                 . strtolower($cmisEntry['properties']['ObjectTypeId']['value']), $entry);
+
+                        /*
+<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"/>
+                         */
+
+        // links
+//            $link = $feed->newElement('link');
+//            $link->appendChild($feed->newAttr('rel','self'));
+//            $link->appendChild($feed->newAttr('href', CMIS_BASE_URI . strtolower($cmisEntry['properties']['ObjectTypeId']['value'])
+//                                                                    . '/' . $cmisEntry['properties']['ObjectId']['value']));
+//            $entry->appendChild($link);
+        $link = $feed->newElement('link');
+        $link->appendChild($feed->newAttr('rel','cmis-parent'));
+        $link->appendChild($feed->newAttr('href', CMIS_BASE_URI . 'folder/' . $path));
+        $entry->appendChild($link);
+
+        if (strtolower($cmisEntry['properties']['ObjectTypeId']['value']) == 'folder')
+        {
+            $link = $feed->newElement('link');
+            $link->appendChild($feed->newAttr('rel','cmis-folderparent'));
+            $link->appendChild($feed->newAttr('href', CMIS_BASE_URI . 'folder/' . $path));
+            $entry->appendChild($link);
+            $link = $feed->newElement('link');
+            $link->appendChild($feed->newAttr('rel','cmis-children'));
+            $link->appendChild($feed->newAttr('href', CMIS_BASE_URI
+                                                    . strtolower($cmisEntry['properties']['ObjectTypeId']['value'])
+                                                    . '/' . $path . '/' . urlencode($cmisEntry['properties']['Name']['value'])
+                                                    . '/children'));
+            $entry->appendChild($link);
+            $link = $feed->newElement('link');
+            $link->appendChild($feed->newAttr('rel','cmis-descendants'));
+            $link->appendChild($feed->newAttr('href', CMIS_BASE_URI
+                                                    . strtolower($cmisEntry['properties']['ObjectTypeId']['value'])
+                                                    . '/' . $path . '/' . urlencode($cmisEntry['properties']['Name']['value']) 
+                                                    . '/descendants'));
+            $entry->appendChild($link);
+        }
+
+        $link = $feed->newElement('link');
+        $link->appendChild($feed->newAttr('rel','cmis-type'));
+        $link->appendChild($feed->newAttr('href', CMIS_BASE_URI . 'type/' . strtolower($cmisEntry['properties']['ObjectTypeId']['value'])));
+        $entry->appendChild($link);
+        $link = $feed->newElement('link');
+        $link->appendChild($feed->newAttr('rel','cmis-repository'));
+        $link->appendChild($feed->newAttr('href', CMIS_BASE_URI . 'repository'));
+        $entry->appendChild($link);
+        // end links
+
+        $entry->appendChild($feed->newElement('summary', $cmisEntry['properties']['Name']['value']));
+        $entry->appendChild($feed->newElement('title', $cmisEntry['properties']['Name']['value']));
+
+        // main CMIS entry
+        $objectElement = $feed->newElement('cmis:object');
+        $propertiesElement = $feed->newElement('cmis:properties');
+
+        foreach($cmisEntry['properties'] as $propertyName => $property)
+        {
+            $propElement = $feed->newElement('cmis:' . $property['type']);
+            $propElement->appendChild($feed->newAttr('cmis:name', $propertyName));
+            $feed->newField('value', CMISUtil::boolToString($property['value']), $propElement);
+            $propertiesElement->appendChild($propElement);
+        }
+
+        $objectElement->appendChild($propertiesElement);
+        $entry->appendChild($objectElement);
+    }
+
+}
+
+?>
diff --git a/webservice/atompub/cmis/ObjectService.inc.php b/webservice/atompub/cmis/ObjectService.inc.php
new file mode 100644
index 0000000..728de1f
--- /dev/null
+++ b/webservice/atompub/cmis/ObjectService.inc.php
@@ -0,0 +1,37 @@
+<?php
+
+require_once KT_LIB_DIR . '/api/ktcmis/ktcmis.inc.php';
+
+/**
+ * CMIS Service class which hooks into the KnowledgeTree interface
+ * for processing of CMIS queries and responses via atompub/webservices
+ */
+
+class ObjectService extends KTObjectService {
+
+    /**
+     * Fetches the properties for the specified object
+     *
+     * @param string $repositoryId
+     * @param string $objectId
+     * @param boolean $includeAllowableActions
+     * @param boolean $includeRelationships
+     * @param boolean $returnVersion
+     * @param string $filter
+     * @return object CMIS object properties
+     */
+    public function getProperties($repositoryId, $objectId, $includeAllowableActions, $includeRelationships,
+                                  $returnVersion = false, $filter = '')
+    {
+        $result = parent::getProperties($repositoryId, $objectId, $includeAllowableActions,
+                                        $returnVersion, $filter);
+
+        if ($result['status_code'] == 0)
+        {
+            return $result['results'];
+        }
+    }
+
+}
+
+?>
diff --git a/webservice/atompub/cmis/RepositoryService.inc.php b/webservice/atompub/cmis/RepositoryService.inc.php
new file mode 100644
index 0000000..55a3a80
--- /dev/null
+++ b/webservice/atompub/cmis/RepositoryService.inc.php
@@ -0,0 +1,85 @@
+<?php
+
+/**
+ * CMIS Service class which hooks into the KnowledgeTree interface
+ * for processing of CMIS queries and responses via atompub/webservices
+ */
+
+require_once KT_LIB_DIR . '/api/ktcmis/ktcmis.inc.php';
+
+class RepositoryService extends KTRepositoryService {
+
+    /**
+    * Fetches a list of available repositories
+    *
+    * @return cmisRepositoryEntryType[]
+    */
+    public function getRepositories()
+    {
+        $result = parent::getRepositories();
+
+        if ($result['status_code'] == 0)
+        {
+            return $result['results'];
+        }
+    }
+
+    /**
+     * Fetches information about the selected repository
+     *
+     * @param string $repositoryId
+     * @return cmisRepositoryInfoType
+     */
+    public function getRepositoryInfo($repositoryId)
+    {
+        $result = parent::getRepositoryInfo($repositoryId);
+
+        if ($result['status_code'] == 0)
+        {
+            return $result['results'];
+        }
+    }
+
+    /**
+     * Fetch the list of supported object types for the selected repository
+     *
+     * @param string $repositoryId The ID of the repository for which object types must be returned
+     * @param string $typeId The type to return, ALL if not set
+     * @param boolean $returnPropertyDefinitions Return property definitions as well if TRUE
+     * @param int $maxItems The maximum number of items to return
+     * @param int $skipCount The number of items to skip before starting to return results
+     * @param boolean $hasMoreItems TRUE if there are more items to return than were requested
+     * @return cmisTypeDefinitionType[]
+     */
+    public function getTypes($repositoryId, $typeId = '', $returnPropertyDefinitions = false,
+                      $maxItems = 0, $skipCount = 0, &$hasMoreItems = false)
+    {
+        $result = parent::getTypes($repositoryId, $typeId, $returnPropertyDefinitions,
+                                $maxItems, $skipCount, $hasMoreItems);
+
+        if ($result['status_code'] == 0)
+        {
+            return $result['results'];
+        }
+    }
+
+    /**
+     * Fetch the object type definition for the requested type
+     *
+     * @param string $repositoryId
+     * @param string $typeId
+     * @return cmisTypeDefinitionType
+     */
+    public function getTypeDefinition($repositoryId, $typeId)
+    {
+        $result = parent::getTypeDefinition($repositoryId, $typeId);
+
+        if ($result['status_code'] == 0)
+        {
+            return $result['results'];
+        }
+    }
+
+}
+
+?>
diff --git a/webservice/atompub/cmis/index.php b/webservice/atompub/cmis/index.php
new file mode 100644
index 0000000..9af9909
--- /dev/null
+++ b/webservice/atompub/cmis/index.php
@@ -0,0 +1,127 @@
+<?php
+
+/**
+ * Framework for an Atom Publication Protocol Service
+ *
+ * KnowledgeTree Community Edition
+ * Document Management Made Simple
+ * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Portions copyright The Jam Warehouse Software (Pty) Limited
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License version 3 as published by the
+ * Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
+ * California 94120-7775, or email info@knowledgetree.com.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "Powered by
+ * KnowledgeTree" logo and retain the original copyright notice. If the display of the
+ * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
+ * must display the words "Powered by KnowledgeTree" and retain the original
+ * copyright notice.
+ * Contributor( s):
+ * 				Mark Holtzhausen <mark@knowledgetree.com>
+ * 				Paul Barrett <paul@knowledgetree.com>
+ *
+ */
+
+require_once('../../../config/dmsDefaults.php');
+//include_once('lib/cmis/KTCMISAPPFeed.inc.php');
+
+define('KT_APP_BASE_URI', "http://".$_SERVER['HTTP_HOST'].dirname($_SERVER['PHP_SELF']).'/?/');
+define('KT_APP_SYSTEM_URI', "http://".$_SERVER['HTTP_HOST']);
+define('KT_ATOM_LIB_FOLDER', '../../classes/atompub/');
+//echo KT_ATOM_LIB_FOLDER.'KT_atom_server.inc.php';exit;
+define ('CMIS_APP_BASE_URI', trim(KT_APP_BASE_URI, '/'));
+define('CMIS_APP_SYSTEM_URI', KT_APP_SYSTEM_URI);
+define ('CMIS_ATOM_LIB_FOLDER', trim(KT_ATOM_LIB_FOLDER, '/') . '/cmis/');
+
+// fetch username and password for auth;  note that this apparently only works when PHP is run as an apache module
+// TODO method to fetch username and password when running PHP as CGI, if possible
+// HTTP Basic Auth:
+$username = $_SERVER['PHP_AUTH_USER'];
+$password = $_SERVER['PHP_AUTH_PW'];
+
+/**
+ * Includes
+ */
+include_once(CMIS_ATOM_LIB_FOLDER.'KT_cmis_atom_server.inc.php');
+include_once(CMIS_ATOM_LIB_FOLDER.'KT_cmis_atom_baseDoc.inc.php');
+include_once(CMIS_ATOM_LIB_FOLDER.'KT_cmis_atom_responseFeed.inc.php');				//Containing the response feed class allowing easy atom feed generation
+include_once(CMIS_ATOM_LIB_FOLDER.'KT_cmis_atom_serviceDoc.inc.php');          //Containing the servicedoc class allowing easy ServiceDocument generation
+include_once(CMIS_ATOM_LIB_FOLDER.'KT_cmis_atom_service.inc.php');          //Containing the servicedoc class allowing easy ServiceDocument generation
+
+include_once('KT_cmis_atom_server.services.inc.php');
+
+
+//Start the AtomPubProtocol Routing Engine
+$APP = new KT_cmis_atom_server();
+$APP->initServiceDocument();
+$APP->addWorkspaceTag('dms','atom:title','KnowledgeTree DMS');
+/**
+ * Register Services
+ *
+ * Registered services are classes extended from KT_atom_service
+ * The registration process takes the following parameters
+ * 		Workspace		:The workspace within which the service collection will be grouped
+ * 		ServiceName		:This is the name by which the service/collection is exposed
+ * 		ServiceClass	:This is the class name of the class to be instantiated when this service is accessed
+ * 		Title			:This is the title given to the service/collection in the servicedocument
+ *      http://ktatompub/index.php?/service/param1/param2
+ *      http://ktatompub/?/folder/children/whatfoldertolookat
+ *      http://ktatompub/{folder/folder2/folder3/}service/param1/param2
+*/
+$APP->registerService('dms', 'folder', 'KT_cmis_atom_service_folder', 'Root Folder Children Collection', array($APP->repositoryInfo['rootFolderId'], 'children'), 'root-children');
+$APP->registerService('dms', 'folder', 'KT_cmis_atom_service_folder', 'Root Folder Children Collection', array($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');
+
+//Execute the current url/header request
+$APP->execute();
+
+//echo '<pre>'.print_r($APP,true).'</pre>';
+
+//Render the resulting feed response
+$APP->render();
+
+// TODO response if failed auth, need generic response which can be used by all code
+
+//$arg = (isset($query[1]) ? $query[1] : '');
+//
+//switch($arg)
+//{
+//    case 'checkedout':
+//        include('services/cmis/checkedout.inc.php');
+//        break;
+//    case 'document':
+//        include('services/cmis/document.inc.php');
+//        break;
+//    case 'folder':
+//        include('services/cmis/folder.inc.php');
+//        break;
+//    case 'type':
+//    case 'types':
+//        include('services/cmis/types.inc.php');
+//        break;
+//    case 'repository':
+//    default:
+//        include('services/cmis/servicedocument.inc.php');
+//        break;
+//}
+
+?>
diff --git a/webservice/classes/atompub/cmis/KT_cmis_atom_baseDoc.inc.php b/webservice/classes/atompub/cmis/KT_cmis_atom_baseDoc.inc.php
new file mode 100644
index 0000000..fc24e21
--- /dev/null
+++ b/webservice/classes/atompub/cmis/KT_cmis_atom_baseDoc.inc.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Framework for an Atom Publication Protocol Service
+ *
+ * KnowledgeTree Community Edition
+ * Document Management Made Simple
+ * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Portions copyright The Jam Warehouse Software (Pty) Limited
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License version 3 as published by the
+ * Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
+ * California 94120-7775, or email info@knowledgetree.com.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "Powered by
+ * KnowledgeTree" logo and retain the original copyright notice. If the display of the
+ * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
+ * must display the words "Powered by KnowledgeTree" and retain the original
+ * copyright notice.
+ * Contributor( s):
+ * 				Mark Holtzhausen <mark@knowledgetree.com>
+ * 				Paul Barrett <paul@knowledgetree.com>
+ *
+ */
+
+/**
+ * Includes
+ */
+
+include_once(KT_ATOM_LIB_FOLDER.'KT_atom_baseDoc.inc.php'); //Containing the parent class allowing easy XML manipulation
+
+class KT_cmis_atom_baseDoc extends KT_atom_baseDoc {
+
+    // override and extend as needed
+
+}
+
+?>
\ No newline at end of file
diff --git a/webservice/classes/atompub/cmis/KT_cmis_atom_responseFeed.inc.php b/webservice/classes/atompub/cmis/KT_cmis_atom_responseFeed.inc.php
new file mode 100644
index 0000000..3e0ffa9
--- /dev/null
+++ b/webservice/classes/atompub/cmis/KT_cmis_atom_responseFeed.inc.php
@@ -0,0 +1,16 @@
+<?php
+
+include_once(KT_ATOM_LIB_FOLDER.'KT_atom_responseFeed.inc.php');
+
+class KT_cmis_atom_responseFeed extends KT_atom_responseFeed {
+
+    // override and extend as needed
+
+}
+
+class KT_cmis_atom_ResponseFeed_GET extends KT_cmis_atom_responseFeed{}
+class KT_cmis_atom_ResponseFeed_PUT extends KT_cmis_atom_responseFeed{}
+class KT_cmis_atom_ResponseFeed_POST extends KT_cmis_atom_responseFeed{}
+class KT_cmis_atom_ResponseFeed_DELETE extends KT_cmis_atom_responseFeed{}
+
+?>
\ No newline at end of file
diff --git a/webservice/classes/atompub/cmis/KT_cmis_atom_server.inc.php b/webservice/classes/atompub/cmis/KT_cmis_atom_server.inc.php
new file mode 100644
index 0000000..03db4a8
--- /dev/null
+++ b/webservice/classes/atompub/cmis/KT_cmis_atom_server.inc.php
@@ -0,0 +1,107 @@
+<?php
+
+include_once(KT_ATOM_LIB_FOLDER . 'KT_atom_server.inc.php');
+include_once('RepositoryService.inc.php');
+
+class KT_cmis_atom_server extends KT_atom_server {
+
+    // override and extend as needed
+    public $repositoryInfo;
+
+    public function initServiceDocument()
+    {
+		$queryArray = split('/', trim($_SERVER['QUERY_STRING'], '/'));
+		$workspace = strtolower(trim($queryArray[0]));
+        if ($workspace == 'servicedocument')
+        {
+            include 'services/cmis/RepositoryService.inc.php';
+            $RepositoryService = new RepositoryService();
+
+            // fetch data for response
+            $repositories = $RepositoryService->getRepositories();
+            // fetch for default first repo;  NOTE that this will probably have to change at some point, quick and dirty for now
+            $this->repositoryInfo = $RepositoryService->getRepositoryInfo($repositories[0]['repositoryId']);
+        }
+    }
+    
+	public function serviceDocument()
+    {
+		$service = new KT_cmis_atom_serviceDoc(KT_APP_BASE_URI);
+
+		foreach($this->services as $workspace => $collection)
+        {
+			//Creating the Default Workspace for use with standard atomPub Clients
+			$ws = $service->newWorkspace();
+
+            $hadDetail=false;
+			if(isset($this->workspaceDetail[$workspace]))if(is_array($this->workspaceDetail[$workspace])){
+				foreach ($this->workspaceDetail[$workspace] as $wsTag=>$wsValue){
+					$ws->appendChild($service->newElement($wsTag,$wsValue));
+					$hadDetail=true;
+				}
+			}
+			if(!$hadDetail){
+				$ws->appendChild($service->newElement('atom:title',$workspace));
+			}
+
+            $ws->appendChild($service->newAttr('cmis:repositoryRelationship', $this->repositoryInfo['repositoryRelationship']));
+            
+            // repository information
+            $element = $service->newElement('cmis:repositoryInfo');
+            foreach($this->repositoryInfo as $key => $repoData)
+            {
+                if ($key == 'rootFolderId')
+                {
+                    $repoData = CMIS_APP_BASE_URI . 'folder/' . $repoData;
+                }
+
+                if (!is_array($repoData))
+                {
+                    $element->appendChild($service->newElement('cmis:' . $key, $repoData));
+                }
+                else
+                {
+                    $elementSub = $service->newElement('cmis:' . $key);
+                    foreach($repoData as $key2 => $data)
+                    {
+                        $elementSub->appendChild($service->newElement('cmis:' . $key2, CMISUtil::boolToString($data)));
+                    }
+                    $element->appendChild($elementSub);
+                }
+            }
+            $ws->appendChild($element);
+
+			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);
+                }
+			}
+		}
+
+		$this->output = $service->getAPPdoc();
+	}
+
+    public function registerService($workspace = NULL, $serviceName = NULL, $serviceClass = NULL, $title = NULL, 
+                                    $serviceParameters = NULL, $collectionType = NULL)
+    {
+		$workspace = strtolower(trim($workspace));
+		$serviceName = strtolower(trim($serviceName));
+
+		$serviceRecord = array(
+			'fileName'		=> $fileName,
+			'serviceClass'	=> $serviceClass,
+			'title'			=> $title,
+            'parameters'    => $serviceParameters,
+            'collectionType'    => $collectionType
+		);
+
+		$this->services[$workspace][$serviceName][] = $serviceRecord;
+	}
+
+}
+
+?>
\ No newline at end of file
diff --git a/webservice/classes/atompub/cmis/KT_cmis_atom_service.inc.php b/webservice/classes/atompub/cmis/KT_cmis_atom_service.inc.php
new file mode 100644
index 0000000..26225ab
--- /dev/null
+++ b/webservice/classes/atompub/cmis/KT_cmis_atom_service.inc.php
@@ -0,0 +1,10 @@
+<?php
+
+include_once(KT_ATOM_LIB_FOLDER.'KT_atom_service.inc.php');
+
+class KT_cmis_atom_service extends KT_atom_service {
+
+	// override and extend as needed
+
+}
+?>
\ No newline at end of file
diff --git a/webservice/classes/atompub/cmis/KT_cmis_atom_serviceDoc.inc.php b/webservice/classes/atompub/cmis/KT_cmis_atom_serviceDoc.inc.php
new file mode 100644
index 0000000..082535e
--- /dev/null
+++ b/webservice/classes/atompub/cmis/KT_cmis_atom_serviceDoc.inc.php
@@ -0,0 +1,125 @@
+<?php
+/**
+ * Framework for an Atom Publication Protocol Service
+ *
+ * KnowledgeTree Community Edition
+ * Document Management Made Simple
+ * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Portions copyright The Jam Warehouse Software (Pty) Limited
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License version 3 as published by the
+ * Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
+ * California 94120-7775, or email info@knowledgetree.com.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "Powered by
+ * KnowledgeTree" logo and retain the original copyright notice. If the display of the
+ * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
+ * must display the words "Powered by KnowledgeTree" and retain the original
+ * copyright notice.
+ * Contributor( s): 
+ * 				Mark Holtzhausen <mark@knowledgetree.com>
+ * 				Paul Barrett <paul@knowledgetree.com>
+ *
+ */
+
+
+/**
+ * Includes
+ */
+include_once(KT_ATOM_LIB_FOLDER.'KT_atom_serviceDoc.inc.php');
+//include_once('KT_atom_baseDoc.inc.php');
+
+class KT_cmis_atom_serviceDoc extends KT_atom_serviceDoc {
+
+    // override and extend as needed
+
+    public $repositoryInfo = array();
+
+    public function __construct($baseURI = NULL)
+    {
+		parent::__construct();
+
+        // get repositoryInfo
+        // NOTE currently we only support one repository, which will be the first one found in the repositories.xml config
+        // TODO multiple repositories as individual workspaces
+
+        include 'services/cmis/RepositoryService.inc.php';
+        $RepositoryService = new RepositoryService();
+
+        // fetch data for response
+        $repositories = $RepositoryService->getRepositories();
+        // fetch for default first repo;  NOTE that this will probably have to change at some point, quick and dirty for now
+        $this->repositoryInfo = $RepositoryService->getRepositoryInfo($repositories[0]['repositoryId']);
+	}
+	
+	protected function constructServiceDocumentHeaders()
+    {
+		$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'));
+        $this->service =& $service;
+		$this->DOM->appendChild($this->service);
+	}
+	
+	public function &newCollection($url = NULL, $title = NULL, $cmisCollectionType = 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(isset($ws))$ws->appendChild($collection);
+		return $collection;
+	}
+	
+}
+
+/**
+<?xml version="1.0" encoding="utf-8"?>
+<service xmlns="http://www.w3.org/2007/app" xmlns:atom="http://www.w3.org/2005/Atom">
+  <workspace>
+    <atom:title>Main Site</atom:title>
+    <collection href="http://example.org/blog/main" >
+      <atom:title>My Blog Entries</atom:title>
+      <categories href="http://example.com/cats/forMain.cats" />
+    </collection>
+    <collection href="http://example.org/blog/pic" >
+      <atom:title>Pictures</atom:title>
+      <accept>image/png</accept>
+      <accept>image/jpeg</accept>
+      <accept>image/gif</accept>
+    </collection>
+  </workspace>
+  <workspace>
+    <atom:title>Sidebar Blog</atom:title>
+    <collection href="http://example.org/sidebar/list" >
+      <atom:title>Remaindered Links</atom:title>
+      <accept>application/atom+xml;type=entry</accept>
+      <categories fixed="yes">
+        <atom:category scheme="http://example.org/extra-cats/" term="joke" />
+        <atom:category scheme="http://example.org/extra-cats/" term="serious" />
+      </categories>
+    </collection>
+  </workspace>
+</service>
+
+ */
+
+
+?>
\ No newline at end of file