From d37d203c7311a47b7e8280cf42e21438a8493f91 Mon Sep 17 00:00:00 2001
From: David Caruana <david.caruana@alfresco.com>
Date: Thu, 29 Oct 2009 17:23:46 +0000
Subject: [PATCH] Merged CMIS063 to HEAD   15929: Incorporate Chemistry TCK
 into Alfresco

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17237 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../org/alfresco/cmis/cmis.get.html.ftl       |   33 +-
 .../webscripts/org/alfresco/cmis/cmis.get.js  |    5 +-
 .../cmis/rest/test/BaseCMISWebScriptTest.java |  675 -----
 .../cmis/rest/test/CMISCustomTypeTest.java    |  453 ----
 .../repo/cmis/rest/test/CMISTest.java         | 1534 ------------
 .../repo/cmis/rest/test/CMISTestRunner.java   |  234 --
 .../rest/test/CMISTestRunnerWebScript.java    |   70 +-
 .../checkinandupdatedocument.atomentry.xml    |    5 -
 .../rest/test/checkindocument.atomentry.xml   |    2 -
 .../rest/test/createatomentry.atomentry.xml   |    8 -
 .../test/createcustomdocument.atomentry.xml   |   13 -
 .../test/createcustomfolder.atomentry.xml     |   11 -
 .../rest/test/createdocument.atomentry.xml    |   11 -
 .../rest/test/createdocument2.atomentry.xml   |   10 -
 .../test/createdocumentBase64.atomentry.xml   |   21 -
 .../cmis/rest/test/createdocumentBase64.txt   |    1 -
 .../createdocumentNoContent.atomentry.xml     |   10 -
 .../cmis/rest/test/createfolder.atomentry.xml |   10 -
 .../test/createrelationship.atomentry.xml     |    9 -
 .../repo/cmis/rest/test/query.cmisquery.xml   |    5 -
 .../test/queryallowableactions.cmisquery.xml  |    6 -
 .../test/updatecustomdocument.atomentry.xml   |   10 -
 .../rest/test/updatedocument.atomentry.xml    |    5 -
 .../org/alfresco/repo/cmis/rest/xsd/ATOM.xsd  |  447 ----
 .../alfresco/repo/cmis/rest/xsd/CMIS-Core.xsd | 1229 ---------
 .../repo/cmis/rest/xsd/CMIS-RestAtom.xsd      |  264 --
 .../repo/cmis/rest/xsd/CMISSchemaTest.java    |  265 --
 .../repo/cmis/rest/xsd/CMISValidator.java     |  160 --
 .../alfresco/repo/cmis/rest/xsd/address.rng   |   27 -
 .../alfresco/repo/cmis/rest/xsd/address.xml   |   12 -
 .../rest/xsd/examples/AllowableActions.xml    |   22 -
 .../repo/cmis/rest/xsd/examples/ChangeLog.xml |  352 ---
 .../cmis/rest/xsd/examples/DocumentEntry.xml  |  107 -
 .../rest/xsd/examples/DocumentEntryPWC.xml    |  114 -
 .../xsd/examples/DocumentEntryWithChanges.xml |  111 -
 .../cmis/rest/xsd/examples/FolderChildren.xml |  336 ---
 .../rest/xsd/examples/FolderDescendants.xml   |  493 ----
 .../cmis/rest/xsd/examples/FolderEntry.xml    |   70 -
 .../cmis/rest/xsd/examples/PolicyEntry.xml    |   61 -
 .../repo/cmis/rest/xsd/examples/Query.xml     |    8 -
 .../rest/xsd/examples/RelationshipEntry.xml   |   61 -
 .../repo/cmis/rest/xsd/examples/Service.xml   |   74 -
 .../rest/xsd/examples/TypeDocumentWith.xml    |  401 ---
 .../rest/xsd/examples/TypeDocumentWithout.xml |   39 -
 .../cmis/rest/xsd/examples/TypeFolderWith.xml |  211 --
 .../rest/xsd/examples/TypeFolderWithout.xml   |   37 -
 .../xsd/examples/TypeRelationshipWith.xml     |  198 --
 .../xsd/examples/TypeRelationshipWithout.xml  |   37 -
 .../rest/xsd/examples/example_atomentry.xml   |   26 -
 .../example_folderchildren_alfresco.xml       |   45 -
 .../repo/cmis/rest/xsd/xhtml1-strict.xsd      | 2208 -----------------
 .../org/alfresco/repo/cmis/rest/xsd/xml.xsd   |   48 -
 52 files changed, 64 insertions(+), 10540 deletions(-)
 delete mode 100644 source/java/org/alfresco/repo/cmis/rest/test/BaseCMISWebScriptTest.java
 delete mode 100644 source/java/org/alfresco/repo/cmis/rest/test/CMISCustomTypeTest.java
 delete mode 100644 source/java/org/alfresco/repo/cmis/rest/test/CMISTest.java
 delete mode 100644 source/java/org/alfresco/repo/cmis/rest/test/CMISTestRunner.java
 delete mode 100644 source/java/org/alfresco/repo/cmis/rest/test/checkinandupdatedocument.atomentry.xml
 delete mode 100644 source/java/org/alfresco/repo/cmis/rest/test/checkindocument.atomentry.xml
 delete mode 100644 source/java/org/alfresco/repo/cmis/rest/test/createatomentry.atomentry.xml
 delete mode 100644 source/java/org/alfresco/repo/cmis/rest/test/createcustomdocument.atomentry.xml
 delete mode 100644 source/java/org/alfresco/repo/cmis/rest/test/createcustomfolder.atomentry.xml
 delete mode 100644 source/java/org/alfresco/repo/cmis/rest/test/createdocument.atomentry.xml
 delete mode 100644 source/java/org/alfresco/repo/cmis/rest/test/createdocument2.atomentry.xml
 delete mode 100644 source/java/org/alfresco/repo/cmis/rest/test/createdocumentBase64.atomentry.xml
 delete mode 100644 source/java/org/alfresco/repo/cmis/rest/test/createdocumentBase64.txt
 delete mode 100644 source/java/org/alfresco/repo/cmis/rest/test/createdocumentNoContent.atomentry.xml
 delete mode 100644 source/java/org/alfresco/repo/cmis/rest/test/createfolder.atomentry.xml
 delete mode 100644 source/java/org/alfresco/repo/cmis/rest/test/createrelationship.atomentry.xml
 delete mode 100644 source/java/org/alfresco/repo/cmis/rest/test/query.cmisquery.xml
 delete mode 100644 source/java/org/alfresco/repo/cmis/rest/test/queryallowableactions.cmisquery.xml
 delete mode 100644 source/java/org/alfresco/repo/cmis/rest/test/updatecustomdocument.atomentry.xml
 delete mode 100644 source/java/org/alfresco/repo/cmis/rest/test/updatedocument.atomentry.xml
 delete mode 100755 source/java/org/alfresco/repo/cmis/rest/xsd/ATOM.xsd
 delete mode 100755 source/java/org/alfresco/repo/cmis/rest/xsd/CMIS-Core.xsd
 delete mode 100755 source/java/org/alfresco/repo/cmis/rest/xsd/CMIS-RestAtom.xsd
 delete mode 100644 source/java/org/alfresco/repo/cmis/rest/xsd/CMISSchemaTest.java
 delete mode 100644 source/java/org/alfresco/repo/cmis/rest/xsd/CMISValidator.java
 delete mode 100644 source/java/org/alfresco/repo/cmis/rest/xsd/address.rng
 delete mode 100644 source/java/org/alfresco/repo/cmis/rest/xsd/address.xml
 delete mode 100644 source/java/org/alfresco/repo/cmis/rest/xsd/examples/AllowableActions.xml
 delete mode 100644 source/java/org/alfresco/repo/cmis/rest/xsd/examples/ChangeLog.xml
 delete mode 100644 source/java/org/alfresco/repo/cmis/rest/xsd/examples/DocumentEntry.xml
 delete mode 100644 source/java/org/alfresco/repo/cmis/rest/xsd/examples/DocumentEntryPWC.xml
 delete mode 100644 source/java/org/alfresco/repo/cmis/rest/xsd/examples/DocumentEntryWithChanges.xml
 delete mode 100644 source/java/org/alfresco/repo/cmis/rest/xsd/examples/FolderChildren.xml
 delete mode 100644 source/java/org/alfresco/repo/cmis/rest/xsd/examples/FolderDescendants.xml
 delete mode 100644 source/java/org/alfresco/repo/cmis/rest/xsd/examples/FolderEntry.xml
 delete mode 100644 source/java/org/alfresco/repo/cmis/rest/xsd/examples/PolicyEntry.xml
 delete mode 100644 source/java/org/alfresco/repo/cmis/rest/xsd/examples/Query.xml
 delete mode 100644 source/java/org/alfresco/repo/cmis/rest/xsd/examples/RelationshipEntry.xml
 delete mode 100644 source/java/org/alfresco/repo/cmis/rest/xsd/examples/Service.xml
 delete mode 100644 source/java/org/alfresco/repo/cmis/rest/xsd/examples/TypeDocumentWith.xml
 delete mode 100644 source/java/org/alfresco/repo/cmis/rest/xsd/examples/TypeDocumentWithout.xml
 delete mode 100644 source/java/org/alfresco/repo/cmis/rest/xsd/examples/TypeFolderWith.xml
 delete mode 100644 source/java/org/alfresco/repo/cmis/rest/xsd/examples/TypeFolderWithout.xml
 delete mode 100644 source/java/org/alfresco/repo/cmis/rest/xsd/examples/TypeRelationshipWith.xml
 delete mode 100644 source/java/org/alfresco/repo/cmis/rest/xsd/examples/TypeRelationshipWithout.xml
 delete mode 100644 source/java/org/alfresco/repo/cmis/rest/xsd/examples/example_atomentry.xml
 delete mode 100644 source/java/org/alfresco/repo/cmis/rest/xsd/examples/example_folderchildren_alfresco.xml
 delete mode 100644 source/java/org/alfresco/repo/cmis/rest/xsd/xhtml1-strict.xsd
 delete mode 100644 source/java/org/alfresco/repo/cmis/rest/xsd/xml.xsd

diff --git a/config/alfresco/templates/webscripts/org/alfresco/cmis/cmis.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/cmis/cmis.get.html.ftl
index 784e2ad794..c174bdfa26 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/cmis/cmis.get.html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/cmis/cmis.get.html.ftl
@@ -5,8 +5,8 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
   <title>Alfresco CMIS</title>
-  <link rel="stylesheet" href="/css-boilerplate/screen.css" type="text/css" media="screen" charset="utf-8">
-  <!--[if lte IE 6]><link rel="stylesheet" href="/css-boilerplate/lib/ie.css" type="text/css" media="screen" charset="utf-8"><![endif]-->
+  <link rel="stylesheet" href="${url.context}/css-boilerplate/screen.css" type="text/css" media="screen" charset="utf-8">
+  <!--[if lte IE 6]><link rel="stylesheet" href="${url.context}/css-boilerplate/lib/ie.css" type="text/css" media="screen" charset="utf-8"><![endif]-->
   <script type="text/javascript">
     function toggleDisplay(toggle)
     {
@@ -30,7 +30,7 @@
 
 <div id="page">
   <div id="header">
-    <a href="http://www.alfresco.com"><img id="alflogo" src="/images/logo/AlfrescoLogo200.png"/></a><a href="http://www.oasis-open.org/committees/cmis"><img id="alflogo" height="55px" src="/images/logo/cmis_logo_100.png"/></a>
+    <a href="http://www.alfresco.com"><img id="alflogo" src="${url.context}/images/logo/AlfrescoLogo200.png"/></a><a href="http://www.oasis-open.org/committees/cmis"><img id="alflogo" height="55px" src="${url.context}/images/logo/cmis_logo_100.png"/></a>
   </div>
   
   <div id="body" class="wrapper">
@@ -83,22 +83,24 @@
       <h3>CMIS AtomPub TCK</h3>
       <p>Point the TCK (Test Compatibility Kit) at your CMIS Repository AtomPub Service Document. Provide credentials (or leave blank, if authentication not required) and adjust options as necessary. Hit the '<strong>Start TCK</strong>' button for a test report.</p>
       <p><em>Tip: Enable the 'Trace Reqs/Responses' option for examples of conversations with a CMIS Repository via AtomPub.</em></p>
-      <p><em>Note: We have re-packaged and contributed this TCK to <a href="http://incubator.apache.org/chemistry/">Apache Chemistry</a>. We'll very soon replace this TCK with the Apache Chemistry version.</em></p>
+      <p><em>Note: This TCK is now contributed to <a href="http://incubator.apache.org/chemistry/">Apache Chemistry</a>.</em></p>
 
       <form action="${url.serviceContext}/api/cmis/test" method="post" class="hform">
       <fieldset>
         <legend>CMIS Repository</legend>
-        <p><label>Service Document</label><input type="text" name="url" size="50" value="${absurl(url.serviceContext)}/api/cmis"></p>
-        <p><label>Username/Password</label><input type="text" name="user" value="admin/admin"></p>
+        <p><label>Service Document</label><input type="text" name="chemistry.tck.serviceUrl" size="50" value="${absurl(url.serviceContext)}/api/cmis"></p>
+        <p><label>Username</label><input type="text" name="chemistry.tck.user" value="admin"></p>
+        <p><label>Password</label><input type="text" name="chemistry.tck.password" value="admin"></p>
       </fieldset>
       <fieldset>
         <legend>Options</legend>
-        <p class="checkbox"><label>Validate Responses</label><input type="checkbox" name="validate" value="true" checked="checked"></p>
-        <p class="checkbox"><label>Trace Reqs/Responses</label><input type="checkbox" name="trace" value="true"><p>
-        <p><label>Tests (use * for wildcard)</label><input name="tests" value="*"></p>
-        <p><label><span id="availtests" class="toggle" onclick="return toggleDisplay(this)">+</span> Available Tests</label>
+        <p class="checkbox"><label>Validate Responses</label><input type="checkbox" name="chemistry.tck.validate" value="true"[#if tckOptions.validate] checked="checked"[/#if]></p>
+        <p class="checkbox"><label>Fail on Validation Error</label><input type="checkbox" name="chemistry.tck.failOnValidationError" value="true"[#if tckOptions.failOnValidationError] checked="checked"[/#if]></p>
+        <p class="checkbox"><label>Trace Reqs/Responses</label><input type="checkbox" name="chemistry.tck.traceRequests" value="true"[#if tckOptions.traceRequests] checked="checked"[/#if]><p>
+        <p><label>Tests</label><input name="chemistry.tck.tests" value="RepositoryServiceTest.testRepository"></p>
+        <p><label><span id="availtests" class="toggle" onclick="return toggleDisplay(this)">[+]</span> Available Tests</label>
         <table id="availtests_body" style="display: none;">
-        [#list tests as test]<tr><td>${test}</td></tr>[/#list]
+        [#list tckTests as test]<tr><td>${test}</td></tr>[/#list]
         </table></p>
       </fieldset>
       <p><input type="submit" name="submit" value="Start TCK" class="button"></p>
@@ -116,8 +118,13 @@
       <ul>
         <li><a href="http://wiki.alfresco.com/wiki/CMIS">CMIS Wiki</a></li>
         <li><a href="http://blogs.alfresco.com/cmis/">CMIS Blog</a></li>
-        <li><a href="http://wiki.alfresco.com/wiki/Download_Community_Edition">Download</a> Repository and TCK</a></li>
-        <li><a href="http://wiki.alfresco.com/wiki/Alfresco_SVN_Development_Environment">Source Code</a> for Repository and TCK</li>
+        <li><a href="http://wiki.alfresco.com/wiki/Download_Community_Edition">Download</a> Repository</a></li>
+        <li><a href="http://wiki.alfresco.com/wiki/Alfresco_SVN_Development_Environment">Source Code</a> for Repository</li>
+      </ul>
+      <h3>Apache Chemistry</h3>
+      <ul>
+        <li><a href="http://incubator.apache.org/chemistry/">Home Page</a></li>
+        <li><a href="http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/">Source Code</a> for TCK</li>
       </ul>
       <h3>Provide Feedback</h3>
       <ul>
diff --git a/config/alfresco/templates/webscripts/org/alfresco/cmis/cmis.get.js b/config/alfresco/templates/webscripts/org/alfresco/cmis/cmis.get.js
index e5dfa44f69..38312d310a 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/cmis/cmis.get.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/cmis/cmis.get.js
@@ -1,5 +1,6 @@
-var testRunner = Packages.org.alfresco.repo.cmis.rest.test.CMISTestRunner();
-model.tests = testRunner.getTestNames("*");
+var tckRunner = Packages.org.apache.chemistry.tck.atompub.tools.TCKRunner();
+model.tckTests = tckRunner.getTestNames();
+model.tckOptions = tckRunner.getOptions();
 model.cmisVersion = cmis.version;
 model.querySupport = cmis.querySupport.label;
 model.joinSupport = cmis.joinSupport.label;
diff --git a/source/java/org/alfresco/repo/cmis/rest/test/BaseCMISWebScriptTest.java b/source/java/org/alfresco/repo/cmis/rest/test/BaseCMISWebScriptTest.java
deleted file mode 100644
index 3ffa0d39f5..0000000000
--- a/source/java/org/alfresco/repo/cmis/rest/test/BaseCMISWebScriptTest.java
+++ /dev/null
@@ -1,675 +0,0 @@
-/*
- * Copyright (C) 2005-2007 Alfresco Software Limited.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
- * As a special exception to the terms and conditions of version 2.0 of 
- * the GPL, you may redistribute this Program in connection with Free/Libre 
- * and Open Source Software ("FLOSS") applications as described in Alfresco's 
- * FLOSS exception.  You should have recieved a copy of the text describing 
- * the FLOSS exception, and it is also available here: 
- * http://www.alfresco.com/legal/licensing"
- */
-package org.alfresco.repo.cmis.rest.test;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.PrintStream;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.util.List;
-import java.util.Map;
-
-import javax.activation.MimeType;
-import javax.activation.MimeTypeParseException;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.validation.Validator;
-
-import junit.framework.Test;
-
-import org.alfresco.abdera.ext.cmis.CMISCapabilities;
-import org.alfresco.abdera.ext.cmis.CMISConstants;
-import org.alfresco.abdera.ext.cmis.CMISExtensionFactory;
-import org.alfresco.abdera.ext.cmis.CMISObject;
-import org.alfresco.abdera.ext.cmis.CMISRepositoryInfo;
-import org.alfresco.error.AlfrescoRuntimeException;
-import org.alfresco.repo.cmis.rest.xsd.CMISValidator;
-import org.alfresco.repo.web.scripts.BaseWebScriptTest;
-import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.util.Base64;
-import org.alfresco.web.scripts.Format;
-import org.alfresco.web.scripts.TestWebScriptServer.GetRequest;
-import org.alfresco.web.scripts.TestWebScriptServer.PostRequest;
-import org.alfresco.web.scripts.TestWebScriptServer.Request;
-import org.alfresco.web.scripts.TestWebScriptServer.Response;
-import org.alfresco.web.scripts.atom.AbderaService;
-import org.alfresco.web.scripts.atom.AbderaServiceImpl;
-import org.apache.abdera.i18n.iri.IRI;
-import org.apache.abdera.model.Collection;
-import org.apache.abdera.model.Entry;
-import org.apache.abdera.model.Feed;
-import org.apache.abdera.model.Link;
-import org.apache.abdera.model.Service;
-import org.apache.abdera.model.Workspace;
-import org.w3c.dom.Document;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-
-/**
- * Base CMIS Web Script Test
- * 
- * @author davidc
- */
-public class BaseCMISWebScriptTest extends BaseWebScriptTest
-{
-    // Repository Access
-    private String serviceUrl = "http://localhost:8080/alfresco/service/api/repository";
-
-    // validation support
-    private CMISValidator cmisValidator = new CMISValidator();
-    private boolean validateResponse = true;
-    
-    // cached responses
-    private AbderaService abdera;
-    private Service service = null;
-    private String queryCapability = null;
-    private Entry testRootFolder = null;
-    private Entry testRunFolder = null;
-    
-    
-    /**
-     * Sets the Repository Service URL
-     * 
-     * @param serviceUrl  serviceURL
-     */
-    public void setServiceUrl(String serviceUrl)
-    {
-        this.serviceUrl = serviceUrl;
-    }
-    
-    /**
-     * Validate Response
-     * 
-     * @param validateResponse
-     */
-    protected void setValidateResponse(boolean validateResponse)
-    {
-        this.validateResponse = validateResponse;
-    }
-
-    
-    @Override
-    protected void setUp()
-        throws Exception
-    {
-        // setup client atom support
-        AbderaServiceImpl abderaImpl = new AbderaServiceImpl();
-        abderaImpl.afterPropertiesSet();
-        abderaImpl.registerExtensionFactory(new CMISExtensionFactory());
-        abdera = abderaImpl;
-
-        super.setUp();
-    }
-
-    
-    /**
-     * Gets the Abdera Service
-     * 
-     * @return  abdera service
-     */
-    protected AbderaService getAbdera()
-    {
-        return abdera;
-    }
-    
-    /**
-     * Gets CMIS Validator
-     * 
-     * @return  CMIS Validator
-     */
-    protected CMISValidator getCMISValidator()
-    {
-        return cmisValidator;
-    }
-    
-    /**
-     * Gets CMIS App Validator
-     * 
-     * @return  CMIS App Validator
-     * 
-     * @throws SAXException 
-     * @throws IOException 
-     */
-    protected Validator getAppValidator()
-        throws IOException, SAXException
-    {
-        return getCMISValidator().getAppValidator();
-    }
-
-    /**
-     * Gets CMIS Atom Validator
-     * 
-     * @return  CMIS App Validator
-     * 
-     * @throws SAXException 
-     * @throws IOException 
-     */
-    protected Validator getAtomValidator()
-        throws IOException, SAXException
-    {
-        return getCMISValidator().getCMISAtomValidator();
-    }
-
-    /**
-     * Asserts XML complies with specified Validator
-     * 
-     * @param xml  xml to assert
-     * @param validator  validator to assert with
-     * @throws IOException
-     * @throws ParserConfigurationException
-     */
-    protected void assertValidXML(String xml, Validator validator)
-        throws IOException, ParserConfigurationException
-    {
-        if (validateResponse)
-        {
-            try
-            {
-                Document document = cmisValidator.getDocumentBuilder().parse(new InputSource(new StringReader(xml)));
-                validator.validate(new DOMSource(document));
-            }
-            catch (SAXException e)
-            {
-                fail(cmisValidator.toString(e, xml));
-            }
-        }
-    }
-     
-    /**
-     * Load text from file specified by class path
-     * 
-     * @param classPath  XML file
-     * @return  XML
-     * @throws IOException
-     */
-    protected String loadString(String classPath)
-        throws IOException
-    {
-        InputStream input = getClass().getResourceAsStream(classPath);
-        if (input == null)
-        {
-            throw new IOException(classPath + " not found.");
-        }
-
-        InputStreamReader reader = new InputStreamReader(input, "UTF-8");
-        StringWriter writer = new StringWriter();
-
-        try
-        {
-            char[] buffer = new char[4096];
-            int bytesRead = -1;
-            while ((bytesRead = reader.read(buffer)) != -1)
-            {
-                writer.write(buffer, 0, bytesRead);
-            }
-            writer.flush();
-        }
-        finally
-        {
-            reader.close();
-            writer.close();
-        }
-        
-        return writer.toString();
-    }
-
-    /**
-     * Send Request to Test Web Script Server (as admin)
-     * 
-     * @param req
-     * @param expectedStatus
-     * @return response
-     * @throws IOException
-     */
-    protected Response sendRequest(Request req, int expectedStatus, Validator responseValidator)
-        throws IOException
-    {
-        return sendRequest(req, expectedStatus, responseValidator, null);
-    }
-    
-    /**
-     * Send Request
-     * 
-     * @param req
-     * @param expectedStatus
-     * @param asUser
-     * @return response
-     * @throws IOException
-     */
-    protected Response sendRequest(Request req, int expectedStatus, Validator responseValidator, String asUser)
-        throws IOException
-    {
-        Response res = sendRequest(req, expectedStatus, asUser);
-        if (responseValidator != null)
-        {
-            try
-            {
-                // Validate response according to validator
-                String resXML = res.getContentAsString();
-                assertValidXML(resXML, responseValidator);
-            }
-            catch (ParserConfigurationException e)
-            {
-                throw new AlfrescoRuntimeException("Failed to validate", e);
-            }
-        }
-        return res;
-    }
-    
-    /**
-     * Default Test Listener
-     */
-    public static class CMISTestListener extends BaseWebScriptTestListener implements WebScriptTestListener
-    {
-        /**
-         * Construct
-         * 
-         * @param writer
-         */
-        public CMISTestListener(PrintStream writer)
-        {
-            super(writer);
-        }
-
-        /* (non-Javadoc)
-         * @see junit.textui.ResultPrinter#startTest(junit.framework.Test)
-         */
-        @Override
-        public void startTest(Test test)
-        {
-            BaseCMISWebScriptTest cmisTest = (BaseCMISWebScriptTest)test;
-            getWriter().println();
-            getWriter().println("*** Test started: " + cmisTest.getName() + " (remote: " + (cmisTest.getRemoteServer() != null) + ")");
-        }
-    }
-    
-    
-    //
-    // General Abdera Helpers
-    //
-    protected Entry getEntry(IRI href)
-        throws Exception
-    {
-        return getEntry(href, null);
-    }
-
-    protected Entry getEntry(IRI href, Map<String, String> args)
-        throws Exception
-    {
-        Request get = new GetRequest(href.toString()).setArgs(args);
-        Response res = sendRequest(get, 200, getAtomValidator());
-        assertNotNull(res);
-        String xml = res.getContentAsString();
-        Entry entry = abdera.parseEntry(new StringReader(xml), null);
-        assertNotNull(entry);
-        // TODO: fix up self links with arguments
-        if (args == null)
-        {
-            assertEquals(get.getFullUri(), entry.getSelfLink().getHref().toString());
-        }
-        return entry;
-    }
-    
-    protected Feed getFeed(IRI href)
-        throws Exception
-    {
-        return getFeed(href, null);
-    }
-    
-    protected Feed getFeed(IRI href, Map<String, String> args)
-        throws Exception
-    {
-        Request get = new GetRequest(href.toString()).setArgs(args);
-        Response res = sendRequest(get, 200, getAtomValidator());
-        assertNotNull(res);
-        String xml = res.getContentAsString();
-        Feed feed = abdera.parseFeed(new StringReader(xml), null);
-        assertNotNull(feed);
-        assertEquals(get.getFullUri(), feed.getSelfLink().getHref().toString());
-        return feed;
-    }
-
-    //
-    // General CMIS Helpers
-    //
-    
-    protected Service getRepository()
-        throws Exception
-    {
-        if (service == null)
-        {
-            Response res = sendRequest(new GetRequest(serviceUrl), 200, getAppValidator());
-            String xml = res.getContentAsString();
-            assertNotNull(xml);
-            assertTrue(xml.length() > 0);
-            service = abdera.parseService(new StringReader(xml), null);
-            assertNotNull(service);
-        }
-        return service;
-    }
-    
-    protected String getQueryCapability()
-        throws Exception
-    {
-        if (queryCapability == null)
-        {
-            Service repo = getRepository();
-            Workspace workspace = getWorkspace(repo);
-            CMISRepositoryInfo repoInfo = workspace.getExtension(CMISConstants.REPOSITORY_INFO);
-            assertNotNull(repoInfo);
-            CMISCapabilities capabilities = repoInfo.getCapabilities();
-            assertNotNull(repoInfo);
-            queryCapability = capabilities.getQuery();
-            assertNotNull(queryCapability);
-        }
-        return queryCapability;
-    }
-    
-    protected Workspace getWorkspace(Service service)
-    {
-        return service.getWorkspaces().get(0);
-    }
-    
-    protected Collection getCMISCollection(Workspace workspace, String collectionId)
-    {
-        List<Collection> collections = workspace.getCollections();
-        for (Collection collection : collections)
-        {
-            String id = collection.getAttributeValue(CMISConstants.COLLECTION_TYPE);
-            if (id != null && id.equals(collectionId))
-            {
-                return collection;
-            }
-        }
-        return null;
-    }
-    
-    protected IRI getRootCollection(Workspace workspace)
-    {
-        Collection root = getCMISCollection(workspace, CMISConstants.COLLECTION_ROOT);
-        assertNotNull(root);
-        IRI rootHREF = root.getHref();
-        assertNotNull(rootHREF);
-        return rootHREF;
-    }
-
-    protected IRI getCheckedOutCollection(Workspace workspace)
-    {
-        Collection root = getCMISCollection(workspace, CMISConstants.COLLECTION_CHECKEDOUT);
-        assertNotNull(root);
-        IRI rootHREF = root.getHref();
-        assertNotNull(rootHREF);
-        return rootHREF;
-    }
-
-    protected IRI getTypesChildrenCollection(Workspace workspace)
-    {
-        Collection root = getCMISCollection(workspace, CMISConstants.COLLECTION_TYPES);
-        assertNotNull(root);
-        IRI rootHREF = root.getHref();
-        assertNotNull(rootHREF);
-        return rootHREF;
-    }
-
-    protected IRI getQueryCollection(Workspace workspace)
-    {
-        Collection root = getCMISCollection(workspace, CMISConstants.COLLECTION_QUERY);
-        assertNotNull(root);
-        IRI rootHREF = root.getHref();
-        assertNotNull(rootHREF);
-        return rootHREF;
-    }
-
-    protected Link getLink(Entry entry, String rel, String... matchesMimetypes)
-    {
-        List<Link> links = entry.getLinks(rel);
-        if (links != null)
-        {
-            for (Link link : links)
-            {
-                MimeType mimetype = link.getMimeType();
-                if (matchesMimetypes.length == 0)
-                {
-                    if (links.size() == 1)
-                    {
-                        // take the single link regardless of type
-                        return link;
-                    }
-                    else if (mimetype == null)
-                    {
-                        // take the link if it doesn't have a type
-                        return link;
-                    }
-                }
-                for (String matchesMimetype : matchesMimetypes)
-                {
-                    try
-                    {
-                        if (mimetype != null && mimetype.match(matchesMimetype))
-                        {
-                            return link;
-                        }
-                    }
-                    catch (MimeTypeParseException e)
-                    {
-                        // note: not a match
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    protected Link getChildrenLink(Entry entry)
-    {
-        return getLink(entry, CMISConstants.REL_DOWN, CMISConstants.MIMETYPE_FEED);
-    }
-
-    protected Link getDescendantsLink(Entry entry)
-    {
-        return getLink(entry, CMISConstants.REL_DOWN, CMISConstants.MIMETYPE_CMISTREE);
-    }
-
-    protected Link getFolderTreeLink(Entry entry)
-    {
-        return getLink(entry, CMISConstants.REL_FOLDER_TREE, CMISConstants.MIMETYPE_CMISTREE);
-    }
-
-    protected Link getObjectParentsLink(Entry entry)
-    {
-        return getLink(entry, CMISConstants.REL_UP, CMISConstants.MIMETYPE_FEED);
-    }
-
-    protected Link getFolderParentLink(Entry entry)
-    {
-        return getLink(entry, CMISConstants.REL_UP, CMISConstants.MIMETYPE_ENTRY);
-    }
-
-    protected Entry createFolder(IRI parent, String name)
-        throws Exception
-    {
-        return createFolder(parent, name, "/org/alfresco/repo/cmis/rest/test/createfolder.atomentry.xml");
-    }
-    
-    protected Entry createFolder(IRI parent, String name, String atomEntryFile)
-        throws Exception
-    {
-        String createFolder = loadString(atomEntryFile);
-        createFolder = createFolder.replace("${NAME}", name);
-        Response res = sendRequest(new PostRequest(parent.toString(), createFolder, Format.ATOMENTRY.mimetype()), 201, getAtomValidator());
-        assertNotNull(res);
-        String xml = res.getContentAsString();
-        Entry entry = abdera.parseEntry(new StringReader(xml), null);
-        assertNotNull(entry);
-        assertEquals(name, entry.getTitle());
-        //assertEquals(name + " (summary)", entry.getSummary());
-        CMISObject object = entry.getExtension(CMISConstants.OBJECT);
-        assertEquals(CMISConstants.TYPE_FOLDER, object.getBaseTypeId().getStringValue());
-        String testFolderHREF = (String)res.getHeader("Location");
-        assertNotNull(testFolderHREF);
-        return entry;
-    }
-    
-    protected Entry createDocument(IRI parent, String name)
-        throws Exception
-    {
-        return createDocument(parent, name, "/org/alfresco/repo/cmis/rest/test/createdocument.atomentry.xml");
-    }
-    
-    protected Entry createDocument(IRI parent, String name, String atomEntryFile)
-        throws Exception
-    {
-        String createFile = loadString(atomEntryFile);
-        createFile = createFile.replace("${NAME}", name);
-        // determine if creating content via mediatype
-        Entry createEntry = abdera.parseEntry(new StringReader(createFile), null);
-        MimeType mimeType = createEntry.getContentMimeType();
-        boolean mediaType = (mimeType != null);
-        createFile = createFile.replace("${CONTENT}", mediaType ? Base64.encodeBytes(name.getBytes()) : name);
-        Response res = sendRequest(new PostRequest(parent.toString(), createFile, Format.ATOMENTRY.mimetype()), 201, getAtomValidator());
-        assertNotNull(res);
-        String xml = res.getContentAsString();
-        Entry entry = abdera.parseEntry(new StringReader(xml), null);
-        assertNotNull(entry);
-        assertEquals(name, entry.getTitle());
-        //assertEquals(name + " (summary)", entry.getSummary());
-        assertNotNull(entry.getContentSrc());
-        CMISObject object = entry.getExtension(CMISConstants.OBJECT);
-        assertEquals(CMISConstants.TYPE_DOCUMENT, object.getBaseTypeId().getStringValue());
-        String testFileHREF = (String)res.getHeader("Location");
-        assertNotNull(testFileHREF);
-        return entry;
-    }
-
-    protected Entry createRelationship(IRI parent, String type, String targetId)
-        throws Exception
-    {
-        return createRelationship(parent, type, targetId, "/org/alfresco/repo/cmis/rest/test/createrelationship.atomentry.xml");
-    }
-
-    protected Entry createRelationship(IRI parent, String type, String targetId, String atomEntryFile)
-        throws Exception
-    {
-        String createFile = loadString(atomEntryFile);
-        createFile = createFile.replace("${RELTYPE}", type);
-        createFile = createFile.replace("${TARGETID}", targetId);
-        Response res = sendRequest(new PostRequest(parent.toString(), createFile, Format.ATOMENTRY.mimetype()), 201, getAtomValidator());
-        assertNotNull(res);
-        String xml = res.getContentAsString();
-        Entry entry = abdera.parseEntry(new StringReader(xml), null);
-        assertNotNull(entry);
-        CMISObject object = entry.getExtension(CMISConstants.OBJECT);
-        assertEquals(CMISConstants.TYPE_RELATIONSHIP, object.getBaseTypeId().getStringValue());
-        assertEquals(targetId, object.getTargetId().getStringValue());
-        String testFileHREF = (String)res.getHeader("Location");
-        assertNotNull(testFileHREF);
-        return entry;
-    }
-    
-    //
-    // General Test Helpers
-    //
-
-    protected Entry getTestRootFolder()
-        throws Exception
-    {
-        if (testRootFolder == null)
-        {
-            testRootFolder = createTestRootFolder();
-        }
-        return testRootFolder;
-    }
-    
-    protected Entry createTestRootFolder()
-        throws Exception
-    {
-        Service service = getRepository();
-        IRI rootFolderHREF = getRootCollection(getWorkspace(service));
-        
-        // TODO: Convert to query
-        Feed children = getFeed(rootFolderHREF);
-        for (Entry child : children.getEntries())
-        {
-            if (child.getTitle().equals("CMIS Tests"))
-            {
-                return child;
-            }
-        }
-        
-        // not found, create it
-        return createFolder(rootFolderHREF, "CMIS Tests");
-    }
-    
-    protected Entry getTestRunFolder()
-        throws Exception
-    {
-        if (testRunFolder == null)
-        {
-            testRunFolder = createTestRunFolder();
-        }
-        return testRunFolder;
-    }
-    
-    protected Entry createTestRunFolder()
-        throws Exception
-    {
-        Entry testRootFolder = getTestRootFolder();
-        Link testsChildrenLink = getChildrenLink(testRootFolder);
-        return createFolder(testsChildrenLink.getHref(), "Test Run " + System.currentTimeMillis());
-    }
-    
-    protected Entry createTestFolder(String name)
-        throws Exception
-    {
-        Entry testRunFolder = getTestRunFolder();
-        Link childrenLink = getChildrenLink(testRunFolder);
-        assertNotNull(childrenLink);
-        Entry testFolder = createFolder(childrenLink.getHref(), name + " " + System.currentTimeMillis());
-        return testFolder;
-    }
-    
-    //
-    // Alfresco specific helpers
-    //
-    
-    protected NodeRef getNodeRef(Entry entry)
-    {
-        NodeRef nodeRef = null;
-        CMISObject object = entry.getExtension(CMISConstants.OBJECT);
-        if (object != null)
-        {
-            String strNodeRef = object.getObjectId().getStringValue();
-            if (strNodeRef != null)
-            {
-                nodeRef = new NodeRef(strNodeRef);
-            }
-        }
-        return nodeRef;
-    }
-
-}
diff --git a/source/java/org/alfresco/repo/cmis/rest/test/CMISCustomTypeTest.java b/source/java/org/alfresco/repo/cmis/rest/test/CMISCustomTypeTest.java
deleted file mode 100644
index 230e43a726..0000000000
--- a/source/java/org/alfresco/repo/cmis/rest/test/CMISCustomTypeTest.java
+++ /dev/null
@@ -1,453 +0,0 @@
-/*
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * Copyright (C) 2005-2008 Alfresco Software Limited.
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
- * As a special exception to the terms and conditions of version 2.0 of 
- * the GPL, you may redistribute this Program in connection with Free/Libre 
- * and Open Source Software ("FLOSS") applications as described in Alfresco's 
- * FLOSS exception.  You should have recieved a copy of the text describing 
- * the FLOSS exception, and it is also available here: 
- * http://www.alfresco.com/legal/licensing"
- */
-package org.alfresco.repo.cmis.rest.test;
-
-import java.io.StringReader;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.alfresco.abdera.ext.cmis.CMISConstants;
-import org.alfresco.abdera.ext.cmis.CMISObject;
-import org.alfresco.abdera.ext.cmis.CMISProperties;
-import org.alfresco.abdera.ext.cmis.CMISProperty;
-import org.alfresco.repo.cmis.rest.CMISScript;
-import org.alfresco.util.GUID;
-import org.alfresco.web.scripts.Format;
-import org.alfresco.web.scripts.TestWebScriptServer.DeleteRequest;
-import org.alfresco.web.scripts.TestWebScriptServer.GetRequest;
-import org.alfresco.web.scripts.TestWebScriptServer.PatchRequest;
-import org.alfresco.web.scripts.TestWebScriptServer.PostRequest;
-import org.alfresco.web.scripts.TestWebScriptServer.PutRequest;
-import org.alfresco.web.scripts.TestWebScriptServer.Response;
-import org.apache.abdera.i18n.iri.IRI;
-import org.apache.abdera.model.Entry;
-import org.apache.abdera.model.Feed;
-import org.apache.abdera.model.Link;
-
-
-/**
- * CMIS API Test Harness
- * 
- * @author davidc
- */
-public class CMISCustomTypeTest extends BaseCMISWebScriptTest
-{
-    private static String TEST_NAMESPACE = "http://www.alfresco.org/model/cmis/custom";
-    
-    
-    @Override
-    protected void setUp()
-        throws Exception
-    {
-        // Uncomment to change default behaviour of tests
-        setCustomContext("classpath:cmis/cmis-test-context.xml");
-        setDefaultRunAs("admin");
-//      RemoteServer server = new RemoteServer();
-//      server.username = "admin";
-//      server.password = "admin";
-//      setRemoteServer(server);
-//      setArgsAsHeaders(false);
-//      setValidateResponse(false);
-//      setListener(new CMISTestListener(System.out));
-//      setTraceReqRes(true);
-
-        super.setUp();
-    }
-
-    
-    public void testCreateFolder()
-        throws Exception
-    {
-        Entry testFolder = createTestFolder("testCreateCustomFolder");
-        Link childrenLink = getChildrenLink(testFolder);
-        assertNotNull(childrenLink);
-        Feed children = getFeed(childrenLink.getHref());
-        assertNotNull(children);
-        int entriesBefore = children.getEntries().size();
-        Entry folder = createFolder(children.getSelfLink().getHref(), "testCreateCustomFolder", "/org/alfresco/repo/cmis/rest/test/createcustomfolder.atomentry.xml");
-        Feed feedFolderAfter = getFeed(childrenLink.getHref());
-        int entriesAfter = feedFolderAfter.getEntries().size();
-        assertEquals(entriesBefore +1, entriesAfter);
-        Entry entry = feedFolderAfter.getEntry(folder.getId().toString());
-        CMISObject object = entry.getExtension(CMISConstants.OBJECT);
-        assertEquals("F/cmiscustom:folder", object.getObjectTypeId().getStringValue());
-        CMISProperty customProp = object.getProperties().find("cmiscustom:folderprop_string");
-        assertNotNull(customProp);
-        assertEquals("custom string", customProp.getStringValue());
-    }
-
-    public void testCreateDocument()
-        throws Exception
-    {
-        Entry testFolder = createTestFolder("testCreateCustomDocument");
-        Link childrenLink = getChildrenLink(testFolder);
-        assertNotNull(childrenLink);
-        Feed children = getFeed(childrenLink.getHref());
-        assertNotNull(children);
-        int entriesBefore = children.getEntries().size();
-        Entry document = createDocument(children.getSelfLink().getHref(), "testCreateCustomDocument", "/org/alfresco/repo/cmis/rest/test/createcustomdocument.atomentry.xml");
-        Feed feedFolderAfter = getFeed(childrenLink.getHref());
-        int entriesAfter = feedFolderAfter.getEntries().size();
-        assertEquals(entriesBefore +1, entriesAfter);
-        Entry entry = feedFolderAfter.getEntry(document.getId().toString());
-        CMISObject object = entry.getExtension(CMISConstants.OBJECT);
-        assertEquals("D/cmiscustom:document", object.getObjectTypeId().getStringValue());
-        CMISProperty customProp = object.getProperties().find("cmiscustom:docprop_string");
-        assertNotNull(customProp);
-        assertEquals("custom string", customProp.getStringValue());
-        CMISProperty multiProp = object.getProperties().find("cmiscustom:docprop_boolean_multi");
-        assertNotNull(multiProp);
-        List<Object> multiValues = multiProp.getNativeValues();
-        assertNotNull(multiValues);
-        assertEquals(2, multiValues.size());
-        assertEquals(true, multiValues.get(0));
-        assertEquals(false, multiValues.get(1));
-    }
-
-    public void testUpdatePatch()
-        throws Exception
-    {
-        // retrieve test folder for update
-        Entry testFolder = createTestFolder("testUpdatePatchCustomDocument");
-        Link childrenLink = getChildrenLink(testFolder);
-        
-        // create document for update
-        Entry document = createDocument(childrenLink.getHref(), "testUpdatePatchCustomDocument", "/org/alfresco/repo/cmis/rest/test/createcustomdocument.atomentry.xml");
-        assertNotNull(document);
-        
-        // update
-        String updateFile = loadString("/org/alfresco/repo/cmis/rest/test/updatecustomdocument.atomentry.xml");
-        String guid = GUID.generate();
-        updateFile = updateFile.replace("${NAME}", guid);
-        Response res = sendRequest(new PatchRequest(document.getSelfLink().getHref().toString(), updateFile, Format.ATOMENTRY.mimetype()), 200, getAtomValidator());
-        assertNotNull(res);
-        Entry updated = getAbdera().parseEntry(new StringReader(res.getContentAsString()), null);
-        
-        // ensure update occurred
-        assertEquals(document.getId(), updated.getId());
-        assertEquals(document.getPublished(), updated.getPublished());
-        assertEquals("Updated Title " + guid, updated.getTitle());
-        CMISObject object = updated.getExtension(CMISConstants.OBJECT);
-        assertEquals("D/cmiscustom:document", object.getObjectTypeId().getStringValue());
-        CMISProperty customProp = object.getProperties().find("cmiscustom:docprop_string");
-        assertNotNull(customProp);
-        assertEquals("custom " + guid, customProp.getStringValue());
-        CMISProperty multiProp = object.getProperties().find("cmiscustom:docprop_boolean_multi");
-        assertNotNull(multiProp);
-        List<Object> multiValues = multiProp.getNativeValues();
-        assertNotNull(multiValues);
-        assertEquals(2, multiValues.size());
-        assertEquals(false, multiValues.get(0));
-        assertEquals(true, multiValues.get(1));
-    }
-    
-    public void testUpdatePut()
-        throws Exception
-    {
-        // retrieve test folder for update
-        Entry testFolder = createTestFolder("testUpdatePutCustomDocument");
-        Link childrenLink = getChildrenLink(testFolder);
-        
-        // create document for update
-        Entry document = createDocument(childrenLink.getHref(), "testUpdatePutCustomDocument", "/org/alfresco/repo/cmis/rest/test/createcustomdocument.atomentry.xml");
-        assertNotNull(document);
-        
-        // update
-        String updateFile = loadString("/org/alfresco/repo/cmis/rest/test/updatecustomdocument.atomentry.xml");
-        String guid = GUID.generate();
-        updateFile = updateFile.replace("${NAME}", guid);
-        Response res = sendRequest(new PutRequest(document.getSelfLink().getHref().toString(), updateFile, Format.ATOMENTRY.mimetype()), 200, getAtomValidator());
-        assertNotNull(res);
-        Entry updated = getAbdera().parseEntry(new StringReader(res.getContentAsString()), null);
-        
-        // ensure update occurred
-        assertEquals(document.getId(), updated.getId());
-        assertEquals(document.getPublished(), updated.getPublished());
-        assertEquals("Updated Title " + guid, updated.getTitle());
-        CMISObject object = updated.getExtension(CMISConstants.OBJECT);
-        assertEquals("D/cmiscustom:document", object.getObjectTypeId().getStringValue());
-        CMISProperty customProp = object.getProperties().find("cmiscustom:docprop_string");
-        assertNotNull(customProp);
-        assertEquals("custom " + guid, customProp.getStringValue());
-        CMISProperty multiProp = object.getProperties().find("cmiscustom:docprop_boolean_multi");
-        assertNotNull(multiProp);
-        List<Object> multiValues = multiProp.getNativeValues();
-        assertNotNull(multiValues);
-        assertEquals(2, multiValues.size());
-        assertEquals(false, multiValues.get(0));
-        assertEquals(true, multiValues.get(1));
-    }
- 
-    public void testDelete()
-        throws Exception
-    {
-        // retrieve test folder for deletes
-        Entry testFolder = createTestFolder("testDeleteCustom");
-        Link childrenLink = getChildrenLink(testFolder);
-        Feed children = getFeed(childrenLink.getHref());
-        int entriesBefore = children.getEntries().size();
-        
-        // create document for delete
-        Entry document = createDocument(childrenLink.getHref(), "testDeleteCustomDocument", "/org/alfresco/repo/cmis/rest/test/createcustomdocument.atomentry.xml");
-        Response documentRes = sendRequest(new GetRequest(document.getSelfLink().getHref().toString()), 200, getAtomValidator());
-        assertNotNull(documentRes);
-
-        // ensure document has been created
-        Feed children2 = getFeed(childrenLink.getHref());
-        assertNotNull(children2);
-        int entriesAfterCreate = children2.getEntries().size();
-        assertEquals(entriesAfterCreate, entriesBefore +1);
-    
-        // delete
-        Response deleteRes = sendRequest(new DeleteRequest(document.getSelfLink().getHref().toString()), 204);
-        assertNotNull(deleteRes);
-    
-        // ensure document has been deleted
-        Feed children3 = getFeed(childrenLink.getHref());
-        assertNotNull(children3);
-        int entriesAfterDelete = children3.getEntries().size();
-        assertEquals(entriesBefore, entriesAfterDelete);
-    }
-    
-    public void testQuery()
-        throws Exception
-    {
-        // retrieve query collection
-        IRI queryHREF = getQueryCollection(getWorkspace(getRepository()));
-        
-        // retrieve test folder for query
-        Entry testFolder = createTestFolder("testQueryCustom");
-        CMISObject testFolderObject = testFolder.getExtension(CMISConstants.OBJECT);
-        Link childrenLink = getChildrenLink(testFolder);
-        
-        // create documents to query
-        // Standard root document
-        Entry document1 = createDocument(childrenLink.getHref(), "apple1");
-        assertNotNull(document1);
-        CMISObject document1Object = document1.getExtension(CMISConstants.OBJECT);
-        assertNotNull(document1Object);
-        String doc2name = "name" + System.currentTimeMillis();
-        // Custom documents
-        Entry document2 = createDocument(childrenLink.getHref(), doc2name, "/org/alfresco/repo/cmis/rest/test/createcustomdocument.atomentry.xml");
-        assertNotNull(document2);
-        CMISObject document2Object = document2.getExtension(CMISConstants.OBJECT);
-        assertNotNull(document2Object);
-        Entry document3 = createDocument(childrenLink.getHref(), "banana1", "/org/alfresco/repo/cmis/rest/test/createcustomdocument.atomentry.xml");
-        assertNotNull(document3);
-        CMISObject document3Object = document3.getExtension(CMISConstants.OBJECT);
-        assertNotNull(document3Object);
-    
-        // retrieve query request document
-        String queryDoc = loadString("/org/alfresco/repo/cmis/rest/test/query.cmisquery.xml");
-    
-        {
-            // construct structured query
-            String query = "SELECT ObjectId, Name, ObjectTypeId, cmiscustom_docprop_string, cmiscustom_docprop_boolean_multi FROM cmiscustom_document " +
-                           "WHERE IN_FOLDER('" + testFolderObject.getObjectId().getStringValue() + "') " +
-                           "AND cmiscustom_docprop_string = 'custom string' ";
-            String queryReq = queryDoc.replace("${STATEMENT}", query);
-            queryReq = queryReq.replace("${SKIPCOUNT}", "0");
-            queryReq = queryReq.replace("${PAGESIZE}", "5");
-    
-            // issue structured query
-            Response queryRes = sendRequest(new PostRequest(queryHREF.toString(), queryReq, CMISConstants.MIMETYPE_CMIS_QUERY), 200);
-            assertNotNull(queryRes);
-            Feed queryFeed = getAbdera().parseFeed(new StringReader(queryRes.getContentAsString()), null);
-            assertNotNull(queryFeed);
-            assertEquals(2, queryFeed.getEntries().size());
-            
-            assertNotNull(queryFeed.getEntry(document2.getId().toString()));
-            CMISObject result1 = queryFeed.getEntry(document2.getId().toString()).getExtension(CMISConstants.OBJECT);
-            assertNotNull(result1);
-            assertEquals(document2Object.getName().getStringValue(), result1.getName().getStringValue());
-            assertEquals(document2Object.getObjectId().getStringValue(), result1.getObjectId().getStringValue());
-            assertEquals(document2Object.getObjectTypeId().getStringValue(), result1.getObjectTypeId().getStringValue());
-            CMISProperties result1properties = result1.getProperties();
-            assertNotNull(result1properties);
-            CMISProperty result1property = result1properties.find("cmiscustom:docprop_string");
-            assertNotNull(result1property);
-            assertEquals("custom string", result1property.getStringValue());
-            CMISProperty result1multiproperty = result1properties.find("cmiscustom:docprop_boolean_multi");
-            assertNotNull(result1multiproperty);
-            List<Object> result1multiValues = result1multiproperty.getNativeValues();
-            assertNotNull(result1multiValues);
-            assertEquals(2, result1multiValues.size());
-            assertEquals(true, result1multiValues.get(0));
-            assertEquals(false, result1multiValues.get(1));
-            
-            assertNotNull(queryFeed.getEntry(document3.getId().toString()));
-            CMISObject result2 = queryFeed.getEntry(document3.getId().toString()).getExtension(CMISConstants.OBJECT);
-            assertNotNull(result2);
-            assertEquals(document3Object.getName().getStringValue(), result2.getName().getStringValue());
-            assertEquals(document3Object.getObjectId().getStringValue(), result2.getObjectId().getStringValue());
-            assertEquals(document3Object.getObjectTypeId().getStringValue(), result2.getObjectTypeId().getStringValue());
-            CMISProperties result2properties = result2.getProperties();
-            assertNotNull(result2properties);
-            CMISProperty result2property = result2properties.find("cmiscustom:docprop_string");
-            assertNotNull(result2property);
-            assertEquals("custom string", result2property.getStringValue());
-            CMISProperty result2multiproperty = result1properties.find("cmiscustom:docprop_boolean_multi");
-            assertNotNull(result2multiproperty);
-            List<Object> result2multiValues = result2multiproperty.getNativeValues();
-            assertNotNull(result2multiValues);
-            assertEquals(2, result2multiValues.size());
-            assertEquals(true, result2multiValues.get(0));
-            assertEquals(false, result2multiValues.get(1));
-        }
-    }
-
-    public void testCreateRelationship()
-        throws Exception
-    {
-        Entry testFolder = createTestFolder("testCreateCustomRelationship");
-        Link childrenLink = getChildrenLink(testFolder);
-        assertNotNull(childrenLink);
-        Feed children = getFeed(childrenLink.getHref());
-        assertNotNull(children);
-        Entry source = createDocument(children.getSelfLink().getHref(), "testSource", "/org/alfresco/repo/cmis/rest/test/createcustomdocument.atomentry.xml");
-        assertNotNull(source);
-        Entry target = createDocument(children.getSelfLink().getHref(), "testTarget", "/org/alfresco/repo/cmis/rest/test/createcustomdocument.atomentry.xml");
-        assertNotNull(target);
-
-        // retrieve relationships feed on source
-        Link relsLink = source.getLink(CMISConstants.REL_RELATIONSHIPS);
-        assertNotNull(relsLink);
-        Feed relsBefore = getFeed(relsLink.getHref());
-        assertNotNull(relsBefore);
-        assertEquals(0, relsBefore.getEntries().size());
-        
-        // create relationship between source and target documents
-        CMISObject targetObject = target.getExtension(CMISConstants.OBJECT);
-        assertNotNull(targetObject);
-        String targetId = targetObject.getObjectId().getStringValue();
-        assertNotNull(targetId);
-        Entry rel = createRelationship(relsLink.getHref(), "R/cmiscustom:assoc", targetId);
-        assertNotNull(rel);
-
-        // check created relationship
-        CMISObject sourceObject = source.getExtension(CMISConstants.OBJECT);
-        assertNotNull(sourceObject);
-        String sourceId = sourceObject.getObjectId().getStringValue();
-        assertNotNull(sourceId);
-        CMISObject relObject = rel.getExtension(CMISConstants.OBJECT);
-        assertNotNull(relObject);
-        assertEquals("R/cmiscustom:assoc", relObject.getObjectTypeId().getStringValue());
-        assertEquals(sourceId, relObject.getSourceId().getStringValue());
-        assertEquals(targetId, relObject.getTargetId().getStringValue());
-        assertEquals(source.getSelfLink().getHref(), rel.getLink(CMISConstants.REL_ASSOC_SOURCE).getHref());
-        assertEquals(target.getSelfLink().getHref(), rel.getLink(CMISConstants.REL_ASSOC_TARGET).getHref());
-
-        // check relationships for created item
-        Map<String, String> args = new HashMap<String, String>();
-        args.put(CMISScript.ARG_INCLUDE_SUB_RELATIONSHIP_TYPES, "true");
-        Feed relsAfter = getFeed(relsLink.getHref(), args);
-        assertNotNull(relsAfter);
-        assertEquals(1, relsAfter.getEntries().size());
-    }
-
-    public void testGetRelationship()
-        throws Exception
-    {
-        Entry testFolder = createTestFolder("testGetCustomRelationship");
-        Link childrenLink = getChildrenLink(testFolder);
-        assertNotNull(childrenLink);
-        Feed children = getFeed(childrenLink.getHref());
-        assertNotNull(children);
-        Entry source = createDocument(children.getSelfLink().getHref(), "testSource", "/org/alfresco/repo/cmis/rest/test/createcustomdocument.atomentry.xml");
-        assertNotNull(source);
-        Entry target = createDocument(children.getSelfLink().getHref(), "testTarget", "/org/alfresco/repo/cmis/rest/test/createcustomdocument.atomentry.xml");
-        assertNotNull(target);
-    
-        // retrieve relationships feed on source
-        Link relsLink = source.getLink(CMISConstants.REL_RELATIONSHIPS);
-        assertNotNull(relsLink);
-        
-        // create relationship between source and target documents
-        CMISObject targetObject = target.getExtension(CMISConstants.OBJECT);
-        assertNotNull(targetObject);
-        String targetId = targetObject.getObjectId().getStringValue();
-        assertNotNull(targetId);
-        Entry rel = createRelationship(relsLink.getHref(), "R/cmiscustom:assoc", targetId);
-        assertNotNull(rel);
-    
-        // get created relationship
-        Entry relEntry = getEntry(rel.getSelfLink().getHref());
-        CMISObject relEntryObject = rel.getExtension(CMISConstants.OBJECT);
-        CMISObject relObject = rel.getExtension(CMISConstants.OBJECT);
-        assertNotNull(relObject);
-        assertEquals(relObject.getObjectTypeId().getStringValue(), relEntryObject.getObjectTypeId().getStringValue());
-        assertEquals(relObject.getSourceId().getStringValue(), relEntryObject.getSourceId().getStringValue());
-        assertEquals(relObject.getTargetId().getStringValue(), relEntryObject.getTargetId().getStringValue());
-        assertEquals(source.getSelfLink().getHref(), relEntry.getLink(CMISConstants.REL_ASSOC_SOURCE).getHref());
-        assertEquals(target.getSelfLink().getHref(), relEntry.getLink(CMISConstants.REL_ASSOC_TARGET).getHref());
-    }
-    
-    public void testDeleteRelationship()
-        throws Exception
-    {
-        Entry testFolder = createTestFolder("testDeleteCustomRelationship");
-        Link childrenLink = getChildrenLink(testFolder);
-        assertNotNull(childrenLink);
-        Feed children = getFeed(childrenLink.getHref());
-        assertNotNull(children);
-        Entry source = createDocument(children.getSelfLink().getHref(), "testSource", "/org/alfresco/repo/cmis/rest/test/createcustomdocument.atomentry.xml");
-        assertNotNull(source);
-        Entry target = createDocument(children.getSelfLink().getHref(), "testTarget", "/org/alfresco/repo/cmis/rest/test/createcustomdocument.atomentry.xml");
-        assertNotNull(target);
-    
-        // retrieve relationships feed on source
-        Link relsLink = source.getLink(CMISConstants.REL_RELATIONSHIPS);
-        assertNotNull(relsLink);
-        Feed relsBefore = getFeed(relsLink.getHref());
-        assertNotNull(relsBefore);
-        assertEquals(0, relsBefore.getEntries().size());
-        
-        // create relationship between source and target documents
-        CMISObject targetObject = target.getExtension(CMISConstants.OBJECT);
-        assertNotNull(targetObject);
-        String targetId = targetObject.getObjectId().getStringValue();
-        assertNotNull(targetId);
-        Entry rel = createRelationship(relsLink.getHref(), "R/cmiscustom:assoc", targetId);
-        assertNotNull(rel);
-    
-        // check relationships for created item
-        Map<String, String> args = new HashMap<String, String>();
-        args.put(CMISScript.ARG_INCLUDE_SUB_RELATIONSHIP_TYPES, "true");
-        Feed relsAfterCreate = getFeed(relsLink.getHref(), args);
-        assertNotNull(relsAfterCreate);
-        assertEquals(1, relsAfterCreate.getEntries().size());
-        
-        // delete relationship
-        Response deleteRes = sendRequest(new DeleteRequest(rel.getSelfLink().getHref().toString()), 204);
-        assertNotNull(deleteRes);
-        
-        // check relationships for deleted item
-        Feed relsAfterDelete = getFeed(relsLink.getHref(), args);
-        assertNotNull(relsAfterDelete);
-        assertEquals(0, relsAfterDelete.getEntries().size());
-    }
-    
-}
diff --git a/source/java/org/alfresco/repo/cmis/rest/test/CMISTest.java b/source/java/org/alfresco/repo/cmis/rest/test/CMISTest.java
deleted file mode 100644
index e6c3179a78..0000000000
--- a/source/java/org/alfresco/repo/cmis/rest/test/CMISTest.java
+++ /dev/null
@@ -1,1534 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or
- *
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * Copyright (C) 2005-2008 Alfresco Software Limited.
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
- * As a special exception to the terms and conditions of version 2.0 of 
- * the GPL, you may redistribute this Program in connection with Free/Libre 
- * and Open Source Software ("FLOSS") applications as described in Alfresco's 
- * FLOSS exception.  You should have recieved a copy of the text describing 
- * the FLOSS exception, and it is also available here: 
- * http://www.alfresco.com/legal/licensing"
- */
-package org.alfresco.repo.cmis.rest.test;
-
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.alfresco.abdera.ext.cmis.CMISAllowableAction;
-import org.alfresco.abdera.ext.cmis.CMISAllowableActions;
-import org.alfresco.abdera.ext.cmis.CMISChildren;
-import org.alfresco.abdera.ext.cmis.CMISConstants;
-import org.alfresco.abdera.ext.cmis.CMISObject;
-import org.alfresco.util.GUID;
-import org.alfresco.web.scripts.Format;
-import org.alfresco.web.scripts.TestWebScriptServer.DeleteRequest;
-import org.alfresco.web.scripts.TestWebScriptServer.GetRequest;
-import org.alfresco.web.scripts.TestWebScriptServer.PatchRequest;
-import org.alfresco.web.scripts.TestWebScriptServer.PostRequest;
-import org.alfresco.web.scripts.TestWebScriptServer.PutRequest;
-import org.alfresco.web.scripts.TestWebScriptServer.Response;
-import org.apache.abdera.i18n.iri.IRI;
-import org.apache.abdera.model.Element;
-import org.apache.abdera.model.Entry;
-import org.apache.abdera.model.Feed;
-import org.apache.abdera.model.Link;
-import org.apache.abdera.model.Service;
-
-
-/**
- * CMIS API Test Harness
- * 
- * @author davidc
- */
-public class CMISTest extends BaseCMISWebScriptTest
-{
-
-    @Override
-    protected void setUp()
-        throws Exception
-    {
-        // Uncomment to change default behaviour of tests  
-        setDefaultRunAs("admin");
-//        RemoteServer server = new RemoteServer();
-//        server.username = "admin";
-//        server.password = "admin";
-//        setRemoteServer(server);
-//        setServiceUrl("http://localhost:8080/alfresco/service/api/cmis");
-//        setValidateResponse(false);
-        setListener(new CMISTestListener(System.out));
-        setTraceReqRes(true);
-        
-        super.setUp();
-    }
-
-    
-    public void testRepository()
-        throws Exception
-    {
-        IRI rootHREF = getRootCollection(getWorkspace(getRepository()));
-        sendRequest(new GetRequest(rootHREF.toString()), 200, getAtomValidator());
-    }
-    
-    public void testCreateDocument()
-        throws Exception
-    {
-        Entry testFolder = createTestFolder("testCreateDocument");
-        Link childrenLink = getChildrenLink(testFolder);
-        assertNotNull(childrenLink);
-        Feed children = getFeed(childrenLink.getHref());
-        assertNotNull(children);
-        int entriesBefore = children.getEntries().size();
-        Entry document = createDocument(children.getSelfLink().getHref(), "testCreateDocument");
-        Response documentContentRes = sendRequest(new GetRequest(document.getContentSrc().toString()), 200);
-        String resContent = documentContentRes.getContentAsString();
-        assertEquals(document.getTitle(), resContent);
-        Feed feedFolderAfter = getFeed(childrenLink.getHref());
-        int entriesAfter = feedFolderAfter.getEntries().size();
-        assertEquals(entriesBefore +1, entriesAfter);
-        Entry entry = feedFolderAfter.getEntry(document.getId().toString());
-        assertNotNull(entry);
-    }
-
-    public void testCreateAtomEntry()
-        throws Exception
-    {
-        Entry testFolder = createTestFolder("testCreateAtomEntry");
-        Link childrenLink = getChildrenLink(testFolder);
-        assertNotNull(childrenLink);
-        Feed children = getFeed(childrenLink.getHref());
-        assertNotNull(children);
-        int entriesBefore = children.getEntries().size();
-        Entry document = createDocument(children.getSelfLink().getHref(), "Iñtërnâtiônàlizætiøn - 1.html", "/org/alfresco/repo/cmis/rest/test/createatomentry.atomentry.xml");
-        Response documentContentRes = sendRequest(new GetRequest(document.getContentSrc().toString()), 200);
-        String resContent = documentContentRes.getContentAsString();
-        assertEquals(document.getTitle(), resContent);
-        Feed feedFolderAfter = getFeed(childrenLink.getHref());
-        int entriesAfter = feedFolderAfter.getEntries().size();
-        assertEquals(entriesBefore +1, entriesAfter);
-        Entry entry = feedFolderAfter.getEntry(document.getId().toString());
-        assertNotNull(entry);
-    }
-    
-    public void testCreateFolder()
-        throws Exception
-    {
-        Entry testFolder = createTestFolder("testCreateFolder");
-        Link childrenLink = getChildrenLink(testFolder);
-        assertNotNull(childrenLink);
-        Feed children = getFeed(childrenLink.getHref());
-        assertNotNull(children);
-        int entriesBefore = children.getEntries().size();
-        Entry folder = createFolder(children.getSelfLink().getHref(), "testCreateFolder");
-        Feed feedFolderAfter = getFeed(childrenLink.getHref());
-        int entriesAfter = feedFolderAfter.getEntries().size();
-        assertEquals(entriesBefore +1, entriesAfter);
-        Entry entry = feedFolderAfter.getEntry(folder.getId().toString());
-        assertNotNull(entry);
-    }
-    
-    public void testGet()
-        throws Exception
-    {
-        // get folder
-        Entry testFolder = createTestFolder("testGet");
-        assertNotNull(testFolder);
-        Entry testFolderFromGet = getEntry(testFolder.getSelfLink().getHref());
-        assertEquals(testFolder.getId(), testFolderFromGet.getId());
-        assertEquals(testFolder.getTitle(), testFolderFromGet.getTitle());
-        assertEquals(testFolder.getSummary(), testFolderFromGet.getSummary());
-        
-        // get document
-        Link childrenLink = getChildrenLink(testFolder);
-        assertNotNull(childrenLink);
-        Entry testDocument = createDocument(childrenLink.getHref(), "testGet");
-        assertNotNull(testDocument);
-        Entry testDocumentFromGet = getEntry(testDocument.getSelfLink().getHref());
-        assertEquals(testDocument.getId(), testDocumentFromGet.getId());
-        assertEquals(testDocument.getTitle(), testDocumentFromGet.getTitle());
-        //assertEquals(testDocument.getSummary(), testDocumentFromGet.getSummary());
-        
-        // get something that doesn't exist
-        Response res = sendRequest(new GetRequest(testDocument.getSelfLink().getHref().toString() + GUID.generate()), 404);
-        assertNotNull(res);
-    }
-
-    public void testGetChildren()
-        throws Exception
-    {
-        // create multiple children
-        Entry testFolder = createTestFolder("testGetChildren");
-        Link childrenLink = getChildrenLink(testFolder);
-        assertNotNull(childrenLink);
-        Entry document1 = createDocument(childrenLink.getHref(), "testGetChildren1");
-        assertNotNull(document1);
-        Entry document2 = createDocument(childrenLink.getHref(), "testGetChildren2");
-        assertNotNull(document2);
-        Entry document3 = createDocument(childrenLink.getHref(), "testGetChildren3");
-        assertNotNull(document3);
-        
-        // checkout one of the children to ensure private working copy isn't included
-        Response documentRes = sendRequest(new GetRequest(document2.getSelfLink().getHref().toString()), 200, getAtomValidator());
-        assertNotNull(documentRes);
-        String documentXML = documentRes.getContentAsString();
-        assertNotNull(documentXML);
-        IRI checkedoutHREF = getCheckedOutCollection(getWorkspace(getRepository()));
-        Response pwcRes = sendRequest(new PostRequest(checkedoutHREF.toString(), documentXML, Format.ATOMENTRY.mimetype()), 201, getAtomValidator());
-        assertNotNull(pwcRes);
-        Entry pwc = getAbdera().parseEntry(new StringReader(pwcRes.getContentAsString()), null);
-        
-        // get children, ensure they exist (but not private working copy)
-        Feed children = getFeed(childrenLink.getHref());
-        assertNotNull(children);
-        assertEquals(3, children.getEntries().size());
-        assertNotNull(children.getEntry(document1.getId().toString()));
-        assertNotNull(children.getEntry(document2.getId().toString()));
-        assertNotNull(children.getEntry(document3.getId().toString()));
-        assertNull(children.getEntry(pwc.getId().toString()));
-    }
-
-    public void testGetChildrenPaging()
-        throws Exception
-    {
-        // create multiple children
-        Set<IRI> docIds = new HashSet<IRI>();
-        Entry testFolder = createTestFolder("testGetChildrenPaging");
-        Link childrenLink = getChildrenLink(testFolder);
-        assertNotNull(childrenLink);
-        for (int i = 0; i < 15; i++)
-        {
-            Entry document = createDocument(childrenLink.getHref(), "testGetChildrenPaging" + i);
-            assertNotNull(document);
-            docIds.add(document.getId());
-        }
-        assertEquals(15, docIds.size());
-        
-        // get children, ensure they exist (but not private working copy)
-        int nextCount = 0;
-        Map<String, String> args = new HashMap<String, String>();
-        args.put("maxItems", "4");
-        IRI childrenHREF = childrenLink.getHref();
-        while (childrenHREF != null)
-        {
-            nextCount++;
-            Feed types = getFeed(childrenHREF, args);
-            assertNotNull(types);
-            assertEquals(nextCount < 4 ? 4 : 3, types.getEntries().size());
-            for (Entry entry : types.getEntries())
-            {
-                docIds.remove(entry.getId());
-            }
-            
-            // next page
-            Link nextLink = types.getLink("next");
-            if (nextCount < 4)
-            {
-                assertNotNull(nextLink);
-            }
-            childrenHREF = (nextLink != null) ? nextLink.getHref() : null;
-            args = null;
-        };
-        assertEquals(4, nextCount);
-        assertEquals(0, docIds.size());
-    }
-    
-    public void testGetChildrenTypeFilter()
-        throws Exception
-    {
-        // create multiple children
-        Entry testFolder = createTestFolder("testChildrenTypeFilter");
-        Link childrenLink = getChildrenLink(testFolder);
-        assertNotNull(childrenLink);
-        Entry document = createDocument(childrenLink.getHref(), "testChildren1");
-        assertNotNull(document);
-        Entry folder = createFolder(childrenLink.getHref(), "testChildren2");
-        assertNotNull(folder);
-        
-        // invalid type filter
-        Map<String, String> args = new HashMap<String, String>();
-        args.put("types", "Invalid");
-        // TODO: potential spec issue
-//        Response invalidRes = sendRequest(new GetRequest(childrenLink.getHref().toString()).setArgs(args), 400);
-//        assertNotNull(invalidRes);
-
-        // no filter
-        Feed noFilters = getFeed(childrenLink.getHref());
-        assertNotNull(noFilters);
-        assertEquals(2, noFilters.getEntries().size());
-
-        // any filter
-        args.put("types", "Any");
-        Feed any = getFeed(childrenLink.getHref(), args);
-        assertNotNull(any);
-        assertEquals(2, any.getEntries().size());
-
-        // folders filter
-        args.put("types", "Folders");
-        Feed folders = getFeed(childrenLink.getHref(), args);
-        assertNotNull(folders);
-        assertEquals(1, folders.getEntries().size());
-        assertNotNull(folders.getEntry(folder.getId().toString()));
-
-        // documents filter
-        args.put("types", "Documents");
-        Feed documents = getFeed(childrenLink.getHref(), args);
-        assertNotNull(documents);
-        assertEquals(1, documents.getEntries().size());
-        assertNotNull(documents.getEntry(document.getId().toString()));
-    }
-
-    public void testGetChildrenPropertyFilter()
-        throws Exception
-    {
-        // create children
-        Entry testFolder = createTestFolder("testGetChildrenPropertyFilter");
-        Link childrenLink = getChildrenLink(testFolder);
-        assertNotNull(childrenLink);
-        Entry document1 = createDocument(childrenLink.getHref(), "testGetChildrenPropertyFilter1");
-        assertNotNull(document1);
-
-        {
-            // get children with all properties
-            Feed children = getFeed(childrenLink.getHref());
-            for (Entry entry : children.getEntries())
-            {
-                CMISObject object = entry.getExtension(CMISConstants.OBJECT);
-                assertNotNull(object.getObjectId().getStringValue());
-                assertNotNull(object.getObjectTypeId().getStringValue());
-            }
-        }
-
-        {
-            // get children with object_id only
-            Map<String, String> args = new HashMap<String, String>();
-            args.put("filter", CMISConstants.PROP_OBJECT_ID);
-            Feed children = getFeed(childrenLink.getHref(), args);
-            for (Entry entry : children.getEntries())
-            {
-                CMISObject object = entry.getExtension(CMISConstants.OBJECT);
-                assertNotNull(object.getObjectId().getStringValue());
-                assertNull(object.getObjectTypeId());
-            }
-        }
-    }
-
-    public void testGetDescendants()
-        throws Exception
-    {
-        // create multiple nested children
-        Entry testFolder = createTestFolder("testGetDescendants");
-        Link childrenLink = getChildrenLink(testFolder);
-        assertNotNull(childrenLink);
-        Entry document1 = createDocument(childrenLink.getHref(), "testGetDescendants1");
-        assertNotNull(document1);
-        Entry folder2 = createFolder(childrenLink.getHref(), "testGetDescendants2");
-        assertNotNull(folder2);
-        Link childrenLink2 = getChildrenLink(folder2);
-        assertNotNull(childrenLink2);
-        Entry document3 = createDocument(childrenLink2.getHref(), "testGetDescendants3");
-        assertNotNull(document3);
-        
-        {
-            // get descendants (depth = 1, equivalent to getChildren)
-            Map<String, String> args = new HashMap<String, String>();
-            args.put("depth", "1");
-            Link descendantsLink = getDescendantsLink(testFolder);
-            assertNotNull(descendantsLink);
-            
-            Feed descendants = getFeed(descendantsLink.getHref(), args);
-            assertNotNull(descendants);
-            assertEquals(2, descendants.getEntries().size());
-            assertNotNull(descendants.getEntry(document1.getId().toString()));
-            assertNotNull(descendants.getEntry(folder2.getId().toString()));
-            
-            Entry getFolder2 = descendants.getEntry(folder2.getId().toString());
-            CMISChildren folder2Children = getFolder2.getFirstChild(CMISConstants.CHILDREN);
-            assertNull(folder2Children);
-        }
-        
-        {
-            // get nested children
-            Map<String, String> args = new HashMap<String, String>();
-            args.put("depth", "2");
-            Link descendantsLink = getDescendantsLink(testFolder);
-            Feed descendants = getFeed(descendantsLink.getHref(), args);
-            assertNotNull(descendants);
-            assertEquals(2, descendants.getEntries().size());
-            assertNotNull(descendants.getEntry(document1.getId().toString()));
-            assertNotNull(descendants.getEntry(folder2.getId().toString()));
-            Entry getFolder2 = descendants.getEntry(folder2.getId().toString());
-            CMISChildren folder2Children = getFolder2.getFirstChild(CMISConstants.CHILDREN);
-            assertNotNull(folder2Children);
-            assertEquals(1, folder2Children.size());
-            Entry getFolder2Child = folder2Children.getEntries().get(0);
-            assertEquals(document3.getId(), getFolder2Child.getId());
-            assertEquals(document3.getEditLink().getHref().toString(), getFolder2Child.getEditLink().getHref().toString());
-        }
-    }
-
-    public void testGetFolderTree()
-        throws Exception
-    {
-        // create multiple nested children
-        Entry testFolder = createTestFolder("testGetFolderTree");
-        Link childrenLink = getChildrenLink(testFolder);
-        assertNotNull(childrenLink);
-        Entry document1 = createDocument(childrenLink.getHref(), "testGetFolderTree1");
-        assertNotNull(document1);
-        Entry folder2 = createFolder(childrenLink.getHref(), "testGetFolderTree2");
-        assertNotNull(folder2);
-        Link childrenLink2 = getChildrenLink(folder2);
-        assertNotNull(childrenLink2);
-        Entry folder3 = createFolder(childrenLink2.getHref(), "testGetFolderTree2");
-        assertNotNull(folder3);
-        Entry document4 = createDocument(childrenLink2.getHref(), "testGetFolderTree3");
-        assertNotNull(document4);
-        
-        {
-            // get tree (depth = 1, equivalent to getChildren)
-            Map<String, String> args = new HashMap<String, String>();
-            args.put("depth", "1");
-            Link treeLink = getFolderTreeLink(testFolder);
-            assertNotNull(treeLink);
-            
-            Feed tree = getFeed(treeLink.getHref(), args);
-            assertNotNull(tree);
-            assertEquals(1, tree.getEntries().size());
-            assertNotNull(tree.getEntry(folder2.getId().toString()));
-            assertNull(tree.getEntry(document1.getId().toString()));
-            
-            Entry getFolder2 = tree.getEntry(folder2.getId().toString());
-            CMISChildren folder2Children = getFolder2.getFirstChild(CMISConstants.CHILDREN);
-            assertNull(folder2Children);
-        }
-        
-        {
-            // get full tree
-            Map<String, String> args = new HashMap<String, String>();
-            args.put("depth", "-1");
-            Link treeLink = getFolderTreeLink(testFolder);
-            Feed tree = getFeed(treeLink.getHref(), args);
-            assertNotNull(treeLink);
-            assertEquals(1, tree.getEntries().size());
-            assertNotNull(tree.getEntry(folder2.getId().toString()));
-            assertNull(tree.getEntry(document1.getId().toString()));
-            
-            Entry getFolder2 = tree.getEntry(folder2.getId().toString());
-            CMISChildren folder2Children = getFolder2.getFirstChild(CMISConstants.CHILDREN);
-            assertNotNull(folder2Children);
-            assertEquals(1, folder2Children.size());
-            assertNotNull(folder2Children.getEntry(folder3.getId().toString()));
-            assertNull(folder2Children.getEntry(document4.getId().toString()));
-        }
-    }
-    
-    public void testGetParent()
-        throws Exception
-    {
-        Entry testFolder = createTestFolder("testParent");
-        Link childrenLink = getChildrenLink(testFolder);
-        assertNotNull(childrenLink);
-        Entry childFolder = createFolder(childrenLink.getHref(), "testParentChild");
-        assertNotNull(childFolder);
-        Link parentLink = getFolderParentLink(childFolder);
-        assertNotNull(parentLink);
-
-        // ensure there is parent 'testParent'
-        Entry parent = getEntry(parentLink.getHref());
-        assertNotNull(parent);
-        assertEquals(testFolder.getId(), parent.getId());
-    }
-
-    public void testGetParents()
-        throws Exception
-    {
-        Entry testFolder = createTestFolder("testParents");
-        Link childrenLink = getChildrenLink(testFolder);
-        assertNotNull(childrenLink);
-        Entry childDocs = createDocument(childrenLink.getHref(), "testParentsChild");
-        assertNotNull(childDocs);
-        Link parentsLink = getObjectParentsLink(childDocs);
-        assertNotNull(parentsLink);
-        
-        // ensure there is parent 'testParent'
-        Feed parent = getFeed(parentsLink.getHref());
-        assertNotNull(parent);
-        assertEquals(1, parent.getEntries().size());
-        assertEquals(testFolder.getId(), parent.getEntries().get(0).getId());
-    }
-    
-    public void testDelete()
-        throws Exception
-    {
-        // retrieve test folder for deletes
-        Entry testFolder = createTestFolder("testDelete");
-        Link childrenLink = getChildrenLink(testFolder);
-        Feed children = getFeed(childrenLink.getHref());
-        int entriesBefore = children.getEntries().size();
-        
-        // create document for delete
-        Entry document = createDocument(childrenLink.getHref(), "testDelete");
-        Response documentRes = sendRequest(new GetRequest(document.getSelfLink().getHref().toString()), 200, getAtomValidator());
-        assertNotNull(documentRes);
-
-        // ensure document has been created
-        Feed children2 = getFeed(childrenLink.getHref());
-        assertNotNull(children2);
-        int entriesAfterCreate = children2.getEntries().size();
-        assertEquals(entriesAfterCreate, entriesBefore +1);
-
-        // delete
-        Response deleteRes = sendRequest(new DeleteRequest(document.getSelfLink().getHref().toString()), 204);
-        assertNotNull(deleteRes);
-
-        // ensure document has been deleted
-        Feed children3 = getFeed(childrenLink.getHref());
-        assertNotNull(children3);
-        int entriesAfterDelete = children3.getEntries().size();
-        assertEquals(entriesBefore, entriesAfterDelete);
-    }
-
-    public void testDeleteDescendants()
-        throws Exception
-    {
-        // create multiple nested children
-        Entry testFolder = createTestFolder("testDeleteDescendants");
-        Link childrenLink = getChildrenLink(testFolder);
-        assertNotNull(childrenLink);
-        Entry document1 = createDocument(childrenLink.getHref(), "testDeleteDescendants1");
-        assertNotNull(document1);
-        Entry folder2 = createFolder(childrenLink.getHref(), "testDeleteDescendants2");
-        assertNotNull(folder2);
-        Link childrenLink2 = getChildrenLink(folder2);
-        assertNotNull(childrenLink2);
-        Entry document3 = createDocument(childrenLink2.getHref(), "testDeleteDescendants3");
-        assertNotNull(document3);
-        
-        // delete on root of created tree
-        Link descendantsLink = getDescendantsLink(testFolder);
-        assertNotNull(descendantsLink);
-        Response deleteRes = sendRequest(new DeleteRequest(descendantsLink.getHref().toString()), 204);
-        assertNotNull(deleteRes);
-    
-        // ensure all have been deleted
-        Response getRes1 = sendRequest(new GetRequest(testFolder.getSelfLink().getHref().toString()), 404);
-        assertNotNull(getRes1);
-        Response getRes2 = sendRequest(new GetRequest(document1.getSelfLink().getHref().toString()), 404);
-        assertNotNull(getRes2);
-        Response getRes3 = sendRequest(new GetRequest(folder2.getSelfLink().getHref().toString()), 404);
-        assertNotNull(getRes3);
-        Response getRes4 = sendRequest(new GetRequest(document3.getSelfLink().getHref().toString()), 404);
-        assertNotNull(getRes4);
-    }
-
-    public void testDeleteFolderTree()
-        throws Exception
-    {
-        // create multiple nested children
-        Entry testFolder = createTestFolder("testDeleteFolderTree");
-        Link childrenLink = getChildrenLink(testFolder);
-        assertNotNull(childrenLink);
-        Entry document1 = createDocument(childrenLink.getHref(), "testDeleteDescendants1");
-        assertNotNull(document1);
-        Entry folder2 = createFolder(childrenLink.getHref(), "testDeleteDescendants2");
-        assertNotNull(folder2);
-        Link childrenLink2 = getChildrenLink(folder2);
-        assertNotNull(childrenLink2);
-        Entry document3 = createDocument(childrenLink2.getHref(), "testDeleteDescendants3");
-        assertNotNull(document3);
-        
-        // delete on root of created tree
-        Link treeLink = getFolderTreeLink(testFolder);
-        assertNotNull(treeLink);
-        Response deleteRes = sendRequest(new DeleteRequest(treeLink.getHref().toString()), 204);
-        assertNotNull(deleteRes);
-    
-        // ensure all have been deleted
-        Response getRes1 = sendRequest(new GetRequest(testFolder.getSelfLink().getHref().toString()), 404);
-        assertNotNull(getRes1);
-        Response getRes2 = sendRequest(new GetRequest(document1.getSelfLink().getHref().toString()), 404);
-        assertNotNull(getRes2);
-        Response getRes3 = sendRequest(new GetRequest(folder2.getSelfLink().getHref().toString()), 404);
-        assertNotNull(getRes3);
-        Response getRes4 = sendRequest(new GetRequest(document3.getSelfLink().getHref().toString()), 404);
-        assertNotNull(getRes4);
-    }
-    
-    public void testUpdatePatch()
-        throws Exception
-    {
-        // retrieve test folder for update
-        Entry testFolder = createTestFolder("testUpdatePatch");
-        Link childrenLink = getChildrenLink(testFolder);
-        
-        // create document for update
-        Entry document = createDocument(childrenLink.getHref(), "testUpdatePatch");
-        assertNotNull(document);
-        String mimetype = (document.getContentMimeType() != null) ? document.getContentMimeType().toString() : null;
-        if (mimetype != null)
-        {
-            assertEquals("text/html", mimetype);
-        }
-    
-        // TODO: check for content update allowable action
-        //       if update allowed, perform update, else update and check for appropriate error
-        
-        // update
-        String updateFile = loadString("/org/alfresco/repo/cmis/rest/test/updatedocument.atomentry.xml");
-        String guid = GUID.generate();
-        updateFile = updateFile.replace("${NAME}", guid);
-        Response res = sendRequest(new PatchRequest(document.getSelfLink().getHref().toString(), updateFile, Format.ATOMENTRY.mimetype()), 200, getAtomValidator());
-        assertNotNull(res);
-        Entry updated = getAbdera().parseEntry(new StringReader(res.getContentAsString()), null);
-        
-        // ensure update occurred
-        assertEquals(document.getId(), updated.getId());
-        assertEquals(document.getPublished(), updated.getPublished());
-        assertEquals("Updated Title " + guid, updated.getTitle());
-        // TODO: why is this testing for text/plain? it should be test/html
-        assertEquals("text/plain", updated.getContentMimeType().toString());
-        Response contentRes = sendRequest(new GetRequest(updated.getContentSrc().toString()), 200);
-        assertEquals("updated content " + guid, contentRes.getContentAsString());
-    }
-    
-    public void testUpdatePut()
-        throws Exception
-    {
-        // retrieve test folder for update
-        Entry testFolder = createTestFolder("testUpdatePut");
-        Link childrenLink = getChildrenLink(testFolder);
-        
-        // create document for update
-        Entry document = createDocument(childrenLink.getHref(), "testUpdatePut");
-        assertNotNull(document);
-        String mimetype = (document.getContentMimeType() != null) ? document.getContentMimeType().toString() : null;
-        if (mimetype != null)
-        {
-            assertEquals("text/html", mimetype);
-        }
-
-        // TODO: check for content update allowable action
-        //       if update allowed, perform update, else update and check for appropriate error
-        
-        // update
-        String updateFile = loadString("/org/alfresco/repo/cmis/rest/test/updatedocument.atomentry.xml");
-        String guid = GUID.generate();
-        updateFile = updateFile.replace("${NAME}", guid);
-        Response res = sendRequest(new PutRequest(document.getSelfLink().getHref().toString(), updateFile, Format.ATOMENTRY.mimetype()), 200, getAtomValidator());
-        assertNotNull(res);
-        Entry updated = getAbdera().parseEntry(new StringReader(res.getContentAsString()), null);
-        
-        // ensure update occurred
-        assertEquals(document.getId(), updated.getId());
-        assertEquals(document.getPublished(), updated.getPublished());
-        assertEquals("Updated Title " + guid, updated.getTitle());
-        // TODO: why is this testing for text/plain? it should be test/html
-        assertEquals("text/plain", updated.getContentMimeType().toString());
-        Response contentRes = sendRequest(new GetRequest(updated.getContentSrc().toString()), 200);
-        assertEquals("updated content " + guid, contentRes.getContentAsString());
-    }
-
-    public void testUpdatePutAtomEntry()
-        throws Exception
-    {
-        // retrieve test folder for update
-        Entry testFolder = createTestFolder("testUpdatePutAtomEntry");
-        Link childrenLink = getChildrenLink(testFolder);
-        
-        // create document for update
-        Entry document = createDocument(childrenLink.getHref(), "testUpdatePutAtomEntry");
-        assertNotNull(document);
-
-        // edit title
-        String updatedTitle = "Iñtërnâtiônàlizætiøn - 2";
-        document.setTitle(updatedTitle);
-        StringWriter writer = new StringWriter();
-        document.writeTo(writer);
-
-        // put document
-        Response res = sendRequest(new PutRequest(document.getSelfLink().getHref().toString(), writer.toString(), Format.ATOMENTRY.mimetype()), 200, getAtomValidator());
-        assertNotNull(res);
-        Entry updated = getAbdera().parseEntry(new StringReader(res.getContentAsString()), null);
-        assertEquals(updatedTitle, updated.getTitle());
-    }
-
-    public void testContentStreamEmpty()
-        throws Exception
-    {
-        // retrieve test folder for content stream tests
-        Entry testFolder = createTestFolder("testContentStreamEmpty");
-        Link childrenLink = getChildrenLink(testFolder);
-        
-        // create document for setting / getting content
-        Entry document = createDocument(childrenLink.getHref(), "testContent", "createdocumentNoContent.atomentry.xml");
-    
-        // retrieve content
-        sendRequest(new GetRequest(document.getContentSrc().toString()), 404);
-    }
-    
-    public void testContentStream()
-        throws Exception
-    {
-        // retrieve test folder for content stream tests
-        Entry testFolder = createTestFolder("testContentStream");
-        Link childrenLink = getChildrenLink(testFolder);
-        
-        // create document for setting / getting content
-        Entry document = createDocument(childrenLink.getHref(), "testContent");
-
-        // retrieve content
-        Response documentContentRes = sendRequest(new GetRequest(document.getContentSrc().toString()), 200);
-        String resContent = documentContentRes.getContentAsString();
-        assertEquals(document.getTitle(), resContent);
-
-        // set content
-        String UPDATED_CONTENT = "Updated via SetContentStream()";
-        Link editMediaLink = document.getEditMediaLink();
-        assertNotNull(editMediaLink);
-        Response res = sendRequest(new PutRequest(editMediaLink.getHref().toString(), UPDATED_CONTENT, Format.TEXT.mimetype()), 200);
-        assertNotNull(res);
-        
-        // retrieve updated content
-        Response documentUpdatedContentRes = sendRequest(new GetRequest(document.getContentSrc().toString()), 200);
-        String resUpdatedContent = documentUpdatedContentRes.getContentAsString();
-        assertEquals(UPDATED_CONTENT, resUpdatedContent);
-    }
-    
-    public void testDeleteContentStream()
-        throws Exception
-    {
-        // retrieve test folder for content stream tests
-        Entry testFolder = createTestFolder("testContentStreamEmpty");
-        Link childrenLink = getChildrenLink(testFolder);
-
-        // create document for setting / getting content
-        Entry document = createDocument(childrenLink.getHref(), "testContent");
-
-        // retrieve content
-        Response documentContentRes = sendRequest(new GetRequest(document.getContentSrc().toString()), 200);
-        String resContent = documentContentRes.getContentAsString();
-        assertEquals(document.getTitle(), resContent);
-
-        // delete content
-        Link editMediaLink = document.getEditMediaLink();
-        assertNotNull(editMediaLink);
-        Response res = sendRequest(new DeleteRequest(editMediaLink.getHref().toString()), 204);
-        assertNotNull(res);
-        
-        // retrieve deleted content
-        sendRequest(new GetRequest(document.getContentSrc().toString()), 404);
-    }
-    
-    public void testAllowableActions()
-        throws Exception
-    {
-        // retrieve test folder for allowable actions
-        Entry testFolder = createTestFolder("testAllowableActions");
-        Link childrenLink = getChildrenLink(testFolder);
-        assertNotNull(childrenLink);
-        
-        // test allowable actions for folder
-        {
-            Entry child = createFolder(childrenLink.getHref(), "testFolderAllowableActions");
-            assertNotNull(child);
-            Link allowableActionsLink = child.getLink(CMISConstants.REL_ALLOWABLE_ACTIONS);
-            Response allowableActionsRes = sendRequest(new GetRequest(allowableActionsLink.getHref().toString()), 200, getAtomValidator());
-            assertNotNull(allowableActionsRes);
-            Element allowableActions = getAbdera().parse(new StringReader(allowableActionsRes.getContentAsString()), null);
-            assertNotNull(allowableActions);
-            assertTrue(allowableActions instanceof CMISAllowableActions);
-            CMISObject childObject = child.getExtension(CMISConstants.OBJECT);
-            assertNotNull(childObject);
-            CMISAllowableActions objectAllowableActions = childObject.getExtension(CMISConstants.ALLOWABLE_ACTIONS);
-            assertNotNull(objectAllowableActions);
-            compareAllowableActions((CMISAllowableActions)allowableActions, objectAllowableActions);
-
-            // retrieve getProperties() with includeAllowableActions flag
-            Map<String, String> args = new HashMap<String, String>();
-            args.put("includeAllowableActions", "true");
-            Entry properties = getEntry(child.getSelfLink().getHref(), args);
-            assertNotNull(properties);
-            CMISObject propObject = properties.getExtension(CMISConstants.OBJECT);
-            assertNotNull(propObject);
-            CMISAllowableActions propAllowableActions = propObject.getExtension(CMISConstants.ALLOWABLE_ACTIONS);
-            assertNotNull(propAllowableActions);
-            compareAllowableActions((CMISAllowableActions)allowableActions, propAllowableActions);
-        }
-
-        // test allowable actions for document
-        {
-            Entry child = createDocument(childrenLink.getHref(), "testDocumentAllowableActions");
-            assertNotNull(child);
-            Link allowableActionsLink = child.getLink(CMISConstants.REL_ALLOWABLE_ACTIONS);
-            Response allowableActionsRes = sendRequest(new GetRequest(allowableActionsLink.getHref().toString()), 200, getAtomValidator());
-            assertNotNull(allowableActionsRes);
-            Element allowableActions = getAbdera().parse(new StringReader(allowableActionsRes.getContentAsString()), null);
-            assertNotNull(allowableActions);
-            assertTrue(allowableActions instanceof CMISAllowableActions);
-            CMISObject childObject = child.getExtension(CMISConstants.OBJECT);
-            assertNotNull(childObject);
-            CMISAllowableActions objectAllowableActions = childObject.getExtension(CMISConstants.ALLOWABLE_ACTIONS);
-            assertNotNull(objectAllowableActions);
-            compareAllowableActions((CMISAllowableActions)allowableActions, objectAllowableActions);
-
-            // retrieve getProperties() with includeAllowableActions flag
-            Map<String, String> args = new HashMap<String, String>();
-            args.put("includeAllowableActions", "true");
-            Entry properties = getEntry(child.getSelfLink().getHref(), args);
-            assertNotNull(properties);
-            CMISObject propObject = properties.getExtension(CMISConstants.OBJECT);
-            assertNotNull(propObject);
-            CMISAllowableActions propAllowableActions = propObject.getExtension(CMISConstants.ALLOWABLE_ACTIONS);
-            assertNotNull(propAllowableActions);
-            compareAllowableActions((CMISAllowableActions)allowableActions, propAllowableActions);
-        }
-        
-        // test allowable actions for children
-        {
-            Map<String, String> args = new HashMap<String, String>();
-            args.put("includeAllowableActions", "true");
-            Feed children = getFeed(childrenLink.getHref(), args);
-            assertNotNull(children);
-            for (Entry child : children.getEntries())
-            {
-                // extract allowable actions from child
-                CMISObject childObject = child.getExtension(CMISConstants.OBJECT);
-                assertNotNull(childObject);
-                CMISAllowableActions objectAllowableActions = childObject.getExtension(CMISConstants.ALLOWABLE_ACTIONS);
-                assertNotNull(objectAllowableActions);
-                
-                // retrieve allowable actions from link
-                Link allowableActionsLink = child.getLink(CMISConstants.REL_ALLOWABLE_ACTIONS);
-                Response allowableActionsRes = sendRequest(new GetRequest(allowableActionsLink.getHref().toString()), 200, getAtomValidator());
-                assertNotNull(allowableActionsRes);
-                Element allowableActions = getAbdera().parse(new StringReader(allowableActionsRes.getContentAsString()), null);
-                assertNotNull(allowableActions);
-                assertTrue(allowableActions instanceof CMISAllowableActions);
-                
-                // compare the two
-                compareAllowableActions((CMISAllowableActions)allowableActions, objectAllowableActions);
-            }
-        }
-    }
-    
-    public void testGetCheckedOut()
-        throws Exception
-    {
-        // retrieve test folder for checkouts
-        Entry testFolder = createTestFolder("testGetCheckedOut");
-        CMISObject object = testFolder.getExtension(CMISConstants.OBJECT);
-        String scopeId = object.getObjectId().getStringValue();
-        assertNotNull(scopeId);
-        
-        // retrieve checkouts within scope of test checkout folder
-        Service repository = getRepository();
-        assertNotNull(repository);
-        IRI checkedoutHREF = getCheckedOutCollection(getWorkspace(getRepository()));
-        Map<String, String> args = new HashMap<String, String>();
-        args.put("folderId", scopeId);
-        Feed checkedout = getFeed(new IRI(checkedoutHREF.toString()), args);
-        assertNotNull(checkedout);
-        assertEquals(0, checkedout.getEntries().size());
-    }
-    
-    public void testCheckout()
-        throws Exception
-    {
-        // retrieve test folder for checkouts
-        Entry testFolder = createTestFolder("testCheckout");
-        Link childrenLink = getChildrenLink(testFolder);
-        
-        // create document for checkout
-        Entry document = createDocument(childrenLink.getHref(), "testCheckout");
-        CMISObject docObject = document.getExtension(CMISConstants.OBJECT);
-        Response documentRes = sendRequest(new GetRequest(document.getSelfLink().getHref().toString()), 200, getAtomValidator());
-        assertNotNull(documentRes);
-        String documentXML = documentRes.getContentAsString();
-        assertNotNull(documentXML);
-        
-        // checkout
-        IRI checkedoutHREF = getCheckedOutCollection(getWorkspace(getRepository()));
-        Response pwcRes = sendRequest(new PostRequest(checkedoutHREF.toString(), documentXML, Format.ATOMENTRY.mimetype()), 201, getAtomValidator());
-        assertNotNull(pwcRes);
-        String pwcXml = pwcRes.getContentAsString();
-        assertNotNull(pwcXml);
-        Entry pwc = getAbdera().parseEntry(new StringReader(pwcXml), null);
-        assertNotNull(pwc);
-        CMISObject pwcObject = pwc.getExtension(CMISConstants.OBJECT);
-        assertNotNull(pwcObject);
-        assertTrue(pwcObject.isVersionSeriesCheckedOut().getBooleanValue());
-        assertEquals(docObject.getObjectId().getStringValue(), pwcObject.getVersionSeriesId().getStringValue());
-        assertEquals(pwcObject.getObjectId().getStringValue(), pwcObject.getVersionSeriesCheckedOutId().getStringValue());
-        assertNotNull(pwcObject.getVersionSeriesCheckedOutBy().getStringValue());
-        
-        // retrieve pwc directly
-        Response pwcGetRes = sendRequest(new GetRequest(pwc.getSelfLink().getHref().toString()), 200);
-        assertNotNull(pwcGetRes);
-        String pwcGetXml = pwcRes.getContentAsString();
-        Entry pwcGet = getAbdera().parseEntry(new StringReader(pwcGetXml), null);
-        assertNotNull(pwcGet);
-        CMISObject pwcGetObject = pwc.getExtension(CMISConstants.OBJECT);
-        assertNotNull(pwcGetObject);
-        assertTrue(pwcGetObject.isVersionSeriesCheckedOut().getBooleanValue());
-        assertEquals(docObject.getObjectId().getStringValue(), pwcGetObject.getVersionSeriesId().getStringValue());
-        assertEquals(pwcGetObject.getObjectId().getStringValue(), pwcGetObject.getVersionSeriesCheckedOutId().getStringValue());
-        assertNotNull(pwcGetObject.getVersionSeriesCheckedOutBy().getStringValue());
-
-        // test getCheckedOut is updated
-        CMISObject object = testFolder.getExtension(CMISConstants.OBJECT);
-        String scopeId = object.getObjectId().getStringValue();
-        Map<String, String> args = new HashMap<String, String>();
-        args.put("folderId", scopeId);
-        Feed checkedout = getFeed(new IRI(checkedoutHREF.toString()), args);
-        assertNotNull(checkedout);
-        assertEquals(1, checkedout.getEntries().size());
-    }
-    
-    public void testCancelCheckout()
-        throws Exception
-    {
-        // retrieve test folder for checkouts
-        Entry testFolder = createTestFolder("testCancelCheckout");
-        Link childrenLink = getChildrenLink(testFolder);
-        
-        // create document for checkout
-        Entry document = createDocument(childrenLink.getHref(), "testCancelCheckout");
-        Response documentRes = sendRequest(new GetRequest(document.getSelfLink().getHref().toString()), 200, getAtomValidator());
-        assertNotNull(documentRes);
-        String xml = documentRes.getContentAsString();
-        assertNotNull(xml);
-        
-        // checkout
-        IRI checkedoutHREF = getCheckedOutCollection(getWorkspace(getRepository()));
-        Response pwcRes = sendRequest(new PostRequest(checkedoutHREF.toString(), xml, Format.ATOMENTRY.mimetype()), 201, getAtomValidator());
-        assertNotNull(pwcRes);
-        String pwcXml = pwcRes.getContentAsString();
-        
-        // test getCheckedOut is updated
-        CMISObject object = testFolder.getExtension(CMISConstants.OBJECT);
-        String scopeId = object.getObjectId().getStringValue();
-        Map<String, String> args = new HashMap<String, String>();
-        args.put("folderId", scopeId);
-        Feed checkedout = getFeed(new IRI(checkedoutHREF.toString()), args);
-        assertNotNull(checkedout);
-        assertEquals(1, checkedout.getEntries().size());
-        
-        // cancel checkout
-        Entry pwc = getAbdera().parseEntry(new StringReader(pwcXml), null);
-        assertNotNull(pwc);
-        Response cancelRes = sendRequest(new DeleteRequest(pwc.getSelfLink().getHref().toString()), 204);
-        assertNotNull(cancelRes);
-
-        // test getCheckedOut is updated
-        CMISObject object2 = testFolder.getExtension(CMISConstants.OBJECT);
-        String scopeId2 = object2.getObjectId().getStringValue();
-        Map<String, String> args2 = new HashMap<String, String>();
-        args2.put("folderId", scopeId2);
-        Feed checkedout2 = getFeed(new IRI(checkedoutHREF.toString()), args2);
-        assertNotNull(checkedout2);
-        assertEquals(0, checkedout2.getEntries().size());
-    }
-
-    public void testCheckIn()
-        throws Exception
-    {
-        // retrieve test folder for checkins
-        Entry testFolder = createTestFolder("testCheckIn");
-        Link childrenLink = getChildrenLink(testFolder);
-        
-        // create document for checkout
-        Entry document = createDocument(childrenLink.getHref(), "testCheckin");
-        Response documentRes = sendRequest(new GetRequest(document.getSelfLink().getHref().toString()), 200, getAtomValidator());
-        assertNotNull(documentRes);
-        String xml = documentRes.getContentAsString();
-        assertNotNull(xml);
-        
-        // checkout
-        IRI checkedoutHREF = getCheckedOutCollection(getWorkspace(getRepository()));
-        Response pwcRes = sendRequest(new PostRequest(checkedoutHREF.toString(), xml, Format.ATOMENTRY.mimetype()), 201, getAtomValidator());
-        assertNotNull(pwcRes);
-        Entry pwc = getAbdera().parseEntry(new StringReader(pwcRes.getContentAsString()), null);
-        assertNotNull(pwc);
-        
-        // test getCheckedOut is updated
-        CMISObject object = testFolder.getExtension(CMISConstants.OBJECT);
-        String scopeId = object.getObjectId().getStringValue();
-        Map<String, String> args = new HashMap<String, String>();
-        args.put("folderId", scopeId);
-        Feed checkedout = getFeed(new IRI(checkedoutHREF.toString()), args);
-        assertNotNull(checkedout);
-        assertEquals(1, checkedout.getEntries().size());
-
-        // test version properties of checked-out item
-        // test checked-in version properties
-        Entry checkedoutdoc = getEntry(document.getSelfLink().getHref());
-        CMISObject checkedoutdocObject = checkedoutdoc.getExtension(CMISConstants.OBJECT);
-        assertNotNull(checkedoutdocObject);
-        assertTrue(checkedoutdocObject.isVersionSeriesCheckedOut().getBooleanValue());
-        //assertEquals(checkedoutdocObject.getObjectId().getStringValue(), checkedoutdocObject.getVersionSeriesId().getStringValue());
-        assertNotNull(checkedoutdocObject.getVersionSeriesCheckedOutId().getStringValue());
-        assertNotNull(checkedoutdocObject.getVersionSeriesCheckedOutBy().getStringValue());
-        
-        // test update of private working copy
-        String updateFile = loadString("/org/alfresco/repo/cmis/rest/test/updatedocument.atomentry.xml");
-        String guid = GUID.generate();
-        updateFile = updateFile.replace("${NAME}", guid);
-        Response pwcUpdatedres = sendRequest(new PatchRequest(pwc.getEditLink().getHref().toString(), updateFile, Format.ATOMENTRY.mimetype()), 200, getAtomValidator());
-        assertNotNull(pwcUpdatedres);
-        Entry updated = getAbdera().parseEntry(new StringReader(pwcUpdatedres.getContentAsString()), null);
-        // ensure update occurred
-        assertEquals(pwc.getId(), updated.getId());
-        assertEquals(pwc.getPublished(), updated.getPublished());
-        assertEquals("Updated Title " + guid, updated.getTitle());
-        assertEquals("text/plain", updated.getContentMimeType().toString());
-        Response pwcContentRes = sendRequest(new GetRequest(pwc.getContentSrc().toString()), 200);
-        assertEquals("updated content " + guid, pwcContentRes.getContentAsString());
-        
-        // checkin
-        String checkinFile = loadString("/org/alfresco/repo/cmis/rest/test/checkindocument.atomentry.xml");
-        String checkinUrl = pwc.getSelfLink().getHref().toString();
-        Map<String, String> args2 = new HashMap<String, String>();
-        args2.put("checkinComment", guid);
-        args2.put("checkin", "true");
-        Response checkinRes = sendRequest(new PatchRequest(checkinUrl, checkinFile, Format.ATOMENTRY.mimetype()).setArgs(args2), 200, getAtomValidator());
-        assertNotNull(checkinRes);
-        String checkinResXML = checkinRes.getContentAsString();
-    
-        // test getCheckedOut is updated
-        CMISObject object2 = testFolder.getExtension(CMISConstants.OBJECT);
-        String scopeId2 = object2.getObjectId().getStringValue();
-        Map<String, String> args3 = new HashMap<String, String>();
-        args3.put("folderId", scopeId2);
-        Feed checkedout2 = getFeed(new IRI(checkedoutHREF.toString()), args3);
-        assertNotNull(checkedout2);
-        assertEquals(0, checkedout2.getEntries().size());
-        
-        // test checked-in doc has new updates
-        Entry checkedIn = getAbdera().parseEntry(new StringReader(checkinResXML), null);
-        Entry updatedDoc = getEntry(checkedIn.getSelfLink().getHref());
-        // TODO: issue with updating name on PWC and it not reflecting on checked-in document
-        //assertEquals("Updated Title " + guid, updatedDoc.getTitle());
-        assertEquals("text/plain", updatedDoc.getContentMimeType().toString());
-        Response updatedContentRes = sendRequest(new GetRequest(updatedDoc.getContentSrc().toString()), 200);
-        assertEquals("updated content " + guid, updatedContentRes.getContentAsString());
-        
-        // test checked-in version properties
-        CMISObject updatedObject = updatedDoc.getExtension(CMISConstants.OBJECT);
-        assertNotNull(updatedObject);
-        assertFalse(updatedObject.isVersionSeriesCheckedOut().getBooleanValue());
-        //assertEquals(updatedObject.getObjectId().getStringValue(), updatedObject.getVersionSeriesId().getStringValue());
-        assertNull(updatedObject.getVersionSeriesCheckedOutId().getStringValue());
-        assertNull(updatedObject.getVersionSeriesCheckedOutBy().getStringValue());
-        assertEquals(guid, updatedObject.getCheckinComment().getStringValue());
-    }
-
-    public void testUpdateOnCheckIn()
-        throws Exception
-    {
-        // retrieve test folder for checkins
-        Entry testFolder = createTestFolder("testUpdateOnCheckIn");
-        Link childrenLink = getChildrenLink(testFolder);
-        
-        // create document for checkout
-        Entry document = createDocument(childrenLink.getHref(), "testUpdateOnCheckIn");
-        Response documentRes = sendRequest(new GetRequest(document.getSelfLink().getHref().toString()), 200, getAtomValidator());
-        assertNotNull(documentRes);
-        String xml = documentRes.getContentAsString();
-        assertNotNull(xml);
-        
-        // checkout
-        IRI checkedoutHREF = getCheckedOutCollection(getWorkspace(getRepository()));
-        Response pwcRes = sendRequest(new PostRequest(checkedoutHREF.toString(), xml, Format.ATOMENTRY.mimetype()), 201, getAtomValidator());
-        assertNotNull(pwcRes);
-        Entry pwc = getAbdera().parseEntry(new StringReader(pwcRes.getContentAsString()), null);
-        assertNotNull(pwc);
-        
-        // test getCheckedOut is updated
-        CMISObject object = testFolder.getExtension(CMISConstants.OBJECT);
-        String scopeId = object.getObjectId().getStringValue();
-        Map<String, String> args = new HashMap<String, String>();
-        args.put("folderId", scopeId);
-        Feed checkedout = getFeed(new IRI(checkedoutHREF.toString()), args);
-        assertNotNull(checkedout);
-        assertEquals(1, checkedout.getEntries().size());
-    
-        // checkin (with update)
-        String checkinFile = loadString("/org/alfresco/repo/cmis/rest/test/checkinandupdatedocument.atomentry.xml");
-        String guid = GUID.generate();
-        checkinFile = checkinFile.replace("${NAME}", guid);
-        String checkinUrl = pwc.getSelfLink().getHref().toString();
-        Map<String, String> args2 = new HashMap<String, String>();
-        args2.put("checkinComment", guid);
-        args2.put("checkin", "true");
-        Response checkinRes = sendRequest(new PatchRequest(checkinUrl, checkinFile, Format.ATOMENTRY.mimetype()).setArgs(args2), 200, getAtomValidator());
-        assertNotNull(checkinRes);
-        String checkinResXML = checkinRes.getContentAsString();
-    
-        // test getCheckedOut is updated
-        CMISObject object2 = testFolder.getExtension(CMISConstants.OBJECT);
-        String scopeId2 = object2.getObjectId().getStringValue();
-        Map<String, String> args3 = new HashMap<String, String>();
-        args3.put("folderId", scopeId2);
-        Feed checkedout2 = getFeed(new IRI(checkedoutHREF.toString()), args3);
-        assertNotNull(checkedout2);
-        assertEquals(0, checkedout2.getEntries().size());
-        
-        // test checked-in doc has new updates
-        Entry checkedIn = getAbdera().parseEntry(new StringReader(checkinResXML), null);
-        Entry updatedDoc = getEntry(checkedIn.getSelfLink().getHref());
-        // TODO: issue with updating name on PWC and it not reflecting on checked-in document
-        //assertEquals("Updated Title " + guid, updatedDoc.getTitle());
-        assertEquals("text/plain", updatedDoc.getContentMimeType().toString());
-        Response updatedContentRes = sendRequest(new GetRequest(updatedDoc.getContentSrc().toString()), 200);
-        assertEquals("updated content " + guid, updatedContentRes.getContentAsString());
-    }
-
-    public void testGetAllVersions()
-        throws Exception
-    {
-        int NUMBER_OF_VERSIONS = 3;
-        
-        // retrieve test folder for checkins
-        Entry testFolder = createTestFolder("testGetAllVersions");
-        Link childrenLink = getChildrenLink(testFolder);
-        
-        // create document for checkout
-        Entry document = createDocument(childrenLink.getHref(), "testGetAllVersions");
-        Response documentRes = sendRequest(new GetRequest(document.getSelfLink().getHref().toString()), 200, getAtomValidator());
-        assertNotNull(documentRes);
-        String xml = documentRes.getContentAsString();
-        assertNotNull(xml);
-
-        IRI checkedoutHREF = getCheckedOutCollection(getWorkspace(getRepository()));
-        for (int i = 0; i < NUMBER_OF_VERSIONS; i++)
-        {
-            // checkout
-            Response pwcRes = sendRequest(new PostRequest(checkedoutHREF.toString(), xml, Format.ATOMENTRY.mimetype()), 201, getAtomValidator());
-            assertNotNull(pwcRes);
-            Entry pwc = getAbdera().parseEntry(new StringReader(pwcRes.getContentAsString()), null);
-            assertNotNull(pwc);
-    
-            // checkin
-            String checkinFile = loadString("/org/alfresco/repo/cmis/rest/test/checkinandupdatedocument.atomentry.xml");
-            checkinFile = checkinFile.replace("${NAME}", "checkin " + i);
-            String checkinUrl = pwc.getSelfLink().getHref().toString();
-            Map<String, String> args2 = new HashMap<String, String>();
-            args2.put("checkinComment", "checkin" + i);
-            args2.put("checkin", "true");
-            Response checkinRes = sendRequest(new PutRequest(checkinUrl, checkinFile, Format.ATOMENTRY.mimetype()).setArgs(args2), 200, getAtomValidator());
-            assertNotNull(checkinRes);
-            
-            // use result of checkin (i.e. document returned), for next checkout
-            xml = checkinRes.getContentAsString();
-            assertNotNull(xml);
-        }
-
-        // get all versions
-        Link allVersionsLink = document.getLink(CMISConstants.REL_VERSION_HISTORY);
-        assertNotNull(allVersionsLink);
-        Feed allVersions = getFeed(allVersionsLink.getHref());
-        assertNotNull(allVersions);
-        assertEquals(NUMBER_OF_VERSIONS + 1 /** initial version */, allVersions.getEntries().size());
-        for (int i = 0; i < NUMBER_OF_VERSIONS; i++)
-        {
-            Link versionLink = allVersions.getEntries().get(i).getSelfLink();
-            assertNotNull(versionLink);
-            Entry version = getEntry(versionLink.getHref());
-            assertNotNull(version);
-            // TODO: issue with updating name on PWC and it not reflecting on checked-in document
-            //assertEquals("Update Title checkin " + i, version.getTitle());
-            Response versionContentRes = sendRequest(new GetRequest(version.getContentSrc().toString()), 200);
-            assertEquals("updated content checkin " + (NUMBER_OF_VERSIONS -1 - i), versionContentRes.getContentAsString());
-            CMISObject versionObject = version.getExtension(CMISConstants.OBJECT);
-            assertNotNull(versionObject);
-            assertEquals("checkin" + + (NUMBER_OF_VERSIONS -1 - i), versionObject.getCheckinComment().getStringValue());
-        }
-    }
-    
-    public void testGetTypeDefinitionsAll()
-        throws Exception
-    {
-        IRI typesHREF = getTypesChildrenCollection(getWorkspace(getRepository()));
-        Feed types = getFeed(typesHREF);
-        assertNotNull(types);
-        Feed typesWithProps = getFeed(typesHREF);
-        assertNotNull(typesWithProps);
-        for (Entry type : types.getEntries())
-        {
-            Entry retrievedType = getEntry(type.getSelfLink().getHref());
-            assertEquals(type.getId(), retrievedType.getId());
-            assertEquals(type.getTitle(), retrievedType.getTitle());
-            // TODO: type specific properties - extension to abdera
-        }
-    }
-
-    public void testGetTypeDefinitionHierarchy()
-        throws Exception
-    {
-        IRI typesHREF = getTypesChildrenCollection(getWorkspace(getRepository()));
-        Map<String, String> args = new HashMap<String, String>();
-        args.put("type", "folder");
-        args.put("includePropertyDefinitions", "true");
-        args.put("maxItems", "5");
-        while (typesHREF != null)
-        {
-            Feed types = getFeed(typesHREF, args);
-            
-            for (Entry type : types.getEntries())
-            {
-                Entry retrievedType = getEntry(type.getSelfLink().getHref());
-                assertEquals(type.getId(), retrievedType.getId());
-                assertEquals(type.getTitle(), retrievedType.getTitle());
-                // TODO: type specific properties - extension to Abdera
-            }
-         
-            // next page
-            Link nextLink = types.getLink("next");
-            typesHREF = (nextLink != null) ? nextLink.getHref() : null;
-            args.remove("maxItems");
-        };
-    }
-
-    public void testGetTypeDefinition()
-        throws Exception
-    {
-        // retrieve test folder for type definitions
-        Entry testFolder = createTestFolder("testGetEntryTypeDefinition");
-        Link childrenLink = getChildrenLink(testFolder);
-        
-        // create document
-        Entry document = createDocument(childrenLink.getHref(), "testGetEntryTypeDefinitionDoc");
-        Response documentRes = sendRequest(new GetRequest(document.getSelfLink().getHref().toString()), 200, getAtomValidator());
-        assertNotNull(documentRes);
-
-        // create folder
-        Entry folder = createFolder(childrenLink.getHref(), "testGetEntryTypeDefinitionFolder");
-        Response folderRes = sendRequest(new GetRequest(folder.getSelfLink().getHref().toString()), 200, getAtomValidator());
-        assertNotNull(folderRes);
-        
-        // retrieve children
-        Feed children = getFeed(childrenLink.getHref());
-        for (Entry entry : children.getEntries())
-        {
-            // get type definition
-            Link typeLink = entry.getLink(CMISConstants.REL_DESCRIBED_BY);
-            assertNotNull(typeLink);
-            Entry type = getEntry(typeLink.getHref());
-            assertNotNull(type);
-            // TODO: test correct type for entry & properties of type
-        }
-    }
-    
-    public void testQuery()
-        throws Exception
-    {
-        String queryCapability = getQueryCapability();
-        if (queryCapability.equals("none"))
-        {
-            return;
-        }
-        
-        // retrieve query collection
-        IRI queryHREF = getQueryCollection(getWorkspace(getRepository()));
-        
-        // retrieve test folder for query
-        Entry testFolder = createTestFolder("testQuery");
-        CMISObject testFolderObject = testFolder.getExtension(CMISConstants.OBJECT);
-        Link childrenLink = getChildrenLink(testFolder);
-        
-        // create documents to query
-        Entry document1 = createDocument(childrenLink.getHref(), "apple1");
-        assertNotNull(document1);
-        CMISObject document1Object = document1.getExtension(CMISConstants.OBJECT);
-        assertNotNull(document1Object);
-        String doc2name = "name" + System.currentTimeMillis();
-        Entry document2 = createDocument(childrenLink.getHref(), doc2name);
-        assertNotNull(document2);
-        CMISObject document2Object = document2.getExtension(CMISConstants.OBJECT);
-        assertNotNull(document2Object);
-        Entry document3 = createDocument(childrenLink.getHref(), "banana1");
-        assertNotNull(document3);
-
-        // retrieve query request document
-        String queryDoc = loadString("/org/alfresco/repo/cmis/rest/test/query.cmisquery.xml");
-
-        if (queryCapability.equals("metadataonly") || queryCapability.equals("bothseperate") || queryCapability.equals("bothcombined"))
-        {
-            {
-                // meta data only query against folder
-                String query = "SELECT * FROM cmis:folder " +
-                               "WHERE cmis:ObjectId = '" + testFolderObject.getObjectId().getStringValue() + "'";
-                String queryReq = queryDoc.replace("${STATEMENT}", query);
-                queryReq = queryReq.replace("${SKIPCOUNT}", "0");
-                queryReq = queryReq.replace("${MAXITEMS}", "5");
-        
-                Response queryRes = sendRequest(new PostRequest(queryHREF.toString(), queryReq, CMISConstants.MIMETYPE_CMIS_QUERY), 200);
-                assertNotNull(queryRes);
-                Feed queryFeed = getAbdera().parseFeed(new StringReader(queryRes.getContentAsString()), null);
-                assertNotNull(queryFeed);
-                assertEquals(1, queryFeed.getEntries().size());
-                assertNotNull(queryFeed.getEntry(testFolder.getId().toString()));
-                CMISObject result1 = queryFeed.getEntry(testFolder.getId().toString()).getExtension(CMISConstants.OBJECT);
-                assertEquals(testFolderObject.getName().getStringValue(), result1.getName().getStringValue());
-                assertEquals(testFolderObject.getObjectId().getStringValue(), result1.getObjectId().getStringValue());
-                assertEquals(testFolderObject.getObjectTypeId().getStringValue(), result1.getObjectTypeId().getStringValue());
-            }
-    
-            {
-                // meta data only query against document
-                String query = "SELECT * FROM cmis:document " +
-                               "WHERE IN_FOLDER('" + testFolderObject.getObjectId().getStringValue() + "') " +
-                               "AND cmis:Name = 'apple1'";
-                String queryReq = queryDoc.replace("${STATEMENT}", query);
-                queryReq = queryReq.replace("${SKIPCOUNT}", "0");
-                queryReq = queryReq.replace("${MAXITEMS}", "5");
-        
-                Response queryRes = sendRequest(new PostRequest(queryHREF.toString(), queryReq, CMISConstants.MIMETYPE_CMIS_QUERY), 200);
-                assertNotNull(queryRes);
-                Feed queryFeed = getAbdera().parseFeed(new StringReader(queryRes.getContentAsString()), null);
-                assertNotNull(queryFeed);
-                assertEquals(1, queryFeed.getEntries().size());
-                assertNotNull(queryFeed.getEntry(document1.getId().toString()));
-                CMISObject result1 = queryFeed.getEntry(document1.getId().toString()).getExtension(CMISConstants.OBJECT);
-                assertEquals(document1Object.getName().getStringValue(), result1.getName().getStringValue());
-                assertEquals(document1Object.getObjectId().getStringValue(), result1.getObjectId().getStringValue());
-                assertEquals(document1Object.getObjectTypeId().getStringValue(), result1.getObjectTypeId().getStringValue());
-            }
-        }
-        
-        if (queryCapability.equals("fulltextonly") || queryCapability.equals("bothseperate") || queryCapability.equals("bothcombined"))
-        {
-            // full text only query
-            String query = "SELECT cmis:ObjectId, cmis:ObjectTypeId, cmis:Name FROM cmis:document " +
-                           "WHERE CONTAINS('" + doc2name + "')";
-            String queryReq = queryDoc.replace("${STATEMENT}", query);
-            queryReq = queryReq.replace("${SKIPCOUNT}", "0");
-            queryReq = queryReq.replace("${MAXITEMS}", "5");
-    
-            Response queryRes = sendRequest(new PostRequest(queryHREF.toString(), queryReq, CMISConstants.MIMETYPE_CMIS_QUERY), 200);
-            assertNotNull(queryRes);
-            Feed queryFeed = getAbdera().parseFeed(new StringReader(queryRes.getContentAsString()), null);
-            assertNotNull(queryFeed);
-            assertEquals(1, queryFeed.getEntries().size());
-            assertNotNull(queryFeed.getEntry(document2.getId().toString()));
-            CMISObject result1 = queryFeed.getEntry(document2.getId().toString()).getExtension(CMISConstants.OBJECT);
-            assertEquals(document2Object.getName().getStringValue(), result1.getName().getStringValue());
-            assertEquals(document2Object.getObjectId().getStringValue(), result1.getObjectId().getStringValue());
-            assertEquals(document2Object.getObjectTypeId().getStringValue(), result1.getObjectTypeId().getStringValue());
-        }
-
-        if (queryCapability.equals("bothcombined"))
-        {
-            // combined meta data and full text
-            String query = "SELECT cmis:ObjectId, cmis:ObjectTypeId, cmis:Name FROM cmis:document " +
-                           "WHERE IN_FOLDER('" + testFolderObject.getObjectId().getStringValue() + "') " +
-                           "AND cmis:Name = 'apple1' " +
-                           "AND CONTAINS('apple1')";
-            String queryReq = queryDoc.replace("${STATEMENT}", query);
-            queryReq = queryReq.replace("${SKIPCOUNT}", "0");
-            queryReq = queryReq.replace("${MAXITEMS}", "5");
-    
-            Response queryRes = sendRequest(new PostRequest(queryHREF.toString(), queryReq, CMISConstants.MIMETYPE_CMIS_QUERY), 200);
-            assertNotNull(queryRes);
-            Feed queryFeed = getAbdera().parseFeed(new StringReader(queryRes.getContentAsString()), null);
-            assertNotNull(queryFeed);
-            assertEquals(1, queryFeed.getEntries().size());
-            assertNotNull(queryFeed.getEntry(document1.getId().toString()));
-            CMISObject result1 = queryFeed.getEntry(document1.getId().toString()).getExtension(CMISConstants.OBJECT);
-            assertEquals(document1Object.getName().getStringValue(), result1.getName().getStringValue());
-            assertEquals(document1Object.getObjectId().getStringValue(), result1.getObjectId().getStringValue());
-            assertEquals(document1Object.getObjectTypeId().getStringValue(), result1.getObjectTypeId().getStringValue());
-        }
-    }
-    
-    public void testQueryPaging() throws Exception
-    {
-        String queryCapability = getQueryCapability();
-        if (queryCapability.equals("none"))
-        {
-            return;
-        }
-        
-        // retrieve query collection
-        IRI queryHREF = getQueryCollection(getWorkspace(getRepository()));
-
-        // create multiple children
-        Set<IRI> docIds = new HashSet<IRI>();
-        Entry testFolder = createTestFolder("testQueryPaging");
-        Link childrenLink = getChildrenLink(testFolder);
-        assertNotNull(childrenLink);
-        for (int i = 0; i < 15; i++)
-        {
-            Entry document = createDocument(childrenLink.getHref(), "testQueryPaging" + i);
-            assertNotNull(document);
-            docIds.add(document.getId());
-        }
-        assertEquals(15, docIds.size());
-
-        // query children
-        String queryDoc = loadString("/org/alfresco/repo/cmis/rest/test/query.cmisquery.xml");
-        CMISObject testFolderObject = testFolder.getExtension(CMISConstants.OBJECT);
-        String query = "SELECT cmis:ObjectId, cmis:ObjectTypeId, cmis:Name FROM cmis:document " + "WHERE IN_FOLDER('" + testFolderObject.getObjectId().getStringValue() + "')";
-        String queryReq = queryDoc.replace("${STATEMENT}", query);
-        queryReq = queryReq.replace("${SKIPCOUNT}", "0");
-        queryReq = queryReq.replace("${MAXITEMS}", "4");
-        
-        // issue query
-        Response queryRes = sendRequest(new PostRequest(queryHREF.toString(), queryReq, CMISConstants.MIMETYPE_CMIS_QUERY), 200);
-        assertNotNull(queryRes);
-        
-        // retrieve entries for first page
-        Feed queryFeed = getAbdera().parseFeed(new StringReader(queryRes.getContentAsString()), null);
-        assertNotNull(queryFeed);
-
-        int page = 0;
-        Link nextLink = null;
-        do
-        {
-            page++;
-            assertEquals(page < 4 ? 4 : 3, queryFeed.getEntries().size());
-            
-            // mark entries as read
-            for (Entry entry : queryFeed.getEntries())
-            {
-                docIds.remove(entry.getId());
-            }
-
-            // next page
-            nextLink = queryFeed.getLink("next");
-            if (page == 4)
-            {
-                assertNull(nextLink);
-            }
-            else
-            {
-                assertNotNull(nextLink);
-            }
-            
-            if (nextLink != null)
-            {
-                queryFeed = getFeed(nextLink.getHref());
-                assertNotNull(queryFeed);
-            }
-        }
-        while (nextLink != null);
-        
-        assertEquals(4, page);
-        assertEquals(0, docIds.size());
-    }
-
-    public void testQueryAllowableActions()
-        throws Exception
-    {
-        String queryCapability = getQueryCapability();
-        if (queryCapability.equals("none"))
-        {
-            return;
-        }
-        
-        // retrieve query collection
-        IRI queryHREF = getQueryCollection(getWorkspace(getRepository()));
-        
-        // retrieve test folder for query
-        Entry testFolder = createTestFolder("testQueryAllowableAcrtions");
-        CMISObject testFolderObject = testFolder.getExtension(CMISConstants.OBJECT);
-        Link childrenLink = getChildrenLink(testFolder);
-        
-        // create documents to query
-        Entry document1 = createDocument(childrenLink.getHref(), "apple1");
-        assertNotNull(document1);
-        CMISObject document1Object = document1.getExtension(CMISConstants.OBJECT);
-        assertNotNull(document1Object);
-        String doc2name = "name" + System.currentTimeMillis();
-        Entry document2 = createDocument(childrenLink.getHref(), doc2name);
-        assertNotNull(document2);
-        CMISObject document2Object = document2.getExtension(CMISConstants.OBJECT);
-        assertNotNull(document2Object);
-        Entry document3 = createDocument(childrenLink.getHref(), "banana1");
-        assertNotNull(document3);
-    
-        // retrieve query request document
-        String queryDoc = loadString("/org/alfresco/repo/cmis/rest/test/queryallowableactions.cmisquery.xml");
-    
-        {
-            // construct structured query
-            String query = "SELECT * FROM cmis:document " +
-                           "WHERE IN_FOLDER('" + testFolderObject.getObjectId().getStringValue() + "') ";
-            String queryReq = queryDoc.replace("${STATEMENT}", query);
-            queryReq = queryReq.replace("${INCLUDEALLOWABLEACTIONS}", "true");
-            queryReq = queryReq.replace("${SKIPCOUNT}", "0");
-            queryReq = queryReq.replace("${MAXITEMS}", "5");
-    
-            // issue structured query
-            Response queryRes = sendRequest(new PostRequest(queryHREF.toString(), queryReq, CMISConstants.MIMETYPE_CMIS_QUERY), 200);
-            assertNotNull(queryRes);
-            Feed queryFeed = getAbdera().parseFeed(new StringReader(queryRes.getContentAsString()), null);
-            assertNotNull(queryFeed);
-            assertEquals(3, queryFeed.getEntries().size());
-            
-            for (Entry child : queryFeed.getEntries())
-            {
-                // extract allowable actions from child
-                CMISObject childObject = child.getExtension(CMISConstants.OBJECT);
-                assertNotNull(childObject);
-                CMISAllowableActions childAllowableActions = childObject.getExtension(CMISConstants.ALLOWABLE_ACTIONS);
-                assertNotNull(childAllowableActions);
-                
-                // retrieve allowable actions from link
-                Map<String, String> args = new HashMap<String, String>();
-                args.put("includeAllowableActions", "true");
-                Entry entry = getEntry(child.getSelfLink().getHref(), args);
-                CMISObject entryObject = entry.getExtension(CMISConstants.OBJECT);
-                assertNotNull(entryObject);
-                CMISAllowableActions entryAllowableActions = entryObject.getExtension(CMISConstants.ALLOWABLE_ACTIONS);
-                
-                // compare the two
-                compareAllowableActions(childAllowableActions, entryAllowableActions);
-            }
-        }
-    }
-
-    
-//    public void testUnfiled()
-//    {
-//    }
-
-    
-    /**
-     * Compare two sets of allowable actions
-     */
-    private void compareAllowableActions(CMISAllowableActions left, CMISAllowableActions right)
-    {
-        List<String> rightactions = new ArrayList<String>(right.getNames());
-        for (String action : left.getNames())
-        {
-            assertTrue(rightactions.contains(action));
-            CMISAllowableAction leftAction = left.find(action);
-            assertNotNull(leftAction);
-            CMISAllowableAction rightAction = right.find(action);
-            assertNotNull(rightAction);
-            assertEquals(leftAction.isAllowed(), rightAction.isAllowed());
-            rightactions.remove(action);
-        }
-        assertTrue(rightactions.size() == 0);
-    }
-    
-}
diff --git a/source/java/org/alfresco/repo/cmis/rest/test/CMISTestRunner.java b/source/java/org/alfresco/repo/cmis/rest/test/CMISTestRunner.java
deleted file mode 100644
index f25ecc7e87..0000000000
--- a/source/java/org/alfresco/repo/cmis/rest/test/CMISTestRunner.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
- * Copyright (C) 2005-2008 Alfresco Software Limited.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
- * As a special exception to the terms and conditions of version 2.0 of 
- * the GPL, you may redistribute this Program in connection with Free/Libre 
- * and Open Source Software ("FLOSS") applications as described in Alfresco's 
- * FLOSS exception.  You should have recieved a copy of the text describing 
- * the FLOSS exception, and it is also available here: 
- * http://www.alfresco.com/legal/licensing"
- */
-package org.alfresco.repo.cmis.rest.test;
-
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.List;
-
-import junit.framework.TestResult;
-import junit.framework.TestSuite;
-
-import org.alfresco.repo.cmis.rest.test.BaseCMISWebScriptTest.CMISTestListener;
-import org.alfresco.repo.web.scripts.BaseWebScriptTest.RemoteServer;
-import org.alfresco.repo.web.scripts.BaseWebScriptTest.WebScriptTestListener;
-import org.alfresco.util.CachingDateFormat;
-
-
-/**
- * CMIS Test Runner
- * 
- * @author davidc
- */
-public class CMISTestRunner
-{
-    private String match = null;
-    private WebScriptTestListener listener = new CMISTestListener(System.out);
-    private boolean traceReqRes = false;
-    private String serviceUrl = null;
-    private String userpass = null;
-    private boolean validateResponse = true;
-
-    
-    /**
-     * @param match  test name to execute (* for wildcards)
-     */
-    public void setMatch(String match)
-    {
-        this.match = match;
-    }
-
-    /**
-     * @param listener  test listener
-     */
-    public void setListener(WebScriptTestListener listener)
-    {
-        this.listener = listener;
-    }
-
-    /**
-     * @param traceReqRes  true => trace requests / responses
-     */
-    public void setTraceReqRes(boolean traceReqRes)
-    {
-        this.traceReqRes = traceReqRes;
-    }
-
-    /**
-     * @param serviceUrl  cmis service document url
-     */
-    public void setServiceUrl(String serviceUrl)
-    {
-        this.serviceUrl = serviceUrl;
-    }
-
-    /**
-     * @param userpass  user name / password
-     */
-    public void setUserPass(String userpass)
-    {
-        this.userpass = userpass;
-    }
-
-    /**
-     * @param validateResponse  true => test response against CMIS XSDs
-     */
-    public void setValidateResponse(boolean validateResponse)
-    {
-        this.validateResponse = validateResponse;
-    }
-    
-    /**
-     * Gets the names of CMIS tests
-     * 
-     * @param match  * for wildcard
-     * @return  array of test names
-     */
-    public String[] getTestNames(String match)
-    {
-        List<String> namesList = new ArrayList<String>();
-        TestSuite allSuite = new TestSuite(CMISTest.class);
-        for (int i = 0; i < allSuite.countTestCases(); i++)
-        {
-            CMISTest test = (CMISTest)allSuite.testAt(i);
-            if (match == null || match.equals("*") || test.getName().matches(match.replace("*", "[A-Za-z0-9]*")))
-            {
-                namesList.add(test.getName());
-            }
-        }
-        String[] names = new String[namesList.size()];
-        namesList.toArray(names);
-        return names;
-    }
-    
-    /**
-     * Execute CMIS Tests
-     */
-    public void execute()
-    {
-        RemoteServer server = null;
-        if (serviceUrl != null)
-        {
-            server = new RemoteServer();
-            if (userpass != null)
-            {
-                String[] credentials = userpass.split("/");
-                server.username = credentials[0];
-                if (credentials.length > 1)
-                {
-                    server.password = credentials[1];
-                }
-            }
-        }
-        
-        // dump test parameters
-        if (listener != null)
-        {
-            Calendar today = Calendar.getInstance();
-            SimpleDateFormat df = CachingDateFormat.getDateFormat("yyyy-MM-dd HH:mm:ss.SSS", true);
-            listener.addLog(null, "Test Started at " + df.format(today.getTime()));
-            listener.addLog(null, "Service URL: " + (serviceUrl == null ? "[not set]" : serviceUrl));
-            listener.addLog(null, "User: " + (userpass == null ? "[not set]" : userpass));
-            listener.addLog(null, "Validate Responses: " + validateResponse);
-            listener.addLog(null, "Trace Requests/Responses: " + traceReqRes);
-            listener.addLog(null, "Tests: " + (match == null ? "*" : match));
-            listener.addLog(null, "");
-        }
-        
-        executeSuite(match, server);
-    }
-
-    /**
-     * Execute suite of CMIS Tests
-     * 
-     * @param match  tests to execute (* for wildcard)
-     * @param server  remote server
-     * @param argsAsHeaders  arguments passed in Headers
-     */
-    private void executeSuite(String match, RemoteServer server)
-    {
-        TestSuite allSuite = new TestSuite(CMISTest.class);
-        TestSuite suite = new TestSuite();
-        for (int i = 0; i < allSuite.countTestCases(); i++)
-        {
-            CMISTest test = (CMISTest)allSuite.testAt(i);
-            if (match == null || match.equals("*") || test.getName().matches(match.replace("*", "[A-Za-z0-9]*")))
-            {
-                test.setValidateResponse(validateResponse);
-                if (listener != null)
-                {
-                    test.setListener(listener);
-                    test.setTraceReqRes(traceReqRes);
-                }
-                if (server != null)
-                {
-                    test.setServiceUrl(serviceUrl);
-                    if (server != null)
-                    {
-                        test.setRemoteServer(server);
-                    }
-                }
-                suite.addTest(test);
-            }
-        }
-        TestResult result = new TestResult();
-        if (listener != null)
-        {
-            result.addListener(listener);
-        }
-        suite.run(result);
-    }
-    
-    /**
-     * Execute CMIS Tests from command-line 
-     * 
-     * url={serviceUrl}
-     * user={userpass}
-     * args={"url"|"headers"|"both"}
-     */
-    public static void main(String[] args)
-    {
-        CMISTestRunner runner = new CMISTestRunner();
-
-        for (String arg : args)
-        {
-            String[] argSegment = arg.split("=");
-            if (argSegment[0].equals("url"))
-            {
-                runner.setServiceUrl(argSegment[1]);
-            }
-            else if (argSegment[0].equals("user"))
-            {
-                runner.setUserPass(argSegment[1]);
-            }
-        }
-
-        // execute
-        runner.execute();
-        System.exit(0);
-    }
-
-}
diff --git a/source/java/org/alfresco/repo/cmis/rest/test/CMISTestRunnerWebScript.java b/source/java/org/alfresco/repo/cmis/rest/test/CMISTestRunnerWebScript.java
index 765cd81cf3..288d287157 100644
--- a/source/java/org/alfresco/repo/cmis/rest/test/CMISTestRunnerWebScript.java
+++ b/source/java/org/alfresco/repo/cmis/rest/test/CMISTestRunnerWebScript.java
@@ -26,12 +26,14 @@ package org.alfresco.repo.cmis.rest.test;
 
 import java.io.IOException;
 import java.io.PrintStream;
+import java.util.Properties;
 
-import org.alfresco.repo.cmis.rest.test.BaseCMISWebScriptTest.CMISTestListener;
-import org.alfresco.repo.web.scripts.BaseWebScriptTest.WebScriptTestListener;
 import org.alfresco.web.scripts.AbstractWebScript;
 import org.alfresco.web.scripts.WebScriptRequest;
 import org.alfresco.web.scripts.WebScriptResponse;
+import org.apache.chemistry.tck.atompub.TCKMessageWriter;
+import org.apache.chemistry.tck.atompub.tools.TCKRunner;
+import org.apache.chemistry.tck.atompub.tools.TCKRunnerOptions;
 
 /**
  * Execute CMIS Tests
@@ -46,37 +48,47 @@ public class CMISTestRunnerWebScript extends AbstractWebScript
     public void execute(WebScriptRequest req, WebScriptResponse res)
         throws IOException
     {
-        // setup CMIS tests
-        PrintStream printStream = new PrintStream(res.getOutputStream(), true, "UTF-8");
-        WebScriptTestListener testListener = new CMISTestListener(printStream);
-        CMISTestRunner runner = new CMISTestRunner();
-        runner.setListener(testListener);
+        // setup default values
+        Properties properties = new Properties();
+        properties.put(TCKRunnerOptions.PROP_VALIDATE, "false");
+        properties.put(TCKRunnerOptions.PROP_FAIL_ON_VALIDATION_ERROR, "false");
+        properties.put(TCKRunnerOptions.PROP_TRACE_REQUESTS, "false");
 
-        // process test parameters
-        String serviceUrl = req.getParameter("url");
-        if (serviceUrl != null && serviceUrl.length() > 0)
+        // apply form provided values
+        TCKRunnerOptions options = new TCKRunnerOptions(properties);
+        String[] names = req.getParameterNames();
+        for (String name : names)
         {
-            runner.setServiceUrl(serviceUrl);
-        }
-        String userpass = req.getParameter("user");
-        if (userpass != null && userpass.length() > 0)
-        {
-            runner.setUserPass(userpass);
-        }
-        String validate = req.getParameter("validate");
-        runner.setValidateResponse(Boolean.valueOf(validate));
-            
-        String trace = req.getParameter("trace");
-        runner.setTraceReqRes(Boolean.valueOf(trace));
-
-        String match = req.getParameter("tests");
-        if (match != null && match.length() > 0)
-        {
-            runner.setMatch(match);
+            properties.setProperty(name, req.getParameter(name));
         }
         
-        // execute tests
-        runner.execute();
+        // execute tck
+        TCKRunner runner = new TCKRunner(options, new ResponseMessageWriter(res));
+        runner.execute(properties);
     }
 
+    private static class ResponseMessageWriter implements TCKMessageWriter
+    {
+        private PrintStream printStream;
+        
+        public ResponseMessageWriter(WebScriptResponse res) throws IOException
+        {
+            printStream = new PrintStream(res.getOutputStream(), true, "UTF-8");
+        }
+        
+        public void info(String message)
+        {
+            printStream.println("INFO  " + message);
+        }
+
+        public void trace(String message)
+        {
+            printStream.println("TRACE " + message);
+        }
+
+        public void warn(String message)
+        {
+            printStream.println("WARN  " + message);
+        }
+    }
 }
diff --git a/source/java/org/alfresco/repo/cmis/rest/test/checkinandupdatedocument.atomentry.xml b/source/java/org/alfresco/repo/cmis/rest/test/checkinandupdatedocument.atomentry.xml
deleted file mode 100644
index 852e297dc0..0000000000
--- a/source/java/org/alfresco/repo/cmis/rest/test/checkinandupdatedocument.atomentry.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<entry xmlns="http://www.w3.org/2005/Atom">
-    <title>Updated Title ${NAME}</title>
-    <content>updated content ${NAME}</content>
-</entry>
diff --git a/source/java/org/alfresco/repo/cmis/rest/test/checkindocument.atomentry.xml b/source/java/org/alfresco/repo/cmis/rest/test/checkindocument.atomentry.xml
deleted file mode 100644
index ba99e2fbbd..0000000000
--- a/source/java/org/alfresco/repo/cmis/rest/test/checkindocument.atomentry.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<entry xmlns="http://www.w3.org/2005/Atom"/>
diff --git a/source/java/org/alfresco/repo/cmis/rest/test/createatomentry.atomentry.xml b/source/java/org/alfresco/repo/cmis/rest/test/createatomentry.atomentry.xml
deleted file mode 100644
index ab8821b30e..0000000000
--- a/source/java/org/alfresco/repo/cmis/rest/test/createatomentry.atomentry.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" ?>
-<entry xmlns="http://www.w3.org/2005/Atom">
-    <title>${NAME}</title>
-    <author>
-        <name>CMIS Test</name>
-    </author>
-    <content type="html">${CONTENT}</content>
-</entry>
\ No newline at end of file
diff --git a/source/java/org/alfresco/repo/cmis/rest/test/createcustomdocument.atomentry.xml b/source/java/org/alfresco/repo/cmis/rest/test/createcustomdocument.atomentry.xml
deleted file mode 100644
index dc12d60046..0000000000
--- a/source/java/org/alfresco/repo/cmis/rest/test/createcustomdocument.atomentry.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<entry xmlns="http://www.w3.org/2005/Atom" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200901" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901">
-    <title>${NAME}</title>
-    <summary>${NAME} (summary)</summary>
-    <content type="text/html">${CONTENT}</content>
-    <cmisra:object>
-        <cmis:properties>
-           <cmis:propertyId pdid="cmis:ObjectTypeId"><cmis:value>D/cmiscustom:document</cmis:value></cmis:propertyId>
-           <cmis:propertyString pdid="cmiscustom:docprop_string"><cmis:value>custom string</cmis:value></cmis:propertyString>
-           <cmis:propertyBoolean pdid="cmiscustom:docprop_boolean_multi"><cmis:value>true</cmis:value><cmis:value>false</cmis:value></cmis:propertyBoolean>
-        </cmis:properties>
-    </cmisra:object>
-</entry>
diff --git a/source/java/org/alfresco/repo/cmis/rest/test/createcustomfolder.atomentry.xml b/source/java/org/alfresco/repo/cmis/rest/test/createcustomfolder.atomentry.xml
deleted file mode 100644
index 49e71806ad..0000000000
--- a/source/java/org/alfresco/repo/cmis/rest/test/createcustomfolder.atomentry.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<entry xmlns="http://www.w3.org/2005/Atom" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200901" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901">
-    <title>${NAME}</title>
-    <summary>${NAME} (summary)</summary>
-    <cmisra:object>
-	    <cmis:properties>
-	        <cmis:propertyId pdid="cmis:ObjectTypeId"><cmis:value>F/cmiscustom:folder</cmis:value></cmis:propertyId>
-            <cmis:propertyString pdid="cmiscustom:folderprop_string"><cmis:value>custom string</cmis:value></cmis:propertyString>
-	    </cmis:properties>
-    </cmisra:object>
-</entry>
diff --git a/source/java/org/alfresco/repo/cmis/rest/test/createdocument.atomentry.xml b/source/java/org/alfresco/repo/cmis/rest/test/createdocument.atomentry.xml
deleted file mode 100644
index f42e04113d..0000000000
--- a/source/java/org/alfresco/repo/cmis/rest/test/createdocument.atomentry.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<entry xmlns="http://www.w3.org/2005/Atom" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200901" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901">
-    <title>${NAME}</title>
-    <summary>${NAME} (summary)</summary>
-    <content type="text/html">${CONTENT}</content>
-    <cmisra:object>
-      <cmis:properties>
-         <cmis:propertyId pdid="cmis:ObjectTypeId"><cmis:value>cmis:document</cmis:value></cmis:propertyId>
-      </cmis:properties>
-    </cmisra:object>
-</entry>
diff --git a/source/java/org/alfresco/repo/cmis/rest/test/createdocument2.atomentry.xml b/source/java/org/alfresco/repo/cmis/rest/test/createdocument2.atomentry.xml
deleted file mode 100644
index 7cfec11980..0000000000
--- a/source/java/org/alfresco/repo/cmis/rest/test/createdocument2.atomentry.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<entry xmlns="http://www.w3.org/2005/Atom" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200901" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901" xmlns:app="http://www.w3.org/2007/app">
-  <title type="text">onesentence.txt</title>
-  <content type="text/plain">MQ==&#xd;</content>
-  <cmisra:object>
-    <cmis:properties>
-      <cmis:propertyIs pdid="cmis:ObjectTypeId"><cmis:value>document</cmis:value></cmis:propertyId>
-      <cmis:propertyString pdid="cmis:DocumentTitle"><cmis:value>onesentence.txt</cmis:value></cmis:propertyString>
-    </cmis:properties>
-  </cmisra:object>
-</entry>
\ No newline at end of file
diff --git a/source/java/org/alfresco/repo/cmis/rest/test/createdocumentBase64.atomentry.xml b/source/java/org/alfresco/repo/cmis/rest/test/createdocumentBase64.atomentry.xml
deleted file mode 100644
index 7b85da1fd5..0000000000
--- a/source/java/org/alfresco/repo/cmis/rest/test/createdocumentBase64.atomentry.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<entry xmlns="http://www.w3.org/2005/Atom" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200901" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901">
-    <title>${NAME}</title>
-    <summary>${NAME} (summary)</summary>
-    <content type="text/plain">
-		VGhpcyBtZXRob2QgZm9sbG93cyB0aGUgQXRvbSBQdWJsaXNoaW5nIG1vZGVsIHdoZXJlIHRoZSBl
-		bnRyeSBkb2N1bWVudCwgYXRvbSBvciBjbWlzLCBpcyBwb3N0ZWQgdG8gdGhlIHJvb3Qgb3Igc3Bl
-		Y2lmaWMgZm9sZGVyIFVSSS4gIEZvciB1bmZpbGVkIGRvY3VtZW50cywgcG9zdCB0aGUgZG9jdW1l
-		bnQgdG8gdGhlIHVuZmlsZWQgY29sbGVjdGlvbi4gICBUaGUgZG9jdW1lbnQgd2lsbCBiZSBjcmVh
-		dGVkIGluIHRoZSBmb2xkZXIgcG9zdGVkLiBJZiB0aGUgZG9jdW1lbnQgaXMgcG9zdGVkIHRvIHRo
-		ZSByb290IGNvbGxlY3Rpb24gYW5kIGEgZm9sZGVyIHByb3BlcnR5IGlzIHNwZWNpZmllZCwgdGhl
-		biB0aGUgcmVwb3NpdG9yeSB3aWxsIGNyZWF0ZSB0aGUgZG9jdW1lbnQgaW4gdGhlIHNwZWNpZmll
-		ZCBmb2xkZXIuICBJZiB0aGUgY29udGVudCBzdHJlYW0gaXMgc3BlY2lmaWVkIG9uIGNyZWF0ZSwg
-		aXQgc2hvdWxkIGJlIGJhc2U2NCBlbmNvZGVkIGluIHRoZSBhdG9tIGVudHJ5Lg==
-    </content>
-    <cmisra:object>
-       <cmis:properties>
-          <cmis:propertyId pdid="cmis:ObjectTypeId"><cmis:value>cmis:document</cmis:value></cmis:propertyId>
-       </cmis:properties>
-    </cmisra:object>
-</entry>
diff --git a/source/java/org/alfresco/repo/cmis/rest/test/createdocumentBase64.txt b/source/java/org/alfresco/repo/cmis/rest/test/createdocumentBase64.txt
deleted file mode 100644
index 2d99dea5b3..0000000000
--- a/source/java/org/alfresco/repo/cmis/rest/test/createdocumentBase64.txt
+++ /dev/null
@@ -1 +0,0 @@
-This method follows the Atom Publishing model where the entry document, atom or cmis, is posted to the root or specific folder URI.  For unfiled documents, post the document to the unfiled collection.   The document will be created in the folder posted. If the document is posted to the root collection and a folder property is specified, then the repository will create the document in the specified folder.  If the content stream is specified on create, it should be base64 encoded in the atom entry.
\ No newline at end of file
diff --git a/source/java/org/alfresco/repo/cmis/rest/test/createdocumentNoContent.atomentry.xml b/source/java/org/alfresco/repo/cmis/rest/test/createdocumentNoContent.atomentry.xml
deleted file mode 100644
index 74260983fa..0000000000
--- a/source/java/org/alfresco/repo/cmis/rest/test/createdocumentNoContent.atomentry.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<entry xmlns="http://www.w3.org/2005/Atom" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200901" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901">
-    <title>${NAME}</title>
-    <summary>${NAME} (summary)</summary>
-    <cmisra:object>
-      <cmis:properties>
-         <cmis:propertyId pdid="cmis:ObjectTypeId"><cmis:value>cmis:document</cmis:value></cmis:propertyId>
-      </cmis:properties>
-    </cmisra:object>
-</entry>
diff --git a/source/java/org/alfresco/repo/cmis/rest/test/createfolder.atomentry.xml b/source/java/org/alfresco/repo/cmis/rest/test/createfolder.atomentry.xml
deleted file mode 100644
index c4e8fa04f6..0000000000
--- a/source/java/org/alfresco/repo/cmis/rest/test/createfolder.atomentry.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<entry xmlns="http://www.w3.org/2005/Atom" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200901" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901">
-    <title>${NAME}</title>
-    <summary>${NAME} (summary)</summary>
-    <cmisra:object>
-	    <cmis:properties>
-	        <cmis:propertyId pdid="cmis:ObjectTypeId"><cmis:value>cmis:folder</cmis:value></cmis:propertyId>
-	    </cmis:properties>
-    </cmisra:object>
-</entry>
diff --git a/source/java/org/alfresco/repo/cmis/rest/test/createrelationship.atomentry.xml b/source/java/org/alfresco/repo/cmis/rest/test/createrelationship.atomentry.xml
deleted file mode 100644
index 4ee946313f..0000000000
--- a/source/java/org/alfresco/repo/cmis/rest/test/createrelationship.atomentry.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<entry xmlns="http://www.w3.org/2005/Atom" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200901" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901">
-    <cmisra:object>
-      <cmis:properties>
-         <cmis:propertyId pdid="cmis:ObjectTypeId"><cmis:value>${RELTYPE}</cmis:value></cmis:propertyId>
-         <cmis:propertyId pdid="cmis:TargetId"><cmis:value>${TARGETID}</cmis:value></cmis:propertyId>
-      </cmis:properties>
-    </cmisra:object>
-</entry>
diff --git a/source/java/org/alfresco/repo/cmis/rest/test/query.cmisquery.xml b/source/java/org/alfresco/repo/cmis/rest/test/query.cmisquery.xml
deleted file mode 100644
index 4c43c9a581..0000000000
--- a/source/java/org/alfresco/repo/cmis/rest/test/query.cmisquery.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<cmis:query xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901" >
-  <cmis:statement><![CDATA[${STATEMENT}]]></cmis:statement>
-  <cmis:skipCount>${SKIPCOUNT}</cmis:skipCount>
-  <cmis:maxItems>${MAXITEMS}</cmis:maxItems>
-</cmis:query>
diff --git a/source/java/org/alfresco/repo/cmis/rest/test/queryallowableactions.cmisquery.xml b/source/java/org/alfresco/repo/cmis/rest/test/queryallowableactions.cmisquery.xml
deleted file mode 100644
index 08db1fef86..0000000000
--- a/source/java/org/alfresco/repo/cmis/rest/test/queryallowableactions.cmisquery.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<cmis:query xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901" >
-  <cmis:statement><![CDATA[${STATEMENT}]]></cmis:statement>
-  <cmis:includeAllowableActions>${INCLUDEALLOWABLEACTIONS}</cmis:includeAllowableActions>
-  <cmis:skipCount>${SKIPCOUNT}</cmis:skipCount>
-  <cmis:maxItems>${MAXITEMS}</cmis:maxItems>
-</cmis:query>
diff --git a/source/java/org/alfresco/repo/cmis/rest/test/updatecustomdocument.atomentry.xml b/source/java/org/alfresco/repo/cmis/rest/test/updatecustomdocument.atomentry.xml
deleted file mode 100644
index 04ab325f78..0000000000
--- a/source/java/org/alfresco/repo/cmis/rest/test/updatecustomdocument.atomentry.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<entry xmlns="http://www.w3.org/2005/Atom" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200901" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901">
-    <title>Updated Title ${NAME}</title>
-    <cmisra:object>
-        <cmis:properties>
-           <cmis:propertyString pdid="cmiscustom:docprop_string"><cmis:value>custom ${NAME}</cmis:value></cmis:propertyString>
-           <cmis:propertyBoolean pdid="cmiscustom:docprop_boolean_multi"><cmis:value>false</cmis:value><cmis:value>true</cmis:value></cmis:propertyBoolean>
-        </cmis:properties>
-    </cmisra:object>
-</entry>
diff --git a/source/java/org/alfresco/repo/cmis/rest/test/updatedocument.atomentry.xml b/source/java/org/alfresco/repo/cmis/rest/test/updatedocument.atomentry.xml
deleted file mode 100644
index 852e297dc0..0000000000
--- a/source/java/org/alfresco/repo/cmis/rest/test/updatedocument.atomentry.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<entry xmlns="http://www.w3.org/2005/Atom">
-    <title>Updated Title ${NAME}</title>
-    <content>updated content ${NAME}</content>
-</entry>
diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/ATOM.xsd b/source/java/org/alfresco/repo/cmis/rest/xsd/ATOM.xsd
deleted file mode 100755
index e0caf03017..0000000000
--- a/source/java/org/alfresco/repo/cmis/rest/xsd/ATOM.xsd
+++ /dev/null
@@ -1,447 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-	<!--
-		-*- rnc -*- RELAX NG Compact Syntax Grammar for the Atom Format
-		Specification Version 11
-	-->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-	elementFormDefault="qualified" targetNamespace="http://www.w3.org/2005/Atom"
-	xmlns:atom="http://www.w3.org/2005/Atom" xmlns:xhtml="http://www.w3.org/1999/xhtml"
-	xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901" xmlns:xml="http://www.w3.org/XML/1998/namespace"
-	xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
-	xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200901"
-	jaxb:extensionBindingPrefixes="xjc" jaxb:version="2.1" version="0.62d">
-
-	<xs:import namespace="http://www.w3.org/XML/1998/namespace"
-		schemaLocation="xml.xsd" />
-	<xs:import namespace="http://docs.oasis-open.org/ns/cmis/core/200901"
-		schemaLocation="CMIS-Core.xsd" />
-	<xs:import namespace="http://docs.oasis-open.org/ns/cmis/restatom/200901"
-		schemaLocation="CMIS-RestAtom.xsd" />
-
-	<!-- Common attributes -->
-	<xs:attributeGroup name="atomCommonAttributes">
-		<xs:attribute ref="xml:base" />
-		<xs:attribute ref="xml:lang" />
-		<xs:attributeGroup ref="atom:undefinedAttribute" />
-	</xs:attributeGroup>
-	<!-- Text Constructs -->
-	<xs:attributeGroup name="atomPlainTextConstruct">
-		<xs:attributeGroup ref="atom:atomCommonAttributes" />
-		<xs:attribute name="type">
-			<xs:simpleType>
-				<xs:restriction base="xs:token">
-					<xs:enumeration value="text" />
-					<xs:enumeration value="html" />
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-	</xs:attributeGroup>
-	<xs:group name="atomXHTMLTextConstruct">
-		<xs:sequence>
-			<xs:any minOccurs="0" maxOccurs="unbounded" namespace="http://www.w3.org/1999/xhtml" />
-		</xs:sequence>
-	</xs:group>
-	<xs:attributeGroup name="atomXHTMLTextConstruct">
-		<xs:attributeGroup ref="atom:atomCommonAttributes" />
-		<xs:attribute name="type" use="required">
-			<xs:simpleType>
-				<xs:restriction base="xs:token">
-					<xs:enumeration value="xhtml" />
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-	</xs:attributeGroup>
-	<xs:complexType name="atomTextConstruct" mixed="true">
-		<xs:group minOccurs="0" ref="atom:atomXHTMLTextConstruct" />
-		<xs:attribute name="type">
-			<xs:simpleType>
-				<xs:restriction base="xs:token">
-					<xs:enumeration value="text" />
-					<xs:enumeration value="html" />
-					<xs:enumeration value="xhtml" />
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-		<xs:attributeGroup ref="atom:atomCommonAttributes" />
-	</xs:complexType>
-	<!-- Person Construct -->
-	<xs:complexType name="atomPersonConstruct">
-		<xs:sequence>
-			<xs:element ref="atom:name" minOccurs="0" maxOccurs="1" />
-			<xs:element ref="atom:uri" minOccurs="0" maxOccurs="1" />
-			<xs:element ref="atom:email" minOccurs="0" maxOccurs="1" />
-			<xs:group ref="atom:extensionElement" minOccurs="0"
-				maxOccurs="unbounded" />
-		</xs:sequence>
-		<xs:attributeGroup ref="atom:atomCommonAttributes" />
-	</xs:complexType>
-	<xs:element name="name" type="xs:string" />
-	<xs:element name="uri" type="xs:string" />
-	<xs:element name="email" type="atom:atomEmailAddress" />
-	<!-- Date Construct -->
-	<xs:complexType name="atomDateConstruct">
-		<xs:simpleContent>
-			<xs:extension base="xs:dateTime">
-				<xs:attributeGroup ref="atom:atomCommonAttributes" />
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!-- atom:feed -->
-	<xs:element name="feed" type="atom:feedType"></xs:element>
-	<xs:complexType name="feedType">
-		<xs:sequence>
-			<xs:choice maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:appinfo>
-						<jaxb:property name="items" />
-					</xs:appinfo>
-				</xs:annotation>
-				<xs:element ref="atom:author" />
-				<xs:element ref="atom:category" />
-				<xs:element ref="atom:contributor" />
-				<xs:element ref="atom:generator" />
-				<xs:element ref="atom:icon" />
-				<xs:element ref="atom:id" />
-				<xs:element ref="atom:link" />
-				<xs:element ref="atom:logo" />
-				<xs:element ref="atom:rights" />
-				<xs:element ref="atom:subtitle" />
-				<xs:element ref="atom:title" />
-				<xs:element ref="atom:updated" />
-			</xs:choice>
-
-			<!--  original atom extension element -->
-			<xs:group ref="atom:extensionElement" />
-
-			<xs:element minOccurs="0" maxOccurs="unbounded" ref="atom:entry" />
-		</xs:sequence>
-		<xs:attributeGroup ref="atom:atomCommonAttributes" />
-	</xs:complexType>
-	<!-- atom:entry -->
-	<xs:element name="entry" type="atom:entryType">
-	</xs:element>
-	<xs:complexType name="entryType">
-		<xs:sequence>
-			<xs:choice maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:appinfo>
-						<jaxb:property name="items" />
-					</xs:appinfo>
-				</xs:annotation>
-				<xs:element ref="atom:author" />
-				<xs:element ref="atom:category" />
-				<xs:element ref="atom:content" />
-				<xs:element ref="atom:contributor" />
-				<xs:element ref="atom:id" />
-				<xs:element ref="atom:link" />
-				<xs:element ref="atom:published" />
-				<xs:element ref="atom:rights" />
-				<xs:element ref="atom:source" />
-				<xs:element ref="atom:summary" />
-				<xs:element ref="atom:title" />
-				<xs:element ref="atom:updated" />
-			</xs:choice>
-
-			<!-- Normal ATOM extension element -->
-			<xs:group ref="atom:extensionElement" />
-		</xs:sequence>
-		<xs:attributeGroup ref="atom:atomCommonAttributes" />
-	</xs:complexType>
-
-	<!-- atom:content -->
-	<xs:attributeGroup name="atomInlineTextConstruct">
-		<xs:attributeGroup ref="atom:atomCommonAttributes" />
-		<xs:attribute name="type">
-			<xs:simpleType>
-				<xs:restriction base="xs:token">
-					<xs:enumeration value="text" />
-					<xs:enumeration value="html" />
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-	</xs:attributeGroup>
-	<xs:group name="atomInlineOtherConstruct">
-		<xs:sequence>
-			<xs:group minOccurs="0" maxOccurs="unbounded" ref="atom:anyElement" />
-		</xs:sequence>
-	</xs:group>
-	<xs:attributeGroup name="atomInlineOtherConstruct">
-		<xs:attributeGroup ref="atom:atomCommonAttributes" />
-		<xs:attribute name="type">
-			<xs:simpleType>
-				<xs:union memberTypes="atom:atomMediaType">
-					<xs:simpleType>
-						<xs:restriction base="xs:token">
-							<xs:enumeration value="xhtml" />
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:union>
-			</xs:simpleType>
-		</xs:attribute>
-	</xs:attributeGroup>
-	<xs:attributeGroup name="atomOutOfLineConstruct">
-		<xs:attributeGroup ref="atom:atomCommonAttributes" />
-		<xs:attribute name="type" type="atom:atomMediaType" />
-		<xs:attribute name="src" use="required" />
-	</xs:attributeGroup>
-	<xs:element name="content">
-		<xs:complexType mixed="true">
-			<xs:group minOccurs="0" ref="atom:atomInlineOtherConstruct" />
-			<xs:attribute name="type">
-				<xs:simpleType>
-					<xs:union memberTypes="atom:atomMediaType">
-						<xs:simpleType>
-							<xs:restriction base="xs:token">
-								<xs:enumeration value="text" />
-								<xs:enumeration value="html" />
-							</xs:restriction>
-						</xs:simpleType>
-						<xs:simpleType>
-							<xs:union memberTypes="atom:atomMediaType">
-								<xs:simpleType>
-									<xs:restriction base="xs:token">
-										<xs:enumeration value="xhtml" />
-									</xs:restriction>
-								</xs:simpleType>
-							</xs:union>
-						</xs:simpleType>
-					</xs:union>
-				</xs:simpleType>
-			</xs:attribute>
-			<xs:attributeGroup ref="atom:atomCommonAttributes" />
-			<xs:attribute name="src" />
-		</xs:complexType>
-	</xs:element>
-	<!-- atom:author -->
-	<xs:element name="author" type="atom:atomPersonConstruct" />
-	<!-- atom:category -->
-	<xs:element name="category">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="atom:undefinedContent">
-					<xs:attributeGroup ref="atom:atomCommonAttributes" />
-					<xs:attribute name="term" use="required" />
-					<xs:attribute name="scheme" />
-					<xs:attribute name="label" />
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<!-- atom:contributor -->
-	<xs:element name="contributor" type="atom:atomPersonConstruct" />
-	<!-- atom:generator -->
-	<xs:element name="generator">
-		<xs:complexType mixed="true">
-			<xs:attributeGroup ref="atom:atomCommonAttributes" />
-			<xs:attribute name="uri" />
-			<xs:attribute name="version" />
-		</xs:complexType>
-	</xs:element>
-	<!-- atom:icon -->
-	<xs:element name="icon">
-		<xs:complexType mixed="true">
-			<xs:attributeGroup ref="atom:atomCommonAttributes" />
-		</xs:complexType>
-	</xs:element>
-	<!-- atom:id -->
-	<xs:element name="id">
-		<xs:complexType mixed="true">
-			<xs:attributeGroup ref="atom:atomCommonAttributes" />
-		</xs:complexType>
-	</xs:element>
-	<!-- atom:logo -->
-	<xs:element name="logo">
-		<xs:complexType mixed="true">
-			<xs:attributeGroup ref="atom:atomCommonAttributes" />
-		</xs:complexType>
-	</xs:element>
-	<!-- atom:link -->
-	<xs:element name="link">
-		<xs:annotation>
-			<xs:documentation>
-				The "atom:link" element defines a reference from an
-				entry or feed to a Web resource. This specification
-				assigns no
-				meaning to the content (if any) of this
-				element.
-			</xs:documentation>
-		</xs:annotation>
-
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="atom:undefinedContent">
-					<xs:attributeGroup ref="atom:atomCommonAttributes" />
-					<xs:attribute name="href" use="required" />
-					<xs:attribute name="rel"></xs:attribute>
-					<xs:attribute name="type" type="atom:atomMediaType" />
-					<xs:attribute name="hreflang" type="atom:atomLanguageTag" />
-					<xs:attribute name="title" />
-					<xs:attribute name="length" />
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<!-- atom:published -->
-	<xs:element name="published" type="atom:atomDateConstruct" />
-	<!-- atom:rights -->
-	<xs:element name="rights" type="atom:atomTextConstruct" />
-	<!-- atom:source -->
-	<xs:element name="source">
-		<xs:annotation>
-			<xs:documentation>
-				atom:source is used to preserve metadata of a feed
-				when
-				an entry is copied from a feed to another feed.
-			</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:choice minOccurs="0" maxOccurs="unbounded">
-				<xs:element ref="atom:author" />
-				<xs:element ref="atom:category" />
-				<xs:element ref="atom:contributor" />
-				<xs:element ref="atom:generator" />
-				<xs:element ref="atom:icon" />
-				<xs:element ref="atom:id" />
-				<xs:element ref="atom:link" />
-				<xs:element ref="atom:logo" />
-				<xs:element ref="atom:rights" />
-				<xs:element ref="atom:subtitle" />
-				<xs:element ref="atom:title" />
-				<xs:element ref="atom:updated" />
-				<xs:group ref="atom:extensionElement" />
-			</xs:choice>
-			<xs:attributeGroup ref="atom:atomCommonAttributes" />
-		</xs:complexType>
-	</xs:element>
-	<!-- atom:subtitle -->
-	<xs:element name="subtitle" type="atom:atomTextConstruct" />
-	<!-- atom:summary -->
-	<xs:element name="summary" type="atom:atomTextConstruct" />
-	<!-- atom:title -->
-	<xs:element name="title" type="atom:atomTextConstruct">
-		<xs:annotation>
-			<xs:documentation>
-				The "atom:title" element is a Text construct that
-				conveys a human- readable title for an entry or feed.
-				atomTitle =
-				element atom:title { atomTextConstruct }.
-			</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-	<!-- atom:updated -->
-	<xs:element name="updated" type="atom:atomDateConstruct">
-		<xs:annotation>
-			<xs:documentation>
-				The "atom:updated" element is a Date construct
-				indicating the most recent instant in time when an entry
-				or feed was
-				modified in a way the publisher considers
-				significant. Therefore, not
-				all modifications
-				necessarily result in a changed atom:updated value.
-				atomUpdated = element atom:updated { atomDateConstruct
-				}. Publishers
-				MAY change the value of this element over
-				time.
-			</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-	<!-- Low-level simple types -->
-	<xs:simpleType name="atomNCName">
-		<xs:restriction base="xs:string">
-			<xs:minLength value="1" />
-			<xs:pattern value="[^:]*" />
-		</xs:restriction>
-	</xs:simpleType>
-	<!-- Whatever a media type is, it contains at least one slash -->
-	<xs:simpleType name="atomMediaType">
-		<xs:restriction base="xs:string">
-			<xs:pattern value=".+/.+" />
-		</xs:restriction>
-	</xs:simpleType>
-	<!-- As defined in RFC 3066 -->
-	<xs:simpleType name="atomLanguageTag">
-		<xs:restriction base="xs:string">
-			<xs:pattern value="[A-Za-z]{1,8}(-[A-Za-z0-9]{1,8})*" />
-		</xs:restriction>
-	</xs:simpleType>
-	<!--
-		Unconstrained; it's not entirely clear how IRI fit into xsd:anyURI so
-		let's not try to constrain it here
-	-->
-	<!-- Whatever an email address is, it contains at least one @ -->
-	<xs:simpleType name="atomEmailAddress">
-		<xs:restriction base="xs:string">
-			<xs:pattern value=".+@.+" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<!-- Simple Extension -->
-	<xs:group name="extensionElement">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0"
-				maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:appinfo>
-						<jaxb:property name='anyOther' />
-					</xs:appinfo>
-				</xs:annotation>
-			</xs:any>
-			<xs:any namespace="##local" processContents="lax" minOccurs="0"
-				maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:appinfo>
-						<jaxb:property name='anyLocal' />
-					</xs:appinfo>
-				</xs:annotation>
-			</xs:any>
-		</xs:sequence>
-	</xs:group>
-	<xs:attributeGroup name="undefinedAttribute">
-		<xs:anyAttribute namespace="##other" processContents="lax" />
-	</xs:attributeGroup>
-	<xs:complexType name="undefinedContent">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0"
-				maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:appinfo>
-						<jaxb:property name='anyOther' />
-					</xs:appinfo>
-				</xs:annotation>
-			</xs:any>
-			<xs:any namespace="##local" processContents="lax" minOccurs="0"
-				maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:appinfo>
-						<jaxb:property name='anyLocal' />
-					</xs:appinfo>
-				</xs:annotation>
-			</xs:any>
-		</xs:sequence>
-
-		<!--
-			<xs:group minOccurs="0" maxOccurs="unbounded"
-			ref="atom:anyForeignElement" />
-		-->
-	</xs:complexType>
-	<xs:group name="anyElement">
-		<xs:sequence>
-			<xs:any processContents="lax" />
-		</xs:sequence>
-	</xs:group>
-	<xs:group name="anyForeignElement">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" />
-			<xs:any namespace="##local" processContents="lax" />
-		</xs:sequence>
-	</xs:group>
-	<!-- XHTML -->
-	<xs:group name="anyXHTML">
-		<xs:sequence>
-			<xs:any namespace="http://www.w3.org/1999/xhtml"
-				processContents="lax" />
-		</xs:sequence>
-	</xs:group>
-</xs:schema>
-	<!-- EOF -->
\ No newline at end of file
diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/CMIS-Core.xsd b/source/java/org/alfresco/repo/cmis/rest/xsd/CMIS-Core.xsd
deleted file mode 100755
index 344186d729..0000000000
--- a/source/java/org/alfresco/repo/cmis/rest/xsd/CMIS-Core.xsd
+++ /dev/null
@@ -1,1229 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-	<!--
-		Common CMIS XSD
-	-->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-	elementFormDefault="qualified" targetNamespace="http://docs.oasis-open.org/ns/cmis/core/200901"
-	xmlns:atom="http://www.w3.org/2005/Atom" xmlns:xhtml="http://www.w3.org/1999/xhtml"
-	xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
-	jaxb:extensionBindingPrefixes="xjc" jaxb:version="2.1"
-	xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901" version="0.62f">
-	<xs:import namespace="http://www.w3.org/XML/1998/namespace"
-		schemaLocation="xml.xsd" />
-
-	<!--  enums -->
-	<xs:simpleType name="enumDecimalPrecision">
-		<xs:restriction base="xs:integer">
-			<xs:enumeration value="32" />
-			<xs:enumeration value="64" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="enumContentStreamAllowed">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="notallowed" />
-			<xs:enumeration value="allowed" />
-			<xs:enumeration value="required" />
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="enumCardinality">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="single" />
-			<xs:enumeration value="multi" />
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="enumUpdatability">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="readonly" />
-			<xs:enumeration value="readwrite" />
-			<xs:enumeration value="whencheckedout" />
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="enumPropertyType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="boolean" />
-			<xs:enumeration value="id" />
-			<xs:enumeration value="integer" />
-			<xs:enumeration value="datetime" />
-			<xs:enumeration value="decimal" />
-			<xs:enumeration value="html" />
-			<xs:enumeration value="xhtml" />
-			<xs:enumeration value="string" />
-			<xs:enumeration value="uri" />
-			<xs:enumeration value="xml" />
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="enumBaseObjectTypeIds">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="cmis:document" />
-			<xs:enumeration value="cmis:folder" />
-			<xs:enumeration value="cmis:relationship" />
-			<xs:enumeration value="cmis:policy" />
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="enumCapabilityQuery">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="none" />
-			<xs:enumeration value="metadataonly" />
-			<xs:enumeration value="fulltextonly" />
-			<xs:enumeration value="bothseparate" />
-			<xs:enumeration value="bothcombined" />
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="enumCapabilityJoin">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="none" />
-			<xs:enumeration value="inneronly" />
-			<xs:enumeration value="innerandouter" />
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="enumCapabilityContentStreamUpdates">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="anytime" />
-			<xs:enumeration value="pwc-only" />
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="enumRepositoryRelationship">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="self" />
-			<xs:enumeration value="replica" />
-			<xs:enumeration value="peer" />
-			<xs:enumeration value="parent" />
-			<xs:enumeration value="child" />
-			<xs:enumeration value="archive" />
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="enumVersioningState">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="checkedout" />
-			<xs:enumeration value="minor" />
-			<xs:enumeration value="major" />
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="enumReturnVersion">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="this" />
-			<xs:enumeration value="latest" />
-			<xs:enumeration value="latestmajor" />
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="enumUnfileObject">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="unfile" />
-			<xs:enumeration value="deletesinglefiled" />
-			<xs:enumeration value="delete" />
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="enumRelationshipDirection">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="source" />
-			<xs:enumeration value="target" />
-			<xs:enumeration value="either" />
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="enumIncludeRelationships">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="none" />
-			<xs:enumeration value="source" />
-			<xs:enumeration value="target" />
-			<xs:enumeration value="both" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<!--  properties in CMIS -->
-	<xs:simpleType name="enumPropertiesBase">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="cmis:Name" />
-			<xs:enumeration value="cmis:ObjectId" />
-			<xs:enumeration value="cmis:ObjectTypeId" />
-			<xs:enumeration value="cmis:BaseTypeId" />
-			<xs:enumeration value="cmis:CreatedBy" />
-			<xs:enumeration value="cmis:CreationDate" />
-			<xs:enumeration value="cmis:LastModifiedBy" />
-			<xs:enumeration value="cmis:LastModificationDate" />
-			<xs:enumeration value="cmis:ChangeToken" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="enumPropertiesDocument">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="cmis:IsImmutable" />
-			<xs:enumeration value="cmis:IsLatestVersion" />
-			<xs:enumeration value="cmis:IsMajorVersion" />
-			<xs:enumeration value="cmis:IsLatestMajorVersion" />
-			<xs:enumeration value="cmis:VersionLabel" />
-			<xs:enumeration value="cmis:VersionSeriesId" />
-			<xs:enumeration value="cmis:IsVersionSeriesCheckedOut" />
-			<xs:enumeration value="cmis:VersionSeriesCheckedOutBy" />
-			<xs:enumeration value="cmis:VersionSeriesCheckedOutId" />
-			<xs:enumeration value="cmis:CheckinComment" />
-			<xs:enumeration value="cmis:ContentStreamLength" />
-			<xs:enumeration value="cmis:ContentStreamMimeType" />
-			<xs:enumeration value="cmis:ContentStreamFileName" />
-			<xs:enumeration value="cmis:ContentStreamId" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="enumPropertiesFolder">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="cmis:ParentId" />
-			<xs:enumeration value="cmis:AllowedChildObjectTypeNames" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="enumPropertiesRelationship">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="cmis:SourceId" />
-			<xs:enumeration value="cmis:TargetId" />
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="enumPropertiesPolicy">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="cmis:PolicyText" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:attributeGroup name="cmisUndefinedAttribute">
-		<xs:anyAttribute namespace="##other" processContents="lax" />
-	</xs:attributeGroup>
-
-	<!--  for propertyIds -->
-	<xs:attribute name="href" type="xs:anyURI" />
-
-	<!--  main cmis object -->
-	<xs:complexType name="cmisObjectType">
-		<xs:sequence>
-			<xs:element name="properties" type="cmis:cmisPropertiesType"
-				minOccurs="0" maxOccurs="1" />
-			<xs:element ref="cmis:allowableActions" minOccurs="0"
-				maxOccurs="1" />
-			<xs:element name="relationship" type="cmis:cmisObjectType"
-				minOccurs="0" maxOccurs="unbounded" />
-
-			<xs:element name="child" type="cmis:cmisObjectType"
-				minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-						This holds the children objects of this folder. This is used only in
-						the Web Service binding. In the REST/AtomPub binding, an atom
-						extension element is used.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-
-			<!--  if change log -->
-			<xs:element name="changeEventInfo" type="cmis:cmisChangeEventType"
-				minOccurs="0" maxOccurs="1" />
-
-			<!--  ACL -->
-			<xs:element name="acl" type="cmis:cmisAccessControlListType"
-				minOccurs="0" maxOccurs="1" />
-			<xs:element name="exactACL" type="xs:boolean" minOccurs="0"
-				maxOccurs="1" />
-
-			<!--  Rendition -->
-			<xs:element name="rendition" type="cmis:cmisRenditionType"
-				minOccurs="0" maxOccurs="unbounded" />
-
-			<xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax"
-				namespace="##other" />
-		</xs:sequence>
-		<xs:attributeGroup ref="cmis:cmisUndefinedAttribute" />
-	</xs:complexType>
-
-	<!--  anyther tag -->
-	<xs:complexType name="cmisAnyXml">
-		<xs:sequence>
-			<xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax"
-				namespace="##other" />
-		</xs:sequence>
-		<xs:attributeGroup ref="cmis:cmisUndefinedAttribute" />
-	</xs:complexType>
-
-	<!-- property bag -->
-	<xs:attribute name="key" type="xs:string" />
-	<xs:attribute name="index" type="xs:integer" />
-
-	<xs:complexType name="cmisPropertiesType">
-		<xs:sequence>
-			<xs:choice minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:appinfo>
-						<jaxb:property name="property" />
-					</xs:appinfo>
-				</xs:annotation>
-				<xs:element name="propertyBoolean" type="cmis:cmisPropertyBoolean"
-					nillable="true" />
-				<xs:element name="propertyId" type="cmis:cmisPropertyId"
-					nillable="true" />
-				<xs:element name="propertyInteger" type="cmis:cmisPropertyInteger"
-					nillable="true" />
-				<xs:element name="propertyDateTime" type="cmis:cmisPropertyDateTime"
-					nillable="true" />
-				<xs:element name="propertyDecimal" type="cmis:cmisPropertyDecimal"
-					nillable="true" />
-				<xs:element name="propertyHtml" type="cmis:cmisPropertyHtml"
-					nillable="true" />
-				<xs:element name="propertyXhtml" type="cmis:cmisPropertyXhtml"
-					nillable="true" />
-				<xs:element name="propertyString" type="cmis:cmisPropertyString"
-					nillable="true" />
-				<xs:element name="propertyUri" type="cmis:cmisPropertyUri"
-					nillable="true" />
-				<xs:element name="propertyXml" type="cmis:cmisPropertyXml"
-					nillable="true" />
-			</xs:choice>
-			<xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded"
-				processContents="lax" />
-		</xs:sequence>
-		<xs:attributeGroup ref="cmis:cmisUndefinedAttribute" />
-	</xs:complexType>
-
-
-	<!-- start the prop definitions -->
-	<xs:complexType name="cmisProperty">
-		<xs:attribute name="pdid" use="required" />
-		<xs:attribute name="localname" use="optional" />
-		<xs:attribute name="displayname" use="optional" />
-		<xs:attributeGroup ref="cmis:cmisUndefinedAttribute" />
-	</xs:complexType>
-	<xs:complexType name="cmisPropertyBoolean">
-		<xs:complexContent>
-			<xs:extension base="cmis:cmisProperty">
-				<xs:sequence>
-					<xs:element minOccurs="0" maxOccurs="unbounded" name="value"
-						type="xs:boolean" />
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="cmisPropertyId">
-		<xs:complexContent>
-			<xs:extension base="cmis:cmisProperty">
-				<xs:sequence>
-					<xs:element minOccurs="0" maxOccurs="unbounded" name="value"
-						type="xs:string" />
-				</xs:sequence>
-				<xs:attribute ref="cmis:href" use="optional" />
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="cmisPropertyInteger">
-		<xs:complexContent>
-			<xs:extension base="cmis:cmisProperty">
-				<xs:sequence>
-					<xs:element minOccurs="0" maxOccurs="unbounded" name="value"
-						type="xs:integer" />
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="cmisPropertyDateTime">
-		<xs:complexContent>
-			<xs:extension base="cmis:cmisProperty">
-				<xs:sequence>
-					<xs:element minOccurs="0" maxOccurs="unbounded" name="value"
-						type="xs:dateTime" />
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="cmisPropertyDecimal">
-		<xs:complexContent>
-			<xs:extension base="cmis:cmisProperty">
-				<xs:sequence>
-					<xs:element minOccurs="0" maxOccurs="unbounded" name="value"
-						type="xs:decimal" />
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="cmisPropertyHtml">
-		<xs:complexContent>
-			<xs:extension base="cmis:cmisProperty">
-				<xs:sequence>
-					<xs:element minOccurs="0" maxOccurs="unbounded" name="value">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:any minOccurs="0" maxOccurs="unbounded"
-									processContents="lax" namespace="##other" />
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="cmisPropertyXhtml">
-		<xs:complexContent>
-			<xs:extension base="cmis:cmisProperty">
-				<xs:sequence>
-					<xs:element minOccurs="0" maxOccurs="unbounded" name="value">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:any minOccurs="0" maxOccurs="unbounded"
-									processContents="lax" namespace="##other" />
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-
-	<xs:complexType name="cmisPropertyString">
-		<xs:complexContent>
-			<xs:extension base="cmis:cmisProperty">
-				<xs:sequence>
-					<xs:element minOccurs="0" maxOccurs="unbounded" name="value"
-						type="xs:string" />
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="cmisPropertyUri">
-		<xs:complexContent>
-			<xs:extension base="cmis:cmisProperty">
-				<xs:sequence>
-					<xs:element minOccurs="0" maxOccurs="unbounded" name="value"
-						type="xs:anyURI" />
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="cmisPropertyXml">
-		<xs:complexContent>
-			<xs:extension base="cmis:cmisProperty">
-				<xs:sequence>
-					<xs:element minOccurs="0" maxOccurs="unbounded" name="value">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:any minOccurs="0" maxOccurs="unbounded"
-									processContents="lax" namespace="##other" />
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-
-	<!-- cmis choice -->
-	<xs:complexType name="cmisChoice">
-		<xs:attribute name="displayName" use="required" />
-		<xs:attributeGroup ref="cmis:cmisUndefinedAttribute" />
-	</xs:complexType>
-	<xs:complexType name="cmisChoiceBoolean">
-		<xs:complexContent>
-			<xs:extension base="cmis:cmisChoice">
-				<xs:sequence>
-					<xs:element minOccurs="0" maxOccurs="unbounded" name="value"
-						type="xs:boolean" />
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="cmisChoiceId">
-		<xs:complexContent>
-			<xs:extension base="cmis:cmisChoice">
-				<xs:sequence>
-					<xs:element minOccurs="0" maxOccurs="unbounded" name="value"
-						type="xs:string" />
-				</xs:sequence>
-				<xs:attribute ref="cmis:href" use="optional" />
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="cmisChoiceInteger">
-		<xs:complexContent>
-			<xs:extension base="cmis:cmisChoice">
-				<xs:sequence>
-					<xs:element minOccurs="0" maxOccurs="unbounded" name="value"
-						type="xs:integer" />
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="cmisChoiceDateTime">
-		<xs:complexContent>
-			<xs:extension base="cmis:cmisChoice">
-				<xs:sequence>
-					<xs:element minOccurs="0" maxOccurs="unbounded" name="value"
-						type="xs:dateTime" />
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="cmisChoiceDecimal">
-		<xs:complexContent>
-			<xs:extension base="cmis:cmisChoice">
-				<xs:sequence>
-					<xs:element minOccurs="0" maxOccurs="unbounded" name="value"
-						type="xs:decimal" />
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="cmisChoiceHtml">
-		<xs:complexContent>
-			<xs:extension base="cmis:cmisChoice">
-				<xs:sequence>
-					<xs:element minOccurs="0" maxOccurs="unbounded" name="value">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:any minOccurs="0" maxOccurs="unbounded"
-									processContents="lax" namespace="##other" />
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="cmisChoiceXhtml">
-		<xs:complexContent>
-			<xs:extension base="cmis:cmisChoice">
-				<xs:sequence>
-					<xs:element minOccurs="0" maxOccurs="unbounded" name="value">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:any minOccurs="0" maxOccurs="unbounded"
-									processContents="lax" namespace="##other" />
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="cmisChoiceString">
-		<xs:complexContent>
-			<xs:extension base="cmis:cmisChoice">
-				<xs:sequence>
-					<xs:element minOccurs="0" maxOccurs="unbounded" name="value"
-						type="xs:string" />
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="cmisChoiceUri">
-		<xs:complexContent>
-			<xs:extension base="cmis:cmisChoice">
-				<xs:sequence>
-					<xs:element minOccurs="0" maxOccurs="unbounded" name="value"
-						type="xs:anyURI" />
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="cmisChoiceXml">
-		<xs:complexContent>
-			<xs:extension base="cmis:cmisChoice">
-				<xs:sequence>
-					<xs:element minOccurs="0" maxOccurs="unbounded" name="value">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:any minOccurs="0" maxOccurs="unbounded"
-									processContents="lax" namespace="##other" />
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-
-	<!--  allowable actions -->
-	<xs:complexType name="cmisAllowableActionsType">
-		<xs:sequence>
-			<xs:element name="canDeleteObject" type="xs:boolean"
-				minOccurs="0" maxOccurs="1" />
-			<xs:element name="canUpdateProperties" type="xs:boolean"
-				minOccurs="0" maxOccurs="1" />
-			<xs:element name="canGetProperties" type="xs:boolean"
-				minOccurs="0" maxOccurs="1" />
-			<xs:element name="canGetRelationships" type="xs:boolean"
-				minOccurs="0" maxOccurs="1" />
-			<xs:element name="canGetObjectParents" type="xs:boolean"
-				minOccurs="0" maxOccurs="1" />
-			<xs:element name="canGetFolderParent" type="xs:boolean"
-				minOccurs="0" maxOccurs="1" />
-			<xs:element name="canGetDescendants" type="xs:boolean"
-				minOccurs="0" maxOccurs="1" />
-			<xs:element name="canMoveObject" type="xs:boolean"
-				minOccurs="0" maxOccurs="1" />
-			<xs:element name="canDeleteContentStream" type="xs:boolean"
-				minOccurs="0" maxOccurs="1" />
-			<xs:element name="canCheckOut" type="xs:boolean"
-				minOccurs="0" maxOccurs="1" />
-			<xs:element name="canCancelCheckOut" type="xs:boolean"
-				minOccurs="0" maxOccurs="1" />
-			<xs:element name="canCheckIn" type="xs:boolean" minOccurs="0"
-				maxOccurs="1" />
-			<xs:element name="canSetContentStream" type="xs:boolean"
-				minOccurs="0" maxOccurs="1" />
-			<xs:element name="canGetAllVersions" type="xs:boolean"
-				minOccurs="0" maxOccurs="1" />
-			<xs:element name="canAddObjectToFolder" type="xs:boolean"
-				minOccurs="0" maxOccurs="1" />
-			<xs:element name="canRemoveObjectFromFolder" type="xs:boolean"
-				minOccurs="0" maxOccurs="1" />
-			<xs:element name="canGetContentStream" type="xs:boolean"
-				minOccurs="0" maxOccurs="1" />
-			<xs:element name="canApplyPolicy" type="xs:boolean"
-				minOccurs="0" maxOccurs="1" />
-			<xs:element name="canGetAppliedPolicies" type="xs:boolean"
-				minOccurs="0" maxOccurs="1" />
-			<xs:element name="canRemovePolicy" type="xs:boolean"
-				minOccurs="0" maxOccurs="1" />
-			<xs:element name="canGetChildren" type="xs:boolean"
-				minOccurs="0" maxOccurs="1" />
-			<xs:element name="canCreateDocument" type="xs:boolean"
-				minOccurs="0" maxOccurs="1" />
-			<xs:element name="canCreateFolder" type="xs:boolean"
-				minOccurs="0" maxOccurs="1" />
-			<xs:element name="canCreateRelationship" type="xs:boolean"
-				minOccurs="0" maxOccurs="1" />
-			<xs:element name="canCreatePolicy" type="xs:boolean"
-				minOccurs="0" maxOccurs="1" />
-			<xs:element name="canDeleteTree" type="xs:boolean"
-				minOccurs="0" maxOccurs="1" />
-
-			<!-- renditions -->
-			<xs:element name="canGetRenditions" type="xs:boolean"
-				minOccurs="0" maxOccurs="1" />
-
-			<!-- ACL -->
-			<xs:element name="canGetACL" type="xs:boolean" minOccurs="0"
-				maxOccurs="1" />
-			<xs:element name="canApplyACL" type="xs:boolean"
-				minOccurs="0" maxOccurs="1" />
-
-			<xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded"
-				processContents="lax" />
-		</xs:sequence>
-		<xs:attributeGroup ref="cmis:cmisUndefinedAttribute" />
-	</xs:complexType>
-
-
-
-	<!-- Property Attributes -->
-	<xs:complexType name="cmisPropertyDefinitionType">
-		<xs:sequence>
-			<xs:element name="id" type="xs:string" minOccurs="1"
-				maxOccurs="1" />
-			<xs:element name="localName" type="xs:string" minOccurs="1"
-				maxOccurs="1" />
-			<xs:element name="localNamespace" type="xs:anyURI"
-				minOccurs="0" maxOccurs="1" />
-			<xs:element name="displayName" type="xs:string" minOccurs="0"
-				maxOccurs="1" />
-			<xs:element name="queryName" type="xs:string" minOccurs="0"
-				maxOccurs="1" />
-			<xs:element name="description" type="xs:string" minOccurs="0"
-				maxOccurs="1" />
-			<xs:element name="propertyType" type="cmis:enumPropertyType"
-				minOccurs="1" maxOccurs="1" />
-			<xs:element name="cardinality" type="cmis:enumCardinality"
-				minOccurs="1" maxOccurs="1" />
-			<xs:element name="updatability" type="cmis:enumUpdatability"
-				minOccurs="1" maxOccurs="1" />
-
-			<!-- flags -->
-			<xs:element name="inherited" type="xs:boolean" minOccurs="0"
-				maxOccurs="1" />
-			<xs:element name="required" type="xs:boolean" minOccurs="1"
-				maxOccurs="1" />
-			<xs:element name="queryable" type="xs:boolean" minOccurs="1"
-				maxOccurs="1" />
-			<xs:element name="orderable" type="xs:boolean" minOccurs="1"
-				maxOccurs="1" />
-
-			<xs:element name="openChoice" type="xs:boolean" minOccurs="0"
-				maxOccurs="1" />
-
-			<!--  extension -->
-			<xs:any processContents="lax" namespace="##other" minOccurs="0"
-				maxOccurs="unbounded" />
-		</xs:sequence>
-		<xs:attributeGroup ref="cmis:cmisUndefinedAttribute" />
-	</xs:complexType>
-
-	<!--  type specific definitions -->
-	<xs:complexType name="cmisPropertyBooleanDefinitionType">
-		<xs:complexContent>
-			<xs:extension base="cmis:cmisPropertyDefinitionType">
-				<xs:sequence>
-					<xs:element minOccurs="0" maxOccurs="1" name="defaultValue"
-						type="cmis:cmisPropertyBoolean" />
-					<xs:element minOccurs="0" maxOccurs="unbounded" name="choice"
-						type="cmis:cmisChoiceBoolean" />
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="cmisPropertyIdDefinitionType">
-		<xs:complexContent>
-			<xs:extension base="cmis:cmisPropertyDefinitionType">
-				<xs:sequence>
-					<xs:element minOccurs="0" maxOccurs="1" name="defaultValue"
-						type="cmis:cmisPropertyId" />
-					<xs:element minOccurs="0" maxOccurs="unbounded" name="choice"
-						type="cmis:cmisChoiceId" />
-
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="cmisPropertyIntegerDefinitionType">
-		<xs:complexContent>
-			<xs:extension base="cmis:cmisPropertyDefinitionType">
-				<xs:sequence>
-					<xs:element minOccurs="0" maxOccurs="1" name="defaultValue"
-						type="cmis:cmisPropertyInteger" />
-					<xs:element name="maxValue" type="xs:integer" minOccurs="0"
-						maxOccurs="1" />
-					<xs:element name="minValue" type="xs:integer" minOccurs="0"
-						maxOccurs="1" />
-					<xs:element minOccurs="0" maxOccurs="unbounded" name="choice"
-						type="cmis:cmisChoiceInteger" />
-
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="cmisPropertyDateTimeDefinitionType">
-		<xs:complexContent>
-			<xs:extension base="cmis:cmisPropertyDefinitionType">
-				<xs:sequence>
-					<xs:element minOccurs="0" maxOccurs="1" name="defaultValue"
-						type="cmis:cmisPropertyDateTime" />
-					<xs:element minOccurs="0" maxOccurs="unbounded" name="choice"
-						type="cmis:cmisChoiceDateTime" />
-
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="cmisPropertyDecimalDefinitionType">
-		<xs:complexContent>
-			<xs:extension base="cmis:cmisPropertyDefinitionType">
-				<xs:sequence>
-					<xs:element minOccurs="0" maxOccurs="1" name="defaultValue"
-						type="cmis:cmisPropertyDecimal" />
-					<xs:element name="maxValue" type="xs:decimal" minOccurs="0"
-						maxOccurs="1" />
-					<xs:element name="minValue" type="xs:decimal" minOccurs="0"
-						maxOccurs="1" />
-					<xs:element name="precision" type="cmis:enumDecimalPrecision"
-						minOccurs="0" maxOccurs="1" />
-					<xs:element minOccurs="0" maxOccurs="unbounded" name="choice"
-						type="cmis:cmisChoiceDecimal" />
-
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="cmisPropertyHtmlDefinitionType">
-		<xs:complexContent>
-			<xs:extension base="cmis:cmisPropertyDefinitionType">
-				<xs:sequence>
-					<xs:element minOccurs="0" maxOccurs="1" name="defaultValue"
-						type="cmis:cmisPropertyHtml" />
-					<xs:element minOccurs="0" maxOccurs="unbounded" name="choice"
-						type="cmis:cmisChoiceHtml" />
-
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="cmisPropertyXhtmlDefinitionType">
-		<xs:complexContent>
-			<xs:extension base="cmis:cmisPropertyDefinitionType">
-				<xs:sequence>
-					<xs:element minOccurs="0" maxOccurs="1" name="defaultValue"
-						type="cmis:cmisPropertyXhtml" />
-					<xs:element minOccurs="0" maxOccurs="unbounded" name="choice"
-						type="cmis:cmisChoiceXhtml" />
-
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="cmisPropertyStringDefinitionType">
-		<xs:complexContent>
-			<xs:extension base="cmis:cmisPropertyDefinitionType">
-				<xs:sequence>
-					<xs:element minOccurs="0" maxOccurs="1" name="defaultValue"
-						type="cmis:cmisPropertyString" />
-					<xs:element name="maxLength" type="xs:integer"
-						minOccurs="0" maxOccurs="1" />
-					<xs:element minOccurs="0" maxOccurs="unbounded" name="choice"
-						type="cmis:cmisChoiceString" />
-
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="cmisPropertyUriDefinitionType">
-		<xs:complexContent>
-			<xs:extension base="cmis:cmisPropertyDefinitionType">
-				<xs:sequence>
-					<xs:element minOccurs="0" maxOccurs="1" name="defaultValue"
-						type="cmis:cmisPropertyUri" />
-					<xs:element minOccurs="0" maxOccurs="unbounded" name="choice"
-						type="cmis:cmisChoiceUri" />
-
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="cmisPropertyXmlDefinitionType">
-		<xs:complexContent>
-			<xs:extension base="cmis:cmisPropertyDefinitionType">
-				<xs:sequence>
-					<xs:element minOccurs="0" maxOccurs="1" name="defaultValue"
-						type="cmis:cmisPropertyXml" />
-					<xs:element name="schemaURI" type="xs:anyURI" minOccurs="0"
-						maxOccurs="1" />
-					<xs:element minOccurs="0" maxOccurs="unbounded" name="choice"
-						type="cmis:cmisChoiceXml" />
-
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-
-	<!-- type definition -->
-	<xs:complexType name="cmisTypeDefinitionType" abstract="false">
-		<xs:sequence>
-			<!--  primary identifying attribute -->
-			<xs:element name="id" type="xs:string" minOccurs="1"
-				maxOccurs="1" />
-			<xs:element name="localName" type="xs:string" minOccurs="1"
-				maxOccurs="1" />
-			<xs:element name="localNamespace" type="xs:anyURI"
-				minOccurs="0" maxOccurs="1" />
-			<xs:element name="displayName" type="xs:string" minOccurs="0"
-				maxOccurs="1" />
-			<xs:element name="queryName" type="xs:string" minOccurs="0"
-				maxOccurs="1" />
-			<xs:element name="description" type="xs:string" minOccurs="0"
-				maxOccurs="1" />
-
-			<!--  base type -->
-			<xs:element name="baseTypeId" type="cmis:enumBaseObjectTypeIds"
-				minOccurs="1" maxOccurs="1" />
-
-			<!-- parent -->
-			<xs:element name="parentId" type="xs:string" minOccurs="0"
-				maxOccurs="1" />
-
-			<!-- flags -->
-			<xs:element name="creatable" type="xs:boolean" minOccurs="1"
-				maxOccurs="1" />
-			<xs:element name="fileable" type="xs:boolean" minOccurs="1"
-				maxOccurs="1" />
-			<xs:element name="queryable" type="xs:boolean" minOccurs="1"
-				maxOccurs="1" />
-			<xs:element name="fulltextindexed" type="xs:boolean"
-				minOccurs="1" maxOccurs="1" />
-			<xs:element name="includedInSupertypeQuery" type="xs:boolean"
-				minOccurs="1" maxOccurs="1" default="true" />
-
-			<!-- controllable -->
-			<xs:element name="controllablePolicy" type="xs:boolean"
-				minOccurs="1" maxOccurs="1" />
-			<xs:element name="controllableACL" type="xs:boolean"
-				minOccurs="1" maxOccurs="1" />
-
-			<!-- property definitions -->
-			<xs:choice minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:appinfo>
-						<jaxb:property name="propertyDefinition" />
-					</xs:appinfo>
-				</xs:annotation>
-				<xs:element name="propertyBooleanDefinition" type="cmis:cmisPropertyBooleanDefinitionType" />
-				<xs:element name="propertyDateTimeDefinition"
-					type="cmis:cmisPropertyDateTimeDefinitionType" />
-				<xs:element name="propertyDecimalDefinition" type="cmis:cmisPropertyDecimalDefinitionType" />
-				<xs:element name="propertyIdDefinition" type="cmis:cmisPropertyIdDefinitionType" />
-				<xs:element name="propertyIntegerDefinition" type="cmis:cmisPropertyIntegerDefinitionType" />
-				<xs:element name="propertyHtmlDefinition" type="cmis:cmisPropertyHtmlDefinitionType" />
-				<xs:element name="propertyXhtmlDefinition" type="cmis:cmisPropertyXhtmlDefinitionType" />
-				<xs:element name="propertyStringDefinition" type="cmis:cmisPropertyStringDefinitionType" />
-				<xs:element name="propertyXmlDefinition" type="cmis:cmisPropertyXmlDefinitionType" />
-				<xs:element name="propertyUriDefinition" type="cmis:cmisPropertyUriDefinitionType" />
-			</xs:choice>
-
-			<!-- extension -->
-			<xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded"
-				processContents="lax" />
-		</xs:sequence>
-		<xs:attributeGroup ref="cmis:cmisUndefinedAttribute" />
-	</xs:complexType>
-
-
-	<!-- type specific typedefs -->
-	<xs:complexType name="cmisTypeDocumentDefinitionType">
-		<xs:complexContent>
-			<xs:extension base="cmis:cmisTypeDefinitionType">
-				<xs:sequence>
-					<xs:element name="versionable" type="xs:boolean"
-						minOccurs="1" maxOccurs="1" />
-					<xs:element name="contentStreamAllowed" type="cmis:enumContentStreamAllowed"
-						minOccurs="1" maxOccurs="1" />
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="cmisTypeFolderDefinitionType">
-		<xs:complexContent>
-			<xs:extension base="cmis:cmisTypeDefinitionType">
-				<xs:sequence>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="cmisTypeRelationshipDefinitionType">
-		<xs:complexContent>
-			<xs:extension base="cmis:cmisTypeDefinitionType">
-				<xs:sequence>
-					<xs:element name="allowedSourceTypes" type="xs:string"
-						minOccurs="0" maxOccurs="unbounded" />
-					<xs:element name="allowedTargetTypes" type="xs:string"
-						minOccurs="0" maxOccurs="unbounded" />
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="cmisTypePolicyDefinitionType">
-		<xs:complexContent>
-			<xs:extension base="cmis:cmisTypeDefinitionType">
-				<xs:sequence>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-
-	<!--  query -->
-	<xs:complexType name="cmisQueryType">
-		<xs:sequence>
-			<xs:element name="repositoryId" type="xs:string"
-				minOccurs="0" maxOccurs="1" />
-			<xs:element name="statement" type="xs:string" minOccurs="1"
-				maxOccurs="1" />
-			<xs:element name="searchAllVersions" type="xs:boolean"
-				minOccurs="0" maxOccurs="1" />
-			<xs:element name="maxItems" type="xs:integer" minOccurs="0"
-				maxOccurs="1" />
-			<xs:element name="skipCount" type="xs:integer" minOccurs="0"
-				maxOccurs="1" />
-
-			<xs:element name="includeAllowableActions" type="xs:boolean"
-				minOccurs="0" maxOccurs="1" nillable="true" />
-			<xs:element name="includeRelationships" type="cmis:enumIncludeRelationships"
-				minOccurs="0" maxOccurs="1" nillable="true" />
-			<xs:element name="includeRenditions" type="xs:boolean"
-				minOccurs="0" maxOccurs="1" nillable="true" />
-
-			<xs:any maxOccurs="unbounded" minOccurs="1" namespace="##other"
-				processContents="lax" />
-		</xs:sequence>
-		<xs:attributeGroup ref="cmis:cmisUndefinedAttribute" />
-	</xs:complexType>
-
-
-
-	<!--  repository info -->
-	<xs:complexType name="cmisRepositoryInfoType">
-		<xs:sequence minOccurs="1">
-			<xs:element name="repositoryId" type="xs:string"
-				minOccurs="1" maxOccurs="1" />
-			<xs:element name="repositoryName" type="xs:string"
-				minOccurs="1" maxOccurs="1" />
-			<xs:element name="repositoryRelationship" type="xs:string"
-				minOccurs="1" maxOccurs="1" />
-			<xs:element name="repositoryDescription" type="xs:string"
-				minOccurs="1" maxOccurs="1" />
-			<xs:element name="vendorName" type="xs:string" minOccurs="1"
-				maxOccurs="1" />
-			<xs:element name="productName" type="xs:string" minOccurs="1"
-				maxOccurs="1" />
-			<xs:element name="productVersion" type="xs:string"
-				minOccurs="1" maxOccurs="1" />
-			<xs:element name="rootFolderId" type="xs:string" />
-			<xs:element name="latestChangeToken" type="xs:string" />
-			<xs:element name="capabilities" type="cmis:cmisRepositoryCapabilitiesType"
-				minOccurs="1" maxOccurs="1" />
-			<xs:element name="aclCapability" type="cmis:cmisACLCapabilityType"
-				minOccurs="0" maxOccurs="1" />
-			<xs:element name="cmisVersionSupported" type="xs:decimal"
-				minOccurs="1" maxOccurs="1" />
-			<xs:element name="thinClientURI" type="xs:anyURI"
-				minOccurs="0" maxOccurs="1" />
-
-			<xs:element name="changesIncomplete" type="xs:boolean"
-				maxOccurs="1" minOccurs="0" />
-
-			<xs:any namespace="##other" processContents="lax" minOccurs="0"
-				maxOccurs="unbounded" />
-		</xs:sequence>
-		<xs:attributeGroup ref="cmis:cmisUndefinedAttribute" />
-	</xs:complexType>
-
-	<xs:complexType name="cmisRepositoryCapabilitiesType">
-		<xs:sequence>
-			<xs:element name="capabilityACL" type="cmis:enumCapabilityACL"
-				maxOccurs="1" minOccurs="0" />
-			<xs:element name="capabilityAllVersionsSearchable" type="xs:boolean"
-				minOccurs="1" maxOccurs="1" />
-			<xs:element name="capabilityChanges" type="cmis:enumCapabilityChanges" />
-			<xs:element name="capabilityChangesOnType" type="cmis:enumBaseObjectTypeIds"
-				minOccurs="1" maxOccurs="unbounded" />
-			<xs:element name="capabilityContentStreamUpdatability"
-				type="cmis:enumCapabilityContentStreamUpdates" minOccurs="1"
-				maxOccurs="1" />
-			<xs:element name="capabilityGetDescendants" type="xs:boolean"
-				maxOccurs="1" minOccurs="1" />
-			<xs:element name="capabilityMultifiling" type="xs:boolean"
-				minOccurs="1" maxOccurs="1" />
-			<xs:element name="capabilityPWCSearchable" type="xs:boolean"
-				minOccurs="1" maxOccurs="1" />
-			<xs:element name="capabilityPWCUpdateable" type="xs:boolean"
-				minOccurs="1" maxOccurs="1" />
-			<xs:element name="capabilityQuery" type="cmis:enumCapabilityQuery"
-				minOccurs="1" maxOccurs="1" />
-			<xs:element name="capabilityRenditions" type="cmis:enumCapabilityRendition"
-				minOccurs="1" maxOccurs="1" />
-			<xs:element name="capabilityUnfiling" type="xs:boolean"
-				minOccurs="1" maxOccurs="1" />
-			<xs:element name="capabilityVersionSpecificFiling" type="xs:boolean"
-				minOccurs="1" maxOccurs="1" />
-			<xs:element name="capabilityJoin" type="cmis:enumCapabilityJoin"
-				minOccurs="1" maxOccurs="1" />
-
-			<!-- extension -->
-			<xs:any namespace="##other" processContents="skip" minOccurs="0"
-				maxOccurs="unbounded" />
-		</xs:sequence>
-		<xs:attributeGroup ref="cmis:cmisUndefinedAttribute" />
-	</xs:complexType>
-
-	<!-- Unified Search -->
-	<xs:simpleType name="enumTypeOfChanges">
-		<xs:restriction base="xs:string">
-			<!-- content with a new ID has been created -->
-			<xs:enumeration value="created" />
-			<!-- content with an existing ID has been modified -->
-			<xs:enumeration value="updated" />
-			<!-- content with an existing ID has been deleted -->
-			<xs:enumeration value="deleted" />
-			<!-- content with an existing ID has had its security policy changed-->
-			<xs:enumeration value="security" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="enumCapabilityChanges">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="none" />
-			<xs:enumeration value="objectIdsOnly" />
-			<xs:enumeration value="properties" />
-			<xs:enumeration value="all" />
-		</xs:restriction>
-	</xs:simpleType>
-
-
-
-	<xs:complexType name="cmisChangeEventType">
-		<xs:sequence>
-			<xs:element name="changeType" type="cmis:enumTypeOfChanges" />
-			<xs:element name="changeTime" type="xs:dateTime" />
-
-			<!--  extension -->
-			<xs:any processContents="lax" namespace="##other" minOccurs="0"
-				maxOccurs="unbounded" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<!-- ACL -->
-	<xs:simpleType name="enumACLPropagation">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="repository-determined" />
-			<xs:enumeration value="object-only" />
-			<xs:enumeration value="propagate" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="enumCapabilityACL">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="none" />
-			<xs:enumeration value="discover" />
-			<xs:enumeration value="manage" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="enumBasicPermissions">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="cmis:read" />
-			<xs:enumeration value="cmis:write" />
-			<xs:enumeration value="cmis:delete" />
-			<xs:enumeration value="cmis:all" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:complexType name="cmisPermissionDefinition">
-		<xs:sequence>
-			<xs:element name="permission" type="xs:string" />
-			<xs:element name="description" type="xs:string" minOccurs="0"
-				maxOccurs="1" />
-			<xs:any namespace="##other" processContents="lax" maxOccurs="unbounded" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="cmisPermissionMapping">
-		<xs:sequence>
-			<xs:element name="key" type="cmis:enumAllowableActionsKey" minOccurs="1" maxOccurs="1" />
-			<xs:element name="permission" type="xs:string" minOccurs="1" maxOccurs="1" />
-			<xs:any namespace="##other" />
-		</xs:sequence>
-	</xs:complexType>
-
-
-	<xs:simpleType name="enumAllowableActionsKey">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="canGetDescendents.Folder" />
-			<xs:enumeration value="canGetChildren.Folder" />
-			<xs:enumeration value="canGetParents.Folder" />
-			<xs:enumeration value="canGetFolderParent.Object" />
-			<xs:enumeration value="canCreateDocument.Type" />
-			<xs:enumeration value="canCreateDocument.Folder" />
-			<xs:enumeration value="canCreateFolder.Type" />
-			<xs:enumeration value="canCreateFolder.Folder" />
-			<xs:enumeration value="canCreateRelationship.Type" />
-			<xs:enumeration value="canCreateRelationship.Source" />
-			<xs:enumeration value="canCreateRelationship.Target" />
-			<xs:enumeration value="canCreatePolicy.Type" />
-			<xs:enumeration value="canGetProperties.Object" />
-			<xs:enumeration value="canViewContent.Object" />
-			<xs:enumeration value="canUpdateProperties.Object" />
-			<xs:enumeration value="canMove.Object" />
-			<xs:enumeration value="canMove.Target" />
-			<xs:enumeration value="canMove.Source" />
-			<xs:enumeration value="canDelete.Object" />
-			<xs:enumeration value="canDeleteTree.Folder" />
-			<xs:enumeration value="canSetContent.Document" />
-			<xs:enumeration value="canDeleteContent.Document" />
-			<xs:enumeration value="canAddToFolder.Object" />
-			<xs:enumeration value="canAddToFolder.Folder" />
-			<xs:enumeration value="canRemoveFromFolder.Object" />
-			<xs:enumeration value="canRemoveFromFolder.Folder" />
-			<xs:enumeration value="canCheckout.Document" />
-			<xs:enumeration value="canCancelCheckout.Document" />
-			<xs:enumeration value="canCheckin.Document" />
-			<xs:enumeration value="canGetAllVersions.VersionSeries" />
-			<xs:enumeration value="canGetRelationship.Object" />
-			<xs:enumeration value="canAddPolicy.Object" />
-			<xs:enumeration value="canAddPolicy.Policy" />
-			<xs:enumeration value="canRemovePolicy.Object" />
-			<xs:enumeration value="canRemovePolicy.Policy" />
-			<xs:enumeration value="canGetAppliedPolicies.Object" />
-			<xs:enumeration value="canGetACL.Object" />
-			<xs:enumeration value="canApplyACL.Object" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<!-- ACL on objects -->
-	<xs:complexType name="cmisAccessControlPrincipalType">
-		<xs:sequence>
-			<xs:element name="principalId" type="xs:string" />
-
-			<xs:any namespace="##other" maxOccurs="unbounded" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="cmisAccessControlEntryType">
-		<xs:sequence>
-			<xs:element name="principal" type="cmis:cmisAccessControlPrincipalType" />
-			<xs:element name="permission" type="xs:string" />
-			<xs:element name="direct" type="xs:boolean" />
-
-			<xs:any namespace="##other" maxOccurs="unbounded" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="cmisAccessControlListType">
-		<xs:sequence>
-			<xs:element name="permission" type="cmis:cmisAccessControlEntryType"
-				minOccurs="1" maxOccurs="unbounded" />
-			<xs:any namespace="##other" maxOccurs="unbounded" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="cmisACLCapabilityType">
-		<xs:sequence>
-			<xs:element name="setType" type="cmis:enumACLPropagation" />
-			<xs:element name="permissions" type="cmis:cmisPermissionDefinition"
-				minOccurs="1" maxOccurs="unbounded" />
-			<xs:element name="mapping" type="cmis:cmisPermissionMapping"
-				minOccurs="0" maxOccurs="unbounded" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<!-- renditions -->
-	<xs:simpleType name="enumCapabilityRendition">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="none" />
-			<xs:enumeration value="read" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="enumRenditionKind">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="cmis:thumbnail" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:complexType name="cmisRenditionType">
-		<xs:sequence>
-			<xs:element name="streamId" type="xs:string" />
-			<xs:element name="mimetype" type="xs:string" minOccurs="0" />
-			<xs:element name="length" type="xs:integer" minOccurs="0" />
-			<xs:element name="title" type="xs:string" minOccurs="0" />
-			<xs:element name="kind" type="xs:string" minOccurs="0" />
-			<xs:element name="height" type="xs:integer" minOccurs="0" />
-			<xs:element name="width" type="xs:integer" minOccurs="0" />
-			<xs:element name="renditionDocumentId" type="xs:string"
-				minOccurs="0" />
-			<xs:any namespace="##other" />
-		</xs:sequence>
-	</xs:complexType>
-
-
-	<!-- elements -->
-	<xs:element name="allowableActions" type="cmis:cmisAllowableActionsType">
-		<xs:annotation>
-			<xs:documentation>
-				This is the root tag for a CMIS AllowableActions
-				Document Type
-			</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-
-	<xs:element name="query" type="cmis:cmisQueryType">
-		<xs:annotation>
-			<xs:documentation>
-				This is the root tag for a CMIS Query Document Type
-			</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-	<xs:element name="acl" type="cmis:cmisAccessControlListType">
-		<xs:annotation>
-			<xs:documentation>
-				This is the root tag for a CMIS ACL Document Type
-			</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-</xs:schema>
-	<!-- EOF -->
\ No newline at end of file
diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/CMIS-RestAtom.xsd b/source/java/org/alfresco/repo/cmis/rest/xsd/CMIS-RestAtom.xsd
deleted file mode 100755
index 12ab9c7416..0000000000
--- a/source/java/org/alfresco/repo/cmis/rest/xsd/CMIS-RestAtom.xsd
+++ /dev/null
@@ -1,264 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-	<!--
-		Common CMIS XSD
-	-->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-	elementFormDefault="qualified" targetNamespace="http://docs.oasis-open.org/ns/cmis/restatom/200901"
-	xmlns:atom="http://www.w3.org/2005/Atom" xmlns:xhtml="http://www.w3.org/1999/xhtml"
-	xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
-	jaxb:extensionBindingPrefixes="xjc" jaxb:version="2.1"
-	xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901"
-	xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200901"
-	version="0.62f">
-	<xs:import namespace="http://docs.oasis-open.org/ns/cmis/core/200901"
-		schemaLocation="CMIS-Core.xsd" />
-	<xs:import namespace="http://www.w3.org/2005/Atom"
-		schemaLocation="ATOM.xsd" />
-	<xs:import namespace="http://www.w3.org/XML/1998/namespace"
-		schemaLocation="xml.xsd" />
-
-	<!--
-		should be a member of enumRepositoryRelationship. However, it can be
-		extended, so not constrained.
-	-->
-	<xs:attribute name="repositoryRelationship" type="xs:string" />
-	<xs:attribute name="collectionType" type="cmisra:enumCollectionType" />
-	<xs:attribute name="id" type="xs:string" />
-	<xs:attribute name="renditionType" type="xs:string" />
-
-	<xs:element name="repositoryInfo" type="cmis:cmisRepositoryInfoType">
-		<xs:annotation>
-			<xs:documentation>
-				This is the AtomPub extension element that will be
-				used to contain CMIS repository information
-				inside an AtomPub
-				workspace element inside an AtomPub Service document
-			</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-
-	<xs:element name="type" type="cmis:cmisTypeDefinitionType">
-		<xs:annotation>
-			<xs:documentation>
-				This is the Atom extension element that will be
-				used to contain a type definition (document, folder, relationship,
-				or policy) inside an atom entry element.
-			</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-
-
-	<xs:element name="children" type="atom:feedType">
-		<xs:annotation>
-			<xs:documentation>
-				This is the Atom extension element that will be
-				used to contain a feed inside an atom entry element.
-			</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-
-	<xs:simpleType name="enumCollectionType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="root" />
-			<xs:enumeration value="unfiled" />
-			<xs:enumeration value="checkedout" />
-			<xs:enumeration value="types" />
-			<xs:enumeration value="query" />
-			<xs:enumeration value="changes" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="enumUriTemplateType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="entrybyid" />
-			<xs:enumeration value="folderbypath" />
-			<xs:enumeration value="query" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:complexType name="cmisUriTemplateType">
-		<xs:sequence>
-			<xs:element name="template" type="xs:string" />
-			<xs:element name="type" type="xs:string" />
-			<xs:element name="mediatype" type="xs:string" />
-			<xs:any processContents="lax" namespace="##other" minOccurs="0"
-				maxOccurs="unbounded" />
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="uritemplate" type="cmisra:cmisUriTemplateType">
-		<xs:annotation>
-			<xs:documentation>
-				This is the AtomPub extension element that will be
-				used to contain CMIS URI Templates inside an AtomPub
-				workspace
-				element inside an AtomPub Service document</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-	<xs:element name="object" type="cmis:cmisObjectType">
-		<xs:annotation>
-			<xs:documentation>
-				This is the AtomPub extension element that will be
-				used to contain a CMIS object instance inside an Atom entry element.
-			</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-
-
-	<xs:simpleType name="enumLinkRelations">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="self" />
-			<xs:enumeration value="edit" />
-			<xs:enumeration value="edit-media" />
-			<xs:enumeration value="via" />
-			<xs:enumeration value="up" />
-			<xs:enumeration value="down" />
-			<xs:enumeration value="version-history" />
-			<xs:enumeration value="current-version" />
-			<xs:enumeration value="working-copy" />
-			<xs:enumeration value="service" />
-			<xs:enumeration value="describedby" />
-
-			<!--  paging -->
-			<xs:enumeration value="first" />
-			<xs:enumeration value="last" />
-			<xs:enumeration value="next" />
-			<xs:enumeration value="prev" />
-
-
-			<xs:enumeration
-				value="http://docs.oasis-open.org/ns/cmis/link/200901/allowableactions">
-				<xs:annotation>
-					<xs:appinfo>
-						<jaxb:typesafeEnumMember name="CMIS_ALLOWABLEACTIONS" />
-					</xs:appinfo>
-				</xs:annotation>
-			</xs:enumeration>
-
-			<xs:enumeration
-				value="http://docs.oasis-open.org/ns/cmis/link/200901/relationships">
-				<xs:annotation>
-					<xs:appinfo>
-						<jaxb:typesafeEnumMember name="CMIS_RELATIONSHIPS" />
-					</xs:appinfo>
-				</xs:annotation>
-			</xs:enumeration>
-
-
-			<xs:enumeration
-				value="http://docs.oasis-open.org/ns/cmis/link/200901/source">
-				<xs:annotation>
-					<xs:appinfo>
-						<jaxb:typesafeEnumMember name="CMIS_SOURCE" />
-					</xs:appinfo>
-				</xs:annotation>
-			</xs:enumeration>
-
-			<xs:enumeration
-				value="http://docs.oasis-open.org/ns/cmis/link/200901/target">
-				<xs:annotation>
-					<xs:appinfo>
-						<jaxb:typesafeEnumMember name="CMIS_TARGET" />
-					</xs:appinfo>
-				</xs:annotation>
-			</xs:enumeration>
-
-			<xs:enumeration
-				value="http://docs.oasis-open.org/ns/cmis/link/200901/policies">
-				<xs:annotation>
-					<xs:appinfo>
-						<jaxb:typesafeEnumMember name="CMIS_POLICIES" />
-					</xs:appinfo>
-				</xs:annotation>
-			</xs:enumeration>
-
-			<xs:enumeration value="http://docs.oasis-open.org/ns/cmis/link/200901/acl">
-				<xs:annotation>
-					<xs:appinfo>
-						<jaxb:typesafeEnumMember name="CMIS_ACL" />
-					</xs:appinfo>
-				</xs:annotation>
-			</xs:enumeration>
-
-
-			<!--  changes -->
-			<xs:enumeration
-				value="http://docs.oasis-open.org/ns/cmis/link/200901/changes">
-				<xs:annotation>
-					<xs:appinfo>
-						<jaxb:typesafeEnumMember name="CMIS_CHANGES" />
-					</xs:appinfo>
-				</xs:annotation>
-			</xs:enumeration>
-
-
-			<!--  folder tree -->
-			<xs:enumeration
-				value="http://docs.oasis-open.org/ns/cmis/link/200901/foldertree">
-				<xs:annotation>
-					<xs:appinfo>
-						<jaxb:typesafeEnumMember name="CMIS_FOLDERTREE" />
-					</xs:appinfo>
-				</xs:annotation>
-			</xs:enumeration>
-
-
-
-			<!--  types descendants -->
-			<xs:enumeration
-				value="http://docs.oasis-open.org/ns/cmis/link/200901/typesdescendants">
-				<xs:annotation>
-					<xs:appinfo>
-						<jaxb:typesafeEnumMember name="CMIS_TYPESDESCENDANTS" />
-					</xs:appinfo>
-				</xs:annotation>
-			</xs:enumeration>
-
-			<xs:enumeration
-				value="http://docs.oasis-open.org/ns/cmis/link/200901/rootdescendants">
-				<xs:annotation>
-					<xs:appinfo>
-						<jaxb:typesafeEnumMember name="CMIS_ROOTDESCENDANTS" />
-					</xs:appinfo>
-				</xs:annotation>
-			</xs:enumeration>
-
-
-		</xs:restriction>
-	</xs:simpleType>
-
-	<!--  CMIS Rest Arguments -->
-	<xs:simpleType name="enumArguments">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="childTypes" />
-			<xs:enumeration value="continueOnFailure" />
-			<xs:enumeration value="checkin" />
-			<xs:enumeration value="checkinComment" />
-			<xs:enumeration value="depth" />
-			<xs:enumeration value="direction" />
-			<xs:enumeration value="filter" />
-			<xs:enumeration value="folderId" />
-			<xs:enumeration value="includeAllowableActions" />
-			<xs:enumeration value="includePropertyDefinitions" />
-			<xs:enumeration value="includeRelationships" />
-			<xs:enumeration value="includeSubrelationshipTypes" />
-			<xs:enumeration value="length" />
-			<xs:enumeration value="major" />
-			<xs:enumeration value="maxItems" />
-			<xs:enumeration value="offset" />
-			<xs:enumeration value="removeFrom" />
-			<xs:enumeration value="relationshipType" />
-			<xs:enumeration value="repositoryId" />
-			<xs:enumeration value="returnVersion" />
-			<xs:enumeration value="skipCount" />
-			<xs:enumeration value="thisVersion" />
-			<xs:enumeration value="typeId" />
-			<xs:enumeration value="types" />
-			<xs:enumeration value="unfileMultiFiledDocuments" />
-			<xs:enumeration value="versioningState" />
-		</xs:restriction>
-	</xs:simpleType>
-
-
-
-</xs:schema>
-	<!-- EOF -->
\ No newline at end of file
diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/CMISSchemaTest.java b/source/java/org/alfresco/repo/cmis/rest/xsd/CMISSchemaTest.java
deleted file mode 100644
index 1d27399ce0..0000000000
--- a/source/java/org/alfresco/repo/cmis/rest/xsd/CMISSchemaTest.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
- * Copyright (C) 2005-2008 Alfresco Software Limited.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
- * As a special exception to the terms and conditions of version 2.0 of 
- * the GPL, you may redistribute this Program in connection with Free/Libre 
- * and Open Source Software ("FLOSS") applications as described in Alfresco's 
- * FLOSS exception.  You should have recieved a copy of the text describing 
- * the FLOSS exception, and it is also available here: 
- * http://www.alfresco.com/legal/licensing"
- */
-package org.alfresco.repo.cmis.rest.xsd;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.StringReader;
-import java.io.StringWriter;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.validation.Validator;
-
-import junit.framework.TestCase;
-
-import org.w3c.dom.Document;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-
-/**
- * CMIS XSD Tests
- * 
- * @author davidc
- */
-public class CMISSchemaTest extends TestCase
-{
-    private CMISValidator cmisValidator = new CMISValidator();
-
-
-    /**
-     * Gets XML from file specified by class path
-     * 
-     * @param classPath  XML file
-     * @return  XML
-     * @throws IOException
-     */
-    private String getXML(String classPath)
-        throws IOException
-    {
-        InputStream input = getClass().getResourceAsStream(classPath);
-        if (input == null)
-        {
-            throw new IOException(classPath + " not found.");
-        }
-
-        InputStreamReader reader = new InputStreamReader(input);
-        StringWriter writer = new StringWriter();
-
-        try
-        {
-            char[] buffer = new char[4096];
-            int bytesRead = -1;
-            while ((bytesRead = reader.read(buffer)) != -1)
-            {
-                writer.write(buffer, 0, bytesRead);
-            }
-            writer.flush();
-        }
-        finally
-        {
-            reader.close();
-            writer.close();
-        }
-        
-        return writer.toString();
-    }
-
-    /**
-     * Assert XML is valid according to specified validator
-     *  
-     * @param xml  document to test
-     * @param validator  validator to test with
-     * @throws IOException
-     * @throws ParserConfigurationException 
-     */
-    private void assertValidXML(String xml, Validator validator)
-        throws IOException, ParserConfigurationException
-    {
-        try
-        {
-            Document document = cmisValidator.getDocumentBuilder().parse(new InputSource(new StringReader(xml)));
-            validator.validate(new DOMSource(document));
-        }
-        catch (SAXException e)
-        {
-            fail(cmisValidator.toString(e, xml));
-        }
-    }
-
-    
-//    public void testRelaxNG()
-//        throws Exception
-//    {
-//        String xml = getXML("address.xml");
-//        SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.RELAXNG_NS_URI);
-//        Source schemaFile = new StreamSource(getClass().getResourceAsStream("address.rng"), getClass().getResource("address.rng").toExternalForm());
-//        Schema schema = factory.newSchema(schemaFile);
-//        assertValidXML(xml, schema.newValidator());
-//    }
-    
-    public void testAllowableActions()
-        throws Exception
-    {
-        String xml = getXML("examples/AllowableActions.xml");
-        assertValidXML(xml, cmisValidator.getCMISAtomValidator());
-    }
-
-    public void testChangeLog()
-        throws Exception
-    {
-        String xml = getXML("examples/ChangeLog.xml");
-        assertValidXML(xml, cmisValidator.getCMISAtomValidator());
-    }
-
-    public void testDocumentEntry()
-        throws Exception
-    {
-        String xml = getXML("examples/DocumentEntry.xml");
-        assertValidXML(xml, cmisValidator.getCMISAtomValidator());
-    }
-
-    public void testDocumentEntryPWC()
-        throws Exception
-    {
-        String xml = getXML("examples/DocumentEntryPWC.xml");
-        assertValidXML(xml, cmisValidator.getCMISAtomValidator());
-    }
-
-    public void testDocumentEntryWithChanges()
-        throws Exception
-    {
-        String xml = getXML("examples/DocumentEntryWithChanges.xml");
-        assertValidXML(xml, cmisValidator.getCMISAtomValidator());
-    }
-    
-    public void testFolderChildren()
-        throws Exception
-    {
-        String xml = getXML("examples/FolderChildren.xml");
-        assertValidXML(xml, cmisValidator.getCMISAtomValidator());
-    }
-
-    public void testFolderDescendants()
-        throws Exception
-    {
-        String xml = getXML("examples/FolderDescendants.xml");
-        assertValidXML(xml, cmisValidator.getCMISAtomValidator());
-    }
-
-    public void testFolderEntry()
-        throws Exception
-    {
-        String xml = getXML("examples/FolderEntry.xml");
-        assertValidXML(xml, cmisValidator.getCMISAtomValidator());
-    }
-
-    public void testPolicyEntry()
-        throws Exception
-    {
-        String xml = getXML("examples/PolicyEntry.xml");
-        assertValidXML(xml, cmisValidator.getCMISAtomValidator());
-    }
-
-    public void testQuery()
-        throws Exception
-    {
-        String xml = getXML("examples/Query.xml");
-        assertValidXML(xml, cmisValidator.getCMISAtomValidator());
-    }
-
-    public void testRelationshipEntry()
-        throws Exception
-    {
-        String xml = getXML("examples/RelationshipEntry.xml");
-        assertValidXML(xml, cmisValidator.getCMISAtomValidator());
-    }
-
-    public void testService()
-        throws Exception
-    {
-        String xml = getXML("examples/Service.xml");
-        assertValidXML(xml, cmisValidator.getAppValidator());
-    }
-
-    public void testTypeDocumentWith()
-        throws Exception
-    {
-        String xml = getXML("examples/TypeDocumentWith.xml");
-        assertValidXML(xml, cmisValidator.getCMISAtomValidator());
-    }
-
-    public void testTypeDocumentWithout()
-        throws Exception
-    {
-        String xml = getXML("examples/TypeDocumentWithout.xml");
-        assertValidXML(xml, cmisValidator.getCMISAtomValidator());
-    }
-
-    public void testTypeFolderWith()
-        throws Exception
-    {
-        String xml = getXML("examples/TypeFolderWith.xml");
-        assertValidXML(xml, cmisValidator.getCMISAtomValidator());
-    }
-
-    public void testTypeFolderWithOut()
-        throws Exception
-    {
-        String xml = getXML("examples/TypeFolderWithOut.xml");
-        assertValidXML(xml, cmisValidator.getCMISAtomValidator());
-    }
-
-    public void testTypeRelationshipWith()
-        throws Exception
-    {
-        String xml = getXML("examples/TypeRelationshipWith.xml");
-        assertValidXML(xml, cmisValidator.getCMISAtomValidator());
-    }
-
-    public void testTypeRelationshipWithOut()
-        throws Exception
-    {
-        String xml = getXML("examples/TypeRelationshipWithout.xml");
-        assertValidXML(xml, cmisValidator.getCMISAtomValidator());
-    }
-    
-    public void testFolderChildrenAlfresco()
-        throws Exception
-    {
-        String xml = getXML("examples/example_folderchildren_alfresco.xml");
-        assertValidXML(xml, cmisValidator.getCMISAtomValidator());
-    }
-
-    public void testAtomEntry()
-        throws Exception
-    {
-        String xml = getXML("examples/example_atomentry.xml");
-        assertValidXML(xml, cmisValidator.getCMISAtomValidator());
-    }
-
-}
diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/CMISValidator.java b/source/java/org/alfresco/repo/cmis/rest/xsd/CMISValidator.java
deleted file mode 100644
index e984b79fdf..0000000000
--- a/source/java/org/alfresco/repo/cmis/rest/xsd/CMISValidator.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Copyright (C) 2005-2007 Alfresco Software Limited.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
- * As a special exception to the terms and conditions of version 2.0 of 
- * the GPL, you may redistribute this Program in connection with Free/Libre 
- * and Open Source Software ("FLOSS") applications as described in Alfresco's 
- * FLOSS exception.  You should have recieved a copy of the text describing 
- * the FLOSS exception, and it is also available here: 
- * http://www.alfresco.com/legal/licensing"
- */
-package org.alfresco.repo.cmis.rest.xsd;
-
-import java.io.IOException;
-import java.io.StringReader;
-
-import javax.xml.XMLConstants;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.Source;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamSource;
-import javax.xml.validation.Schema;
-import javax.xml.validation.SchemaFactory;
-import javax.xml.validation.Validator;
-
-import org.w3c.dom.Document;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-
-
-/**
- * CMIS Validator
- * 
- * Support for validating CMIS requests/responses against CMIS XSDs
- * 
- * @author davidc
- */
-public class CMISValidator
-{
-    /** XML Schema Validation */
-    private DocumentBuilder documentBuilder = null;
-    private Validator appValidator = null;
-    private Validator atomValidator = null;
-    
-    
-    /**
-     * Gets document parser
-     * 
-     * @return  document parser
-     * @throws ParserConfigurationException
-     */
-    public DocumentBuilder getDocumentBuilder()
-        throws ParserConfigurationException
-    {
-        if (documentBuilder == null)
-        {
-            DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
-            builderFactory.setNamespaceAware(true);
-            documentBuilder = builderFactory.newDocumentBuilder();
-        }
-        return documentBuilder;
-    }
-    
-    /**
-     * Gets CMIS Atom Publishing Protocol XML Validator
-     * 
-     * @return  APP Validator
-     * @throws IOException
-     * @throws SAXException
-     */
-    public Validator getAppValidator()
-        throws IOException, SAXException
-    {
-        if (appValidator == null)
-        {
-            SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
-            Source APPFile = new StreamSource(getClass().getResourceAsStream("APP.xsd"), getClass().getResource("APP.xsd").toExternalForm());
-            Schema schema = factory.newSchema(APPFile);
-            appValidator = schema.newValidator();
-        }
-        return appValidator;
-    }
-    
-    /**
-     * Gets CMIS Atom Validator
-     * 
-     * @return CMIS Atom Validator
-     * @throws IOException
-     * @throws SAXException
-     */
-    public Validator getCMISAtomValidator()
-        throws IOException, SAXException
-    {
-        if (atomValidator == null)
-        {
-            SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
-            Source ATOMFile = new StreamSource(getClass().getResourceAsStream("ATOM.xsd"), getClass().getResource("ATOM.xsd").toExternalForm());
-            Schema schema = factory.newSchema(ATOMFile);
-            atomValidator = schema.newValidator();
-        }
-        
-        return atomValidator;
-    }
-
-    /**
-     * Asserts XML complies with specified Validator
-     * 
-     * @param xml  xml to assert
-     * @param validator  validator to assert with
-     * @throws IOException
-     * @throws ParserConfigurationException
-     */
-    public void validateXML(String xml, Validator validator)
-        throws IOException, ParserConfigurationException, SAXException
-    {
-        Document document = getDocumentBuilder().parse(new InputSource(new StringReader(xml)));
-        validator.validate(new DOMSource(document));
-    }
- 
-    /**
-     * Convert SAX Exception to String
-     * 
-     * @param e  SAX Exception
-     * @param xml  related XML (if any)
-     * @return  description of SAX Exception
-     */
-    public String toString(SAXException e, String xml)
-    {
-        StringBuffer fail = new StringBuffer(e.toString());
-        if (e instanceof SAXParseException)
-        {
-            fail.append("\n");
-            fail.append("line: ").append(((SAXParseException)e).getLineNumber()).append("\n");
-            fail.append("col: ").append(((SAXParseException)e).getColumnNumber()).append("\n");
-        }
-        if (xml != null)
-        {
-            fail.append("\n");
-            fail.append(xml);
-        }
-        return fail.toString();
-    }
-    
-}
diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/address.rng b/source/java/org/alfresco/repo/cmis/rest/xsd/address.rng
deleted file mode 100644
index 06d5045abb..0000000000
--- a/source/java/org/alfresco/repo/cmis/rest/xsd/address.rng
+++ /dev/null
@@ -1,27 +0,0 @@
-<element name="addressBook" xmlns="http://relaxng.org/ns/structure/1.0">
-  <zeroOrMore>
-    <element name="card">
-      <choice>
-        <element name="givenName">
-          <text/>
-        </element>
-        <group>
-          <element name="givenName">
-            <text/>
-          </element>
-          <element name="familyName">
-            <text/>
-          </element>
-        </group>
-      </choice>
-      <element name="email">
-        <text/>
-      </element>
-      <optional>
-    <element name="note">
-      <text/>
-    </element>
-      </optional>
-    </element>
-  </zeroOrMore>
-</element>
\ No newline at end of file
diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/address.xml b/source/java/org/alfresco/repo/cmis/rest/xsd/address.xml
deleted file mode 100644
index 88cebc3787..0000000000
--- a/source/java/org/alfresco/repo/cmis/rest/xsd/address.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<addressBook>
-  <card>
-    <givenName>John</givenName>
-  <familyName>Smith</familyName>
-    <email>js@example.com</email>
-  </card>
-  <card>
-    <givenName>Fred Bloggs</givenName>
-    <email>fb@example.net</email>
-    <note/>
-  </card>
-</addressBook>
\ No newline at end of file
diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/examples/AllowableActions.xml b/source/java/org/alfresco/repo/cmis/rest/xsd/examples/AllowableActions.xml
deleted file mode 100644
index e9579b94f7..0000000000
--- a/source/java/org/alfresco/repo/cmis/rest/xsd/examples/AllowableActions.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<cmis:allowableActions xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901" xmlns:cmism="http://docs.oasis-open.org/ns/cmis/messaging/200901" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:app="http://www.w3.org/2007/app" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200901">
-    <cmis:canDeleteObject>true</cmis:canDeleteObject>
-    <cmis:canUpdateProperties>true</cmis:canUpdateProperties>
-    <cmis:canGetProperties>true</cmis:canGetProperties>
-    <cmis:canGetRelationships>true</cmis:canGetRelationships>
-    <cmis:canGetObjectParents>true</cmis:canGetObjectParents>
-    <cmis:canMoveObject>true</cmis:canMoveObject>
-    <cmis:canDeleteContentStream>true</cmis:canDeleteContentStream>
-    <cmis:canCheckOut>true</cmis:canCheckOut>
-    <cmis:canCancelCheckOut>true</cmis:canCancelCheckOut>
-    <cmis:canCheckIn>true</cmis:canCheckIn>
-    <cmis:canSetContentStream>true</cmis:canSetContentStream>
-    <cmis:canGetAllVersions>true</cmis:canGetAllVersions>
-    <cmis:canAddObjectToFolder>true</cmis:canAddObjectToFolder>
-    <cmis:canRemoveObjectFromFolder>true</cmis:canRemoveObjectFromFolder>
-    <cmis:canGetContentStream>true</cmis:canGetContentStream>
-    <cmis:canApplyPolicy>true</cmis:canApplyPolicy>
-    <cmis:canGetAppliedPolicies>true</cmis:canGetAppliedPolicies>
-    <cmis:canRemovePolicy>true</cmis:canRemovePolicy>
-    <cmis:canCreateDocument>true</cmis:canCreateDocument>
-</cmis:allowableActions>
diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/examples/ChangeLog.xml b/source/java/org/alfresco/repo/cmis/rest/xsd/examples/ChangeLog.xml
deleted file mode 100644
index 7aaa0e760d..0000000000
--- a/source/java/org/alfresco/repo/cmis/rest/xsd/examples/ChangeLog.xml
+++ /dev/null
@@ -1,352 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<atom:feed xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901" xmlns:cmism="http://docs.oasis-open.org/ns/cmis/messaging/200901" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:app="http://www.w3.org/2007/app" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200901">
-    <atom:title type="text">changelog feed</atom:title>
-    <atom:author>
-        <atom:name>Al Brown</atom:name>
-        <atom:uri>http://www.ibm.com/</atom:uri>
-        <atom:email>albertcbrown@us.ibm.com</atom:email>
-    </atom:author>
-    <atom:updated>2009-07-17T09:13:33.109-07:00</atom:updated>
-    <atom:id>urn:uuid:bbf11f9e-0534-43f4-b5a3-436c7d1cf74a</atom:id>
-    <atom:link type="application/atom+xml;type=feed" rel="self" href="http://cmisexample.oasis-open.org/rep1/folder1feed/3"/>
-    <atom:link type="application/atom+xml;type=entry" rel="via" href="http://cmisexample.oasis-open.org/rep1/folder1feed"/>
-    <atom:link type="application/atom+xml;type=feed" rel="first" href="http://cmisexample.oasis-open.org/rep1/folder1feed/first"/>
-    <atom:link type="application/atom+xml;type=feed" rel="next" href="http://cmisexample.oasis-open.org/rep1/folder1feed/4"/>
-    <atom:link type="application/atom+xml;type=feed" rel="previous" href="http://cmisexample.oasis-open.org/rep1/folder1feed/2"/>
-    <atom:link type="application/atom+xml;type=feed" rel="last" href="http://cmisexample.oasis-open.org/rep1/folder1feed/last"/>
-    <app:collection href="http://cmisexample.oasis-open.org/rep1/folder1feed/3">
-        <atom:title type="text">changelog feed</atom:title>
-        <app:accept>application/atom+xml;type=entry</app:accept>
-        <app:accept>application/atom+xml</app:accept>
-        <app:accept>*/*</app:accept>
-    </app:collection>
-    <atom:entry>
-        <atom:author>
-            <atom:name>Al Brown</atom:name>
-            <atom:uri>http://www.ibm.com/</atom:uri>
-            <atom:email>albertcbrown@us.ibm.com</atom:email>
-        </atom:author>
-        <atom:content src="http://cmisexample.oasis-open.org/rep1/eca5cd9a-a34e-4001-8bcc-99a8d171f08a"/>
-        <atom:id>urn:uuid:eca5cd9a-a34e-4001-8bcc-99a8d171f08a</atom:id>
-        <atom:link rel="self" href="http://cmisexample.oasis-open.org/rep1/eca5cd9a-a34e-4001-8bcc-99a8d171f08a"/>
-        <atom:link rel="edit" href="http://cmisexample.oasis-open.org/rep1/eca5cd9a-a34e-4001-8bcc-99a8d171f08a"/>
-        <atom:link type="application/cmis+xml;type=allowableActions" rel="allowableactions" href="http://cmisexample.oasis-open.org/rep1/eca5cd9a-a34e-4001-8bcc-99a8d171f08a/allowableactions"/>
-        <atom:link type="application/atom+xml;type=entry" rel="type" href="http://cmisexample.oasis-open.org/rep1/eca5cd9a-a34e-4001-8bcc-99a8d171f08a/type"/>
-        <atom:published>2009-07-17T09:13:33.109-07:00</atom:published>
-        <atom:summary type="html">HTML summary of Entry  eca5cd9a-a34e-4001-8bcc-99a8d171f08a</atom:summary>
-        <atom:title type="text">CMIS Example Folder as Customer type</atom:title>
-        <atom:updated>2009-07-17T09:13:33.109-07:00</atom:updated>
-        <atom:link type="application/atom+xml;type=feed" rel="relationships" href="http://cmisexample.oasis-open.org/rep1/eca5cd9a-a34e-4001-8bcc-99a8d171f08a/relationships"/>
-        <atom:link type="application/atom+xml;type=entry" rel="up" href="http://cmisexample.oasis-open.org/rep1/eca5cd9a-a34e-4001-8bcc-99a8d171f08a/up"/>
-        <atom:link type="application/atom+xml;type=feed" rel="down" href="http://cmisexample.oasis-open.org/rep1/eca5cd9a-a34e-4001-8bcc-99a8d171f08a/children/flat"/>
-        <atom:link type="application/cmistree+xml" rel="down" href="http://cmisexample.oasis-open.org/rep1/eca5cd9a-a34e-4001-8bcc-99a8d171f08a/children/tree"/>
-        <cmisra:object>
-            <cmis:properties>
-                <cmis:propertyBoolean localname="rep-cmis:IsImmutable" pdid="cmis:IsImmutable">
-                    <cmis:value>false</cmis:value>
-                </cmis:propertyBoolean>
-                <cmis:propertyDateTime localname="rep-cmis:CreationDate" pdid="cmis:CreationDate">
-                    <cmis:value>2009-07-17T09:13:33.109-07:00</cmis:value>
-                </cmis:propertyDateTime>
-                <cmis:propertyDateTime localname="rep-cmis:LastModificationDate" pdid="cmis:LastModificationDate">
-                    <cmis:value>2009-07-17T09:13:33.109-07:00</cmis:value>
-                </cmis:propertyDateTime>
-                <cmis:propertyId localname="rep-cmis:ObjectId" pdid="cmis:ObjectId">
-                    <cmis:value>eca5cd9a-a34e-4001-8bcc-99a8d171f08a</cmis:value>
-                </cmis:propertyId>
-                <cmis:propertyId localname="rep-cmis:ObjectTypeId" pdid="cmis:ObjectTypeId">
-                    <cmis:value>customer</cmis:value>
-                </cmis:propertyId>
-                <cmis:propertyId localname="rep-cmis:BaseTypeId" pdid="cmis:BaseTypeId">
-                    <cmis:value>cmis:folder</cmis:value>
-                </cmis:propertyId>
-                <cmis:propertyString localname="rep-cmis:LastModifiedBy" pdid="cmis:LastModifiedBy">
-                    <cmis:value>Al Brown</cmis:value>
-                </cmis:propertyString>
-                <cmis:propertyString localname="rep-cmis:CreatedBy" pdid="cmis:CreatedBy">
-                    <cmis:value>Al Brown</cmis:value>
-                </cmis:propertyString>
-                <cmis:propertyId localname="rep-cmis:ParentId" pdid="cmis:ParentId">
-                    <cmis:value>eca5cd9a-a34e-4001-8bcc-99a8d171f08aup</cmis:value>
-                </cmis:propertyId>
-            </cmis:properties>
-            <cmis:allowableActions>
-                <cmis:canDeleteObject>true</cmis:canDeleteObject>
-                <cmis:canUpdateProperties>true</cmis:canUpdateProperties>
-                <cmis:canGetProperties>true</cmis:canGetProperties>
-                <cmis:canGetRelationships>true</cmis:canGetRelationships>
-                <cmis:canGetFolderParent>true</cmis:canGetFolderParent>
-                <cmis:canGetDescendants>true</cmis:canGetDescendants>
-                <cmis:canMoveObject>true</cmis:canMoveObject>
-                <cmis:canAddObjectToFolder>true</cmis:canAddObjectToFolder>
-                <cmis:canRemoveObjectFromFolder>true</cmis:canRemoveObjectFromFolder>
-                <cmis:canApplyPolicy>true</cmis:canApplyPolicy>
-                <cmis:canGetAppliedPolicies>true</cmis:canGetAppliedPolicies>
-                <cmis:canRemovePolicy>true</cmis:canRemovePolicy>
-                <cmis:canGetChildren>true</cmis:canGetChildren>
-                <cmis:canCreateFolder>true</cmis:canCreateFolder>
-                <cmis:canDeleteTree>true</cmis:canDeleteTree>
-            </cmis:allowableActions>
-            <cmis:changeEventInfo>
-                <cmis:changeType>updated</cmis:changeType>
-                <cmis:changeTime>2009-07-17T09:13:33.109-07:00</cmis:changeTime>
-            </cmis:changeEventInfo>
-        </cmisra:object>
-    </atom:entry>
-    <atom:entry>
-        <atom:author>
-            <atom:name>Al Brown</atom:name>
-            <atom:uri>http://www.ibm.com/</atom:uri>
-            <atom:email>albertcbrown@us.ibm.com</atom:email>
-        </atom:author>
-        <atom:content src="http://cmisexample.oasis-open.org/rep1/094b6e99-c409-40de-aa61-6af5feb68a7f"/>
-        <atom:id>urn:uuid:094b6e99-c409-40de-aa61-6af5feb68a7f</atom:id>
-        <atom:link rel="self" href="http://cmisexample.oasis-open.org/rep1/094b6e99-c409-40de-aa61-6af5feb68a7f"/>
-        <atom:link rel="edit" href="http://cmisexample.oasis-open.org/rep1/094b6e99-c409-40de-aa61-6af5feb68a7f"/>
-        <atom:link type="application/cmis+xml;type=allowableActions" rel="allowableactions" href="http://cmisexample.oasis-open.org/rep1/094b6e99-c409-40de-aa61-6af5feb68a7f/allowableactions"/>
-        <atom:link type="application/atom+xml;type=entry" rel="type" href="http://cmisexample.oasis-open.org/rep1/094b6e99-c409-40de-aa61-6af5feb68a7f/type"/>
-        <atom:published>2009-07-17T09:13:33.109-07:00</atom:published>
-        <atom:summary type="html">HTML summary of Entry  094b6e99-c409-40de-aa61-6af5feb68a7f</atom:summary>
-        <atom:title type="text">CMIS Example Folder as Customer type</atom:title>
-        <atom:updated>2009-07-17T09:13:33.109-07:00</atom:updated>
-        <atom:link type="application/atom+xml;type=feed" rel="relationships" href="http://cmisexample.oasis-open.org/rep1/094b6e99-c409-40de-aa61-6af5feb68a7f/relationships"/>
-        <atom:link type="application/atom+xml;type=entry" rel="up" href="http://cmisexample.oasis-open.org/rep1/094b6e99-c409-40de-aa61-6af5feb68a7f/up"/>
-        <atom:link type="application/atom+xml;type=feed" rel="down" href="http://cmisexample.oasis-open.org/rep1/094b6e99-c409-40de-aa61-6af5feb68a7f/children/flat"/>
-        <atom:link type="application/cmistree+xml" rel="down" href="http://cmisexample.oasis-open.org/rep1/094b6e99-c409-40de-aa61-6af5feb68a7f/children/tree"/>
-        <cmisra:object>
-            <cmis:properties>
-                <cmis:propertyBoolean localname="rep-cmis:IsImmutable" pdid="cmis:IsImmutable">
-                    <cmis:value>false</cmis:value>
-                </cmis:propertyBoolean>
-                <cmis:propertyDateTime localname="rep-cmis:CreationDate" pdid="cmis:CreationDate">
-                    <cmis:value>2009-07-17T09:13:33.109-07:00</cmis:value>
-                </cmis:propertyDateTime>
-                <cmis:propertyDateTime localname="rep-cmis:LastModificationDate" pdid="cmis:LastModificationDate">
-                    <cmis:value>2009-07-17T09:13:33.125-07:00</cmis:value>
-                </cmis:propertyDateTime>
-                <cmis:propertyId localname="rep-cmis:ObjectId" pdid="cmis:ObjectId">
-                    <cmis:value>094b6e99-c409-40de-aa61-6af5feb68a7f</cmis:value>
-                </cmis:propertyId>
-                <cmis:propertyId localname="rep-cmis:ObjectTypeId" pdid="cmis:ObjectTypeId">
-                    <cmis:value>customer</cmis:value>
-                </cmis:propertyId>
-                <cmis:propertyId localname="rep-cmis:BaseTypeId" pdid="cmis:BaseTypeId">
-                    <cmis:value>cmis:folder</cmis:value>
-                </cmis:propertyId>
-                <cmis:propertyString localname="rep-cmis:LastModifiedBy" pdid="cmis:LastModifiedBy">
-                    <cmis:value>Al Brown</cmis:value>
-                </cmis:propertyString>
-                <cmis:propertyString localname="rep-cmis:CreatedBy" pdid="cmis:CreatedBy">
-                    <cmis:value>Al Brown</cmis:value>
-                </cmis:propertyString>
-                <cmis:propertyId localname="rep-cmis:ParentId" pdid="cmis:ParentId">
-                    <cmis:value>094b6e99-c409-40de-aa61-6af5feb68a7fup</cmis:value>
-                </cmis:propertyId>
-            </cmis:properties>
-            <cmis:allowableActions>
-                <cmis:canDeleteObject>true</cmis:canDeleteObject>
-                <cmis:canUpdateProperties>true</cmis:canUpdateProperties>
-                <cmis:canGetProperties>true</cmis:canGetProperties>
-                <cmis:canGetRelationships>true</cmis:canGetRelationships>
-                <cmis:canGetFolderParent>true</cmis:canGetFolderParent>
-                <cmis:canGetDescendants>true</cmis:canGetDescendants>
-                <cmis:canMoveObject>true</cmis:canMoveObject>
-                <cmis:canAddObjectToFolder>true</cmis:canAddObjectToFolder>
-                <cmis:canRemoveObjectFromFolder>true</cmis:canRemoveObjectFromFolder>
-                <cmis:canApplyPolicy>true</cmis:canApplyPolicy>
-                <cmis:canGetAppliedPolicies>true</cmis:canGetAppliedPolicies>
-                <cmis:canRemovePolicy>true</cmis:canRemovePolicy>
-                <cmis:canGetChildren>true</cmis:canGetChildren>
-                <cmis:canCreateFolder>true</cmis:canCreateFolder>
-                <cmis:canDeleteTree>true</cmis:canDeleteTree>
-            </cmis:allowableActions>
-            <cmis:changeEventInfo>
-                <cmis:changeType>updated</cmis:changeType>
-                <cmis:changeTime>2009-07-17T09:13:33.125-07:00</cmis:changeTime>
-            </cmis:changeEventInfo>
-        </cmisra:object>
-    </atom:entry>
-    <atom:entry>
-        <atom:author>
-            <atom:name>Al Brown</atom:name>
-            <atom:uri>http://www.ibm.com/</atom:uri>
-            <atom:email>albertcbrown@us.ibm.com</atom:email>
-        </atom:author>
-        <atom:content src="http://cmisexample.oasis-open.org/rep1/13792086-4a35-4818-81a3-0ee63dbe023e"/>
-        <atom:id>urn:uuid:13792086-4a35-4818-81a3-0ee63dbe023e</atom:id>
-        <atom:link rel="self" href="http://cmisexample.oasis-open.org/rep1/13792086-4a35-4818-81a3-0ee63dbe023e"/>
-        <atom:link rel="edit" href="http://cmisexample.oasis-open.org/rep1/13792086-4a35-4818-81a3-0ee63dbe023e"/>
-        <atom:link type="application/cmis+xml;type=allowableActions" rel="allowableactions" href="http://cmisexample.oasis-open.org/rep1/13792086-4a35-4818-81a3-0ee63dbe023e/allowableactions"/>
-        <atom:link type="application/atom+xml;type=entry" rel="type" href="http://cmisexample.oasis-open.org/rep1/13792086-4a35-4818-81a3-0ee63dbe023e/type"/>
-        <atom:published>2009-07-17T09:13:33.125-07:00</atom:published>
-        <atom:summary type="html">HTML summary of Entry  13792086-4a35-4818-81a3-0ee63dbe023e</atom:summary>
-        <atom:title type="text">CMIS Example Folder as Invoice type</atom:title>
-        <atom:updated>2009-07-17T09:13:33.125-07:00</atom:updated>
-        <atom:link type="application/atom+xml;type=feed" rel="relationships" href="http://cmisexample.oasis-open.org/rep1/13792086-4a35-4818-81a3-0ee63dbe023e/relationships"/>
-        <atom:link type="application/atom+xml;type=entry" rel="up" href="http://cmisexample.oasis-open.org/rep1/13792086-4a35-4818-81a3-0ee63dbe023e/up"/>
-        <atom:link type="application/atom+xml;type=feed" rel="down" href="http://cmisexample.oasis-open.org/rep1/13792086-4a35-4818-81a3-0ee63dbe023e/children/flat"/>
-        <atom:link type="application/cmistree+xml" rel="down" href="http://cmisexample.oasis-open.org/rep1/13792086-4a35-4818-81a3-0ee63dbe023e/children/tree"/>
-        <cmisra:object>
-            <cmis:properties>
-                <cmis:propertyBoolean localname="rep-cmis:IsImmutable" pdid="cmis:IsImmutable">
-                    <cmis:value>false</cmis:value>
-                </cmis:propertyBoolean>
-                <cmis:propertyDateTime localname="rep-cmis:CreationDate" pdid="cmis:CreationDate">
-                    <cmis:value>2009-07-17T09:13:33.125-07:00</cmis:value>
-                </cmis:propertyDateTime>
-                <cmis:propertyDateTime localname="rep-cmis:LastModificationDate" pdid="cmis:LastModificationDate">
-                    <cmis:value>2009-07-17T09:13:33.125-07:00</cmis:value>
-                </cmis:propertyDateTime>
-                <cmis:propertyId localname="rep-cmis:ObjectId" pdid="cmis:ObjectId">
-                    <cmis:value>13792086-4a35-4818-81a3-0ee63dbe023e</cmis:value>
-                </cmis:propertyId>
-                <cmis:propertyId localname="rep-cmis:ObjectTypeId" pdid="cmis:ObjectTypeId">
-                    <cmis:value>invoice</cmis:value>
-                </cmis:propertyId>
-                <cmis:propertyId localname="rep-cmis:BaseTypeId" pdid="cmis:BaseTypeId">
-                    <cmis:value>cmis:folder</cmis:value>
-                </cmis:propertyId>
-                <cmis:propertyString localname="rep-cmis:LastModifiedBy" pdid="cmis:LastModifiedBy">
-                    <cmis:value>Al Brown</cmis:value>
-                </cmis:propertyString>
-                <cmis:propertyString localname="rep-cmis:CreatedBy" pdid="cmis:CreatedBy">
-                    <cmis:value>Al Brown</cmis:value>
-                </cmis:propertyString>
-                <cmis:propertyId localname="rep-cmis:ParentId" pdid="cmis:ParentId">
-                    <cmis:value>13792086-4a35-4818-81a3-0ee63dbe023eup</cmis:value>
-                </cmis:propertyId>
-            </cmis:properties>
-            <cmis:allowableActions>
-                <cmis:canDeleteObject>true</cmis:canDeleteObject>
-                <cmis:canUpdateProperties>true</cmis:canUpdateProperties>
-                <cmis:canGetProperties>true</cmis:canGetProperties>
-                <cmis:canGetRelationships>true</cmis:canGetRelationships>
-                <cmis:canGetFolderParent>true</cmis:canGetFolderParent>
-                <cmis:canGetDescendants>true</cmis:canGetDescendants>
-                <cmis:canMoveObject>true</cmis:canMoveObject>
-                <cmis:canAddObjectToFolder>true</cmis:canAddObjectToFolder>
-                <cmis:canRemoveObjectFromFolder>true</cmis:canRemoveObjectFromFolder>
-                <cmis:canApplyPolicy>true</cmis:canApplyPolicy>
-                <cmis:canGetAppliedPolicies>true</cmis:canGetAppliedPolicies>
-                <cmis:canRemovePolicy>true</cmis:canRemovePolicy>
-                <cmis:canGetChildren>true</cmis:canGetChildren>
-                <cmis:canCreateFolder>true</cmis:canCreateFolder>
-                <cmis:canDeleteTree>true</cmis:canDeleteTree>
-            </cmis:allowableActions>
-            <cmis:changeEventInfo>
-                <cmis:changeType>updated</cmis:changeType>
-                <cmis:changeTime>2009-07-17T09:13:33.125-07:00</cmis:changeTime>
-            </cmis:changeEventInfo>
-        </cmisra:object>
-    </atom:entry>
-    <atom:entry>
-        <atom:author>
-            <atom:name>Al Brown</atom:name>
-            <atom:uri>http://www.ibm.com/</atom:uri>
-            <atom:email>albertcbrown@us.ibm.com</atom:email>
-        </atom:author>
-        <atom:content src="http://cmisexample.oasis-open.org/rep1/0c35d523-c8fc-42bb-b08d-ba57452c63c0"/>
-        <atom:id>urn:uuid:0c35d523-c8fc-42bb-b08d-ba57452c63c0</atom:id>
-        <atom:link rel="self" href="http://cmisexample.oasis-open.org/rep1/0c35d523-c8fc-42bb-b08d-ba57452c63c0"/>
-        <atom:link rel="edit" href="http://cmisexample.oasis-open.org/rep1/0c35d523-c8fc-42bb-b08d-ba57452c63c0"/>
-        <atom:link type="application/cmis+xml;type=allowableActions" rel="allowableactions" href="http://cmisexample.oasis-open.org/rep1/0c35d523-c8fc-42bb-b08d-ba57452c63c0/allowableactions"/>
-        <atom:link type="application/atom+xml;type=entry" rel="type" href="http://cmisexample.oasis-open.org/rep1/0c35d523-c8fc-42bb-b08d-ba57452c63c0/type"/>
-        <atom:published>2009-07-17T09:13:33.125-07:00</atom:published>
-        <atom:summary type="html">HTML summary of Entry  0c35d523-c8fc-42bb-b08d-ba57452c63c0</atom:summary>
-        <atom:title type="text">CMIS Example Folder as Invoice type</atom:title>
-        <atom:updated>2009-07-17T09:13:33.125-07:00</atom:updated>
-        <atom:link rel="edit-media" href="http://cmisexample.oasis-open.org/rep1/0c35d523-c8fc-42bb-b08d-ba57452c63c0/edit-media"/>
-        <atom:link rel="alternate" href="http://cmisexample.oasis-open.org/rep1/0c35d523-c8fc-42bb-b08d-ba57452c63c0/alternate"/>
-        <atom:link type="application/atom+xml;type=feed" rel="parents" href="http://cmisexample.oasis-open.org/rep1/0c35d523-c8fc-42bb-b08d-ba57452c63c0/parents"/>
-        <atom:link type="application/atom+xml;type=feed" rel="allversions" href="http://cmisexample.oasis-open.org/rep1/0c35d523-c8fc-42bb-b08d-ba57452c63c0/allversions"/>
-        <atom:link type="application/atom+xml;type=entry" rel="latestversion" href="http://cmisexample.oasis-open.org/rep1/0c35d523-c8fc-42bb-b08d-ba57452c63c0/latestversions"/>
-        <atom:link length="4123" type="text/plain" rel="stream" href="http://cmisexample.oasis-open.org/rep1/0c35d523-c8fc-42bb-b08d-ba57452c63c0media"/>
-        <atom:link type="application/atom+xml;type=feed" rel="relationships" href="http://cmisexample.oasis-open.org/rep1/0c35d523-c8fc-42bb-b08d-ba57452c63c0/relationships"/>
-        <cmisra:object>
-            <cmis:properties>
-                <cmis:propertyBoolean localname="rep-cmis:IsImmutable" pdid="cmis:IsImmutable">
-                    <cmis:value>false</cmis:value>
-                </cmis:propertyBoolean>
-                <cmis:propertyDateTime localname="rep-cmis:CreationDate" pdid="cmis:CreationDate">
-                    <cmis:value>2009-07-17T09:13:33.140-07:00</cmis:value>
-                </cmis:propertyDateTime>
-                <cmis:propertyDateTime localname="rep-cmis:LastModificationDate" pdid="cmis:LastModificationDate">
-                    <cmis:value>2009-07-17T09:13:33.140-07:00</cmis:value>
-                </cmis:propertyDateTime>
-                <cmis:propertyId localname="rep-cmis:ObjectId" pdid="cmis:ObjectId">
-                    <cmis:value>0c35d523-c8fc-42bb-b08d-ba57452c63c0</cmis:value>
-                </cmis:propertyId>
-                <cmis:propertyId localname="rep-cmis:ObjectTypeId" pdid="cmis:ObjectTypeId">
-                    <cmis:value>invoice</cmis:value>
-                </cmis:propertyId>
-                <cmis:propertyId localname="rep-cmis:BaseTypeId" pdid="cmis:BaseTypeId">
-                    <cmis:value>cmis:document</cmis:value>
-                </cmis:propertyId>
-                <cmis:propertyString localname="rep-cmis:LastModifiedBy" pdid="cmis:LastModifiedBy">
-                    <cmis:value>Al Brown</cmis:value>
-                </cmis:propertyString>
-                <cmis:propertyString localname="rep-cmis:CreatedBy" pdid="cmis:CreatedBy">
-                    <cmis:value>Al Brown</cmis:value>
-                </cmis:propertyString>
-                <cmis:propertyBoolean localname="rep-cmis:IsLatestVersion" pdid="cmis:IsLatestVersion">
-                    <cmis:value>true</cmis:value>
-                </cmis:propertyBoolean>
-                <cmis:propertyBoolean localname="rep-cmis:IsVersionSeriesCheckedOut" pdid="cmis:IsVersionSeriesCheckedOut">
-                    <cmis:value>false</cmis:value>
-                </cmis:propertyBoolean>
-                <cmis:propertyBoolean localname="rep-cmis:IsMajorVersion" pdid="cmis:IsMajorVersion">
-                    <cmis:value>false</cmis:value>
-                </cmis:propertyBoolean>
-                <cmis:propertyBoolean localname="rep-cmis:IsLatestMajorVersion" pdid="cmis:IsLatestMajorVersion">
-                    <cmis:value>false</cmis:value>
-                </cmis:propertyBoolean>
-                <cmis:propertyString localname="rep-cmis:CheckinComment" pdid="cmis:CheckinComment">
-                    <cmis:value>Checkin comment</cmis:value>
-                </cmis:propertyString>
-                <cmis:propertyString localname="rep-cmis:VersionLabel" pdid="cmis:VersionLabel">
-                    <cmis:value>0.1</cmis:value>
-                </cmis:propertyString>
-                <cmis:propertyString localname="rep-cmis:ContentStreamMimeType" pdid="cmis:ContentStreamMimeType">
-                    <cmis:value>text/plain</cmis:value>
-                </cmis:propertyString>
-                <cmis:propertyString localname="rep-cmis:ContentStreamFileName" pdid="cmis:ContentStreamFileName">
-                    <cmis:value>text.txt</cmis:value>
-                </cmis:propertyString>
-                <cmis:propertyInteger localname="rep-cmis:ContentStreamLength" pdid="cmis:ContentStreamLength">
-                    <cmis:value>4234</cmis:value>
-                </cmis:propertyInteger>
-                <cmis:propertyString displayname="Keywords for Document" localname="keywords" pdid="keywords">
-                    <cmis:value>document</cmis:value>
-                    <cmis:value>example</cmis:value>
-                    <cmis:value>sample</cmis:value>
-                    <cmis:value>cmis</cmis:value>
-                </cmis:propertyString>
-            </cmis:properties>
-            <cmis:allowableActions>
-                <cmis:canDeleteObject>true</cmis:canDeleteObject>
-                <cmis:canUpdateProperties>true</cmis:canUpdateProperties>
-                <cmis:canGetProperties>true</cmis:canGetProperties>
-                <cmis:canGetRelationships>true</cmis:canGetRelationships>
-                <cmis:canGetObjectParents>true</cmis:canGetObjectParents>
-                <cmis:canMoveObject>true</cmis:canMoveObject>
-                <cmis:canDeleteContentStream>true</cmis:canDeleteContentStream>
-                <cmis:canCheckOut>true</cmis:canCheckOut>
-                <cmis:canCancelCheckOut>true</cmis:canCancelCheckOut>
-                <cmis:canCheckIn>true</cmis:canCheckIn>
-                <cmis:canSetContentStream>true</cmis:canSetContentStream>
-                <cmis:canGetAllVersions>true</cmis:canGetAllVersions>
-                <cmis:canAddObjectToFolder>true</cmis:canAddObjectToFolder>
-                <cmis:canRemoveObjectFromFolder>true</cmis:canRemoveObjectFromFolder>
-                <cmis:canGetContentStream>true</cmis:canGetContentStream>
-                <cmis:canApplyPolicy>true</cmis:canApplyPolicy>
-                <cmis:canGetAppliedPolicies>true</cmis:canGetAppliedPolicies>
-                <cmis:canRemovePolicy>true</cmis:canRemovePolicy>
-                <cmis:canCreateDocument>true</cmis:canCreateDocument>
-            </cmis:allowableActions>
-            <cmis:changeEventInfo>
-                <cmis:changeType>updated</cmis:changeType>
-                <cmis:changeTime>2009-07-17T09:13:33.140-07:00</cmis:changeTime>
-            </cmis:changeEventInfo>
-        </cmisra:object>
-    </atom:entry>
-</atom:feed>
diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/examples/DocumentEntry.xml b/source/java/org/alfresco/repo/cmis/rest/xsd/examples/DocumentEntry.xml
deleted file mode 100644
index e10726eade..0000000000
--- a/source/java/org/alfresco/repo/cmis/rest/xsd/examples/DocumentEntry.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<atom:entry xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901" xmlns:cmism="http://docs.oasis-open.org/ns/cmis/messaging/200901" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:app="http://www.w3.org/2007/app" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200901">
-    <atom:author>
-        <atom:name>Al Brown</atom:name>
-        <atom:uri>http://www.ibm.com/</atom:uri>
-        <atom:email>albertcbrown@us.ibm.com</atom:email>
-    </atom:author>
-    <atom:content src="http://cmisexample.oasis-open.org/rep1/d6ea99e2-ef5e-4bbb-97fa-feeae20d0f94"/>
-    <atom:id>urn:uuid:d6ea99e2-ef5e-4bbb-97fa-feeae20d0f94</atom:id>
-    <atom:link rel="self" href="http://cmisexample.oasis-open.org/rep1/d6ea99e2-ef5e-4bbb-97fa-feeae20d0f94"/>
-    <atom:link rel="edit" href="http://cmisexample.oasis-open.org/rep1/d6ea99e2-ef5e-4bbb-97fa-feeae20d0f94"/>
-    <atom:link type="application/cmis+xml;type=allowableActions" rel="allowableactions" href="http://cmisexample.oasis-open.org/rep1/d6ea99e2-ef5e-4bbb-97fa-feeae20d0f94/allowableactions"/>
-    <atom:link type="application/atom+xml;type=entry" rel="type" href="http://cmisexample.oasis-open.org/rep1/d6ea99e2-ef5e-4bbb-97fa-feeae20d0f94/type"/>
-    <atom:published>2009-07-17T09:13:32.890-07:00</atom:published>
-    <atom:summary type="html">HTML summary of Entry  d6ea99e2-ef5e-4bbb-97fa-feeae20d0f94</atom:summary>
-    <atom:title type="text">CMIS Example Document</atom:title>
-    <atom:updated>2009-07-17T09:13:32.906-07:00</atom:updated>
-    <atom:link rel="edit-media" href="http://cmisexample.oasis-open.org/rep1/d6ea99e2-ef5e-4bbb-97fa-feeae20d0f94/edit-media"/>
-    <atom:link rel="alternate" href="http://cmisexample.oasis-open.org/rep1/d6ea99e2-ef5e-4bbb-97fa-feeae20d0f94/alternate"/>
-    <atom:link type="application/atom+xml;type=feed" rel="parents" href="http://cmisexample.oasis-open.org/rep1/d6ea99e2-ef5e-4bbb-97fa-feeae20d0f94/parents"/>
-    <atom:link type="application/atom+xml;type=feed" rel="allversions" href="http://cmisexample.oasis-open.org/rep1/d6ea99e2-ef5e-4bbb-97fa-feeae20d0f94/allversions"/>
-    <atom:link type="application/atom+xml;type=entry" rel="latestversion" href="http://cmisexample.oasis-open.org/rep1/d6ea99e2-ef5e-4bbb-97fa-feeae20d0f94/latestversions"/>
-    <atom:link length="4123" type="text/plain" rel="stream" href="http://cmisexample.oasis-open.org/rep1/d6ea99e2-ef5e-4bbb-97fa-feeae20d0f94media"/>
-    <atom:link type="application/atom+xml;type=feed" rel="relationships" href="http://cmisexample.oasis-open.org/rep1/d6ea99e2-ef5e-4bbb-97fa-feeae20d0f94/relationships"/>
-    <cmisra:object>
-        <cmis:properties>
-            <cmis:propertyBoolean localname="rep-cmis:IsImmutable" pdid="cmis:IsImmutable">
-                <cmis:value>false</cmis:value>
-            </cmis:propertyBoolean>
-            <cmis:propertyDateTime localname="rep-cmis:CreationDate" pdid="cmis:CreationDate">
-                <cmis:value>2009-07-17T09:13:32.906-07:00</cmis:value>
-            </cmis:propertyDateTime>
-            <cmis:propertyDateTime localname="rep-cmis:LastModificationDate" pdid="cmis:LastModificationDate">
-                <cmis:value>2009-07-17T09:13:32.906-07:00</cmis:value>
-            </cmis:propertyDateTime>
-            <cmis:propertyId localname="rep-cmis:ObjectId" pdid="cmis:ObjectId">
-                <cmis:value>d6ea99e2-ef5e-4bbb-97fa-feeae20d0f94</cmis:value>
-            </cmis:propertyId>
-            <cmis:propertyId localname="rep-cmis:ObjectTypeId" pdid="cmis:ObjectTypeId">
-                <cmis:value>invoice</cmis:value>
-            </cmis:propertyId>
-            <cmis:propertyId localname="rep-cmis:BaseTypeId" pdid="cmis:BaseTypeId">
-                <cmis:value>cmis:document</cmis:value>
-            </cmis:propertyId>
-            <cmis:propertyString localname="rep-cmis:LastModifiedBy" pdid="cmis:LastModifiedBy">
-                <cmis:value>Al Brown</cmis:value>
-            </cmis:propertyString>
-            <cmis:propertyString localname="rep-cmis:CreatedBy" pdid="cmis:CreatedBy">
-                <cmis:value>Al Brown</cmis:value>
-            </cmis:propertyString>
-            <cmis:propertyBoolean localname="rep-cmis:IsLatestVersion" pdid="cmis:IsLatestVersion">
-                <cmis:value>true</cmis:value>
-            </cmis:propertyBoolean>
-            <cmis:propertyBoolean localname="rep-cmis:IsVersionSeriesCheckedOut" pdid="cmis:IsVersionSeriesCheckedOut">
-                <cmis:value>false</cmis:value>
-            </cmis:propertyBoolean>
-            <cmis:propertyBoolean localname="rep-cmis:IsMajorVersion" pdid="cmis:IsMajorVersion">
-                <cmis:value>false</cmis:value>
-            </cmis:propertyBoolean>
-            <cmis:propertyBoolean localname="rep-cmis:IsLatestMajorVersion" pdid="cmis:IsLatestMajorVersion">
-                <cmis:value>false</cmis:value>
-            </cmis:propertyBoolean>
-            <cmis:propertyString localname="rep-cmis:CheckinComment" pdid="cmis:CheckinComment">
-                <cmis:value>Checkin comment</cmis:value>
-            </cmis:propertyString>
-            <cmis:propertyString localname="rep-cmis:VersionLabel" pdid="cmis:VersionLabel">
-                <cmis:value>0.1</cmis:value>
-            </cmis:propertyString>
-            <cmis:propertyString localname="rep-cmis:ContentStreamMimeType" pdid="cmis:ContentStreamMimeType">
-                <cmis:value>text/plain</cmis:value>
-            </cmis:propertyString>
-            <cmis:propertyString localname="rep-cmis:ContentStreamFileName" pdid="cmis:ContentStreamFileName">
-                <cmis:value>text.txt</cmis:value>
-            </cmis:propertyString>
-            <cmis:propertyInteger localname="rep-cmis:ContentStreamLength" pdid="cmis:ContentStreamLength">
-                <cmis:value>4234</cmis:value>
-            </cmis:propertyInteger>
-            <cmis:propertyString displayname="Keywords for Document" localname="keywords" pdid="keywords">
-                <cmis:value>document</cmis:value>
-                <cmis:value>example</cmis:value>
-                <cmis:value>sample</cmis:value>
-                <cmis:value>cmis</cmis:value>
-            </cmis:propertyString>
-        </cmis:properties>
-        <cmis:allowableActions>
-            <cmis:canDeleteObject>true</cmis:canDeleteObject>
-            <cmis:canUpdateProperties>true</cmis:canUpdateProperties>
-            <cmis:canGetProperties>true</cmis:canGetProperties>
-            <cmis:canGetRelationships>true</cmis:canGetRelationships>
-            <cmis:canGetObjectParents>true</cmis:canGetObjectParents>
-            <cmis:canMoveObject>true</cmis:canMoveObject>
-            <cmis:canDeleteContentStream>true</cmis:canDeleteContentStream>
-            <cmis:canCheckOut>true</cmis:canCheckOut>
-            <cmis:canCancelCheckOut>true</cmis:canCancelCheckOut>
-            <cmis:canCheckIn>true</cmis:canCheckIn>
-            <cmis:canSetContentStream>true</cmis:canSetContentStream>
-            <cmis:canGetAllVersions>true</cmis:canGetAllVersions>
-            <cmis:canAddObjectToFolder>true</cmis:canAddObjectToFolder>
-            <cmis:canRemoveObjectFromFolder>true</cmis:canRemoveObjectFromFolder>
-            <cmis:canGetContentStream>true</cmis:canGetContentStream>
-            <cmis:canApplyPolicy>true</cmis:canApplyPolicy>
-            <cmis:canGetAppliedPolicies>true</cmis:canGetAppliedPolicies>
-            <cmis:canRemovePolicy>true</cmis:canRemovePolicy>
-            <cmis:canCreateDocument>true</cmis:canCreateDocument>
-        </cmis:allowableActions>
-    </cmisra:object>
-</atom:entry>
diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/examples/DocumentEntryPWC.xml b/source/java/org/alfresco/repo/cmis/rest/xsd/examples/DocumentEntryPWC.xml
deleted file mode 100644
index 75c4bf6645..0000000000
--- a/source/java/org/alfresco/repo/cmis/rest/xsd/examples/DocumentEntryPWC.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<atom:entry xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901" xmlns:cmism="http://docs.oasis-open.org/ns/cmis/messaging/200901" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:app="http://www.w3.org/2007/app" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200901">
-    <atom:author>
-        <atom:name>Al Brown</atom:name>
-        <atom:uri>http://www.ibm.com/</atom:uri>
-        <atom:email>albertcbrown@us.ibm.com</atom:email>
-    </atom:author>
-    <atom:content src="http://cmisexample.oasis-open.org/rep1/24f3aad1-485c-468e-a9a7-aff29fdbeafb"/>
-    <atom:id>urn:uuid:24f3aad1-485c-468e-a9a7-aff29fdbeafb</atom:id>
-    <atom:link rel="self" href="http://cmisexample.oasis-open.org/rep1/24f3aad1-485c-468e-a9a7-aff29fdbeafb"/>
-    <atom:link rel="edit" href="http://cmisexample.oasis-open.org/rep1/24f3aad1-485c-468e-a9a7-aff29fdbeafb"/>
-    <atom:link type="application/cmis+xml;type=allowableActions" rel="allowableactions" href="http://cmisexample.oasis-open.org/rep1/24f3aad1-485c-468e-a9a7-aff29fdbeafb/allowableactions"/>
-    <atom:link type="application/atom+xml;type=entry" rel="type" href="http://cmisexample.oasis-open.org/rep1/24f3aad1-485c-468e-a9a7-aff29fdbeafb/type"/>
-    <atom:published>2009-07-17T09:13:32.921-07:00</atom:published>
-    <atom:summary type="html">HTML summary of Entry  24f3aad1-485c-468e-a9a7-aff29fdbeafb</atom:summary>
-    <atom:title type="text">CMIS Example Document for PWC</atom:title>
-    <atom:updated>2009-07-17T09:13:32.937-07:00</atom:updated>
-    <atom:link rel="edit-media" href="http://cmisexample.oasis-open.org/rep1/24f3aad1-485c-468e-a9a7-aff29fdbeafb/edit-media"/>
-    <atom:link rel="alternate" href="http://cmisexample.oasis-open.org/rep1/24f3aad1-485c-468e-a9a7-aff29fdbeafb/alternate"/>
-    <atom:link type="application/atom+xml;type=feed" rel="parents" href="http://cmisexample.oasis-open.org/rep1/24f3aad1-485c-468e-a9a7-aff29fdbeafb/parents"/>
-    <atom:link type="application/atom+xml;type=feed" rel="allversions" href="http://cmisexample.oasis-open.org/rep1/24f3aad1-485c-468e-a9a7-aff29fdbeafb/allversions"/>
-    <atom:link type="application/atom+xml;type=entry" rel="latestversion" href="http://cmisexample.oasis-open.org/rep1/24f3aad1-485c-468e-a9a7-aff29fdbeafb/latestversions"/>
-    <atom:link length="4123" type="text/plain" rel="stream" href="http://cmisexample.oasis-open.org/rep1/24f3aad1-485c-468e-a9a7-aff29fdbeafbmedia"/>
-    <atom:link type="application/atom+xml;type=feed" rel="relationships" href="http://cmisexample.oasis-open.org/rep1/24f3aad1-485c-468e-a9a7-aff29fdbeafb/relationships"/>
-    <atom:link type="application/atom+xml;type=feed" rel="pwc" href="http://cmisexample.oasis-open.org/rep1/24f3aad1-485c-468e-a9a7-aff29fdbeafb/pwc"/>
-    <cmisra:object>
-        <cmis:properties>
-            <cmis:propertyBoolean localname="rep-cmis:IsImmutable" pdid="cmis:IsImmutable">
-                <cmis:value>false</cmis:value>
-            </cmis:propertyBoolean>
-            <cmis:propertyDateTime localname="rep-cmis:CreationDate" pdid="cmis:CreationDate">
-                <cmis:value>2009-07-17T09:13:32.937-07:00</cmis:value>
-            </cmis:propertyDateTime>
-            <cmis:propertyDateTime localname="rep-cmis:LastModificationDate" pdid="cmis:LastModificationDate">
-                <cmis:value>2009-07-17T09:13:32.937-07:00</cmis:value>
-            </cmis:propertyDateTime>
-            <cmis:propertyId localname="rep-cmis:ObjectId" pdid="cmis:ObjectId">
-                <cmis:value>24f3aad1-485c-468e-a9a7-aff29fdbeafb</cmis:value>
-            </cmis:propertyId>
-            <cmis:propertyId localname="rep-cmis:ObjectTypeId" pdid="cmis:ObjectTypeId">
-                <cmis:value>invoice</cmis:value>
-            </cmis:propertyId>
-            <cmis:propertyId localname="rep-cmis:BaseTypeId" pdid="cmis:BaseTypeId">
-                <cmis:value>cmis:document</cmis:value>
-            </cmis:propertyId>
-            <cmis:propertyString localname="rep-cmis:LastModifiedBy" pdid="cmis:LastModifiedBy">
-                <cmis:value>Al Brown</cmis:value>
-            </cmis:propertyString>
-            <cmis:propertyString localname="rep-cmis:CreatedBy" pdid="cmis:CreatedBy">
-                <cmis:value>Al Brown</cmis:value>
-            </cmis:propertyString>
-            <cmis:propertyBoolean localname="rep-cmis:IsLatestVersion" pdid="cmis:IsLatestVersion">
-                <cmis:value>true</cmis:value>
-            </cmis:propertyBoolean>
-            <cmis:propertyBoolean localname="rep-cmis:IsVersionSeriesCheckedOut" pdid="cmis:IsVersionSeriesCheckedOut">
-                <cmis:value>true</cmis:value>
-            </cmis:propertyBoolean>
-            <cmis:propertyBoolean localname="rep-cmis:IsMajorVersion" pdid="cmis:IsMajorVersion">
-                <cmis:value>false</cmis:value>
-            </cmis:propertyBoolean>
-            <cmis:propertyBoolean localname="rep-cmis:IsLatestMajorVersion" pdid="cmis:IsLatestMajorVersion">
-                <cmis:value>false</cmis:value>
-            </cmis:propertyBoolean>
-            <cmis:propertyString localname="rep-cmis:CheckinComment" pdid="cmis:CheckinComment">
-                <cmis:value>Checkin comment</cmis:value>
-            </cmis:propertyString>
-            <cmis:propertyString localname="rep-cmis:VersionLabel" pdid="cmis:VersionLabel">
-                <cmis:value>0.1</cmis:value>
-            </cmis:propertyString>
-            <cmis:propertyString localname="rep-cmis:ContentStreamMimeType" pdid="cmis:ContentStreamMimeType">
-                <cmis:value>text/plain</cmis:value>
-            </cmis:propertyString>
-            <cmis:propertyString localname="rep-cmis:ContentStreamFileName" pdid="cmis:ContentStreamFileName">
-                <cmis:value>text.txt</cmis:value>
-            </cmis:propertyString>
-            <cmis:propertyInteger localname="rep-cmis:ContentStreamLength" pdid="cmis:ContentStreamLength">
-                <cmis:value>4234</cmis:value>
-            </cmis:propertyInteger>
-            <cmis:propertyString displayname="Keywords for Document" localname="keywords" pdid="keywords">
-                <cmis:value>document</cmis:value>
-                <cmis:value>example</cmis:value>
-                <cmis:value>sample</cmis:value>
-                <cmis:value>cmis</cmis:value>
-            </cmis:propertyString>
-            <cmis:propertyId localname="rep-cmis:VersionSeriesCheckedOutId" pdid="cmis:VersionSeriesCheckedOutId">
-                <cmis:value>vs-24f3aad1-485c-468e-a9a7-aff29fdbeafb</cmis:value>
-            </cmis:propertyId>
-            <cmis:propertyString localname="rep-cmis:VersionSeriesCheckedOutBy" pdid="cmis:VersionSeriesCheckedOutBy">
-                <cmis:value>Al Brown</cmis:value>
-            </cmis:propertyString>
-        </cmis:properties>
-        <cmis:allowableActions>
-            <cmis:canDeleteObject>true</cmis:canDeleteObject>
-            <cmis:canUpdateProperties>true</cmis:canUpdateProperties>
-            <cmis:canGetProperties>true</cmis:canGetProperties>
-            <cmis:canGetRelationships>true</cmis:canGetRelationships>
-            <cmis:canGetObjectParents>true</cmis:canGetObjectParents>
-            <cmis:canMoveObject>true</cmis:canMoveObject>
-            <cmis:canDeleteContentStream>true</cmis:canDeleteContentStream>
-            <cmis:canCheckOut>true</cmis:canCheckOut>
-            <cmis:canCancelCheckOut>true</cmis:canCancelCheckOut>
-            <cmis:canCheckIn>true</cmis:canCheckIn>
-            <cmis:canSetContentStream>true</cmis:canSetContentStream>
-            <cmis:canGetAllVersions>true</cmis:canGetAllVersions>
-            <cmis:canAddObjectToFolder>true</cmis:canAddObjectToFolder>
-            <cmis:canRemoveObjectFromFolder>true</cmis:canRemoveObjectFromFolder>
-            <cmis:canGetContentStream>true</cmis:canGetContentStream>
-            <cmis:canApplyPolicy>true</cmis:canApplyPolicy>
-            <cmis:canGetAppliedPolicies>true</cmis:canGetAppliedPolicies>
-            <cmis:canRemovePolicy>true</cmis:canRemovePolicy>
-            <cmis:canCreateDocument>true</cmis:canCreateDocument>
-        </cmis:allowableActions>
-    </cmisra:object>
-</atom:entry>
diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/examples/DocumentEntryWithChanges.xml b/source/java/org/alfresco/repo/cmis/rest/xsd/examples/DocumentEntryWithChanges.xml
deleted file mode 100644
index 7662c4e7d7..0000000000
--- a/source/java/org/alfresco/repo/cmis/rest/xsd/examples/DocumentEntryWithChanges.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<atom:entry xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901" xmlns:cmism="http://docs.oasis-open.org/ns/cmis/messaging/200901" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:app="http://www.w3.org/2007/app" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200901">
-    <atom:author>
-        <atom:name>Al Brown</atom:name>
-        <atom:uri>http://www.ibm.com/</atom:uri>
-        <atom:email>albertcbrown@us.ibm.com</atom:email>
-    </atom:author>
-    <atom:content src="http://cmisexample.oasis-open.org/rep1/fb7b8894-bf63-4f61-bcb6-8678d3af7b64"/>
-    <atom:id>urn:uuid:fb7b8894-bf63-4f61-bcb6-8678d3af7b64</atom:id>
-    <atom:link rel="self" href="http://cmisexample.oasis-open.org/rep1/fb7b8894-bf63-4f61-bcb6-8678d3af7b64"/>
-    <atom:link rel="edit" href="http://cmisexample.oasis-open.org/rep1/fb7b8894-bf63-4f61-bcb6-8678d3af7b64"/>
-    <atom:link type="application/cmis+xml;type=allowableActions" rel="allowableactions" href="http://cmisexample.oasis-open.org/rep1/fb7b8894-bf63-4f61-bcb6-8678d3af7b64/allowableactions"/>
-    <atom:link type="application/atom+xml;type=entry" rel="type" href="http://cmisexample.oasis-open.org/rep1/fb7b8894-bf63-4f61-bcb6-8678d3af7b64/type"/>
-    <atom:published>2009-07-17T09:13:33.156-07:00</atom:published>
-    <atom:summary type="html">HTML summary of Entry  fb7b8894-bf63-4f61-bcb6-8678d3af7b64</atom:summary>
-    <atom:title type="text">CMIS Example Document - Loan</atom:title>
-    <atom:updated>2009-07-17T09:13:33.156-07:00</atom:updated>
-    <atom:link rel="edit-media" href="http://cmisexample.oasis-open.org/rep1/fb7b8894-bf63-4f61-bcb6-8678d3af7b64/edit-media"/>
-    <atom:link rel="alternate" href="http://cmisexample.oasis-open.org/rep1/fb7b8894-bf63-4f61-bcb6-8678d3af7b64/alternate"/>
-    <atom:link type="application/atom+xml;type=feed" rel="parents" href="http://cmisexample.oasis-open.org/rep1/fb7b8894-bf63-4f61-bcb6-8678d3af7b64/parents"/>
-    <atom:link type="application/atom+xml;type=feed" rel="allversions" href="http://cmisexample.oasis-open.org/rep1/fb7b8894-bf63-4f61-bcb6-8678d3af7b64/allversions"/>
-    <atom:link type="application/atom+xml;type=entry" rel="latestversion" href="http://cmisexample.oasis-open.org/rep1/fb7b8894-bf63-4f61-bcb6-8678d3af7b64/latestversions"/>
-    <atom:link length="4123" type="text/plain" rel="stream" href="http://cmisexample.oasis-open.org/rep1/fb7b8894-bf63-4f61-bcb6-8678d3af7b64media"/>
-    <atom:link type="application/atom+xml;type=feed" rel="relationships" href="http://cmisexample.oasis-open.org/rep1/fb7b8894-bf63-4f61-bcb6-8678d3af7b64/relationships"/>
-    <cmisra:object>
-        <cmis:properties>
-            <cmis:propertyBoolean localname="rep-cmis:IsImmutable" pdid="cmis:IsImmutable">
-                <cmis:value>false</cmis:value>
-            </cmis:propertyBoolean>
-            <cmis:propertyDateTime localname="rep-cmis:CreationDate" pdid="cmis:CreationDate">
-                <cmis:value>2009-07-17T09:13:33.156-07:00</cmis:value>
-            </cmis:propertyDateTime>
-            <cmis:propertyDateTime localname="rep-cmis:LastModificationDate" pdid="cmis:LastModificationDate">
-                <cmis:value>2009-07-17T09:13:33.156-07:00</cmis:value>
-            </cmis:propertyDateTime>
-            <cmis:propertyId localname="rep-cmis:ObjectId" pdid="cmis:ObjectId">
-                <cmis:value>fb7b8894-bf63-4f61-bcb6-8678d3af7b64</cmis:value>
-            </cmis:propertyId>
-            <cmis:propertyId localname="rep-cmis:ObjectTypeId" pdid="cmis:ObjectTypeId">
-                <cmis:value>loan</cmis:value>
-            </cmis:propertyId>
-            <cmis:propertyId localname="rep-cmis:BaseTypeId" pdid="cmis:BaseTypeId">
-                <cmis:value>cmis:document</cmis:value>
-            </cmis:propertyId>
-            <cmis:propertyString localname="rep-cmis:LastModifiedBy" pdid="cmis:LastModifiedBy">
-                <cmis:value>Al Brown</cmis:value>
-            </cmis:propertyString>
-            <cmis:propertyString localname="rep-cmis:CreatedBy" pdid="cmis:CreatedBy">
-                <cmis:value>Al Brown</cmis:value>
-            </cmis:propertyString>
-            <cmis:propertyBoolean localname="rep-cmis:IsLatestVersion" pdid="cmis:IsLatestVersion">
-                <cmis:value>true</cmis:value>
-            </cmis:propertyBoolean>
-            <cmis:propertyBoolean localname="rep-cmis:IsVersionSeriesCheckedOut" pdid="cmis:IsVersionSeriesCheckedOut">
-                <cmis:value>false</cmis:value>
-            </cmis:propertyBoolean>
-            <cmis:propertyBoolean localname="rep-cmis:IsMajorVersion" pdid="cmis:IsMajorVersion">
-                <cmis:value>false</cmis:value>
-            </cmis:propertyBoolean>
-            <cmis:propertyBoolean localname="rep-cmis:IsLatestMajorVersion" pdid="cmis:IsLatestMajorVersion">
-                <cmis:value>false</cmis:value>
-            </cmis:propertyBoolean>
-            <cmis:propertyString localname="rep-cmis:CheckinComment" pdid="cmis:CheckinComment">
-                <cmis:value>Checkin comment</cmis:value>
-            </cmis:propertyString>
-            <cmis:propertyString localname="rep-cmis:VersionLabel" pdid="cmis:VersionLabel">
-                <cmis:value>0.1</cmis:value>
-            </cmis:propertyString>
-            <cmis:propertyString localname="rep-cmis:ContentStreamMimeType" pdid="cmis:ContentStreamMimeType">
-                <cmis:value>text/plain</cmis:value>
-            </cmis:propertyString>
-            <cmis:propertyString localname="rep-cmis:ContentStreamFileName" pdid="cmis:ContentStreamFileName">
-                <cmis:value>text.txt</cmis:value>
-            </cmis:propertyString>
-            <cmis:propertyInteger localname="rep-cmis:ContentStreamLength" pdid="cmis:ContentStreamLength">
-                <cmis:value>4234</cmis:value>
-            </cmis:propertyInteger>
-            <cmis:propertyString displayname="Keywords for Document" localname="keywords" pdid="keywords">
-                <cmis:value>document</cmis:value>
-                <cmis:value>example</cmis:value>
-                <cmis:value>sample</cmis:value>
-                <cmis:value>cmis</cmis:value>
-            </cmis:propertyString>
-        </cmis:properties>
-        <cmis:allowableActions>
-            <cmis:canDeleteObject>true</cmis:canDeleteObject>
-            <cmis:canUpdateProperties>true</cmis:canUpdateProperties>
-            <cmis:canGetProperties>true</cmis:canGetProperties>
-            <cmis:canGetRelationships>true</cmis:canGetRelationships>
-            <cmis:canGetObjectParents>true</cmis:canGetObjectParents>
-            <cmis:canMoveObject>true</cmis:canMoveObject>
-            <cmis:canDeleteContentStream>true</cmis:canDeleteContentStream>
-            <cmis:canCheckOut>true</cmis:canCheckOut>
-            <cmis:canCancelCheckOut>true</cmis:canCancelCheckOut>
-            <cmis:canCheckIn>true</cmis:canCheckIn>
-            <cmis:canSetContentStream>true</cmis:canSetContentStream>
-            <cmis:canGetAllVersions>true</cmis:canGetAllVersions>
-            <cmis:canAddObjectToFolder>true</cmis:canAddObjectToFolder>
-            <cmis:canRemoveObjectFromFolder>true</cmis:canRemoveObjectFromFolder>
-            <cmis:canGetContentStream>true</cmis:canGetContentStream>
-            <cmis:canApplyPolicy>true</cmis:canApplyPolicy>
-            <cmis:canGetAppliedPolicies>true</cmis:canGetAppliedPolicies>
-            <cmis:canRemovePolicy>true</cmis:canRemovePolicy>
-            <cmis:canCreateDocument>true</cmis:canCreateDocument>
-        </cmis:allowableActions>
-        <cmis:changeEventInfo>
-            <cmis:changeType>updated</cmis:changeType>
-            <cmis:changeTime>2009-07-17T09:13:33.156-07:00</cmis:changeTime>
-        </cmis:changeEventInfo>
-    </cmisra:object>
-</atom:entry>
diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/examples/FolderChildren.xml b/source/java/org/alfresco/repo/cmis/rest/xsd/examples/FolderChildren.xml
deleted file mode 100644
index f514b396b4..0000000000
--- a/source/java/org/alfresco/repo/cmis/rest/xsd/examples/FolderChildren.xml
+++ /dev/null
@@ -1,336 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<atom:feed xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901" xmlns:cmism="http://docs.oasis-open.org/ns/cmis/messaging/200901" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:app="http://www.w3.org/2007/app" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200901">
-    <atom:title type="text">Feed for folder1</atom:title>
-    <atom:author>
-        <atom:name>Al Brown</atom:name>
-        <atom:uri>http://www.ibm.com/</atom:uri>
-        <atom:email>albertcbrown@us.ibm.com</atom:email>
-    </atom:author>
-    <atom:updated>2009-07-17T09:13:33.000-07:00</atom:updated>
-    <atom:id>urn:uuid:55638aa8-d558-4e59-b9b4-0bf9aba14bb3</atom:id>
-    <atom:link type="application/atom+xml;type=feed" rel="self" href="http://cmisexample.oasis-open.org/rep1/folder1feed/3"/>
-    <atom:link type="application/atom+xml;type=entry" rel="via" href="http://cmisexample.oasis-open.org/rep1/folder1feed"/>
-    <atom:link type="application/atom+xml;type=feed" rel="first" href="http://cmisexample.oasis-open.org/rep1/folder1feed/first"/>
-    <atom:link type="application/atom+xml;type=feed" rel="next" href="http://cmisexample.oasis-open.org/rep1/folder1feed/4"/>
-    <atom:link type="application/atom+xml;type=feed" rel="previous" href="http://cmisexample.oasis-open.org/rep1/folder1feed/2"/>
-    <atom:link type="application/atom+xml;type=feed" rel="last" href="http://cmisexample.oasis-open.org/rep1/folder1feed/last"/>
-    <app:collection href="http://cmisexample.oasis-open.org/rep1/folder1feed/3">
-        <atom:title type="text">Feed for folder1</atom:title>
-        <app:accept>application/atom+xml;type=entry</app:accept>
-        <app:accept>application/atom+xml</app:accept>
-        <app:accept>*/*</app:accept>
-    </app:collection>
-    <atom:entry>
-        <atom:author>
-            <atom:name>Al Brown</atom:name>
-            <atom:uri>http://www.ibm.com/</atom:uri>
-            <atom:email>albertcbrown@us.ibm.com</atom:email>
-        </atom:author>
-        <atom:content src="http://cmisexample.oasis-open.org/rep1/aed6c3a7-306d-461f-9a4f-3eed15e19a13"/>
-        <atom:id>urn:uuid:aed6c3a7-306d-461f-9a4f-3eed15e19a13</atom:id>
-        <atom:link rel="self" href="http://cmisexample.oasis-open.org/rep1/aed6c3a7-306d-461f-9a4f-3eed15e19a13"/>
-        <atom:link rel="edit" href="http://cmisexample.oasis-open.org/rep1/aed6c3a7-306d-461f-9a4f-3eed15e19a13"/>
-        <atom:link type="application/cmis+xml;type=allowableActions" rel="allowableactions" href="http://cmisexample.oasis-open.org/rep1/aed6c3a7-306d-461f-9a4f-3eed15e19a13/allowableactions"/>
-        <atom:link type="application/atom+xml;type=entry" rel="type" href="http://cmisexample.oasis-open.org/rep1/aed6c3a7-306d-461f-9a4f-3eed15e19a13/type"/>
-        <atom:published>2009-07-17T09:13:33.000-07:00</atom:published>
-        <atom:summary type="html">HTML summary of Entry  aed6c3a7-306d-461f-9a4f-3eed15e19a13</atom:summary>
-        <atom:title type="text">CMIS Example Folder as Customer type</atom:title>
-        <atom:updated>2009-07-17T09:13:33.000-07:00</atom:updated>
-        <atom:link type="application/atom+xml;type=feed" rel="relationships" href="http://cmisexample.oasis-open.org/rep1/aed6c3a7-306d-461f-9a4f-3eed15e19a13/relationships"/>
-        <atom:link type="application/atom+xml;type=entry" rel="up" href="http://cmisexample.oasis-open.org/rep1/aed6c3a7-306d-461f-9a4f-3eed15e19a13/up"/>
-        <atom:link type="application/atom+xml;type=feed" rel="down" href="http://cmisexample.oasis-open.org/rep1/aed6c3a7-306d-461f-9a4f-3eed15e19a13/children/flat"/>
-        <atom:link type="application/cmistree+xml" rel="down" href="http://cmisexample.oasis-open.org/rep1/aed6c3a7-306d-461f-9a4f-3eed15e19a13/children/tree"/>
-        <cmisra:object>
-            <cmis:properties>
-                <cmis:propertyBoolean localname="rep-cmis:IsImmutable" pdid="cmis:IsImmutable">
-                    <cmis:value>false</cmis:value>
-                </cmis:propertyBoolean>
-                <cmis:propertyDateTime localname="rep-cmis:CreationDate" pdid="cmis:CreationDate">
-                    <cmis:value>2009-07-17T09:13:33.000-07:00</cmis:value>
-                </cmis:propertyDateTime>
-                <cmis:propertyDateTime localname="rep-cmis:LastModificationDate" pdid="cmis:LastModificationDate">
-                    <cmis:value>2009-07-17T09:13:33.015-07:00</cmis:value>
-                </cmis:propertyDateTime>
-                <cmis:propertyId localname="rep-cmis:ObjectId" pdid="cmis:ObjectId">
-                    <cmis:value>aed6c3a7-306d-461f-9a4f-3eed15e19a13</cmis:value>
-                </cmis:propertyId>
-                <cmis:propertyId localname="rep-cmis:ObjectTypeId" pdid="cmis:ObjectTypeId">
-                    <cmis:value>customer</cmis:value>
-                </cmis:propertyId>
-                <cmis:propertyId localname="rep-cmis:BaseTypeId" pdid="cmis:BaseTypeId">
-                    <cmis:value>cmis:folder</cmis:value>
-                </cmis:propertyId>
-                <cmis:propertyString localname="rep-cmis:LastModifiedBy" pdid="cmis:LastModifiedBy">
-                    <cmis:value>Al Brown</cmis:value>
-                </cmis:propertyString>
-                <cmis:propertyString localname="rep-cmis:CreatedBy" pdid="cmis:CreatedBy">
-                    <cmis:value>Al Brown</cmis:value>
-                </cmis:propertyString>
-                <cmis:propertyId localname="rep-cmis:ParentId" pdid="cmis:ParentId">
-                    <cmis:value>aed6c3a7-306d-461f-9a4f-3eed15e19a13up</cmis:value>
-                </cmis:propertyId>
-            </cmis:properties>
-            <cmis:allowableActions>
-                <cmis:canDeleteObject>true</cmis:canDeleteObject>
-                <cmis:canUpdateProperties>true</cmis:canUpdateProperties>
-                <cmis:canGetProperties>true</cmis:canGetProperties>
-                <cmis:canGetRelationships>true</cmis:canGetRelationships>
-                <cmis:canGetFolderParent>true</cmis:canGetFolderParent>
-                <cmis:canGetDescendants>true</cmis:canGetDescendants>
-                <cmis:canMoveObject>true</cmis:canMoveObject>
-                <cmis:canAddObjectToFolder>true</cmis:canAddObjectToFolder>
-                <cmis:canRemoveObjectFromFolder>true</cmis:canRemoveObjectFromFolder>
-                <cmis:canApplyPolicy>true</cmis:canApplyPolicy>
-                <cmis:canGetAppliedPolicies>true</cmis:canGetAppliedPolicies>
-                <cmis:canRemovePolicy>true</cmis:canRemovePolicy>
-                <cmis:canGetChildren>true</cmis:canGetChildren>
-                <cmis:canCreateFolder>true</cmis:canCreateFolder>
-                <cmis:canDeleteTree>true</cmis:canDeleteTree>
-            </cmis:allowableActions>
-        </cmisra:object>
-    </atom:entry>
-    <atom:entry>
-        <atom:author>
-            <atom:name>Al Brown</atom:name>
-            <atom:uri>http://www.ibm.com/</atom:uri>
-            <atom:email>albertcbrown@us.ibm.com</atom:email>
-        </atom:author>
-        <atom:content src="http://cmisexample.oasis-open.org/rep1/03649b71-6c2b-4298-a4fb-09dd8465a267"/>
-        <atom:id>urn:uuid:03649b71-6c2b-4298-a4fb-09dd8465a267</atom:id>
-        <atom:link rel="self" href="http://cmisexample.oasis-open.org/rep1/03649b71-6c2b-4298-a4fb-09dd8465a267"/>
-        <atom:link rel="edit" href="http://cmisexample.oasis-open.org/rep1/03649b71-6c2b-4298-a4fb-09dd8465a267"/>
-        <atom:link type="application/cmis+xml;type=allowableActions" rel="allowableactions" href="http://cmisexample.oasis-open.org/rep1/03649b71-6c2b-4298-a4fb-09dd8465a267/allowableactions"/>
-        <atom:link type="application/atom+xml;type=entry" rel="type" href="http://cmisexample.oasis-open.org/rep1/03649b71-6c2b-4298-a4fb-09dd8465a267/type"/>
-        <atom:published>2009-07-17T09:13:33.015-07:00</atom:published>
-        <atom:summary type="html">HTML summary of Entry  03649b71-6c2b-4298-a4fb-09dd8465a267</atom:summary>
-        <atom:title type="text">CMIS Example Folder as Customer type</atom:title>
-        <atom:updated>2009-07-17T09:13:33.015-07:00</atom:updated>
-        <atom:link type="application/atom+xml;type=feed" rel="relationships" href="http://cmisexample.oasis-open.org/rep1/03649b71-6c2b-4298-a4fb-09dd8465a267/relationships"/>
-        <atom:link type="application/atom+xml;type=entry" rel="up" href="http://cmisexample.oasis-open.org/rep1/03649b71-6c2b-4298-a4fb-09dd8465a267/up"/>
-        <atom:link type="application/atom+xml;type=feed" rel="down" href="http://cmisexample.oasis-open.org/rep1/03649b71-6c2b-4298-a4fb-09dd8465a267/children/flat"/>
-        <atom:link type="application/cmistree+xml" rel="down" href="http://cmisexample.oasis-open.org/rep1/03649b71-6c2b-4298-a4fb-09dd8465a267/children/tree"/>
-        <cmisra:object>
-            <cmis:properties>
-                <cmis:propertyBoolean localname="rep-cmis:IsImmutable" pdid="cmis:IsImmutable">
-                    <cmis:value>false</cmis:value>
-                </cmis:propertyBoolean>
-                <cmis:propertyDateTime localname="rep-cmis:CreationDate" pdid="cmis:CreationDate">
-                    <cmis:value>2009-07-17T09:13:33.015-07:00</cmis:value>
-                </cmis:propertyDateTime>
-                <cmis:propertyDateTime localname="rep-cmis:LastModificationDate" pdid="cmis:LastModificationDate">
-                    <cmis:value>2009-07-17T09:13:33.015-07:00</cmis:value>
-                </cmis:propertyDateTime>
-                <cmis:propertyId localname="rep-cmis:ObjectId" pdid="cmis:ObjectId">
-                    <cmis:value>03649b71-6c2b-4298-a4fb-09dd8465a267</cmis:value>
-                </cmis:propertyId>
-                <cmis:propertyId localname="rep-cmis:ObjectTypeId" pdid="cmis:ObjectTypeId">
-                    <cmis:value>customer</cmis:value>
-                </cmis:propertyId>
-                <cmis:propertyId localname="rep-cmis:BaseTypeId" pdid="cmis:BaseTypeId">
-                    <cmis:value>cmis:folder</cmis:value>
-                </cmis:propertyId>
-                <cmis:propertyString localname="rep-cmis:LastModifiedBy" pdid="cmis:LastModifiedBy">
-                    <cmis:value>Al Brown</cmis:value>
-                </cmis:propertyString>
-                <cmis:propertyString localname="rep-cmis:CreatedBy" pdid="cmis:CreatedBy">
-                    <cmis:value>Al Brown</cmis:value>
-                </cmis:propertyString>
-                <cmis:propertyId localname="rep-cmis:ParentId" pdid="cmis:ParentId">
-                    <cmis:value>03649b71-6c2b-4298-a4fb-09dd8465a267up</cmis:value>
-                </cmis:propertyId>
-            </cmis:properties>
-            <cmis:allowableActions>
-                <cmis:canDeleteObject>true</cmis:canDeleteObject>
-                <cmis:canUpdateProperties>true</cmis:canUpdateProperties>
-                <cmis:canGetProperties>true</cmis:canGetProperties>
-                <cmis:canGetRelationships>true</cmis:canGetRelationships>
-                <cmis:canGetFolderParent>true</cmis:canGetFolderParent>
-                <cmis:canGetDescendants>true</cmis:canGetDescendants>
-                <cmis:canMoveObject>true</cmis:canMoveObject>
-                <cmis:canAddObjectToFolder>true</cmis:canAddObjectToFolder>
-                <cmis:canRemoveObjectFromFolder>true</cmis:canRemoveObjectFromFolder>
-                <cmis:canApplyPolicy>true</cmis:canApplyPolicy>
-                <cmis:canGetAppliedPolicies>true</cmis:canGetAppliedPolicies>
-                <cmis:canRemovePolicy>true</cmis:canRemovePolicy>
-                <cmis:canGetChildren>true</cmis:canGetChildren>
-                <cmis:canCreateFolder>true</cmis:canCreateFolder>
-                <cmis:canDeleteTree>true</cmis:canDeleteTree>
-            </cmis:allowableActions>
-        </cmisra:object>
-    </atom:entry>
-    <atom:entry>
-        <atom:author>
-            <atom:name>Al Brown</atom:name>
-            <atom:uri>http://www.ibm.com/</atom:uri>
-            <atom:email>albertcbrown@us.ibm.com</atom:email>
-        </atom:author>
-        <atom:content src="http://cmisexample.oasis-open.org/rep1/d67daab3-1357-4f76-a1ee-4e803277d7b6"/>
-        <atom:id>urn:uuid:d67daab3-1357-4f76-a1ee-4e803277d7b6</atom:id>
-        <atom:link rel="self" href="http://cmisexample.oasis-open.org/rep1/d67daab3-1357-4f76-a1ee-4e803277d7b6"/>
-        <atom:link rel="edit" href="http://cmisexample.oasis-open.org/rep1/d67daab3-1357-4f76-a1ee-4e803277d7b6"/>
-        <atom:link type="application/cmis+xml;type=allowableActions" rel="allowableactions" href="http://cmisexample.oasis-open.org/rep1/d67daab3-1357-4f76-a1ee-4e803277d7b6/allowableactions"/>
-        <atom:link type="application/atom+xml;type=entry" rel="type" href="http://cmisexample.oasis-open.org/rep1/d67daab3-1357-4f76-a1ee-4e803277d7b6/type"/>
-        <atom:published>2009-07-17T09:13:33.015-07:00</atom:published>
-        <atom:summary type="html">HTML summary of Entry  d67daab3-1357-4f76-a1ee-4e803277d7b6</atom:summary>
-        <atom:title type="text">CMIS Example Folder as Invoice type</atom:title>
-        <atom:updated>2009-07-17T09:13:33.015-07:00</atom:updated>
-        <atom:link type="application/atom+xml;type=feed" rel="relationships" href="http://cmisexample.oasis-open.org/rep1/d67daab3-1357-4f76-a1ee-4e803277d7b6/relationships"/>
-        <atom:link type="application/atom+xml;type=entry" rel="up" href="http://cmisexample.oasis-open.org/rep1/d67daab3-1357-4f76-a1ee-4e803277d7b6/up"/>
-        <atom:link type="application/atom+xml;type=feed" rel="down" href="http://cmisexample.oasis-open.org/rep1/d67daab3-1357-4f76-a1ee-4e803277d7b6/children/flat"/>
-        <atom:link type="application/cmistree+xml" rel="down" href="http://cmisexample.oasis-open.org/rep1/d67daab3-1357-4f76-a1ee-4e803277d7b6/children/tree"/>
-        <cmisra:object>
-            <cmis:properties>
-                <cmis:propertyBoolean localname="rep-cmis:IsImmutable" pdid="cmis:IsImmutable">
-                    <cmis:value>false</cmis:value>
-                </cmis:propertyBoolean>
-                <cmis:propertyDateTime localname="rep-cmis:CreationDate" pdid="cmis:CreationDate">
-                    <cmis:value>2009-07-17T09:13:33.015-07:00</cmis:value>
-                </cmis:propertyDateTime>
-                <cmis:propertyDateTime localname="rep-cmis:LastModificationDate" pdid="cmis:LastModificationDate">
-                    <cmis:value>2009-07-17T09:13:33.015-07:00</cmis:value>
-                </cmis:propertyDateTime>
-                <cmis:propertyId localname="rep-cmis:ObjectId" pdid="cmis:ObjectId">
-                    <cmis:value>d67daab3-1357-4f76-a1ee-4e803277d7b6</cmis:value>
-                </cmis:propertyId>
-                <cmis:propertyId localname="rep-cmis:ObjectTypeId" pdid="cmis:ObjectTypeId">
-                    <cmis:value>invoice</cmis:value>
-                </cmis:propertyId>
-                <cmis:propertyId localname="rep-cmis:BaseTypeId" pdid="cmis:BaseTypeId">
-                    <cmis:value>cmis:folder</cmis:value>
-                </cmis:propertyId>
-                <cmis:propertyString localname="rep-cmis:LastModifiedBy" pdid="cmis:LastModifiedBy">
-                    <cmis:value>Al Brown</cmis:value>
-                </cmis:propertyString>
-                <cmis:propertyString localname="rep-cmis:CreatedBy" pdid="cmis:CreatedBy">
-                    <cmis:value>Al Brown</cmis:value>
-                </cmis:propertyString>
-                <cmis:propertyId localname="rep-cmis:ParentId" pdid="cmis:ParentId">
-                    <cmis:value>d67daab3-1357-4f76-a1ee-4e803277d7b6up</cmis:value>
-                </cmis:propertyId>
-            </cmis:properties>
-            <cmis:allowableActions>
-                <cmis:canDeleteObject>true</cmis:canDeleteObject>
-                <cmis:canUpdateProperties>true</cmis:canUpdateProperties>
-                <cmis:canGetProperties>true</cmis:canGetProperties>
-                <cmis:canGetRelationships>true</cmis:canGetRelationships>
-                <cmis:canGetFolderParent>true</cmis:canGetFolderParent>
-                <cmis:canGetDescendants>true</cmis:canGetDescendants>
-                <cmis:canMoveObject>true</cmis:canMoveObject>
-                <cmis:canAddObjectToFolder>true</cmis:canAddObjectToFolder>
-                <cmis:canRemoveObjectFromFolder>true</cmis:canRemoveObjectFromFolder>
-                <cmis:canApplyPolicy>true</cmis:canApplyPolicy>
-                <cmis:canGetAppliedPolicies>true</cmis:canGetAppliedPolicies>
-                <cmis:canRemovePolicy>true</cmis:canRemovePolicy>
-                <cmis:canGetChildren>true</cmis:canGetChildren>
-                <cmis:canCreateFolder>true</cmis:canCreateFolder>
-                <cmis:canDeleteTree>true</cmis:canDeleteTree>
-            </cmis:allowableActions>
-        </cmisra:object>
-    </atom:entry>
-    <atom:entry>
-        <atom:author>
-            <atom:name>Al Brown</atom:name>
-            <atom:uri>http://www.ibm.com/</atom:uri>
-            <atom:email>albertcbrown@us.ibm.com</atom:email>
-        </atom:author>
-        <atom:content src="http://cmisexample.oasis-open.org/rep1/ce8c55db-a313-4db5-96c6-4d9b8a171a8d"/>
-        <atom:id>urn:uuid:ce8c55db-a313-4db5-96c6-4d9b8a171a8d</atom:id>
-        <atom:link rel="self" href="http://cmisexample.oasis-open.org/rep1/ce8c55db-a313-4db5-96c6-4d9b8a171a8d"/>
-        <atom:link rel="edit" href="http://cmisexample.oasis-open.org/rep1/ce8c55db-a313-4db5-96c6-4d9b8a171a8d"/>
-        <atom:link type="application/cmis+xml;type=allowableActions" rel="allowableactions" href="http://cmisexample.oasis-open.org/rep1/ce8c55db-a313-4db5-96c6-4d9b8a171a8d/allowableactions"/>
-        <atom:link type="application/atom+xml;type=entry" rel="type" href="http://cmisexample.oasis-open.org/rep1/ce8c55db-a313-4db5-96c6-4d9b8a171a8d/type"/>
-        <atom:published>2009-07-17T09:13:33.015-07:00</atom:published>
-        <atom:summary type="html">HTML summary of Entry  ce8c55db-a313-4db5-96c6-4d9b8a171a8d</atom:summary>
-        <atom:title type="text">CMIS Example Folder as Invoice type</atom:title>
-        <atom:updated>2009-07-17T09:13:33.015-07:00</atom:updated>
-        <atom:link rel="edit-media" href="http://cmisexample.oasis-open.org/rep1/ce8c55db-a313-4db5-96c6-4d9b8a171a8d/edit-media"/>
-        <atom:link rel="alternate" href="http://cmisexample.oasis-open.org/rep1/ce8c55db-a313-4db5-96c6-4d9b8a171a8d/alternate"/>
-        <atom:link type="application/atom+xml;type=feed" rel="parents" href="http://cmisexample.oasis-open.org/rep1/ce8c55db-a313-4db5-96c6-4d9b8a171a8d/parents"/>
-        <atom:link type="application/atom+xml;type=feed" rel="allversions" href="http://cmisexample.oasis-open.org/rep1/ce8c55db-a313-4db5-96c6-4d9b8a171a8d/allversions"/>
-        <atom:link type="application/atom+xml;type=entry" rel="latestversion" href="http://cmisexample.oasis-open.org/rep1/ce8c55db-a313-4db5-96c6-4d9b8a171a8d/latestversions"/>
-        <atom:link length="4123" type="text/plain" rel="stream" href="http://cmisexample.oasis-open.org/rep1/ce8c55db-a313-4db5-96c6-4d9b8a171a8dmedia"/>
-        <atom:link type="application/atom+xml;type=feed" rel="relationships" href="http://cmisexample.oasis-open.org/rep1/ce8c55db-a313-4db5-96c6-4d9b8a171a8d/relationships"/>
-        <cmisra:object>
-            <cmis:properties>
-                <cmis:propertyBoolean localname="rep-cmis:IsImmutable" pdid="cmis:IsImmutable">
-                    <cmis:value>false</cmis:value>
-                </cmis:propertyBoolean>
-                <cmis:propertyDateTime localname="rep-cmis:CreationDate" pdid="cmis:CreationDate">
-                    <cmis:value>2009-07-17T09:13:33.015-07:00</cmis:value>
-                </cmis:propertyDateTime>
-                <cmis:propertyDateTime localname="rep-cmis:LastModificationDate" pdid="cmis:LastModificationDate">
-                    <cmis:value>2009-07-17T09:13:33.015-07:00</cmis:value>
-                </cmis:propertyDateTime>
-                <cmis:propertyId localname="rep-cmis:ObjectId" pdid="cmis:ObjectId">
-                    <cmis:value>ce8c55db-a313-4db5-96c6-4d9b8a171a8d</cmis:value>
-                </cmis:propertyId>
-                <cmis:propertyId localname="rep-cmis:ObjectTypeId" pdid="cmis:ObjectTypeId">
-                    <cmis:value>invoice</cmis:value>
-                </cmis:propertyId>
-                <cmis:propertyId localname="rep-cmis:BaseTypeId" pdid="cmis:BaseTypeId">
-                    <cmis:value>cmis:document</cmis:value>
-                </cmis:propertyId>
-                <cmis:propertyString localname="rep-cmis:LastModifiedBy" pdid="cmis:LastModifiedBy">
-                    <cmis:value>Al Brown</cmis:value>
-                </cmis:propertyString>
-                <cmis:propertyString localname="rep-cmis:CreatedBy" pdid="cmis:CreatedBy">
-                    <cmis:value>Al Brown</cmis:value>
-                </cmis:propertyString>
-                <cmis:propertyBoolean localname="rep-cmis:IsLatestVersion" pdid="cmis:IsLatestVersion">
-                    <cmis:value>true</cmis:value>
-                </cmis:propertyBoolean>
-                <cmis:propertyBoolean localname="rep-cmis:IsVersionSeriesCheckedOut" pdid="cmis:IsVersionSeriesCheckedOut">
-                    <cmis:value>false</cmis:value>
-                </cmis:propertyBoolean>
-                <cmis:propertyBoolean localname="rep-cmis:IsMajorVersion" pdid="cmis:IsMajorVersion">
-                    <cmis:value>false</cmis:value>
-                </cmis:propertyBoolean>
-                <cmis:propertyBoolean localname="rep-cmis:IsLatestMajorVersion" pdid="cmis:IsLatestMajorVersion">
-                    <cmis:value>false</cmis:value>
-                </cmis:propertyBoolean>
-                <cmis:propertyString localname="rep-cmis:CheckinComment" pdid="cmis:CheckinComment">
-                    <cmis:value>Checkin comment</cmis:value>
-                </cmis:propertyString>
-                <cmis:propertyString localname="rep-cmis:VersionLabel" pdid="cmis:VersionLabel">
-                    <cmis:value>0.1</cmis:value>
-                </cmis:propertyString>
-                <cmis:propertyString localname="rep-cmis:ContentStreamMimeType" pdid="cmis:ContentStreamMimeType">
-                    <cmis:value>text/plain</cmis:value>
-                </cmis:propertyString>
-                <cmis:propertyString localname="rep-cmis:ContentStreamFileName" pdid="cmis:ContentStreamFileName">
-                    <cmis:value>text.txt</cmis:value>
-                </cmis:propertyString>
-                <cmis:propertyInteger localname="rep-cmis:ContentStreamLength" pdid="cmis:ContentStreamLength">
-                    <cmis:value>4234</cmis:value>
-                </cmis:propertyInteger>
-                <cmis:propertyString displayname="Keywords for Document" localname="keywords" pdid="keywords">
-                    <cmis:value>document</cmis:value>
-                    <cmis:value>example</cmis:value>
-                    <cmis:value>sample</cmis:value>
-                    <cmis:value>cmis</cmis:value>
-                </cmis:propertyString>
-            </cmis:properties>
-            <cmis:allowableActions>
-                <cmis:canDeleteObject>true</cmis:canDeleteObject>
-                <cmis:canUpdateProperties>true</cmis:canUpdateProperties>
-                <cmis:canGetProperties>true</cmis:canGetProperties>
-                <cmis:canGetRelationships>true</cmis:canGetRelationships>
-                <cmis:canGetObjectParents>true</cmis:canGetObjectParents>
-                <cmis:canMoveObject>true</cmis:canMoveObject>
-                <cmis:canDeleteContentStream>true</cmis:canDeleteContentStream>
-                <cmis:canCheckOut>true</cmis:canCheckOut>
-                <cmis:canCancelCheckOut>true</cmis:canCancelCheckOut>
-                <cmis:canCheckIn>true</cmis:canCheckIn>
-                <cmis:canSetContentStream>true</cmis:canSetContentStream>
-                <cmis:canGetAllVersions>true</cmis:canGetAllVersions>
-                <cmis:canAddObjectToFolder>true</cmis:canAddObjectToFolder>
-                <cmis:canRemoveObjectFromFolder>true</cmis:canRemoveObjectFromFolder>
-                <cmis:canGetContentStream>true</cmis:canGetContentStream>
-                <cmis:canApplyPolicy>true</cmis:canApplyPolicy>
-                <cmis:canGetAppliedPolicies>true</cmis:canGetAppliedPolicies>
-                <cmis:canRemovePolicy>true</cmis:canRemovePolicy>
-                <cmis:canCreateDocument>true</cmis:canCreateDocument>
-            </cmis:allowableActions>
-        </cmisra:object>
-    </atom:entry>
-</atom:feed>
diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/examples/FolderDescendants.xml b/source/java/org/alfresco/repo/cmis/rest/xsd/examples/FolderDescendants.xml
deleted file mode 100644
index 59e30291ed..0000000000
--- a/source/java/org/alfresco/repo/cmis/rest/xsd/examples/FolderDescendants.xml
+++ /dev/null
@@ -1,493 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<atom:feed xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901" xmlns:cmism="http://docs.oasis-open.org/ns/cmis/messaging/200901" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:app="http://www.w3.org/2007/app" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200901">
-    <atom:title type="text">Feed for folder1</atom:title>
-    <atom:author>
-        <atom:name>Al Brown</atom:name>
-        <atom:uri>http://www.ibm.com/</atom:uri>
-        <atom:email>albertcbrown@us.ibm.com</atom:email>
-    </atom:author>
-    <atom:updated>2009-07-17T09:13:33.046-07:00</atom:updated>
-    <atom:id>urn:uuid:93474b3f-9ca1-440a-8856-af51e5197e05</atom:id>
-    <atom:link type="application/atom+xml;type=feed" rel="self" href="http://cmisexample.oasis-open.org/rep1/efe18f0a-74e8-4dcd-8057-9fcb799caf0e/3"/>
-    <atom:link type="application/atom+xml;type=entry" rel="via" href="http://cmisexample.oasis-open.org/rep1/efe18f0a-74e8-4dcd-8057-9fcb799caf0e"/>
-    <app:collection href="http://cmisexample.oasis-open.org/rep1/efe18f0a-74e8-4dcd-8057-9fcb799caf0e/3">
-        <atom:title type="text">Feed for folder1</atom:title>
-        <app:accept>application/atom+xml;type=entry</app:accept>
-        <app:accept>application/atom+xml</app:accept>
-        <app:accept>*/*</app:accept>
-    </app:collection>
-    <atom:entry>
-        <atom:author>
-            <atom:name>Al Brown</atom:name>
-            <atom:uri>http://www.ibm.com/</atom:uri>
-            <atom:email>albertcbrown@us.ibm.com</atom:email>
-        </atom:author>
-        <atom:content src="http://cmisexample.oasis-open.org/rep1/50f79725-6aa4-4206-838e-03c90a045b17"/>
-        <atom:id>urn:uuid:50f79725-6aa4-4206-838e-03c90a045b17</atom:id>
-        <atom:link rel="self" href="http://cmisexample.oasis-open.org/rep1/50f79725-6aa4-4206-838e-03c90a045b17"/>
-        <atom:link rel="edit" href="http://cmisexample.oasis-open.org/rep1/50f79725-6aa4-4206-838e-03c90a045b17"/>
-        <atom:link type="application/cmis+xml;type=allowableActions" rel="allowableactions" href="http://cmisexample.oasis-open.org/rep1/50f79725-6aa4-4206-838e-03c90a045b17/allowableactions"/>
-        <atom:link type="application/atom+xml;type=entry" rel="type" href="http://cmisexample.oasis-open.org/rep1/50f79725-6aa4-4206-838e-03c90a045b17/type"/>
-        <atom:published>2009-07-17T09:13:33.046-07:00</atom:published>
-        <atom:summary type="html">HTML summary of Entry  50f79725-6aa4-4206-838e-03c90a045b17</atom:summary>
-        <atom:title type="text">CMIS Example Folder as Customer type</atom:title>
-        <atom:updated>2009-07-17T09:13:33.046-07:00</atom:updated>
-        <atom:link type="application/atom+xml;type=feed" rel="relationships" href="http://cmisexample.oasis-open.org/rep1/50f79725-6aa4-4206-838e-03c90a045b17/relationships"/>
-        <atom:link type="application/atom+xml;type=entry" rel="up" href="http://cmisexample.oasis-open.org/rep1/50f79725-6aa4-4206-838e-03c90a045b17/up"/>
-        <atom:link type="application/atom+xml;type=feed" rel="down" href="http://cmisexample.oasis-open.org/rep1/50f79725-6aa4-4206-838e-03c90a045b17/children/flat"/>
-        <atom:link type="application/cmistree+xml" rel="down" href="http://cmisexample.oasis-open.org/rep1/50f79725-6aa4-4206-838e-03c90a045b17/children/tree"/>
-        <cmisra:object>
-            <cmis:properties>
-                <cmis:propertyBoolean localname="rep-cmis:IsImmutable" pdid="cmis:IsImmutable">
-                    <cmis:value>false</cmis:value>
-                </cmis:propertyBoolean>
-                <cmis:propertyDateTime localname="rep-cmis:CreationDate" pdid="cmis:CreationDate">
-                    <cmis:value>2009-07-17T09:13:33.046-07:00</cmis:value>
-                </cmis:propertyDateTime>
-                <cmis:propertyDateTime localname="rep-cmis:LastModificationDate" pdid="cmis:LastModificationDate">
-                    <cmis:value>2009-07-17T09:13:33.046-07:00</cmis:value>
-                </cmis:propertyDateTime>
-                <cmis:propertyId localname="rep-cmis:ObjectId" pdid="cmis:ObjectId">
-                    <cmis:value>50f79725-6aa4-4206-838e-03c90a045b17</cmis:value>
-                </cmis:propertyId>
-                <cmis:propertyId localname="rep-cmis:ObjectTypeId" pdid="cmis:ObjectTypeId">
-                    <cmis:value>customer</cmis:value>
-                </cmis:propertyId>
-                <cmis:propertyId localname="rep-cmis:BaseTypeId" pdid="cmis:BaseTypeId">
-                    <cmis:value>cmis:folder</cmis:value>
-                </cmis:propertyId>
-                <cmis:propertyString localname="rep-cmis:LastModifiedBy" pdid="cmis:LastModifiedBy">
-                    <cmis:value>Al Brown</cmis:value>
-                </cmis:propertyString>
-                <cmis:propertyString localname="rep-cmis:CreatedBy" pdid="cmis:CreatedBy">
-                    <cmis:value>Al Brown</cmis:value>
-                </cmis:propertyString>
-                <cmis:propertyId localname="rep-cmis:ParentId" pdid="cmis:ParentId">
-                    <cmis:value>50f79725-6aa4-4206-838e-03c90a045b17up</cmis:value>
-                </cmis:propertyId>
-            </cmis:properties>
-            <cmis:allowableActions>
-                <cmis:canDeleteObject>true</cmis:canDeleteObject>
-                <cmis:canUpdateProperties>true</cmis:canUpdateProperties>
-                <cmis:canGetProperties>true</cmis:canGetProperties>
-                <cmis:canGetRelationships>true</cmis:canGetRelationships>
-                <cmis:canGetFolderParent>true</cmis:canGetFolderParent>
-                <cmis:canGetDescendants>true</cmis:canGetDescendants>
-                <cmis:canMoveObject>true</cmis:canMoveObject>
-                <cmis:canAddObjectToFolder>true</cmis:canAddObjectToFolder>
-                <cmis:canRemoveObjectFromFolder>true</cmis:canRemoveObjectFromFolder>
-                <cmis:canApplyPolicy>true</cmis:canApplyPolicy>
-                <cmis:canGetAppliedPolicies>true</cmis:canGetAppliedPolicies>
-                <cmis:canRemovePolicy>true</cmis:canRemovePolicy>
-                <cmis:canGetChildren>true</cmis:canGetChildren>
-                <cmis:canCreateFolder>true</cmis:canCreateFolder>
-                <cmis:canDeleteTree>true</cmis:canDeleteTree>
-            </cmis:allowableActions>
-        </cmisra:object>
-        <cmisra:children>
-            <atom:title type="text">CMIS Example Folder as Customer type</atom:title>
-            <atom:author>
-                <atom:name>Al Brown</atom:name>
-                <atom:uri>http://www.ibm.com/</atom:uri>
-                <atom:email>albertcbrown@us.ibm.com</atom:email>
-            </atom:author>
-            <atom:updated>2009-07-17T09:13:33.046-07:00</atom:updated>
-            <atom:id>urn:uuid:40c0b703-758c-4102-8739-18d19e11109c</atom:id>
-            <atom:link type="application/atom+xml;type=feed" rel="self" href="http://cmisexample.oasis-open.org/rep1/50f79725-6aa4-4206-838e-03c90a045b17/3"/>
-            <atom:link type="application/atom+xml;type=entry" rel="via" href="http://cmisexample.oasis-open.org/rep1/50f79725-6aa4-4206-838e-03c90a045b17"/>
-            <app:collection href="http://cmisexample.oasis-open.org/rep1/50f79725-6aa4-4206-838e-03c90a045b17/3">
-                <atom:title type="text">CMIS Example Folder as Customer type</atom:title>
-                <app:accept>application/atom+xml;type=entry</app:accept>
-                <app:accept>application/atom+xml</app:accept>
-                <app:accept>*/*</app:accept>
-            </app:collection>
-            <atom:entry>
-                <atom:author>
-                    <atom:name>Al Brown</atom:name>
-                    <atom:uri>http://www.ibm.com/</atom:uri>
-                    <atom:email>albertcbrown@us.ibm.com</atom:email>
-                </atom:author>
-                <atom:content src="http://cmisexample.oasis-open.org/rep1/ba61c32c-da45-43cf-8fe7-399cae307ccc"/>
-                <atom:id>urn:uuid:ba61c32c-da45-43cf-8fe7-399cae307ccc</atom:id>
-                <atom:link rel="self" href="http://cmisexample.oasis-open.org/rep1/ba61c32c-da45-43cf-8fe7-399cae307ccc"/>
-                <atom:link rel="edit" href="http://cmisexample.oasis-open.org/rep1/ba61c32c-da45-43cf-8fe7-399cae307ccc"/>
-                <atom:link type="application/cmis+xml;type=allowableActions" rel="allowableactions" href="http://cmisexample.oasis-open.org/rep1/ba61c32c-da45-43cf-8fe7-399cae307ccc/allowableactions"/>
-                <atom:link type="application/atom+xml;type=entry" rel="type" href="http://cmisexample.oasis-open.org/rep1/ba61c32c-da45-43cf-8fe7-399cae307ccc/type"/>
-                <atom:published>2009-07-17T09:13:33.046-07:00</atom:published>
-                <atom:summary type="html">HTML summary of Entry  ba61c32c-da45-43cf-8fe7-399cae307ccc</atom:summary>
-                <atom:title type="text">CMIS Example Doc as Invoice type</atom:title>
-                <atom:updated>2009-07-17T09:13:33.046-07:00</atom:updated>
-                <atom:link rel="edit-media" href="http://cmisexample.oasis-open.org/rep1/ba61c32c-da45-43cf-8fe7-399cae307ccc/edit-media"/>
-                <atom:link rel="alternate" href="http://cmisexample.oasis-open.org/rep1/ba61c32c-da45-43cf-8fe7-399cae307ccc/alternate"/>
-                <atom:link type="application/atom+xml;type=feed" rel="parents" href="http://cmisexample.oasis-open.org/rep1/ba61c32c-da45-43cf-8fe7-399cae307ccc/parents"/>
-                <atom:link type="application/atom+xml;type=feed" rel="allversions" href="http://cmisexample.oasis-open.org/rep1/ba61c32c-da45-43cf-8fe7-399cae307ccc/allversions"/>
-                <atom:link type="application/atom+xml;type=entry" rel="latestversion" href="http://cmisexample.oasis-open.org/rep1/ba61c32c-da45-43cf-8fe7-399cae307ccc/latestversions"/>
-                <atom:link length="4123" type="text/plain" rel="stream" href="http://cmisexample.oasis-open.org/rep1/ba61c32c-da45-43cf-8fe7-399cae307cccmedia"/>
-                <atom:link type="application/atom+xml;type=feed" rel="relationships" href="http://cmisexample.oasis-open.org/rep1/ba61c32c-da45-43cf-8fe7-399cae307ccc/relationships"/>
-                <cmisra:object>
-                    <cmis:properties>
-                        <cmis:propertyBoolean localname="rep-cmis:IsImmutable" pdid="cmis:IsImmutable">
-                            <cmis:value>false</cmis:value>
-                        </cmis:propertyBoolean>
-                        <cmis:propertyDateTime localname="rep-cmis:CreationDate" pdid="cmis:CreationDate">
-                            <cmis:value>2009-07-17T09:13:33.046-07:00</cmis:value>
-                        </cmis:propertyDateTime>
-                        <cmis:propertyDateTime localname="rep-cmis:LastModificationDate" pdid="cmis:LastModificationDate">
-                            <cmis:value>2009-07-17T09:13:33.046-07:00</cmis:value>
-                        </cmis:propertyDateTime>
-                        <cmis:propertyId localname="rep-cmis:ObjectId" pdid="cmis:ObjectId">
-                            <cmis:value>ba61c32c-da45-43cf-8fe7-399cae307ccc</cmis:value>
-                        </cmis:propertyId>
-                        <cmis:propertyId localname="rep-cmis:ObjectTypeId" pdid="cmis:ObjectTypeId">
-                            <cmis:value>invoice</cmis:value>
-                        </cmis:propertyId>
-                        <cmis:propertyId localname="rep-cmis:BaseTypeId" pdid="cmis:BaseTypeId">
-                            <cmis:value>cmis:document</cmis:value>
-                        </cmis:propertyId>
-                        <cmis:propertyString localname="rep-cmis:LastModifiedBy" pdid="cmis:LastModifiedBy">
-                            <cmis:value>Al Brown</cmis:value>
-                        </cmis:propertyString>
-                        <cmis:propertyString localname="rep-cmis:CreatedBy" pdid="cmis:CreatedBy">
-                            <cmis:value>Al Brown</cmis:value>
-                        </cmis:propertyString>
-                        <cmis:propertyBoolean localname="rep-cmis:IsLatestVersion" pdid="cmis:IsLatestVersion">
-                            <cmis:value>true</cmis:value>
-                        </cmis:propertyBoolean>
-                        <cmis:propertyBoolean localname="rep-cmis:IsVersionSeriesCheckedOut" pdid="cmis:IsVersionSeriesCheckedOut">
-                            <cmis:value>false</cmis:value>
-                        </cmis:propertyBoolean>
-                        <cmis:propertyBoolean localname="rep-cmis:IsMajorVersion" pdid="cmis:IsMajorVersion">
-                            <cmis:value>false</cmis:value>
-                        </cmis:propertyBoolean>
-                        <cmis:propertyBoolean localname="rep-cmis:IsLatestMajorVersion" pdid="cmis:IsLatestMajorVersion">
-                            <cmis:value>false</cmis:value>
-                        </cmis:propertyBoolean>
-                        <cmis:propertyString localname="rep-cmis:CheckinComment" pdid="cmis:CheckinComment">
-                            <cmis:value>Checkin comment</cmis:value>
-                        </cmis:propertyString>
-                        <cmis:propertyString localname="rep-cmis:VersionLabel" pdid="cmis:VersionLabel">
-                            <cmis:value>0.1</cmis:value>
-                        </cmis:propertyString>
-                        <cmis:propertyString localname="rep-cmis:ContentStreamMimeType" pdid="cmis:ContentStreamMimeType">
-                            <cmis:value>text/plain</cmis:value>
-                        </cmis:propertyString>
-                        <cmis:propertyString localname="rep-cmis:ContentStreamFileName" pdid="cmis:ContentStreamFileName">
-                            <cmis:value>text.txt</cmis:value>
-                        </cmis:propertyString>
-                        <cmis:propertyInteger localname="rep-cmis:ContentStreamLength" pdid="cmis:ContentStreamLength">
-                            <cmis:value>4234</cmis:value>
-                        </cmis:propertyInteger>
-                        <cmis:propertyString displayname="Keywords for Document" localname="keywords" pdid="keywords">
-                            <cmis:value>document</cmis:value>
-                            <cmis:value>example</cmis:value>
-                            <cmis:value>sample</cmis:value>
-                            <cmis:value>cmis</cmis:value>
-                        </cmis:propertyString>
-                    </cmis:properties>
-                    <cmis:allowableActions>
-                        <cmis:canDeleteObject>true</cmis:canDeleteObject>
-                        <cmis:canUpdateProperties>true</cmis:canUpdateProperties>
-                        <cmis:canGetProperties>true</cmis:canGetProperties>
-                        <cmis:canGetRelationships>true</cmis:canGetRelationships>
-                        <cmis:canGetObjectParents>true</cmis:canGetObjectParents>
-                        <cmis:canMoveObject>true</cmis:canMoveObject>
-                        <cmis:canDeleteContentStream>true</cmis:canDeleteContentStream>
-                        <cmis:canCheckOut>true</cmis:canCheckOut>
-                        <cmis:canCancelCheckOut>true</cmis:canCancelCheckOut>
-                        <cmis:canCheckIn>true</cmis:canCheckIn>
-                        <cmis:canSetContentStream>true</cmis:canSetContentStream>
-                        <cmis:canGetAllVersions>true</cmis:canGetAllVersions>
-                        <cmis:canAddObjectToFolder>true</cmis:canAddObjectToFolder>
-                        <cmis:canRemoveObjectFromFolder>true</cmis:canRemoveObjectFromFolder>
-                        <cmis:canGetContentStream>true</cmis:canGetContentStream>
-                        <cmis:canApplyPolicy>true</cmis:canApplyPolicy>
-                        <cmis:canGetAppliedPolicies>true</cmis:canGetAppliedPolicies>
-                        <cmis:canRemovePolicy>true</cmis:canRemovePolicy>
-                        <cmis:canCreateDocument>true</cmis:canCreateDocument>
-                    </cmis:allowableActions>
-                </cmisra:object>
-            </atom:entry>
-            <atom:entry>
-                <atom:author>
-                    <atom:name>Al Brown</atom:name>
-                    <atom:uri>http://www.ibm.com/</atom:uri>
-                    <atom:email>albertcbrown@us.ibm.com</atom:email>
-                </atom:author>
-                <atom:content src="http://cmisexample.oasis-open.org/rep1/8d712ae5-18fe-469b-b4c4-caa0ea3ab348"/>
-                <atom:id>urn:uuid:8d712ae5-18fe-469b-b4c4-caa0ea3ab348</atom:id>
-                <atom:link rel="self" href="http://cmisexample.oasis-open.org/rep1/8d712ae5-18fe-469b-b4c4-caa0ea3ab348"/>
-                <atom:link rel="edit" href="http://cmisexample.oasis-open.org/rep1/8d712ae5-18fe-469b-b4c4-caa0ea3ab348"/>
-                <atom:link type="application/cmis+xml;type=allowableActions" rel="allowableactions" href="http://cmisexample.oasis-open.org/rep1/8d712ae5-18fe-469b-b4c4-caa0ea3ab348/allowableactions"/>
-                <atom:link type="application/atom+xml;type=entry" rel="type" href="http://cmisexample.oasis-open.org/rep1/8d712ae5-18fe-469b-b4c4-caa0ea3ab348/type"/>
-                <atom:published>2009-07-17T09:13:33.062-07:00</atom:published>
-                <atom:summary type="html">HTML summary of Entry  8d712ae5-18fe-469b-b4c4-caa0ea3ab348</atom:summary>
-                <atom:title type="text">CMIS Example Doc as Invoice type</atom:title>
-                <atom:updated>2009-07-17T09:13:33.062-07:00</atom:updated>
-                <atom:link rel="edit-media" href="http://cmisexample.oasis-open.org/rep1/8d712ae5-18fe-469b-b4c4-caa0ea3ab348/edit-media"/>
-                <atom:link rel="alternate" href="http://cmisexample.oasis-open.org/rep1/8d712ae5-18fe-469b-b4c4-caa0ea3ab348/alternate"/>
-                <atom:link type="application/atom+xml;type=feed" rel="parents" href="http://cmisexample.oasis-open.org/rep1/8d712ae5-18fe-469b-b4c4-caa0ea3ab348/parents"/>
-                <atom:link type="application/atom+xml;type=feed" rel="allversions" href="http://cmisexample.oasis-open.org/rep1/8d712ae5-18fe-469b-b4c4-caa0ea3ab348/allversions"/>
-                <atom:link type="application/atom+xml;type=entry" rel="latestversion" href="http://cmisexample.oasis-open.org/rep1/8d712ae5-18fe-469b-b4c4-caa0ea3ab348/latestversions"/>
-                <atom:link length="4123" type="text/plain" rel="stream" href="http://cmisexample.oasis-open.org/rep1/8d712ae5-18fe-469b-b4c4-caa0ea3ab348media"/>
-                <atom:link type="application/atom+xml;type=feed" rel="relationships" href="http://cmisexample.oasis-open.org/rep1/8d712ae5-18fe-469b-b4c4-caa0ea3ab348/relationships"/>
-                <cmisra:object>
-                    <cmis:properties>
-                        <cmis:propertyBoolean localname="rep-cmis:IsImmutable" pdid="cmis:IsImmutable">
-                            <cmis:value>false</cmis:value>
-                        </cmis:propertyBoolean>
-                        <cmis:propertyDateTime localname="rep-cmis:CreationDate" pdid="cmis:CreationDate">
-                            <cmis:value>2009-07-17T09:13:33.062-07:00</cmis:value>
-                        </cmis:propertyDateTime>
-                        <cmis:propertyDateTime localname="rep-cmis:LastModificationDate" pdid="cmis:LastModificationDate">
-                            <cmis:value>2009-07-17T09:13:33.062-07:00</cmis:value>
-                        </cmis:propertyDateTime>
-                        <cmis:propertyId localname="rep-cmis:ObjectId" pdid="cmis:ObjectId">
-                            <cmis:value>8d712ae5-18fe-469b-b4c4-caa0ea3ab348</cmis:value>
-                        </cmis:propertyId>
-                        <cmis:propertyId localname="rep-cmis:ObjectTypeId" pdid="cmis:ObjectTypeId">
-                            <cmis:value>invoice</cmis:value>
-                        </cmis:propertyId>
-                        <cmis:propertyId localname="rep-cmis:BaseTypeId" pdid="cmis:BaseTypeId">
-                            <cmis:value>cmis:document</cmis:value>
-                        </cmis:propertyId>
-                        <cmis:propertyString localname="rep-cmis:LastModifiedBy" pdid="cmis:LastModifiedBy">
-                            <cmis:value>Al Brown</cmis:value>
-                        </cmis:propertyString>
-                        <cmis:propertyString localname="rep-cmis:CreatedBy" pdid="cmis:CreatedBy">
-                            <cmis:value>Al Brown</cmis:value>
-                        </cmis:propertyString>
-                        <cmis:propertyBoolean localname="rep-cmis:IsLatestVersion" pdid="cmis:IsLatestVersion">
-                            <cmis:value>true</cmis:value>
-                        </cmis:propertyBoolean>
-                        <cmis:propertyBoolean localname="rep-cmis:IsVersionSeriesCheckedOut" pdid="cmis:IsVersionSeriesCheckedOut">
-                            <cmis:value>false</cmis:value>
-                        </cmis:propertyBoolean>
-                        <cmis:propertyBoolean localname="rep-cmis:IsMajorVersion" pdid="cmis:IsMajorVersion">
-                            <cmis:value>false</cmis:value>
-                        </cmis:propertyBoolean>
-                        <cmis:propertyBoolean localname="rep-cmis:IsLatestMajorVersion" pdid="cmis:IsLatestMajorVersion">
-                            <cmis:value>false</cmis:value>
-                        </cmis:propertyBoolean>
-                        <cmis:propertyString localname="rep-cmis:CheckinComment" pdid="cmis:CheckinComment">
-                            <cmis:value>Checkin comment</cmis:value>
-                        </cmis:propertyString>
-                        <cmis:propertyString localname="rep-cmis:VersionLabel" pdid="cmis:VersionLabel">
-                            <cmis:value>0.1</cmis:value>
-                        </cmis:propertyString>
-                        <cmis:propertyString localname="rep-cmis:ContentStreamMimeType" pdid="cmis:ContentStreamMimeType">
-                            <cmis:value>text/plain</cmis:value>
-                        </cmis:propertyString>
-                        <cmis:propertyString localname="rep-cmis:ContentStreamFileName" pdid="cmis:ContentStreamFileName">
-                            <cmis:value>text.txt</cmis:value>
-                        </cmis:propertyString>
-                        <cmis:propertyInteger localname="rep-cmis:ContentStreamLength" pdid="cmis:ContentStreamLength">
-                            <cmis:value>4234</cmis:value>
-                        </cmis:propertyInteger>
-                        <cmis:propertyString displayname="Keywords for Document" localname="keywords" pdid="keywords">
-                            <cmis:value>document</cmis:value>
-                            <cmis:value>example</cmis:value>
-                            <cmis:value>sample</cmis:value>
-                            <cmis:value>cmis</cmis:value>
-                        </cmis:propertyString>
-                    </cmis:properties>
-                    <cmis:allowableActions>
-                        <cmis:canDeleteObject>true</cmis:canDeleteObject>
-                        <cmis:canUpdateProperties>true</cmis:canUpdateProperties>
-                        <cmis:canGetProperties>true</cmis:canGetProperties>
-                        <cmis:canGetRelationships>true</cmis:canGetRelationships>
-                        <cmis:canGetObjectParents>true</cmis:canGetObjectParents>
-                        <cmis:canMoveObject>true</cmis:canMoveObject>
-                        <cmis:canDeleteContentStream>true</cmis:canDeleteContentStream>
-                        <cmis:canCheckOut>true</cmis:canCheckOut>
-                        <cmis:canCancelCheckOut>true</cmis:canCancelCheckOut>
-                        <cmis:canCheckIn>true</cmis:canCheckIn>
-                        <cmis:canSetContentStream>true</cmis:canSetContentStream>
-                        <cmis:canGetAllVersions>true</cmis:canGetAllVersions>
-                        <cmis:canAddObjectToFolder>true</cmis:canAddObjectToFolder>
-                        <cmis:canRemoveObjectFromFolder>true</cmis:canRemoveObjectFromFolder>
-                        <cmis:canGetContentStream>true</cmis:canGetContentStream>
-                        <cmis:canApplyPolicy>true</cmis:canApplyPolicy>
-                        <cmis:canGetAppliedPolicies>true</cmis:canGetAppliedPolicies>
-                        <cmis:canRemovePolicy>true</cmis:canRemovePolicy>
-                        <cmis:canCreateDocument>true</cmis:canCreateDocument>
-                    </cmis:allowableActions>
-                </cmisra:object>
-            </atom:entry>
-        </cmisra:children>
-    </atom:entry>
-    <atom:entry>
-        <atom:author>
-            <atom:name>Al Brown</atom:name>
-            <atom:uri>http://www.ibm.com/</atom:uri>
-            <atom:email>albertcbrown@us.ibm.com</atom:email>
-        </atom:author>
-        <atom:content src="http://cmisexample.oasis-open.org/rep1/56b10c11-dbe1-4bd8-a5e4-8dc3dcd58204"/>
-        <atom:id>urn:uuid:56b10c11-dbe1-4bd8-a5e4-8dc3dcd58204</atom:id>
-        <atom:link rel="self" href="http://cmisexample.oasis-open.org/rep1/56b10c11-dbe1-4bd8-a5e4-8dc3dcd58204"/>
-        <atom:link rel="edit" href="http://cmisexample.oasis-open.org/rep1/56b10c11-dbe1-4bd8-a5e4-8dc3dcd58204"/>
-        <atom:link type="application/cmis+xml;type=allowableActions" rel="allowableactions" href="http://cmisexample.oasis-open.org/rep1/56b10c11-dbe1-4bd8-a5e4-8dc3dcd58204/allowableactions"/>
-        <atom:link type="application/atom+xml;type=entry" rel="type" href="http://cmisexample.oasis-open.org/rep1/56b10c11-dbe1-4bd8-a5e4-8dc3dcd58204/type"/>
-        <atom:published>2009-07-17T09:13:33.062-07:00</atom:published>
-        <atom:summary type="html">HTML summary of Entry  56b10c11-dbe1-4bd8-a5e4-8dc3dcd58204</atom:summary>
-        <atom:title type="text">CMIS Example Folder as Customer type</atom:title>
-        <atom:updated>2009-07-17T09:13:33.062-07:00</atom:updated>
-        <atom:link type="application/atom+xml;type=feed" rel="relationships" href="http://cmisexample.oasis-open.org/rep1/56b10c11-dbe1-4bd8-a5e4-8dc3dcd58204/relationships"/>
-        <atom:link type="application/atom+xml;type=entry" rel="up" href="http://cmisexample.oasis-open.org/rep1/56b10c11-dbe1-4bd8-a5e4-8dc3dcd58204/up"/>
-        <atom:link type="application/atom+xml;type=feed" rel="down" href="http://cmisexample.oasis-open.org/rep1/56b10c11-dbe1-4bd8-a5e4-8dc3dcd58204/children/flat"/>
-        <atom:link type="application/cmistree+xml" rel="down" href="http://cmisexample.oasis-open.org/rep1/56b10c11-dbe1-4bd8-a5e4-8dc3dcd58204/children/tree"/>
-        <cmisra:object>
-            <cmis:properties>
-                <cmis:propertyBoolean localname="rep-cmis:IsImmutable" pdid="cmis:IsImmutable">
-                    <cmis:value>false</cmis:value>
-                </cmis:propertyBoolean>
-                <cmis:propertyDateTime localname="rep-cmis:CreationDate" pdid="cmis:CreationDate">
-                    <cmis:value>2009-07-17T09:13:33.062-07:00</cmis:value>
-                </cmis:propertyDateTime>
-                <cmis:propertyDateTime localname="rep-cmis:LastModificationDate" pdid="cmis:LastModificationDate">
-                    <cmis:value>2009-07-17T09:13:33.062-07:00</cmis:value>
-                </cmis:propertyDateTime>
-                <cmis:propertyId localname="rep-cmis:ObjectId" pdid="cmis:ObjectId">
-                    <cmis:value>56b10c11-dbe1-4bd8-a5e4-8dc3dcd58204</cmis:value>
-                </cmis:propertyId>
-                <cmis:propertyId localname="rep-cmis:ObjectTypeId" pdid="cmis:ObjectTypeId">
-                    <cmis:value>customer</cmis:value>
-                </cmis:propertyId>
-                <cmis:propertyId localname="rep-cmis:BaseTypeId" pdid="cmis:BaseTypeId">
-                    <cmis:value>cmis:folder</cmis:value>
-                </cmis:propertyId>
-                <cmis:propertyString localname="rep-cmis:LastModifiedBy" pdid="cmis:LastModifiedBy">
-                    <cmis:value>Al Brown</cmis:value>
-                </cmis:propertyString>
-                <cmis:propertyString localname="rep-cmis:CreatedBy" pdid="cmis:CreatedBy">
-                    <cmis:value>Al Brown</cmis:value>
-                </cmis:propertyString>
-                <cmis:propertyId localname="rep-cmis:ParentId" pdid="cmis:ParentId">
-                    <cmis:value>56b10c11-dbe1-4bd8-a5e4-8dc3dcd58204up</cmis:value>
-                </cmis:propertyId>
-            </cmis:properties>
-            <cmis:allowableActions>
-                <cmis:canDeleteObject>true</cmis:canDeleteObject>
-                <cmis:canUpdateProperties>true</cmis:canUpdateProperties>
-                <cmis:canGetProperties>true</cmis:canGetProperties>
-                <cmis:canGetRelationships>true</cmis:canGetRelationships>
-                <cmis:canGetFolderParent>true</cmis:canGetFolderParent>
-                <cmis:canGetDescendants>true</cmis:canGetDescendants>
-                <cmis:canMoveObject>true</cmis:canMoveObject>
-                <cmis:canAddObjectToFolder>true</cmis:canAddObjectToFolder>
-                <cmis:canRemoveObjectFromFolder>true</cmis:canRemoveObjectFromFolder>
-                <cmis:canApplyPolicy>true</cmis:canApplyPolicy>
-                <cmis:canGetAppliedPolicies>true</cmis:canGetAppliedPolicies>
-                <cmis:canRemovePolicy>true</cmis:canRemovePolicy>
-                <cmis:canGetChildren>true</cmis:canGetChildren>
-                <cmis:canCreateFolder>true</cmis:canCreateFolder>
-                <cmis:canDeleteTree>true</cmis:canDeleteTree>
-            </cmis:allowableActions>
-        </cmisra:object>
-    </atom:entry>
-    <atom:entry>
-        <atom:author>
-            <atom:name>Al Brown</atom:name>
-            <atom:uri>http://www.ibm.com/</atom:uri>
-            <atom:email>albertcbrown@us.ibm.com</atom:email>
-        </atom:author>
-        <atom:content src="http://cmisexample.oasis-open.org/rep1/400d5852-f94a-4734-802d-0de3b6aa6004"/>
-        <atom:id>urn:uuid:400d5852-f94a-4734-802d-0de3b6aa6004</atom:id>
-        <atom:link rel="self" href="http://cmisexample.oasis-open.org/rep1/400d5852-f94a-4734-802d-0de3b6aa6004"/>
-        <atom:link rel="edit" href="http://cmisexample.oasis-open.org/rep1/400d5852-f94a-4734-802d-0de3b6aa6004"/>
-        <atom:link type="application/cmis+xml;type=allowableActions" rel="allowableactions" href="http://cmisexample.oasis-open.org/rep1/400d5852-f94a-4734-802d-0de3b6aa6004/allowableactions"/>
-        <atom:link type="application/atom+xml;type=entry" rel="type" href="http://cmisexample.oasis-open.org/rep1/400d5852-f94a-4734-802d-0de3b6aa6004/type"/>
-        <atom:published>2009-07-17T09:13:33.062-07:00</atom:published>
-        <atom:summary type="html">HTML summary of Entry  400d5852-f94a-4734-802d-0de3b6aa6004</atom:summary>
-        <atom:title type="text">CMIS Example Doc as Invoice type</atom:title>
-        <atom:updated>2009-07-17T09:13:33.078-07:00</atom:updated>
-        <atom:link rel="edit-media" href="http://cmisexample.oasis-open.org/rep1/400d5852-f94a-4734-802d-0de3b6aa6004/edit-media"/>
-        <atom:link rel="alternate" href="http://cmisexample.oasis-open.org/rep1/400d5852-f94a-4734-802d-0de3b6aa6004/alternate"/>
-        <atom:link type="application/atom+xml;type=feed" rel="parents" href="http://cmisexample.oasis-open.org/rep1/400d5852-f94a-4734-802d-0de3b6aa6004/parents"/>
-        <atom:link type="application/atom+xml;type=feed" rel="allversions" href="http://cmisexample.oasis-open.org/rep1/400d5852-f94a-4734-802d-0de3b6aa6004/allversions"/>
-        <atom:link type="application/atom+xml;type=entry" rel="latestversion" href="http://cmisexample.oasis-open.org/rep1/400d5852-f94a-4734-802d-0de3b6aa6004/latestversions"/>
-        <atom:link length="4123" type="text/plain" rel="stream" href="http://cmisexample.oasis-open.org/rep1/400d5852-f94a-4734-802d-0de3b6aa6004media"/>
-        <atom:link type="application/atom+xml;type=feed" rel="relationships" href="http://cmisexample.oasis-open.org/rep1/400d5852-f94a-4734-802d-0de3b6aa6004/relationships"/>
-        <cmisra:object>
-            <cmis:properties>
-                <cmis:propertyBoolean localname="rep-cmis:IsImmutable" pdid="cmis:IsImmutable">
-                    <cmis:value>false</cmis:value>
-                </cmis:propertyBoolean>
-                <cmis:propertyDateTime localname="rep-cmis:CreationDate" pdid="cmis:CreationDate">
-                    <cmis:value>2009-07-17T09:13:33.078-07:00</cmis:value>
-                </cmis:propertyDateTime>
-                <cmis:propertyDateTime localname="rep-cmis:LastModificationDate" pdid="cmis:LastModificationDate">
-                    <cmis:value>2009-07-17T09:13:33.078-07:00</cmis:value>
-                </cmis:propertyDateTime>
-                <cmis:propertyId localname="rep-cmis:ObjectId" pdid="cmis:ObjectId">
-                    <cmis:value>400d5852-f94a-4734-802d-0de3b6aa6004</cmis:value>
-                </cmis:propertyId>
-                <cmis:propertyId localname="rep-cmis:ObjectTypeId" pdid="cmis:ObjectTypeId">
-                    <cmis:value>invoice</cmis:value>
-                </cmis:propertyId>
-                <cmis:propertyId localname="rep-cmis:BaseTypeId" pdid="cmis:BaseTypeId">
-                    <cmis:value>cmis:document</cmis:value>
-                </cmis:propertyId>
-                <cmis:propertyString localname="rep-cmis:LastModifiedBy" pdid="cmis:LastModifiedBy">
-                    <cmis:value>Al Brown</cmis:value>
-                </cmis:propertyString>
-                <cmis:propertyString localname="rep-cmis:CreatedBy" pdid="cmis:CreatedBy">
-                    <cmis:value>Al Brown</cmis:value>
-                </cmis:propertyString>
-                <cmis:propertyBoolean localname="rep-cmis:IsLatestVersion" pdid="cmis:IsLatestVersion">
-                    <cmis:value>true</cmis:value>
-                </cmis:propertyBoolean>
-                <cmis:propertyBoolean localname="rep-cmis:IsVersionSeriesCheckedOut" pdid="cmis:IsVersionSeriesCheckedOut">
-                    <cmis:value>false</cmis:value>
-                </cmis:propertyBoolean>
-                <cmis:propertyBoolean localname="rep-cmis:IsMajorVersion" pdid="cmis:IsMajorVersion">
-                    <cmis:value>false</cmis:value>
-                </cmis:propertyBoolean>
-                <cmis:propertyBoolean localname="rep-cmis:IsLatestMajorVersion" pdid="cmis:IsLatestMajorVersion">
-                    <cmis:value>false</cmis:value>
-                </cmis:propertyBoolean>
-                <cmis:propertyString localname="rep-cmis:CheckinComment" pdid="cmis:CheckinComment">
-                    <cmis:value>Checkin comment</cmis:value>
-                </cmis:propertyString>
-                <cmis:propertyString localname="rep-cmis:VersionLabel" pdid="cmis:VersionLabel">
-                    <cmis:value>0.1</cmis:value>
-                </cmis:propertyString>
-                <cmis:propertyString localname="rep-cmis:ContentStreamMimeType" pdid="cmis:ContentStreamMimeType">
-                    <cmis:value>text/plain</cmis:value>
-                </cmis:propertyString>
-                <cmis:propertyString localname="rep-cmis:ContentStreamFileName" pdid="cmis:ContentStreamFileName">
-                    <cmis:value>text.txt</cmis:value>
-                </cmis:propertyString>
-                <cmis:propertyInteger localname="rep-cmis:ContentStreamLength" pdid="cmis:ContentStreamLength">
-                    <cmis:value>4234</cmis:value>
-                </cmis:propertyInteger>
-                <cmis:propertyString displayname="Keywords for Document" localname="keywords" pdid="keywords">
-                    <cmis:value>document</cmis:value>
-                    <cmis:value>example</cmis:value>
-                    <cmis:value>sample</cmis:value>
-                    <cmis:value>cmis</cmis:value>
-                </cmis:propertyString>
-            </cmis:properties>
-            <cmis:allowableActions>
-                <cmis:canDeleteObject>true</cmis:canDeleteObject>
-                <cmis:canUpdateProperties>true</cmis:canUpdateProperties>
-                <cmis:canGetProperties>true</cmis:canGetProperties>
-                <cmis:canGetRelationships>true</cmis:canGetRelationships>
-                <cmis:canGetObjectParents>true</cmis:canGetObjectParents>
-                <cmis:canMoveObject>true</cmis:canMoveObject>
-                <cmis:canDeleteContentStream>true</cmis:canDeleteContentStream>
-                <cmis:canCheckOut>true</cmis:canCheckOut>
-                <cmis:canCancelCheckOut>true</cmis:canCancelCheckOut>
-                <cmis:canCheckIn>true</cmis:canCheckIn>
-                <cmis:canSetContentStream>true</cmis:canSetContentStream>
-                <cmis:canGetAllVersions>true</cmis:canGetAllVersions>
-                <cmis:canAddObjectToFolder>true</cmis:canAddObjectToFolder>
-                <cmis:canRemoveObjectFromFolder>true</cmis:canRemoveObjectFromFolder>
-                <cmis:canGetContentStream>true</cmis:canGetContentStream>
-                <cmis:canApplyPolicy>true</cmis:canApplyPolicy>
-                <cmis:canGetAppliedPolicies>true</cmis:canGetAppliedPolicies>
-                <cmis:canRemovePolicy>true</cmis:canRemovePolicy>
-                <cmis:canCreateDocument>true</cmis:canCreateDocument>
-            </cmis:allowableActions>
-        </cmisra:object>
-    </atom:entry>
-</atom:feed>
diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/examples/FolderEntry.xml b/source/java/org/alfresco/repo/cmis/rest/xsd/examples/FolderEntry.xml
deleted file mode 100644
index 01be82862d..0000000000
--- a/source/java/org/alfresco/repo/cmis/rest/xsd/examples/FolderEntry.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<atom:entry xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901" xmlns:cmism="http://docs.oasis-open.org/ns/cmis/messaging/200901" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:app="http://www.w3.org/2007/app" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200901">
-    <atom:author>
-        <atom:name>Al Brown</atom:name>
-        <atom:uri>http://www.ibm.com/</atom:uri>
-        <atom:email>albertcbrown@us.ibm.com</atom:email>
-    </atom:author>
-    <atom:content src="http://cmisexample.oasis-open.org/rep1/86b91347-4039-4363-9171-1b50b2a20f6c"/>
-    <atom:id>urn:uuid:86b91347-4039-4363-9171-1b50b2a20f6c</atom:id>
-    <atom:link rel="self" href="http://cmisexample.oasis-open.org/rep1/86b91347-4039-4363-9171-1b50b2a20f6c"/>
-    <atom:link rel="edit" href="http://cmisexample.oasis-open.org/rep1/86b91347-4039-4363-9171-1b50b2a20f6c"/>
-    <atom:link type="application/cmis+xml;type=allowableActions" rel="allowableactions" href="http://cmisexample.oasis-open.org/rep1/86b91347-4039-4363-9171-1b50b2a20f6c/allowableactions"/>
-    <atom:link type="application/atom+xml;type=entry" rel="type" href="http://cmisexample.oasis-open.org/rep1/86b91347-4039-4363-9171-1b50b2a20f6c/type"/>
-    <atom:published>2009-07-17T09:13:32.937-07:00</atom:published>
-    <atom:summary type="html">HTML summary of Entry  86b91347-4039-4363-9171-1b50b2a20f6c</atom:summary>
-    <atom:title type="text">CMIS Example Folder as Customer type</atom:title>
-    <atom:updated>2009-07-17T09:13:32.937-07:00</atom:updated>
-    <atom:link type="application/atom+xml;type=feed" rel="relationships" href="http://cmisexample.oasis-open.org/rep1/86b91347-4039-4363-9171-1b50b2a20f6c/relationships"/>
-    <atom:link type="application/atom+xml;type=entry" rel="up" href="http://cmisexample.oasis-open.org/rep1/86b91347-4039-4363-9171-1b50b2a20f6c/up"/>
-    <atom:link type="application/atom+xml;type=feed" rel="down" href="http://cmisexample.oasis-open.org/rep1/86b91347-4039-4363-9171-1b50b2a20f6c/children/flat"/>
-    <atom:link type="application/cmistree+xml" rel="down" href="http://cmisexample.oasis-open.org/rep1/86b91347-4039-4363-9171-1b50b2a20f6c/children/tree"/>
-    <cmisra:object>
-        <cmis:properties>
-            <cmis:propertyBoolean localname="rep-cmis:IsImmutable" pdid="cmis:IsImmutable">
-                <cmis:value>false</cmis:value>
-            </cmis:propertyBoolean>
-            <cmis:propertyDateTime localname="rep-cmis:CreationDate" pdid="cmis:CreationDate">
-                <cmis:value>2009-07-17T09:13:32.937-07:00</cmis:value>
-            </cmis:propertyDateTime>
-            <cmis:propertyDateTime localname="rep-cmis:LastModificationDate" pdid="cmis:LastModificationDate">
-                <cmis:value>2009-07-17T09:13:32.937-07:00</cmis:value>
-            </cmis:propertyDateTime>
-            <cmis:propertyId localname="rep-cmis:ObjectId" pdid="cmis:ObjectId">
-                <cmis:value>86b91347-4039-4363-9171-1b50b2a20f6c</cmis:value>
-            </cmis:propertyId>
-            <cmis:propertyId localname="rep-cmis:ObjectTypeId" pdid="cmis:ObjectTypeId">
-                <cmis:value>customer</cmis:value>
-            </cmis:propertyId>
-            <cmis:propertyId localname="rep-cmis:BaseTypeId" pdid="cmis:BaseTypeId">
-                <cmis:value>cmis:folder</cmis:value>
-            </cmis:propertyId>
-            <cmis:propertyString localname="rep-cmis:LastModifiedBy" pdid="cmis:LastModifiedBy">
-                <cmis:value>Al Brown</cmis:value>
-            </cmis:propertyString>
-            <cmis:propertyString localname="rep-cmis:CreatedBy" pdid="cmis:CreatedBy">
-                <cmis:value>Al Brown</cmis:value>
-            </cmis:propertyString>
-            <cmis:propertyId localname="rep-cmis:ParentId" pdid="cmis:ParentId">
-                <cmis:value>86b91347-4039-4363-9171-1b50b2a20f6cup</cmis:value>
-            </cmis:propertyId>
-        </cmis:properties>
-        <cmis:allowableActions>
-            <cmis:canDeleteObject>true</cmis:canDeleteObject>
-            <cmis:canUpdateProperties>true</cmis:canUpdateProperties>
-            <cmis:canGetProperties>true</cmis:canGetProperties>
-            <cmis:canGetRelationships>true</cmis:canGetRelationships>
-            <cmis:canGetFolderParent>true</cmis:canGetFolderParent>
-            <cmis:canGetDescendants>true</cmis:canGetDescendants>
-            <cmis:canMoveObject>true</cmis:canMoveObject>
-            <cmis:canAddObjectToFolder>true</cmis:canAddObjectToFolder>
-            <cmis:canRemoveObjectFromFolder>true</cmis:canRemoveObjectFromFolder>
-            <cmis:canApplyPolicy>true</cmis:canApplyPolicy>
-            <cmis:canGetAppliedPolicies>true</cmis:canGetAppliedPolicies>
-            <cmis:canRemovePolicy>true</cmis:canRemovePolicy>
-            <cmis:canGetChildren>true</cmis:canGetChildren>
-            <cmis:canCreateFolder>true</cmis:canCreateFolder>
-            <cmis:canDeleteTree>true</cmis:canDeleteTree>
-        </cmis:allowableActions>
-    </cmisra:object>
-</atom:entry>
diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/examples/PolicyEntry.xml b/source/java/org/alfresco/repo/cmis/rest/xsd/examples/PolicyEntry.xml
deleted file mode 100644
index 400a18e3f4..0000000000
--- a/source/java/org/alfresco/repo/cmis/rest/xsd/examples/PolicyEntry.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<atom:entry xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901" xmlns:cmism="http://docs.oasis-open.org/ns/cmis/messaging/200901" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:app="http://www.w3.org/2007/app" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200901">
-    <atom:author>
-        <atom:name>Al Brown</atom:name>
-        <atom:uri>http://www.ibm.com/</atom:uri>
-        <atom:email>albertcbrown@us.ibm.com</atom:email>
-    </atom:author>
-    <atom:content src="http://cmisexample.oasis-open.org/rep1/7910ee91-6201-4868-bcd9-1c72edf6161f"/>
-    <atom:id>urn:uuid:7910ee91-6201-4868-bcd9-1c72edf6161f</atom:id>
-    <atom:link rel="self" href="http://cmisexample.oasis-open.org/rep1/7910ee91-6201-4868-bcd9-1c72edf6161f"/>
-    <atom:link rel="edit" href="http://cmisexample.oasis-open.org/rep1/7910ee91-6201-4868-bcd9-1c72edf6161f"/>
-    <atom:link type="application/cmis+xml;type=allowableActions" rel="allowableactions" href="http://cmisexample.oasis-open.org/rep1/7910ee91-6201-4868-bcd9-1c72edf6161f/allowableactions"/>
-    <atom:link type="application/atom+xml;type=entry" rel="type" href="http://cmisexample.oasis-open.org/rep1/7910ee91-6201-4868-bcd9-1c72edf6161f/type"/>
-    <atom:published>2009-07-17T09:13:32.953-07:00</atom:published>
-    <atom:summary type="html">HTML summary of Entry  7910ee91-6201-4868-bcd9-1c72edf6161f</atom:summary>
-    <atom:title type="text">CMIS Example Policy</atom:title>
-    <atom:updated>2009-07-17T09:13:32.968-07:00</atom:updated>
-    <atom:link type="application/atom+xml;type=feed" rel="parents" href="http://cmisexample.oasis-open.org/rep1/7910ee91-6201-4868-bcd9-1c72edf6161f/parents"/>
-    <atom:link type="application/atom+xml;type=feed" rel="relationships" href="http://cmisexample.oasis-open.org/rep1/7910ee91-6201-4868-bcd9-1c72edf6161f/relationships"/>
-    <cmisra:object>
-        <cmis:properties>
-            <cmis:propertyBoolean localname="rep-cmis:IsImmutable" pdid="cmis:IsImmutable">
-                <cmis:value>false</cmis:value>
-            </cmis:propertyBoolean>
-            <cmis:propertyDateTime localname="rep-cmis:CreationDate" pdid="cmis:CreationDate">
-                <cmis:value>2009-07-17T09:13:32.968-07:00</cmis:value>
-            </cmis:propertyDateTime>
-            <cmis:propertyDateTime localname="rep-cmis:LastModificationDate" pdid="cmis:LastModificationDate">
-                <cmis:value>2009-07-17T09:13:32.968-07:00</cmis:value>
-            </cmis:propertyDateTime>
-            <cmis:propertyId localname="rep-cmis:ObjectId" pdid="cmis:ObjectId">
-                <cmis:value>7910ee91-6201-4868-bcd9-1c72edf6161f</cmis:value>
-            </cmis:propertyId>
-            <cmis:propertyId localname="rep-cmis:ObjectTypeId" pdid="cmis:ObjectTypeId">
-                <cmis:value>policy</cmis:value>
-            </cmis:propertyId>
-            <cmis:propertyId localname="rep-cmis:BaseTypeId" pdid="cmis:BaseTypeId">
-                <cmis:value>cmis:policy</cmis:value>
-            </cmis:propertyId>
-            <cmis:propertyString localname="rep-cmis:LastModifiedBy" pdid="cmis:LastModifiedBy">
-                <cmis:value>Al Brown</cmis:value>
-            </cmis:propertyString>
-            <cmis:propertyString localname="rep-cmis:CreatedBy" pdid="cmis:CreatedBy">
-                <cmis:value>Al Brown</cmis:value>
-            </cmis:propertyString>
-        </cmis:properties>
-        <cmis:allowableActions>
-            <cmis:canDeleteObject>true</cmis:canDeleteObject>
-            <cmis:canUpdateProperties>true</cmis:canUpdateProperties>
-            <cmis:canGetProperties>true</cmis:canGetProperties>
-            <cmis:canGetRelationships>true</cmis:canGetRelationships>
-            <cmis:canMoveObject>true</cmis:canMoveObject>
-            <cmis:canAddObjectToFolder>true</cmis:canAddObjectToFolder>
-            <cmis:canRemoveObjectFromFolder>true</cmis:canRemoveObjectFromFolder>
-            <cmis:canApplyPolicy>true</cmis:canApplyPolicy>
-            <cmis:canGetAppliedPolicies>true</cmis:canGetAppliedPolicies>
-            <cmis:canRemovePolicy>true</cmis:canRemovePolicy>
-            <cmis:canCreatePolicy>true</cmis:canCreatePolicy>
-        </cmis:allowableActions>
-    </cmisra:object>
-</atom:entry>
diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/examples/Query.xml b/source/java/org/alfresco/repo/cmis/rest/xsd/examples/Query.xml
deleted file mode 100644
index 1809b16d59..0000000000
--- a/source/java/org/alfresco/repo/cmis/rest/xsd/examples/Query.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<cmis:query xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901" xmlns:cmism="http://docs.oasis-open.org/ns/cmis/messaging/200901" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:app="http://www.w3.org/2007/app" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200901">
-    <cmis:statement>SELECT * FROM Document</cmis:statement>
-    <cmis:searchAllVersions>true</cmis:searchAllVersions>
-    <cmis:maxItems>50</cmis:maxItems>
-    <cmis:skipCount>0</cmis:skipCount>
-    <x:invalidschema xmlns:x="http://invalid"></x:invalidschema>
-</cmis:query>
diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/examples/RelationshipEntry.xml b/source/java/org/alfresco/repo/cmis/rest/xsd/examples/RelationshipEntry.xml
deleted file mode 100644
index 110fbbc00a..0000000000
--- a/source/java/org/alfresco/repo/cmis/rest/xsd/examples/RelationshipEntry.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<atom:entry xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901" xmlns:cmism="http://docs.oasis-open.org/ns/cmis/messaging/200901" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:app="http://www.w3.org/2007/app" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200901">
-    <atom:author>
-        <atom:name>Al Brown</atom:name>
-        <atom:uri>http://www.ibm.com/</atom:uri>
-        <atom:email>albertcbrown@us.ibm.com</atom:email>
-    </atom:author>
-    <atom:content src="http://cmisexample.oasis-open.org/rep1/bfe1e986-a166-4abf-b2a2-e164ca954738"/>
-    <atom:id>urn:uuid:bfe1e986-a166-4abf-b2a2-e164ca954738</atom:id>
-    <atom:link rel="self" href="http://cmisexample.oasis-open.org/rep1/bfe1e986-a166-4abf-b2a2-e164ca954738"/>
-    <atom:link rel="edit" href="http://cmisexample.oasis-open.org/rep1/bfe1e986-a166-4abf-b2a2-e164ca954738"/>
-    <atom:link type="application/cmis+xml;type=allowableActions" rel="allowableactions" href="http://cmisexample.oasis-open.org/rep1/bfe1e986-a166-4abf-b2a2-e164ca954738/allowableactions"/>
-    <atom:link type="application/atom+xml;type=entry" rel="type" href="http://cmisexample.oasis-open.org/rep1/bfe1e986-a166-4abf-b2a2-e164ca954738/type"/>
-    <atom:published>2009-07-17T09:13:32.984-07:00</atom:published>
-    <atom:summary type="html">HTML summary of Entry  bfe1e986-a166-4abf-b2a2-e164ca954738</atom:summary>
-    <atom:title type="text">CMIS Example Relationship as Compound Document type</atom:title>
-    <atom:updated>2009-07-17T09:13:32.984-07:00</atom:updated>
-    <atom:link type="application/atom+xml;type=entry" rel="source" href="http://cmisexample.oasis-open.org/rep1/bfe1e986-a166-4abf-b2a2-e164ca954738/source"/>
-    <atom:link type="application/atom+xml;type=entry" rel="target" href="http://cmisexample.oasis-open.org/rep1/bfe1e986-a166-4abf-b2a2-e164ca954738/target"/>
-    <cmisra:object>
-        <cmis:properties>
-            <cmis:propertyBoolean localname="rep-cmis:IsImmutable" pdid="cmis:IsImmutable">
-                <cmis:value>false</cmis:value>
-            </cmis:propertyBoolean>
-            <cmis:propertyDateTime localname="rep-cmis:CreationDate" pdid="cmis:CreationDate">
-                <cmis:value>2009-07-17T09:13:32.984-07:00</cmis:value>
-            </cmis:propertyDateTime>
-            <cmis:propertyDateTime localname="rep-cmis:LastModificationDate" pdid="cmis:LastModificationDate">
-                <cmis:value>2009-07-17T09:13:32.984-07:00</cmis:value>
-            </cmis:propertyDateTime>
-            <cmis:propertyId localname="rep-cmis:ObjectId" pdid="cmis:ObjectId">
-                <cmis:value>bfe1e986-a166-4abf-b2a2-e164ca954738</cmis:value>
-            </cmis:propertyId>
-            <cmis:propertyId localname="rep-cmis:ObjectTypeId" pdid="cmis:ObjectTypeId">
-                <cmis:value>compounddocument</cmis:value>
-            </cmis:propertyId>
-            <cmis:propertyId localname="rep-cmis:BaseTypeId" pdid="cmis:BaseTypeId">
-                <cmis:value>cmis:relationship</cmis:value>
-            </cmis:propertyId>
-            <cmis:propertyString localname="rep-cmis:LastModifiedBy" pdid="cmis:LastModifiedBy">
-                <cmis:value>Al Brown</cmis:value>
-            </cmis:propertyString>
-            <cmis:propertyString localname="rep-cmis:CreatedBy" pdid="cmis:CreatedBy">
-                <cmis:value>Al Brown</cmis:value>
-            </cmis:propertyString>
-        </cmis:properties>
-        <cmis:allowableActions>
-            <cmis:canDeleteObject>true</cmis:canDeleteObject>
-            <cmis:canUpdateProperties>true</cmis:canUpdateProperties>
-            <cmis:canGetProperties>true</cmis:canGetProperties>
-            <cmis:canGetRelationships>true</cmis:canGetRelationships>
-            <cmis:canMoveObject>true</cmis:canMoveObject>
-            <cmis:canAddObjectToFolder>true</cmis:canAddObjectToFolder>
-            <cmis:canRemoveObjectFromFolder>true</cmis:canRemoveObjectFromFolder>
-            <cmis:canApplyPolicy>true</cmis:canApplyPolicy>
-            <cmis:canGetAppliedPolicies>true</cmis:canGetAppliedPolicies>
-            <cmis:canRemovePolicy>true</cmis:canRemovePolicy>
-            <cmis:canCreateRelationship>true</cmis:canCreateRelationship>
-        </cmis:allowableActions>
-    </cmisra:object>
-</atom:entry>
diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/examples/Service.xml b/source/java/org/alfresco/repo/cmis/rest/xsd/examples/Service.xml
deleted file mode 100644
index f481f254d6..0000000000
--- a/source/java/org/alfresco/repo/cmis/rest/xsd/examples/Service.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<app:service xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901" xmlns:cmism="http://docs.oasis-open.org/ns/cmis/messaging/200901" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:app="http://www.w3.org/2007/app" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200901">
-    <app:workspace>
-        <atom:title type="text">CMIS Repository</atom:title>
-        <app:collection href="http://cmisexample.oasis-open.org/rep1//checkedout" cmisra:CollectionType="checkedout">
-            <atom:title type="text">Checkedout collection</atom:title>
-            <app:accept>application/atom+xml;type=entry</app:accept>
-        </app:collection>
-        <app:collection href="http://cmisexample.oasis-open.org/rep1//query" cmisra:CollectionType="query">
-            <atom:title type="text">Query collection</atom:title>
-            <app:accept>application/cmisquery+xml</app:accept>
-        </app:collection>
-        <app:collection href="http://cmisexample.oasis-open.org/rep1//rootc" cmisra:CollectionType="root">
-            <atom:title type="text">Root children collection</atom:title>
-        </app:collection>
-        <app:collection href="http://cmisexample.oasis-open.org/rep1//typec" cmisra:CollectionType="types">
-            <atom:title type="text">Types children collection</atom:title>
-        </app:collection>
-        <app:collection href="http://cmisexample.oasis-open.org/rep1//unfiled" cmisra:CollectionType="unfiled">
-            <atom:title type="text">Unfiled collection</atom:title>
-            <app:accept>application/atom+xml;type=entry</app:accept>
-        </app:collection>
-        <app:collection href="http://cmisexample.oasis-open.org/rep1//changes" cmisra:CollectionType="changes">
-            <atom:title type="text">changes collection</atom:title>
-        </app:collection>
-        <atom:link title="Types Descendants feed" type="application/atom+xml;type=feed" rel="http://docs.oasis-open.org/ns/cmis/link/200901/typesdescendants" href="http://cmisexample.oasis-open.org/rep1//typesdescendants"/>
-        <atom:link title="Folder Tree feed for root folder" type="application/atom+xml;type=feed" rel="http://docs.oasis-open.org/ns/cmis/link/200901/foldertree" href="http://cmisexample.oasis-open.org/rep1//foldertree"/>
-        <cmisra:repositoryInfo>
-            <cmis:repositoryId>repid1</cmis:repositoryId>
-            <cmis:repositoryName>Repository1</cmis:repositoryName>
-            <cmis:repositoryRelationship>self</cmis:repositoryRelationship>
-            <cmis:repositoryDescription>CMIS Repository Description</cmis:repositoryDescription>
-            <cmis:vendorName>CMIS Vendor 1</cmis:vendorName>
-            <cmis:productName>CMIS Prototype for VendorX</cmis:productName>
-            <cmis:productVersion>0.62</cmis:productVersion>
-            <cmis:rootFolderId>rootfolder</cmis:rootFolderId>
-            <cmis:latestChangeToken>token-Fri Jul 17 09:13:33 PDT 2009</cmis:latestChangeToken>
-            <cmis:capabilities>
-                <cmis:capabilityACL>manage</cmis:capabilityACL>
-                <cmis:capabilityAllVersionsSearchable>true</cmis:capabilityAllVersionsSearchable>
-                <cmis:capabilityChanges>all</cmis:capabilityChanges>
-                <cmis:capabilityChangesOnType>cmis:document</cmis:capabilityChangesOnType>
-                <cmis:capabilityChangesOnType>cmis:folder</cmis:capabilityChangesOnType>
-                <cmis:capabilityContentStreamUpdatability>anytime</cmis:capabilityContentStreamUpdatability>
-                <cmis:capabilityGetDescendants>true</cmis:capabilityGetDescendants>
-                <cmis:capabilityMultifiling>true</cmis:capabilityMultifiling>
-                <cmis:capabilityPWCSearchable>true</cmis:capabilityPWCSearchable>
-                <cmis:capabilityPWCUpdateable>true</cmis:capabilityPWCUpdateable>
-                <cmis:capabilityQuery>bothcombined</cmis:capabilityQuery>
-                <cmis:capabilityRenditions>read</cmis:capabilityRenditions>
-                <cmis:capabilityUnfiling>true</cmis:capabilityUnfiling>
-                <cmis:capabilityVersionSpecificFiling>true</cmis:capabilityVersionSpecificFiling>
-                <cmis:capabilityJoin>innerandouter</cmis:capabilityJoin>
-            </cmis:capabilities>
-            <cmis:cmisVersionSupported>0.62</cmis:cmisVersionSupported>
-            <cmis:changesIncomplete>true</cmis:changesIncomplete>
-        </cmisra:repositoryInfo>
-        <cmisra:uritemplate>
-            <cmisra:template>http://cmisexample.oasis-open.org/rep1/entrybyid/{id}</cmisra:template>
-            <cmisra:type>entrybyid</cmisra:type>
-            <cmisra:mediatype>application/atom+xml;type=entry</cmisra:mediatype>
-        </cmisra:uritemplate>
-        <cmisra:uritemplate>
-            <cmisra:template>http://cmisexample.oasis-open.org/rep1/folderbypath/{path}</cmisra:template>
-            <cmisra:type>folderbypath</cmisra:type>
-            <cmisra:mediatype>application/atom+xml;type=entry</cmisra:mediatype>
-        </cmisra:uritemplate>
-        <cmisra:uritemplate>
-            <cmisra:template>http://cmisexample.oasis-open.org/rep1/query?q={path}&amp;searchAllVersions={searchAllVersions}&amp;maxItems={maxItems}&amp;skipCount={skipCount}</cmisra:template>
-            <cmisra:type>query</cmisra:type>
-            <cmisra:mediatype>application/atom+xml;type=entry</cmisra:mediatype>
-        </cmisra:uritemplate>
-    </app:workspace>
-</app:service>
diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/examples/TypeDocumentWith.xml b/source/java/org/alfresco/repo/cmis/rest/xsd/examples/TypeDocumentWith.xml
deleted file mode 100644
index 71a7a7f21a..0000000000
--- a/source/java/org/alfresco/repo/cmis/rest/xsd/examples/TypeDocumentWith.xml
+++ /dev/null
@@ -1,401 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<atom:entry xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901" xmlns:cmism="http://docs.oasis-open.org/ns/cmis/messaging/200901" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:app="http://www.w3.org/2007/app" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200901">
-    <atom:author>
-        <atom:name>Al Brown</atom:name>
-        <atom:uri>http://www.ibm.com/</atom:uri>
-        <atom:email>albertcbrown@us.ibm.com</atom:email>
-    </atom:author>
-    <atom:content>Type Definition for document-invoice</atom:content>
-    <atom:id>http://cmisexample.oasis-open.org/rep1/type/document-invoice</atom:id>
-    <atom:link type="application/atom+xml;type=entry" rel="self" href="http://cmisexample.oasis-open.org/rep1/type/document-invoice"/>
-    <atom:link type="application/atomsvc+xml" rel="service" href="http://cmisexample.oasis-open.org/rep1/type/document-invoice"/>
-    <atom:link type="application/atom+xml;type=entry" rel="describedby" href="http://cmisexample.oasis-open.org/rep1/type/cmis:document"/>
-    <atom:link type="application/atom+xml;type=entry" rel="up" href="http://cmisexample.oasis-open.org/rep1/type/document-invoice/parent"/>
-    <atom:link type="application/atom+xml;type=feed" rel="down" href="http://cmisexample.oasis-open.org/rep1/type/document-invoice/children/flat"/>
-    <atom:link type="application/cmistree+xml" rel="down" href="http://cmisexample.oasis-open.org/rep1/type/document-invoice/children/tree"/>
-    <atom:published>2009-07-17T09:13:33.171-07:00</atom:published>
-    <atom:summary type="html">HTML summary of Type Definition  document-invoice</atom:summary>
-    <atom:title type="text">Type Definition - document-invoice</atom:title>
-    <atom:updated>2009-07-17T09:13:33.171-07:00</atom:updated>
-    <app:edited>2009-07-17T09:13:33.171-07:00</app:edited>
-    <cmisra:type xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="cmis:cmisTypeDocumentDefinitionType">
-        <cmis:id>dtdocument-invoice</cmis:id>
-        <cmis:localName>myrepname-document-invoice</cmis:localName>
-        <cmis:displayName>document-invoice</cmis:displayName>
-        <cmis:queryName>document-invoice</cmis:queryName>
-        <cmis:description>Description for type definition document-invoice</cmis:description>
-        <cmis:baseTypeId>cmis:document</cmis:baseTypeId>
-        <cmis:parentId>parent</cmis:parentId>
-        <cmis:creatable>true</cmis:creatable>
-        <cmis:fileable>true</cmis:fileable>
-        <cmis:queryable>false</cmis:queryable>
-        <cmis:fulltextindexed>false</cmis:fulltextindexed>
-        <cmis:includedInSupertypeQuery>true</cmis:includedInSupertypeQuery>
-        <cmis:controllablePolicy>true</cmis:controllablePolicy>
-        <cmis:controllableACL>true</cmis:controllableACL>
-        <cmis:propertyIdDefinition>
-            <cmis:id>cmis:BaseTypeId</cmis:id>
-            <cmis:localName>rep-cmis:BaseTypeId</cmis:localName>
-            <cmis:displayName>cmis:BaseTypeId</cmis:displayName>
-            <cmis:description>Description for cmis:BaseTypeId</cmis:description>
-            <cmis:propertyType>id</cmis:propertyType>
-            <cmis:cardinality>single</cmis:cardinality>
-            <cmis:updatability>readonly</cmis:updatability>
-            <cmis:inherited>true</cmis:inherited>
-            <cmis:required>false</cmis:required>
-            <cmis:queryable>true</cmis:queryable>
-            <cmis:orderable>true</cmis:orderable>
-            <cmis:openChoice>false</cmis:openChoice>
-        </cmis:propertyIdDefinition>
-        <cmis:propertyStringDefinition>
-            <cmis:id>cmis:Name</cmis:id>
-            <cmis:localName>rep-cmis:Name</cmis:localName>
-            <cmis:displayName>cmis:Name</cmis:displayName>
-            <cmis:description>Description for cmis:Name</cmis:description>
-            <cmis:propertyType>string</cmis:propertyType>
-            <cmis:cardinality>single</cmis:cardinality>
-            <cmis:updatability>readwrite</cmis:updatability>
-            <cmis:inherited>true</cmis:inherited>
-            <cmis:required>false</cmis:required>
-            <cmis:queryable>true</cmis:queryable>
-            <cmis:orderable>true</cmis:orderable>
-            <cmis:openChoice>false</cmis:openChoice>
-            <cmis:maxLength>128</cmis:maxLength>
-        </cmis:propertyStringDefinition>
-        <cmis:propertyIdDefinition>
-            <cmis:id>cmis:ObjectId</cmis:id>
-            <cmis:localName>rep-cmis:ObjectId</cmis:localName>
-            <cmis:displayName>cmis:ObjectId</cmis:displayName>
-            <cmis:description>Description for cmis:ObjectId</cmis:description>
-            <cmis:propertyType>id</cmis:propertyType>
-            <cmis:cardinality>single</cmis:cardinality>
-            <cmis:updatability>readonly</cmis:updatability>
-            <cmis:inherited>true</cmis:inherited>
-            <cmis:required>false</cmis:required>
-            <cmis:queryable>true</cmis:queryable>
-            <cmis:orderable>true</cmis:orderable>
-            <cmis:openChoice>false</cmis:openChoice>
-        </cmis:propertyIdDefinition>
-        <cmis:propertyStringDefinition>
-            <cmis:id>cmis:ObjectTypeId</cmis:id>
-            <cmis:localName>rep-cmis:ObjectTypeId</cmis:localName>
-            <cmis:displayName>cmis:ObjectTypeId</cmis:displayName>
-            <cmis:description>Description for cmis:ObjectTypeId</cmis:description>
-            <cmis:propertyType>string</cmis:propertyType>
-            <cmis:cardinality>single</cmis:cardinality>
-            <cmis:updatability>readonly</cmis:updatability>
-            <cmis:inherited>true</cmis:inherited>
-            <cmis:required>false</cmis:required>
-            <cmis:queryable>true</cmis:queryable>
-            <cmis:orderable>true</cmis:orderable>
-            <cmis:openChoice>false</cmis:openChoice>
-            <cmis:maxLength>128</cmis:maxLength>
-        </cmis:propertyStringDefinition>
-        <cmis:propertyStringDefinition>
-            <cmis:id>cmis:BaseTypeId</cmis:id>
-            <cmis:localName>rep-cmis:BaseTypeId</cmis:localName>
-            <cmis:displayName>cmis:BaseTypeId</cmis:displayName>
-            <cmis:description>Description for cmis:BaseTypeId</cmis:description>
-            <cmis:propertyType>string</cmis:propertyType>
-            <cmis:cardinality>single</cmis:cardinality>
-            <cmis:updatability>readonly</cmis:updatability>
-            <cmis:inherited>true</cmis:inherited>
-            <cmis:required>false</cmis:required>
-            <cmis:queryable>true</cmis:queryable>
-            <cmis:orderable>true</cmis:orderable>
-            <cmis:openChoice>false</cmis:openChoice>
-            <cmis:maxLength>128</cmis:maxLength>
-        </cmis:propertyStringDefinition>
-        <cmis:propertyStringDefinition>
-            <cmis:id>cmis:CreatedBy</cmis:id>
-            <cmis:localName>rep-cmis:CreatedBy</cmis:localName>
-            <cmis:displayName>cmis:CreatedBy</cmis:displayName>
-            <cmis:description>Description for cmis:CreatedBy</cmis:description>
-            <cmis:propertyType>string</cmis:propertyType>
-            <cmis:cardinality>single</cmis:cardinality>
-            <cmis:updatability>readonly</cmis:updatability>
-            <cmis:inherited>true</cmis:inherited>
-            <cmis:required>false</cmis:required>
-            <cmis:queryable>true</cmis:queryable>
-            <cmis:orderable>true</cmis:orderable>
-            <cmis:openChoice>false</cmis:openChoice>
-            <cmis:maxLength>128</cmis:maxLength>
-        </cmis:propertyStringDefinition>
-        <cmis:propertyDateTimeDefinition>
-            <cmis:id>cmis:CreationDate</cmis:id>
-            <cmis:localName>rep-cmis:CreationDate</cmis:localName>
-            <cmis:displayName>cmis:CreationDate</cmis:displayName>
-            <cmis:description>Description for cmis:CreationDate</cmis:description>
-            <cmis:propertyType>datetime</cmis:propertyType>
-            <cmis:cardinality>single</cmis:cardinality>
-            <cmis:updatability>readonly</cmis:updatability>
-            <cmis:inherited>true</cmis:inherited>
-            <cmis:required>false</cmis:required>
-            <cmis:queryable>true</cmis:queryable>
-            <cmis:orderable>true</cmis:orderable>
-            <cmis:openChoice>false</cmis:openChoice>
-        </cmis:propertyDateTimeDefinition>
-        <cmis:propertyStringDefinition>
-            <cmis:id>cmis:LastModifiedBy</cmis:id>
-            <cmis:localName>rep-cmis:LastModifiedBy</cmis:localName>
-            <cmis:displayName>cmis:LastModifiedBy</cmis:displayName>
-            <cmis:description>Description for cmis:LastModifiedBy</cmis:description>
-            <cmis:propertyType>string</cmis:propertyType>
-            <cmis:cardinality>single</cmis:cardinality>
-            <cmis:updatability>readonly</cmis:updatability>
-            <cmis:inherited>true</cmis:inherited>
-            <cmis:required>false</cmis:required>
-            <cmis:queryable>true</cmis:queryable>
-            <cmis:orderable>true</cmis:orderable>
-            <cmis:openChoice>false</cmis:openChoice>
-            <cmis:maxLength>128</cmis:maxLength>
-        </cmis:propertyStringDefinition>
-        <cmis:propertyDateTimeDefinition>
-            <cmis:id>cmis:LastModificationDate</cmis:id>
-            <cmis:localName>rep-cmis:LastModificationDate</cmis:localName>
-            <cmis:displayName>cmis:LastModificationDate</cmis:displayName>
-            <cmis:description>Description for cmis:LastModificationDate</cmis:description>
-            <cmis:propertyType>datetime</cmis:propertyType>
-            <cmis:cardinality>single</cmis:cardinality>
-            <cmis:updatability>readonly</cmis:updatability>
-            <cmis:inherited>true</cmis:inherited>
-            <cmis:required>false</cmis:required>
-            <cmis:queryable>true</cmis:queryable>
-            <cmis:orderable>true</cmis:orderable>
-            <cmis:openChoice>false</cmis:openChoice>
-        </cmis:propertyDateTimeDefinition>
-        <cmis:propertyStringDefinition>
-            <cmis:id>cmis:ChangeToken</cmis:id>
-            <cmis:localName>rep-cmis:ChangeToken</cmis:localName>
-            <cmis:displayName>cmis:ChangeToken</cmis:displayName>
-            <cmis:description>Description for cmis:ChangeToken</cmis:description>
-            <cmis:propertyType>string</cmis:propertyType>
-            <cmis:cardinality>single</cmis:cardinality>
-            <cmis:updatability>readonly</cmis:updatability>
-            <cmis:inherited>true</cmis:inherited>
-            <cmis:required>false</cmis:required>
-            <cmis:queryable>true</cmis:queryable>
-            <cmis:orderable>true</cmis:orderable>
-            <cmis:openChoice>false</cmis:openChoice>
-            <cmis:maxLength>128</cmis:maxLength>
-        </cmis:propertyStringDefinition>
-        <cmis:propertyBooleanDefinition>
-            <cmis:id>cmis:IsImmutable</cmis:id>
-            <cmis:localName>rep-cmis:IsImmutable</cmis:localName>
-            <cmis:displayName>cmis:IsImmutable</cmis:displayName>
-            <cmis:description>Description for cmis:IsImmutable</cmis:description>
-            <cmis:propertyType>boolean</cmis:propertyType>
-            <cmis:cardinality>single</cmis:cardinality>
-            <cmis:updatability>readonly</cmis:updatability>
-            <cmis:inherited>true</cmis:inherited>
-            <cmis:required>false</cmis:required>
-            <cmis:queryable>true</cmis:queryable>
-            <cmis:orderable>true</cmis:orderable>
-            <cmis:openChoice>false</cmis:openChoice>
-        </cmis:propertyBooleanDefinition>
-        <cmis:propertyBooleanDefinition>
-            <cmis:id>cmis:IsLatestVersion</cmis:id>
-            <cmis:localName>rep-cmis:IsLatestVersion</cmis:localName>
-            <cmis:displayName>cmis:IsLatestVersion</cmis:displayName>
-            <cmis:description>Description for cmis:IsLatestVersion</cmis:description>
-            <cmis:propertyType>boolean</cmis:propertyType>
-            <cmis:cardinality>single</cmis:cardinality>
-            <cmis:updatability>readonly</cmis:updatability>
-            <cmis:inherited>true</cmis:inherited>
-            <cmis:required>false</cmis:required>
-            <cmis:queryable>true</cmis:queryable>
-            <cmis:orderable>true</cmis:orderable>
-            <cmis:openChoice>false</cmis:openChoice>
-        </cmis:propertyBooleanDefinition>
-        <cmis:propertyBooleanDefinition>
-            <cmis:id>cmis:IsMajorVersion</cmis:id>
-            <cmis:localName>rep-cmis:IsMajorVersion</cmis:localName>
-            <cmis:displayName>cmis:IsMajorVersion</cmis:displayName>
-            <cmis:description>Description for cmis:IsMajorVersion</cmis:description>
-            <cmis:propertyType>boolean</cmis:propertyType>
-            <cmis:cardinality>single</cmis:cardinality>
-            <cmis:updatability>readonly</cmis:updatability>
-            <cmis:inherited>true</cmis:inherited>
-            <cmis:required>false</cmis:required>
-            <cmis:queryable>true</cmis:queryable>
-            <cmis:orderable>true</cmis:orderable>
-            <cmis:openChoice>false</cmis:openChoice>
-        </cmis:propertyBooleanDefinition>
-        <cmis:propertyBooleanDefinition>
-            <cmis:id>cmis:IsLatestMajorVersion</cmis:id>
-            <cmis:localName>rep-cmis:IsLatestMajorVersion</cmis:localName>
-            <cmis:displayName>cmis:IsLatestMajorVersion</cmis:displayName>
-            <cmis:description>Description for cmis:IsLatestMajorVersion</cmis:description>
-            <cmis:propertyType>boolean</cmis:propertyType>
-            <cmis:cardinality>single</cmis:cardinality>
-            <cmis:updatability>readonly</cmis:updatability>
-            <cmis:inherited>true</cmis:inherited>
-            <cmis:required>false</cmis:required>
-            <cmis:queryable>true</cmis:queryable>
-            <cmis:orderable>true</cmis:orderable>
-            <cmis:openChoice>false</cmis:openChoice>
-        </cmis:propertyBooleanDefinition>
-        <cmis:propertyStringDefinition>
-            <cmis:id>cmis:VersionLabel</cmis:id>
-            <cmis:localName>rep-cmis:VersionLabel</cmis:localName>
-            <cmis:displayName>cmis:VersionLabel</cmis:displayName>
-            <cmis:description>Description for cmis:VersionLabel</cmis:description>
-            <cmis:propertyType>string</cmis:propertyType>
-            <cmis:cardinality>single</cmis:cardinality>
-            <cmis:updatability>readonly</cmis:updatability>
-            <cmis:inherited>true</cmis:inherited>
-            <cmis:required>false</cmis:required>
-            <cmis:queryable>true</cmis:queryable>
-            <cmis:orderable>true</cmis:orderable>
-            <cmis:openChoice>false</cmis:openChoice>
-            <cmis:maxLength>128</cmis:maxLength>
-        </cmis:propertyStringDefinition>
-        <cmis:propertyIdDefinition>
-            <cmis:id>cmis:VersionSeriesId</cmis:id>
-            <cmis:localName>rep-cmis:VersionSeriesId</cmis:localName>
-            <cmis:displayName>cmis:VersionSeriesId</cmis:displayName>
-            <cmis:description>Description for cmis:VersionSeriesId</cmis:description>
-            <cmis:propertyType>id</cmis:propertyType>
-            <cmis:cardinality>single</cmis:cardinality>
-            <cmis:updatability>readonly</cmis:updatability>
-            <cmis:inherited>true</cmis:inherited>
-            <cmis:required>false</cmis:required>
-            <cmis:queryable>true</cmis:queryable>
-            <cmis:orderable>true</cmis:orderable>
-            <cmis:openChoice>false</cmis:openChoice>
-        </cmis:propertyIdDefinition>
-        <cmis:propertyBooleanDefinition>
-            <cmis:id>cmis:IsVersionSeriesCheckedOut</cmis:id>
-            <cmis:localName>rep-cmis:IsVersionSeriesCheckedOut</cmis:localName>
-            <cmis:displayName>cmis:IsVersionSeriesCheckedOut</cmis:displayName>
-            <cmis:description>Description for cmis:IsVersionSeriesCheckedOut</cmis:description>
-            <cmis:propertyType>boolean</cmis:propertyType>
-            <cmis:cardinality>single</cmis:cardinality>
-            <cmis:updatability>readonly</cmis:updatability>
-            <cmis:inherited>true</cmis:inherited>
-            <cmis:required>false</cmis:required>
-            <cmis:queryable>true</cmis:queryable>
-            <cmis:orderable>true</cmis:orderable>
-            <cmis:openChoice>false</cmis:openChoice>
-        </cmis:propertyBooleanDefinition>
-        <cmis:propertyStringDefinition>
-            <cmis:id>cmis:VersionSeriesCheckedOutBy</cmis:id>
-            <cmis:localName>rep-cmis:VersionSeriesCheckedOutBy</cmis:localName>
-            <cmis:displayName>cmis:VersionSeriesCheckedOutBy</cmis:displayName>
-            <cmis:description>Description for cmis:VersionSeriesCheckedOutBy</cmis:description>
-            <cmis:propertyType>string</cmis:propertyType>
-            <cmis:cardinality>single</cmis:cardinality>
-            <cmis:updatability>readonly</cmis:updatability>
-            <cmis:inherited>true</cmis:inherited>
-            <cmis:required>false</cmis:required>
-            <cmis:queryable>true</cmis:queryable>
-            <cmis:orderable>true</cmis:orderable>
-            <cmis:openChoice>false</cmis:openChoice>
-            <cmis:maxLength>128</cmis:maxLength>
-        </cmis:propertyStringDefinition>
-        <cmis:propertyIdDefinition>
-            <cmis:id>cmis:VersionSeriesCheckedOutId</cmis:id>
-            <cmis:localName>rep-cmis:VersionSeriesCheckedOutId</cmis:localName>
-            <cmis:displayName>cmis:VersionSeriesCheckedOutId</cmis:displayName>
-            <cmis:description>Description for cmis:VersionSeriesCheckedOutId</cmis:description>
-            <cmis:propertyType>id</cmis:propertyType>
-            <cmis:cardinality>single</cmis:cardinality>
-            <cmis:updatability>readonly</cmis:updatability>
-            <cmis:inherited>true</cmis:inherited>
-            <cmis:required>false</cmis:required>
-            <cmis:queryable>true</cmis:queryable>
-            <cmis:orderable>true</cmis:orderable>
-            <cmis:openChoice>false</cmis:openChoice>
-        </cmis:propertyIdDefinition>
-        <cmis:propertyStringDefinition>
-            <cmis:id>cmis:CheckinComment</cmis:id>
-            <cmis:localName>rep-cmis:CheckinComment</cmis:localName>
-            <cmis:displayName>cmis:CheckinComment</cmis:displayName>
-            <cmis:description>Description for cmis:CheckinComment</cmis:description>
-            <cmis:propertyType>string</cmis:propertyType>
-            <cmis:cardinality>single</cmis:cardinality>
-            <cmis:updatability>readonly</cmis:updatability>
-            <cmis:inherited>true</cmis:inherited>
-            <cmis:required>false</cmis:required>
-            <cmis:queryable>true</cmis:queryable>
-            <cmis:orderable>true</cmis:orderable>
-            <cmis:openChoice>false</cmis:openChoice>
-            <cmis:maxLength>128</cmis:maxLength>
-        </cmis:propertyStringDefinition>
-        <cmis:propertyIntegerDefinition>
-            <cmis:id>cmis:ContentStreamLength</cmis:id>
-            <cmis:localName>rep-cmis:ContentStreamLength</cmis:localName>
-            <cmis:displayName>cmis:ContentStreamLength</cmis:displayName>
-            <cmis:description>Description for cmis:ContentStreamLength</cmis:description>
-            <cmis:propertyType>datetime</cmis:propertyType>
-            <cmis:cardinality>single</cmis:cardinality>
-            <cmis:updatability>readonly</cmis:updatability>
-            <cmis:inherited>true</cmis:inherited>
-            <cmis:required>false</cmis:required>
-            <cmis:queryable>true</cmis:queryable>
-            <cmis:orderable>true</cmis:orderable>
-            <cmis:openChoice>false</cmis:openChoice>
-            <cmis:maxValue>9223372036854775807</cmis:maxValue>
-            <cmis:minValue>-9223372036854775808</cmis:minValue>
-        </cmis:propertyIntegerDefinition>
-        <cmis:propertyStringDefinition>
-            <cmis:id>cmis:ContentStreamMimeType</cmis:id>
-            <cmis:localName>rep-cmis:ContentStreamMimeType</cmis:localName>
-            <cmis:displayName>cmis:ContentStreamMimeType</cmis:displayName>
-            <cmis:description>Description for cmis:ContentStreamMimeType</cmis:description>
-            <cmis:propertyType>string</cmis:propertyType>
-            <cmis:cardinality>single</cmis:cardinality>
-            <cmis:updatability>readonly</cmis:updatability>
-            <cmis:inherited>true</cmis:inherited>
-            <cmis:required>false</cmis:required>
-            <cmis:queryable>true</cmis:queryable>
-            <cmis:orderable>true</cmis:orderable>
-            <cmis:openChoice>false</cmis:openChoice>
-            <cmis:maxLength>128</cmis:maxLength>
-        </cmis:propertyStringDefinition>
-        <cmis:propertyStringDefinition>
-            <cmis:id>cmis:ContentStreamFileName</cmis:id>
-            <cmis:localName>rep-cmis:ContentStreamFileName</cmis:localName>
-            <cmis:displayName>cmis:ContentStreamFileName</cmis:displayName>
-            <cmis:description>Description for cmis:ContentStreamFileName</cmis:description>
-            <cmis:propertyType>string</cmis:propertyType>
-            <cmis:cardinality>single</cmis:cardinality>
-            <cmis:updatability>readonly</cmis:updatability>
-            <cmis:inherited>true</cmis:inherited>
-            <cmis:required>false</cmis:required>
-            <cmis:queryable>true</cmis:queryable>
-            <cmis:orderable>true</cmis:orderable>
-            <cmis:openChoice>false</cmis:openChoice>
-            <cmis:maxLength>128</cmis:maxLength>
-        </cmis:propertyStringDefinition>
-        <cmis:propertyStringDefinition>
-            <cmis:id>custom-customertype</cmis:id>
-            <cmis:localName>rep-custom-customertype</cmis:localName>
-            <cmis:displayName>custom-customertype</cmis:displayName>
-            <cmis:description>Description for custom-customertype</cmis:description>
-            <cmis:propertyType>string</cmis:propertyType>
-            <cmis:cardinality>single</cmis:cardinality>
-            <cmis:updatability>readwrite</cmis:updatability>
-            <cmis:inherited>true</cmis:inherited>
-            <cmis:required>false</cmis:required>
-            <cmis:queryable>true</cmis:queryable>
-            <cmis:orderable>true</cmis:orderable>
-            <cmis:openChoice>false</cmis:openChoice>
-            <cmis:defaultValue localname="rep-custom-customertype" pdid="custom-customertype">
-                <cmis:value>defaultvalue for custom-customertype</cmis:value>
-            </cmis:defaultValue>
-            <cmis:maxLength>128</cmis:maxLength>
-            <cmis:choice displayName="Choice 1">
-                <cmis:value>choice1value</cmis:value>
-            </cmis:choice>
-            <cmis:choice displayName="Choice 2">
-                <cmis:value>choice2value</cmis:value>
-            </cmis:choice>
-            <cmis:choice displayName="Choice 3">
-                <cmis:value>choice3value</cmis:value>
-            </cmis:choice>
-        </cmis:propertyStringDefinition>
-        <cmis:versionable>true</cmis:versionable>
-        <cmis:contentStreamAllowed>allowed</cmis:contentStreamAllowed>
-    </cmisra:type>
-</atom:entry>
diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/examples/TypeDocumentWithout.xml b/source/java/org/alfresco/repo/cmis/rest/xsd/examples/TypeDocumentWithout.xml
deleted file mode 100644
index 3d95ee1bab..0000000000
--- a/source/java/org/alfresco/repo/cmis/rest/xsd/examples/TypeDocumentWithout.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<atom:entry xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901" xmlns:cmism="http://docs.oasis-open.org/ns/cmis/messaging/200901" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:app="http://www.w3.org/2007/app" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200901">
-    <atom:author>
-        <atom:name>Al Brown</atom:name>
-        <atom:uri>http://www.ibm.com/</atom:uri>
-        <atom:email>albertcbrown@us.ibm.com</atom:email>
-    </atom:author>
-    <atom:content>Type Definition for document-invoice</atom:content>
-    <atom:id>http://cmisexample.oasis-open.org/rep1/type/document-invoice</atom:id>
-    <atom:link type="application/atom+xml;type=entry" rel="self" href="http://cmisexample.oasis-open.org/rep1/type/document-invoice"/>
-    <atom:link type="application/atomsvc+xml" rel="service" href="http://cmisexample.oasis-open.org/rep1/type/document-invoice"/>
-    <atom:link type="application/atom+xml;type=entry" rel="describedby" href="http://cmisexample.oasis-open.org/rep1/type/cmis:document"/>
-    <atom:link type="application/atom+xml;type=entry" rel="up" href="http://cmisexample.oasis-open.org/rep1/type/document-invoice/parent"/>
-    <atom:link type="application/atom+xml;type=feed" rel="down" href="http://cmisexample.oasis-open.org/rep1/type/document-invoice/children/flat"/>
-    <atom:link type="application/cmistree+xml" rel="down" href="http://cmisexample.oasis-open.org/rep1/type/document-invoice/children/tree"/>
-    <atom:published>2009-07-17T09:13:33.156-07:00</atom:published>
-    <atom:summary type="html">HTML summary of Type Definition  document-invoice</atom:summary>
-    <atom:title type="text">Type Definition - document-invoice</atom:title>
-    <atom:updated>2009-07-17T09:13:33.156-07:00</atom:updated>
-    <app:edited>2009-07-17T09:13:33.156-07:00</app:edited>
-    <cmisra:type xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="cmis:cmisTypeDocumentDefinitionType">
-        <cmis:id>dtdocument-invoice</cmis:id>
-        <cmis:localName>myrepname-document-invoice</cmis:localName>
-        <cmis:displayName>document-invoice</cmis:displayName>
-        <cmis:queryName>document-invoice</cmis:queryName>
-        <cmis:description>Description for type definition document-invoice</cmis:description>
-        <cmis:baseTypeId>cmis:document</cmis:baseTypeId>
-        <cmis:parentId>parent</cmis:parentId>
-        <cmis:creatable>true</cmis:creatable>
-        <cmis:fileable>true</cmis:fileable>
-        <cmis:queryable>false</cmis:queryable>
-        <cmis:fulltextindexed>false</cmis:fulltextindexed>
-        <cmis:includedInSupertypeQuery>true</cmis:includedInSupertypeQuery>
-        <cmis:controllablePolicy>true</cmis:controllablePolicy>
-        <cmis:controllableACL>true</cmis:controllableACL>
-        <cmis:versionable>true</cmis:versionable>
-        <cmis:contentStreamAllowed>allowed</cmis:contentStreamAllowed>
-    </cmisra:type>
-</atom:entry>
diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/examples/TypeFolderWith.xml b/source/java/org/alfresco/repo/cmis/rest/xsd/examples/TypeFolderWith.xml
deleted file mode 100644
index fbb90cb8df..0000000000
--- a/source/java/org/alfresco/repo/cmis/rest/xsd/examples/TypeFolderWith.xml
+++ /dev/null
@@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<atom:entry xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901" xmlns:cmism="http://docs.oasis-open.org/ns/cmis/messaging/200901" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:app="http://www.w3.org/2007/app" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200901">
-    <atom:author>
-        <atom:name>Al Brown</atom:name>
-        <atom:uri>http://www.ibm.com/</atom:uri>
-        <atom:email>albertcbrown@us.ibm.com</atom:email>
-    </atom:author>
-    <atom:content>Type Definition for folder-invoice</atom:content>
-    <atom:id>http://cmisexample.oasis-open.org/rep1/type/folder-invoice</atom:id>
-    <atom:link type="application/atom+xml;type=entry" rel="self" href="http://cmisexample.oasis-open.org/rep1/type/folder-invoice"/>
-    <atom:link type="application/atomsvc+xml" rel="service" href="http://cmisexample.oasis-open.org/rep1/type/folder-invoice"/>
-    <atom:link type="application/atom+xml;type=entry" rel="describedby" href="http://cmisexample.oasis-open.org/rep1/type/cmis:folder"/>
-    <atom:link type="application/atom+xml;type=entry" rel="up" href="http://cmisexample.oasis-open.org/rep1/type/folder-invoice/parent"/>
-    <atom:link type="application/atom+xml;type=feed" rel="down" href="http://cmisexample.oasis-open.org/rep1/type/folder-invoice/children/flat"/>
-    <atom:link type="application/cmistree+xml" rel="down" href="http://cmisexample.oasis-open.org/rep1/type/folder-invoice/children/tree"/>
-    <atom:published>2009-07-17T09:13:33.187-07:00</atom:published>
-    <atom:summary type="html">HTML summary of Type Definition  folder-invoice</atom:summary>
-    <atom:title type="text">Type Definition - folder-invoice</atom:title>
-    <atom:updated>2009-07-17T09:13:33.187-07:00</atom:updated>
-    <app:edited>2009-07-17T09:13:33.187-07:00</app:edited>
-    <cmisra:type xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="cmis:cmisTypeFolderDefinitionType">
-        <cmis:id>dtfolder-invoice</cmis:id>
-        <cmis:localName>myrepname-folder-invoice</cmis:localName>
-        <cmis:displayName>folder-invoice</cmis:displayName>
-        <cmis:queryName>folder-invoice</cmis:queryName>
-        <cmis:description>Description for type definition folder-invoice</cmis:description>
-        <cmis:baseTypeId>cmis:document</cmis:baseTypeId>
-        <cmis:parentId>parent</cmis:parentId>
-        <cmis:creatable>true</cmis:creatable>
-        <cmis:fileable>true</cmis:fileable>
-        <cmis:queryable>false</cmis:queryable>
-        <cmis:fulltextindexed>false</cmis:fulltextindexed>
-        <cmis:includedInSupertypeQuery>true</cmis:includedInSupertypeQuery>
-        <cmis:controllablePolicy>true</cmis:controllablePolicy>
-        <cmis:controllableACL>true</cmis:controllableACL>
-        <cmis:propertyIdDefinition>
-            <cmis:id>cmis:BaseTypeId</cmis:id>
-            <cmis:localName>rep-cmis:BaseTypeId</cmis:localName>
-            <cmis:displayName>cmis:BaseTypeId</cmis:displayName>
-            <cmis:description>Description for cmis:BaseTypeId</cmis:description>
-            <cmis:propertyType>id</cmis:propertyType>
-            <cmis:cardinality>single</cmis:cardinality>
-            <cmis:updatability>readonly</cmis:updatability>
-            <cmis:inherited>true</cmis:inherited>
-            <cmis:required>false</cmis:required>
-            <cmis:queryable>true</cmis:queryable>
-            <cmis:orderable>true</cmis:orderable>
-            <cmis:openChoice>false</cmis:openChoice>
-        </cmis:propertyIdDefinition>
-        <cmis:propertyStringDefinition>
-            <cmis:id>cmis:Name</cmis:id>
-            <cmis:localName>rep-cmis:Name</cmis:localName>
-            <cmis:displayName>cmis:Name</cmis:displayName>
-            <cmis:description>Description for cmis:Name</cmis:description>
-            <cmis:propertyType>string</cmis:propertyType>
-            <cmis:cardinality>single</cmis:cardinality>
-            <cmis:updatability>readwrite</cmis:updatability>
-            <cmis:inherited>true</cmis:inherited>
-            <cmis:required>false</cmis:required>
-            <cmis:queryable>true</cmis:queryable>
-            <cmis:orderable>true</cmis:orderable>
-            <cmis:openChoice>false</cmis:openChoice>
-            <cmis:maxLength>128</cmis:maxLength>
-        </cmis:propertyStringDefinition>
-        <cmis:propertyIdDefinition>
-            <cmis:id>cmis:ObjectId</cmis:id>
-            <cmis:localName>rep-cmis:ObjectId</cmis:localName>
-            <cmis:displayName>cmis:ObjectId</cmis:displayName>
-            <cmis:description>Description for cmis:ObjectId</cmis:description>
-            <cmis:propertyType>id</cmis:propertyType>
-            <cmis:cardinality>single</cmis:cardinality>
-            <cmis:updatability>readonly</cmis:updatability>
-            <cmis:inherited>true</cmis:inherited>
-            <cmis:required>false</cmis:required>
-            <cmis:queryable>true</cmis:queryable>
-            <cmis:orderable>true</cmis:orderable>
-            <cmis:openChoice>false</cmis:openChoice>
-        </cmis:propertyIdDefinition>
-        <cmis:propertyStringDefinition>
-            <cmis:id>cmis:ObjectTypeId</cmis:id>
-            <cmis:localName>rep-cmis:ObjectTypeId</cmis:localName>
-            <cmis:displayName>cmis:ObjectTypeId</cmis:displayName>
-            <cmis:description>Description for cmis:ObjectTypeId</cmis:description>
-            <cmis:propertyType>string</cmis:propertyType>
-            <cmis:cardinality>single</cmis:cardinality>
-            <cmis:updatability>readonly</cmis:updatability>
-            <cmis:inherited>true</cmis:inherited>
-            <cmis:required>false</cmis:required>
-            <cmis:queryable>true</cmis:queryable>
-            <cmis:orderable>true</cmis:orderable>
-            <cmis:openChoice>false</cmis:openChoice>
-            <cmis:maxLength>128</cmis:maxLength>
-        </cmis:propertyStringDefinition>
-        <cmis:propertyStringDefinition>
-            <cmis:id>cmis:BaseTypeId</cmis:id>
-            <cmis:localName>rep-cmis:BaseTypeId</cmis:localName>
-            <cmis:displayName>cmis:BaseTypeId</cmis:displayName>
-            <cmis:description>Description for cmis:BaseTypeId</cmis:description>
-            <cmis:propertyType>string</cmis:propertyType>
-            <cmis:cardinality>single</cmis:cardinality>
-            <cmis:updatability>readonly</cmis:updatability>
-            <cmis:inherited>true</cmis:inherited>
-            <cmis:required>false</cmis:required>
-            <cmis:queryable>true</cmis:queryable>
-            <cmis:orderable>true</cmis:orderable>
-            <cmis:openChoice>false</cmis:openChoice>
-            <cmis:maxLength>128</cmis:maxLength>
-        </cmis:propertyStringDefinition>
-        <cmis:propertyStringDefinition>
-            <cmis:id>cmis:CreatedBy</cmis:id>
-            <cmis:localName>rep-cmis:CreatedBy</cmis:localName>
-            <cmis:displayName>cmis:CreatedBy</cmis:displayName>
-            <cmis:description>Description for cmis:CreatedBy</cmis:description>
-            <cmis:propertyType>string</cmis:propertyType>
-            <cmis:cardinality>single</cmis:cardinality>
-            <cmis:updatability>readonly</cmis:updatability>
-            <cmis:inherited>true</cmis:inherited>
-            <cmis:required>false</cmis:required>
-            <cmis:queryable>true</cmis:queryable>
-            <cmis:orderable>true</cmis:orderable>
-            <cmis:openChoice>false</cmis:openChoice>
-            <cmis:maxLength>128</cmis:maxLength>
-        </cmis:propertyStringDefinition>
-        <cmis:propertyDateTimeDefinition>
-            <cmis:id>cmis:CreationDate</cmis:id>
-            <cmis:localName>rep-cmis:CreationDate</cmis:localName>
-            <cmis:displayName>cmis:CreationDate</cmis:displayName>
-            <cmis:description>Description for cmis:CreationDate</cmis:description>
-            <cmis:propertyType>datetime</cmis:propertyType>
-            <cmis:cardinality>single</cmis:cardinality>
-            <cmis:updatability>readonly</cmis:updatability>
-            <cmis:inherited>true</cmis:inherited>
-            <cmis:required>false</cmis:required>
-            <cmis:queryable>true</cmis:queryable>
-            <cmis:orderable>true</cmis:orderable>
-            <cmis:openChoice>false</cmis:openChoice>
-        </cmis:propertyDateTimeDefinition>
-        <cmis:propertyStringDefinition>
-            <cmis:id>cmis:LastModifiedBy</cmis:id>
-            <cmis:localName>rep-cmis:LastModifiedBy</cmis:localName>
-            <cmis:displayName>cmis:LastModifiedBy</cmis:displayName>
-            <cmis:description>Description for cmis:LastModifiedBy</cmis:description>
-            <cmis:propertyType>string</cmis:propertyType>
-            <cmis:cardinality>single</cmis:cardinality>
-            <cmis:updatability>readonly</cmis:updatability>
-            <cmis:inherited>true</cmis:inherited>
-            <cmis:required>false</cmis:required>
-            <cmis:queryable>true</cmis:queryable>
-            <cmis:orderable>true</cmis:orderable>
-            <cmis:openChoice>false</cmis:openChoice>
-            <cmis:maxLength>128</cmis:maxLength>
-        </cmis:propertyStringDefinition>
-        <cmis:propertyDateTimeDefinition>
-            <cmis:id>cmis:LastModificationDate</cmis:id>
-            <cmis:localName>rep-cmis:LastModificationDate</cmis:localName>
-            <cmis:displayName>cmis:LastModificationDate</cmis:displayName>
-            <cmis:description>Description for cmis:LastModificationDate</cmis:description>
-            <cmis:propertyType>datetime</cmis:propertyType>
-            <cmis:cardinality>single</cmis:cardinality>
-            <cmis:updatability>readonly</cmis:updatability>
-            <cmis:inherited>true</cmis:inherited>
-            <cmis:required>false</cmis:required>
-            <cmis:queryable>true</cmis:queryable>
-            <cmis:orderable>true</cmis:orderable>
-            <cmis:openChoice>false</cmis:openChoice>
-        </cmis:propertyDateTimeDefinition>
-        <cmis:propertyStringDefinition>
-            <cmis:id>cmis:ChangeToken</cmis:id>
-            <cmis:localName>rep-cmis:ChangeToken</cmis:localName>
-            <cmis:displayName>cmis:ChangeToken</cmis:displayName>
-            <cmis:description>Description for cmis:ChangeToken</cmis:description>
-            <cmis:propertyType>string</cmis:propertyType>
-            <cmis:cardinality>single</cmis:cardinality>
-            <cmis:updatability>readonly</cmis:updatability>
-            <cmis:inherited>true</cmis:inherited>
-            <cmis:required>false</cmis:required>
-            <cmis:queryable>true</cmis:queryable>
-            <cmis:orderable>true</cmis:orderable>
-            <cmis:openChoice>false</cmis:openChoice>
-            <cmis:maxLength>128</cmis:maxLength>
-        </cmis:propertyStringDefinition>
-        <cmis:propertyIdDefinition>
-            <cmis:id>cmis:ParentId</cmis:id>
-            <cmis:localName>rep-cmis:ParentId</cmis:localName>
-            <cmis:displayName>cmis:ParentId</cmis:displayName>
-            <cmis:description>Description for cmis:ParentId</cmis:description>
-            <cmis:propertyType>id</cmis:propertyType>
-            <cmis:cardinality>single</cmis:cardinality>
-            <cmis:updatability>readonly</cmis:updatability>
-            <cmis:inherited>true</cmis:inherited>
-            <cmis:required>false</cmis:required>
-            <cmis:queryable>true</cmis:queryable>
-            <cmis:orderable>true</cmis:orderable>
-            <cmis:openChoice>false</cmis:openChoice>
-        </cmis:propertyIdDefinition>
-        <cmis:propertyIdDefinition>
-            <cmis:id>cmis:AllowedChildObjectTypeNames</cmis:id>
-            <cmis:localName>rep-cmis:AllowedChildObjectTypeNames</cmis:localName>
-            <cmis:displayName>cmis:AllowedChildObjectTypeNames</cmis:displayName>
-            <cmis:description>Description for cmis:AllowedChildObjectTypeNames</cmis:description>
-            <cmis:propertyType>id</cmis:propertyType>
-            <cmis:cardinality>multi</cmis:cardinality>
-            <cmis:updatability>readwrite</cmis:updatability>
-            <cmis:inherited>true</cmis:inherited>
-            <cmis:required>false</cmis:required>
-            <cmis:queryable>true</cmis:queryable>
-            <cmis:orderable>true</cmis:orderable>
-            <cmis:openChoice>false</cmis:openChoice>
-        </cmis:propertyIdDefinition>
-    </cmisra:type>
-</atom:entry>
diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/examples/TypeFolderWithout.xml b/source/java/org/alfresco/repo/cmis/rest/xsd/examples/TypeFolderWithout.xml
deleted file mode 100644
index b38227be64..0000000000
--- a/source/java/org/alfresco/repo/cmis/rest/xsd/examples/TypeFolderWithout.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<atom:entry xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901" xmlns:cmism="http://docs.oasis-open.org/ns/cmis/messaging/200901" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:app="http://www.w3.org/2007/app" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200901">
-    <atom:author>
-        <atom:name>Al Brown</atom:name>
-        <atom:uri>http://www.ibm.com/</atom:uri>
-        <atom:email>albertcbrown@us.ibm.com</atom:email>
-    </atom:author>
-    <atom:content>Type Definition for folder-invoice</atom:content>
-    <atom:id>http://cmisexample.oasis-open.org/rep1/type/folder-invoice</atom:id>
-    <atom:link type="application/atom+xml;type=entry" rel="self" href="http://cmisexample.oasis-open.org/rep1/type/folder-invoice"/>
-    <atom:link type="application/atomsvc+xml" rel="service" href="http://cmisexample.oasis-open.org/rep1/type/folder-invoice"/>
-    <atom:link type="application/atom+xml;type=entry" rel="describedby" href="http://cmisexample.oasis-open.org/rep1/type/cmis:folder"/>
-    <atom:link type="application/atom+xml;type=entry" rel="up" href="http://cmisexample.oasis-open.org/rep1/type/folder-invoice/parent"/>
-    <atom:link type="application/atom+xml;type=feed" rel="down" href="http://cmisexample.oasis-open.org/rep1/type/folder-invoice/children/flat"/>
-    <atom:link type="application/cmistree+xml" rel="down" href="http://cmisexample.oasis-open.org/rep1/type/folder-invoice/children/tree"/>
-    <atom:published>2009-07-17T09:13:33.187-07:00</atom:published>
-    <atom:summary type="html">HTML summary of Type Definition  folder-invoice</atom:summary>
-    <atom:title type="text">Type Definition - folder-invoice</atom:title>
-    <atom:updated>2009-07-17T09:13:33.187-07:00</atom:updated>
-    <app:edited>2009-07-17T09:13:33.187-07:00</app:edited>
-    <cmisra:type xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="cmis:cmisTypeFolderDefinitionType">
-        <cmis:id>dtfolder-invoice</cmis:id>
-        <cmis:localName>myrepname-folder-invoice</cmis:localName>
-        <cmis:displayName>folder-invoice</cmis:displayName>
-        <cmis:queryName>folder-invoice</cmis:queryName>
-        <cmis:description>Description for type definition folder-invoice</cmis:description>
-        <cmis:baseTypeId>cmis:document</cmis:baseTypeId>
-        <cmis:parentId>parent</cmis:parentId>
-        <cmis:creatable>true</cmis:creatable>
-        <cmis:fileable>true</cmis:fileable>
-        <cmis:queryable>false</cmis:queryable>
-        <cmis:fulltextindexed>false</cmis:fulltextindexed>
-        <cmis:includedInSupertypeQuery>true</cmis:includedInSupertypeQuery>
-        <cmis:controllablePolicy>true</cmis:controllablePolicy>
-        <cmis:controllableACL>true</cmis:controllableACL>
-    </cmisra:type>
-</atom:entry>
diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/examples/TypeRelationshipWith.xml b/source/java/org/alfresco/repo/cmis/rest/xsd/examples/TypeRelationshipWith.xml
deleted file mode 100644
index 6ace8bfce3..0000000000
--- a/source/java/org/alfresco/repo/cmis/rest/xsd/examples/TypeRelationshipWith.xml
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<atom:entry xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901" xmlns:cmism="http://docs.oasis-open.org/ns/cmis/messaging/200901" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:app="http://www.w3.org/2007/app" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200901">
-    <atom:author>
-        <atom:name>Al Brown</atom:name>
-        <atom:uri>http://www.ibm.com/</atom:uri>
-        <atom:email>albertcbrown@us.ibm.com</atom:email>
-    </atom:author>
-    <atom:content>Type Definition for security-policy</atom:content>
-    <atom:id>http://cmisexample.oasis-open.org/rep1/type/security-policy</atom:id>
-    <atom:link type="application/atom+xml;type=entry" rel="self" href="http://cmisexample.oasis-open.org/rep1/type/security-policy"/>
-    <atom:link type="application/atomsvc+xml" rel="service" href="http://cmisexample.oasis-open.org/rep1/type/security-policy"/>
-    <atom:link type="application/atom+xml;type=entry" rel="describedby" href="http://cmisexample.oasis-open.org/rep1/type/cmis:policy"/>
-    <atom:link type="application/atom+xml;type=entry" rel="up" href="http://cmisexample.oasis-open.org/rep1/type/security-policy/parent"/>
-    <atom:link type="application/atom+xml;type=feed" rel="down" href="http://cmisexample.oasis-open.org/rep1/type/security-policy/children/flat"/>
-    <atom:link type="application/cmistree+xml" rel="down" href="http://cmisexample.oasis-open.org/rep1/type/security-policy/children/tree"/>
-    <atom:published>2009-07-17T09:13:33.234-07:00</atom:published>
-    <atom:summary type="html">HTML summary of Type Definition  security-policy</atom:summary>
-    <atom:title type="text">Type Definition - security-policy</atom:title>
-    <atom:updated>2009-07-17T09:13:33.234-07:00</atom:updated>
-    <app:edited>2009-07-17T09:13:33.234-07:00</app:edited>
-    <cmisra:type xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="cmis:cmisTypePolicyDefinitionType">
-        <cmis:id>dtsecurity-policy</cmis:id>
-        <cmis:localName>myrepname-security-policy</cmis:localName>
-        <cmis:displayName>security-policy</cmis:displayName>
-        <cmis:queryName>security-policy</cmis:queryName>
-        <cmis:description>Description for type definition security-policy</cmis:description>
-        <cmis:baseTypeId>cmis:document</cmis:baseTypeId>
-        <cmis:parentId>parent</cmis:parentId>
-        <cmis:creatable>true</cmis:creatable>
-        <cmis:fileable>false</cmis:fileable>
-        <cmis:queryable>false</cmis:queryable>
-        <cmis:fulltextindexed>false</cmis:fulltextindexed>
-        <cmis:includedInSupertypeQuery>true</cmis:includedInSupertypeQuery>
-        <cmis:controllablePolicy>true</cmis:controllablePolicy>
-        <cmis:controllableACL>true</cmis:controllableACL>
-        <cmis:propertyIdDefinition>
-            <cmis:id>cmis:BaseTypeId</cmis:id>
-            <cmis:localName>rep-cmis:BaseTypeId</cmis:localName>
-            <cmis:displayName>cmis:BaseTypeId</cmis:displayName>
-            <cmis:description>Description for cmis:BaseTypeId</cmis:description>
-            <cmis:propertyType>id</cmis:propertyType>
-            <cmis:cardinality>single</cmis:cardinality>
-            <cmis:updatability>readonly</cmis:updatability>
-            <cmis:inherited>true</cmis:inherited>
-            <cmis:required>false</cmis:required>
-            <cmis:queryable>true</cmis:queryable>
-            <cmis:orderable>true</cmis:orderable>
-            <cmis:openChoice>false</cmis:openChoice>
-        </cmis:propertyIdDefinition>
-        <cmis:propertyStringDefinition>
-            <cmis:id>cmis:Name</cmis:id>
-            <cmis:localName>rep-cmis:Name</cmis:localName>
-            <cmis:displayName>cmis:Name</cmis:displayName>
-            <cmis:description>Description for cmis:Name</cmis:description>
-            <cmis:propertyType>string</cmis:propertyType>
-            <cmis:cardinality>single</cmis:cardinality>
-            <cmis:updatability>readwrite</cmis:updatability>
-            <cmis:inherited>true</cmis:inherited>
-            <cmis:required>false</cmis:required>
-            <cmis:queryable>true</cmis:queryable>
-            <cmis:orderable>true</cmis:orderable>
-            <cmis:openChoice>false</cmis:openChoice>
-            <cmis:maxLength>128</cmis:maxLength>
-        </cmis:propertyStringDefinition>
-        <cmis:propertyIdDefinition>
-            <cmis:id>cmis:ObjectId</cmis:id>
-            <cmis:localName>rep-cmis:ObjectId</cmis:localName>
-            <cmis:displayName>cmis:ObjectId</cmis:displayName>
-            <cmis:description>Description for cmis:ObjectId</cmis:description>
-            <cmis:propertyType>id</cmis:propertyType>
-            <cmis:cardinality>single</cmis:cardinality>
-            <cmis:updatability>readonly</cmis:updatability>
-            <cmis:inherited>true</cmis:inherited>
-            <cmis:required>false</cmis:required>
-            <cmis:queryable>true</cmis:queryable>
-            <cmis:orderable>true</cmis:orderable>
-            <cmis:openChoice>false</cmis:openChoice>
-        </cmis:propertyIdDefinition>
-        <cmis:propertyStringDefinition>
-            <cmis:id>cmis:ObjectTypeId</cmis:id>
-            <cmis:localName>rep-cmis:ObjectTypeId</cmis:localName>
-            <cmis:displayName>cmis:ObjectTypeId</cmis:displayName>
-            <cmis:description>Description for cmis:ObjectTypeId</cmis:description>
-            <cmis:propertyType>string</cmis:propertyType>
-            <cmis:cardinality>single</cmis:cardinality>
-            <cmis:updatability>readonly</cmis:updatability>
-            <cmis:inherited>true</cmis:inherited>
-            <cmis:required>false</cmis:required>
-            <cmis:queryable>true</cmis:queryable>
-            <cmis:orderable>true</cmis:orderable>
-            <cmis:openChoice>false</cmis:openChoice>
-            <cmis:maxLength>128</cmis:maxLength>
-        </cmis:propertyStringDefinition>
-        <cmis:propertyStringDefinition>
-            <cmis:id>cmis:BaseTypeId</cmis:id>
-            <cmis:localName>rep-cmis:BaseTypeId</cmis:localName>
-            <cmis:displayName>cmis:BaseTypeId</cmis:displayName>
-            <cmis:description>Description for cmis:BaseTypeId</cmis:description>
-            <cmis:propertyType>string</cmis:propertyType>
-            <cmis:cardinality>single</cmis:cardinality>
-            <cmis:updatability>readonly</cmis:updatability>
-            <cmis:inherited>true</cmis:inherited>
-            <cmis:required>false</cmis:required>
-            <cmis:queryable>true</cmis:queryable>
-            <cmis:orderable>true</cmis:orderable>
-            <cmis:openChoice>false</cmis:openChoice>
-            <cmis:maxLength>128</cmis:maxLength>
-        </cmis:propertyStringDefinition>
-        <cmis:propertyStringDefinition>
-            <cmis:id>cmis:CreatedBy</cmis:id>
-            <cmis:localName>rep-cmis:CreatedBy</cmis:localName>
-            <cmis:displayName>cmis:CreatedBy</cmis:displayName>
-            <cmis:description>Description for cmis:CreatedBy</cmis:description>
-            <cmis:propertyType>string</cmis:propertyType>
-            <cmis:cardinality>single</cmis:cardinality>
-            <cmis:updatability>readonly</cmis:updatability>
-            <cmis:inherited>true</cmis:inherited>
-            <cmis:required>false</cmis:required>
-            <cmis:queryable>true</cmis:queryable>
-            <cmis:orderable>true</cmis:orderable>
-            <cmis:openChoice>false</cmis:openChoice>
-            <cmis:maxLength>128</cmis:maxLength>
-        </cmis:propertyStringDefinition>
-        <cmis:propertyDateTimeDefinition>
-            <cmis:id>cmis:CreationDate</cmis:id>
-            <cmis:localName>rep-cmis:CreationDate</cmis:localName>
-            <cmis:displayName>cmis:CreationDate</cmis:displayName>
-            <cmis:description>Description for cmis:CreationDate</cmis:description>
-            <cmis:propertyType>datetime</cmis:propertyType>
-            <cmis:cardinality>single</cmis:cardinality>
-            <cmis:updatability>readonly</cmis:updatability>
-            <cmis:inherited>true</cmis:inherited>
-            <cmis:required>false</cmis:required>
-            <cmis:queryable>true</cmis:queryable>
-            <cmis:orderable>true</cmis:orderable>
-            <cmis:openChoice>false</cmis:openChoice>
-        </cmis:propertyDateTimeDefinition>
-        <cmis:propertyStringDefinition>
-            <cmis:id>cmis:LastModifiedBy</cmis:id>
-            <cmis:localName>rep-cmis:LastModifiedBy</cmis:localName>
-            <cmis:displayName>cmis:LastModifiedBy</cmis:displayName>
-            <cmis:description>Description for cmis:LastModifiedBy</cmis:description>
-            <cmis:propertyType>string</cmis:propertyType>
-            <cmis:cardinality>single</cmis:cardinality>
-            <cmis:updatability>readonly</cmis:updatability>
-            <cmis:inherited>true</cmis:inherited>
-            <cmis:required>false</cmis:required>
-            <cmis:queryable>true</cmis:queryable>
-            <cmis:orderable>true</cmis:orderable>
-            <cmis:openChoice>false</cmis:openChoice>
-            <cmis:maxLength>128</cmis:maxLength>
-        </cmis:propertyStringDefinition>
-        <cmis:propertyDateTimeDefinition>
-            <cmis:id>cmis:LastModificationDate</cmis:id>
-            <cmis:localName>rep-cmis:LastModificationDate</cmis:localName>
-            <cmis:displayName>cmis:LastModificationDate</cmis:displayName>
-            <cmis:description>Description for cmis:LastModificationDate</cmis:description>
-            <cmis:propertyType>datetime</cmis:propertyType>
-            <cmis:cardinality>single</cmis:cardinality>
-            <cmis:updatability>readonly</cmis:updatability>
-            <cmis:inherited>true</cmis:inherited>
-            <cmis:required>false</cmis:required>
-            <cmis:queryable>true</cmis:queryable>
-            <cmis:orderable>true</cmis:orderable>
-            <cmis:openChoice>false</cmis:openChoice>
-        </cmis:propertyDateTimeDefinition>
-        <cmis:propertyStringDefinition>
-            <cmis:id>cmis:ChangeToken</cmis:id>
-            <cmis:localName>rep-cmis:ChangeToken</cmis:localName>
-            <cmis:displayName>cmis:ChangeToken</cmis:displayName>
-            <cmis:description>Description for cmis:ChangeToken</cmis:description>
-            <cmis:propertyType>string</cmis:propertyType>
-            <cmis:cardinality>single</cmis:cardinality>
-            <cmis:updatability>readonly</cmis:updatability>
-            <cmis:inherited>true</cmis:inherited>
-            <cmis:required>false</cmis:required>
-            <cmis:queryable>true</cmis:queryable>
-            <cmis:orderable>true</cmis:orderable>
-            <cmis:openChoice>false</cmis:openChoice>
-            <cmis:maxLength>128</cmis:maxLength>
-        </cmis:propertyStringDefinition>
-        <cmis:propertyStringDefinition>
-            <cmis:id>cmis:PolicyText</cmis:id>
-            <cmis:localName>rep-cmis:PolicyText</cmis:localName>
-            <cmis:displayName>cmis:PolicyText</cmis:displayName>
-            <cmis:description>Description for cmis:PolicyText</cmis:description>
-            <cmis:propertyType>string</cmis:propertyType>
-            <cmis:cardinality>single</cmis:cardinality>
-            <cmis:updatability>readwrite</cmis:updatability>
-            <cmis:inherited>true</cmis:inherited>
-            <cmis:required>false</cmis:required>
-            <cmis:queryable>true</cmis:queryable>
-            <cmis:orderable>true</cmis:orderable>
-            <cmis:openChoice>false</cmis:openChoice>
-            <cmis:maxLength>128</cmis:maxLength>
-        </cmis:propertyStringDefinition>
-    </cmisra:type>
-</atom:entry>
diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/examples/TypeRelationshipWithout.xml b/source/java/org/alfresco/repo/cmis/rest/xsd/examples/TypeRelationshipWithout.xml
deleted file mode 100644
index fce8e306cd..0000000000
--- a/source/java/org/alfresco/repo/cmis/rest/xsd/examples/TypeRelationshipWithout.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<atom:entry xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901" xmlns:cmism="http://docs.oasis-open.org/ns/cmis/messaging/200901" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:app="http://www.w3.org/2007/app" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200901">
-    <atom:author>
-        <atom:name>Al Brown</atom:name>
-        <atom:uri>http://www.ibm.com/</atom:uri>
-        <atom:email>albertcbrown@us.ibm.com</atom:email>
-    </atom:author>
-    <atom:content>Type Definition for security-policy</atom:content>
-    <atom:id>http://cmisexample.oasis-open.org/rep1/type/security-policy</atom:id>
-    <atom:link type="application/atom+xml;type=entry" rel="self" href="http://cmisexample.oasis-open.org/rep1/type/security-policy"/>
-    <atom:link type="application/atomsvc+xml" rel="service" href="http://cmisexample.oasis-open.org/rep1/type/security-policy"/>
-    <atom:link type="application/atom+xml;type=entry" rel="describedby" href="http://cmisexample.oasis-open.org/rep1/type/cmis:policy"/>
-    <atom:link type="application/atom+xml;type=entry" rel="up" href="http://cmisexample.oasis-open.org/rep1/type/security-policy/parent"/>
-    <atom:link type="application/atom+xml;type=feed" rel="down" href="http://cmisexample.oasis-open.org/rep1/type/security-policy/children/flat"/>
-    <atom:link type="application/cmistree+xml" rel="down" href="http://cmisexample.oasis-open.org/rep1/type/security-policy/children/tree"/>
-    <atom:published>2009-07-17T09:13:33.218-07:00</atom:published>
-    <atom:summary type="html">HTML summary of Type Definition  security-policy</atom:summary>
-    <atom:title type="text">Type Definition - security-policy</atom:title>
-    <atom:updated>2009-07-17T09:13:33.218-07:00</atom:updated>
-    <app:edited>2009-07-17T09:13:33.218-07:00</app:edited>
-    <cmisra:type xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="cmis:cmisTypePolicyDefinitionType">
-        <cmis:id>dtsecurity-policy</cmis:id>
-        <cmis:localName>myrepname-security-policy</cmis:localName>
-        <cmis:displayName>security-policy</cmis:displayName>
-        <cmis:queryName>security-policy</cmis:queryName>
-        <cmis:description>Description for type definition security-policy</cmis:description>
-        <cmis:baseTypeId>cmis:document</cmis:baseTypeId>
-        <cmis:parentId>parent</cmis:parentId>
-        <cmis:creatable>true</cmis:creatable>
-        <cmis:fileable>false</cmis:fileable>
-        <cmis:queryable>false</cmis:queryable>
-        <cmis:fulltextindexed>false</cmis:fulltextindexed>
-        <cmis:includedInSupertypeQuery>true</cmis:includedInSupertypeQuery>
-        <cmis:controllablePolicy>true</cmis:controllablePolicy>
-        <cmis:controllableACL>true</cmis:controllableACL>
-    </cmisra:type>
-</atom:entry>
diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/examples/example_atomentry.xml b/source/java/org/alfresco/repo/cmis/rest/xsd/examples/example_atomentry.xml
deleted file mode 100644
index 45e06be6ec..0000000000
--- a/source/java/org/alfresco/repo/cmis/rest/xsd/examples/example_atomentry.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<ns3:entry xmlns:ns1="http://docs.oasis-open.org/ns/cmis/core/200901" xmlns:ns2="http://docs.oasis-open.org/ns/cmis/messaging/200901" xmlns:ns3="http://www.w3.org/2005/Atom" xmlns:ns4="http://www.w3.org/2007/app">
-    <ns3:author>
-        <ns3:name>Al Brown</ns3:name>
-        <ns3:uri>http://www.ibm.com/</ns3:uri>
-        <ns3:email>albertcbrown@us.ibm.com</ns3:email>
-    </ns3:author>
-    <ns3:content src="http://cmisexample.oasis-open.org/rep1/70cfe57f-5d59-4293-9cbc-842107117d65"/>
-    <ns3:id>urn:uuid:70cfe57f-5d59-4293-9cbc-842107117d65</ns3:id>
-    <ns3:link rel="self" href="http://cmisexample.oasis-open.org/rep1/70cfe57f-5d59-4293-9cbc-842107117d65"/>
-    <ns3:link rel="edit" href="http://cmisexample.oasis-open.org/rep1/70cfe57f-5d59-4293-9cbc-842107117d65"/>
-    <ns3:link type="application/cmis+xml;type=allowableActions" rel="allowableactions" href="http://cmisexample.oasis-open.org/rep1/70cfe57f-5d59-4293-9cbc-842107117d65/allowableactions"/>
-    <ns3:link type="application/atom+xml;type=entry" rel="type" href="http://cmisexample.oasis-open.org/rep1/70cfe57f-5d59-4293-9cbc-842107117d65/type"/>
-    <ns3:link rel="edit-media" href="http://cmisexample.oasis-open.org/rep1/70cfe57f-5d59-4293-9cbc-842107117d65/edit-media"/>
-    <ns3:link rel="alternate" href="http://cmisexample.oasis-open.org/rep1/70cfe57f-5d59-4293-9cbc-842107117d65/alternate"/>
-    <ns3:link type="application/atom+xml;type=feed" rel="parents" href="http://cmisexample.oasis-open.org/rep1/70cfe57f-5d59-4293-9cbc-842107117d65/parents"/>
-    <ns3:link type="application/atom+xml;type=feed" rel="allversions" href="http://cmisexample.oasis-open.org/rep1/70cfe57f-5d59-4293-9cbc-842107117d65/allversions"/>
-    <ns3:link type="application/atom+xml;type=entry" rel="latestversion" href="http://cmisexample.oasis-open.org/rep1/70cfe57f-5d59-4293-9cbc-842107117d65/latestversions"/>
-    <ns3:link length="4123" type="text/plain" rel="stream" href="http://cmisexample.oasis-open.org/rep1/70cfe57f-5d59-4293-9cbc-842107117d65media"/>
-    <ns3:link type="application/atom+xml;type=feed" rel="relationships" href="http://cmisexample.oasis-open.org/rep1/70cfe57f-5d59-4293-9cbc-842107117d65/relationships"/>
-    <ns3:published>2009-04-17T13:50:58.656-07:00</ns3:published>
-    <ns3:summary type="html">HTML summary of Entry  70cfe57f-5d59-4293-9cbc-842107117d65</ns3:summary>
-    <ns3:title type="text">CMIS Example Document</ns3:title>
-    <ns3:updated>2009-04-17T13:50:58.656-07:00</ns3:updated>
-    <ns1:terminator xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:nil="true"/>
-</ns3:entry>
diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/examples/example_folderchildren_alfresco.xml b/source/java/org/alfresco/repo/cmis/rest/xsd/examples/example_folderchildren_alfresco.xml
deleted file mode 100644
index 96558bd65f..0000000000
--- a/source/java/org/alfresco/repo/cmis/rest/xsd/examples/example_folderchildren_alfresco.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?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://docs.oasis-open.org/ns/cmis/core/200901" 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 (sea-mist-dev-2 @build-number@)">Alfresco (Labs)</generator>
-<icon>http://localhost:80/alfresco/images/logo/AlfrescoLogo16.ico</icon>
-<id>urn:uuid:ffddcc48-0c6a-4aa3-b9e2-1121c35f6504</id>
-<link rel="self" href="http://localhost:80/alfresco/service/api/path/workspace/SpacesStore/Company%20Home/children"/>
-<link rel="first" href="http://localhost:80/alfresco/service/api/path/workspace/SpacesStore/Company%20Home/children?pageNo=1&amp;guest=&amp;format=atomfeed" type="application/atom+xml;type=feed"/>
-<link rel="last" href="http://localhost:80/alfresco/service/api/path/workspace/SpacesStore/Company%20Home/children?pageNo=1&amp;guest=&amp;format=atomfeed" type="application/atom+xml;type=feed"/>
-<title>Company Home</title>
-<updated>2008-07-11T16:51:03.508+01:00</updated>
-<opensearch:totalResults>6</opensearch:totalResults>
-<opensearch:startIndex>0</opensearch:startIndex>
-<opensearch:itemsPerPage>0</opensearch:itemsPerPage>
-<entry>
-<author><name>System</name></author>
-<content>b09bc7f5-19c3-4ad1-9c5d-8f3a95a3417d</content>
-<id>urn:uuid:b09bc7f5-19c3-4ad1-9c5d-8f3a95a3417d</id>
-<link rel="self" href="http://localhost:80/alfresco/service/api/node/workspace/SpacesStore/b09bc7f5-19c3-4ad1-9c5d-8f3a95a3417d"/>
-<link rel="edit" href="http://localhost:80/alfresco/service/api/node/workspace/SpacesStore/b09bc7f5-19c3-4ad1-9c5d-8f3a95a3417d"/>
-<link rel="cmis-allowableactions" href="http://localhost:80/alfresco/service/api/node/workspace/SpacesStore/b09bc7f5-19c3-4ad1-9c5d-8f3a95a3417d/permissions"/>
-<link rel="cmis-relationships" href="http://localhost:80/alfresco/service/api/node/workspace/SpacesStore/b09bc7f5-19c3-4ad1-9c5d-8f3a95a3417d/associations"/>
-<link rel="cmis-parent" href="http://localhost:80/alfresco/service/api/node/workspace/SpacesStore/b09bc7f5-19c3-4ad1-9c5d-8f3a95a3417d/parent"/>
-<link rel="cmis-children" href="http://localhost:80/alfresco/service/api/node/workspace/SpacesStore/b09bc7f5-19c3-4ad1-9c5d-8f3a95a3417d/children"/>
-<link rel="cmis-descendants" href="http://localhost:80/alfresco/service/api/node/workspace/SpacesStore/b09bc7f5-19c3-4ad1-9c5d-8f3a95a3417d/descendants"/>
-<published>2008-07-11T16:51:03.086+01:00</published>
-<summary>Site Collaboration Spaces</summary>
-<title>Sites</title>
-<updated>2008-07-11T16:51:03.854+01:00</updated>
-<app:edited>2008-07-11T16:51:03.854+01:00</app:edited>
-<alf:icon>http://localhost:80/alfresco/images/icons/space-icon-default-16.gif</alf:icon>
-<cmis:object>
-<cmis:properties>
-<cmis:propertyDateTime id="creationDate"><cmis:value>2008-07-11T16:51:03.086+01:00</cmis:value></cmis:propertyDateTime>
-<cmis:propertyDateTime id="lastModificationDate"><cmis:value>2008-07-11T16:51:03.854+01:00</cmis:value></cmis:propertyDateTime>
-<cmis:propertyId id="objectId"><cmis:value>workspace://SpacesStore/b09bc7f5-19c3-4ad1-9c5d-8f3a95a3417d</cmis:value></cmis:propertyId>
-<cmis:propertyId id="parent"><cmis:value>workspace://SpacesStore/ffddcc48-0c6a-4aa3-b9e2-1121c35f6504</cmis:value></cmis:propertyId>
-<cmis:propertyString id="baseType"><cmis:value>document</cmis:value></cmis:propertyString>
-<cmis:propertyString id="createdBy"><cmis:value>System</cmis:value></cmis:propertyString>
-<cmis:propertyString id="lastModifiedBy"><cmis:value>System</cmis:value></cmis:propertyString>
-<cmis:propertyString id="name"><cmis:value>Sites</cmis:value></cmis:propertyString>
-</cmis:properties>
-</cmis:object>
-</entry>
-</feed>
\ No newline at end of file
diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/xhtml1-strict.xsd b/source/java/org/alfresco/repo/cmis/rest/xsd/xhtml1-strict.xsd
deleted file mode 100644
index eaced8ed93..0000000000
--- a/source/java/org/alfresco/repo/cmis/rest/xsd/xhtml1-strict.xsd
+++ /dev/null
@@ -1,2208 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema version="1.0" xml:lang="en" 
-xmlns:xs="http://www.w3.org/2001/XMLSchema" 
-targetNamespace="http://www.w3.org/1999/xhtml" 
-xmlns="http://www.w3.org/1999/xhtml" 
-xmlns:xml="http://www.w3.org/XML/1998/namespace" 
-elementFormDefault="qualified">
-
-  <xs:annotation>
-    <xs:documentation>
-    XHTML 1.0 (Second Edition) Strict in XML Schema
-
-    This is the same as HTML 4 Strict except for
-    changes due to the differences between XML and SGML.
-
-    Namespace = http://www.w3.org/1999/xhtml
-
-    For further information, see: http://www.w3.org/TR/xhtml1
-
-    Copyright (c) 1998-2002 W3C (MIT, INRIA, Keio),
-    All Rights Reserved. 
-
-    The DTD version is identified by the PUBLIC and SYSTEM identifiers:
-
-    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"
-
-    $Id: xhtml1-strict.xsd,v 1.2 2002/08/28 08:05:44 mimasa Exp $
-    </xs:documentation>
-  </xs:annotation>
-
-  <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-
-  <xs:annotation>
-    <xs:documentation>
-    ================ Character mnemonic entities =========================
-
-    XHTML entity sets are identified by the PUBLIC and SYSTEM identifiers:
-  
-    PUBLIC "-//W3C//ENTITIES Latin 1 for XHTML//EN"
-    SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent"
-
-    PUBLIC "-//W3C//ENTITIES Special for XHTML//EN"
-    SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml-special.ent"
-
-    PUBLIC "-//W3C//ENTITIES Symbols for XHTML//EN"
-    SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml-symbol.ent"
-    </xs:documentation>
-  </xs:annotation>
-
-  <xs:annotation>
-    <xs:documentation>
-    ================== Imported Names ====================================
-    </xs:documentation>
-  </xs:annotation>
-
-  <xs:simpleType name="ContentType">
-    <xs:annotation>
-      <xs:documentation>
-      media type, as per [RFC2045]
-      </xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:string"/>
-  </xs:simpleType>
-
-  <xs:simpleType name="ContentTypes">
-    <xs:annotation>
-      <xs:documentation>
-      comma-separated list of media types, as per [RFC2045]
-      </xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:string"/>
-  </xs:simpleType>
-
-  <xs:simpleType name="Charset">
-    <xs:annotation>
-      <xs:documentation>
-      a character encoding, as per [RFC2045]
-      </xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:string"/>
-  </xs:simpleType>
-
-  <xs:simpleType name="Charsets">
-    <xs:annotation>
-      <xs:documentation>
-      a space separated list of character encodings, as per [RFC2045]
-      </xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:string"/>
-  </xs:simpleType>
-
-  <xs:simpleType name="LanguageCode">
-    <xs:annotation>
-      <xs:documentation>
-      a language code, as per [RFC3066]
-      </xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:language"/>
-  </xs:simpleType>
-
-  <xs:simpleType name="Character">
-    <xs:annotation>
-      <xs:documentation>
-      a single character, as per section 2.2 of [XML]
-      </xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:string">
-      <xs:length value="1" fixed="true"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="Number">
-    <xs:annotation>
-      <xs:documentation>
-      one or more digits
-      </xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:nonNegativeInteger">
-      <xs:pattern value="[0-9]+"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="tabindexNumber">
-    <xs:annotation>
-      <xs:documentation>
-      tabindex attribute specifies the position of the current element
-      in the tabbing order for the current document. This value must be
-      a number between 0 and 32767. User agents should ignore leading zeros. 
-      </xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="Number">
-      <xs:minInclusive value="0"/>
-      <xs:maxInclusive value="32767"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="LinkTypes">
-    <xs:annotation>
-      <xs:documentation>
-      space-separated list of link types
-      </xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:NMTOKENS"/>
-  </xs:simpleType>
-
-  <xs:simpleType name="MediaDesc">
-    <xs:annotation>
-      <xs:documentation>
-      single or comma-separated list of media descriptors
-      </xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:string">
-      <xs:pattern value="[^,]+(,\s*[^,]+)*"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="URI">
-    <xs:annotation>
-      <xs:documentation>
-      a Uniform Resource Identifier, see [RFC2396]
-      </xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:anyURI"/>
-  </xs:simpleType>
-
-  <xs:simpleType name="UriList">
-    <xs:annotation>
-      <xs:documentation>
-      a space separated list of Uniform Resource Identifiers
-      </xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:string"/>
-  </xs:simpleType>
-
-  <xs:simpleType name="Datetime">
-    <xs:annotation>
-      <xs:documentation>
-      date and time information. ISO date format
-      </xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:dateTime"/>
-  </xs:simpleType>
-
-  <xs:simpleType name="Script">
-    <xs:annotation>
-      <xs:documentation>
-      script expression
-      </xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:string"/>
-  </xs:simpleType>
-
-  <xs:simpleType name="StyleSheet">
-    <xs:annotation>
-      <xs:documentation>
-      style sheet data
-      </xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:string"/>
-  </xs:simpleType>
-
-  <xs:simpleType name="Text">
-    <xs:annotation>
-      <xs:documentation>
-      used for titles etc.
-      </xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:string"/>
-  </xs:simpleType>
-
-  <xs:simpleType name="Length">
-    <xs:annotation>
-      <xs:documentation>
-      nn for pixels or nn% for percentage length
-      </xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:string">
-      <xs:pattern value="[-+]?(\d+|\d+(\.\d+)?%)"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="MultiLength">
-    <xs:annotation>
-      <xs:documentation>
-      pixel, percentage, or relative
-      </xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:string">
-      <xs:pattern value="[-+]?(\d+|\d+(\.\d+)?%)|[1-9]?(\d+)?\*"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="Pixels">
-    <xs:annotation>
-      <xs:documentation>
-      integer representing length in pixels
-      </xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:nonNegativeInteger"/>
-  </xs:simpleType>
-
-  <xs:annotation>
-    <xs:documentation>
-    these are used for image maps
-    </xs:documentation>
-  </xs:annotation>
-
-  <xs:simpleType name="Shape">
-    <xs:restriction base="xs:token">
-      <xs:enumeration value="rect"/>
-      <xs:enumeration value="circle"/>
-      <xs:enumeration value="poly"/>
-      <xs:enumeration value="default"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="Coords">
-    <xs:annotation>
-      <xs:documentation>
-      comma separated list of lengths
-      </xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:string">
-      <xs:pattern value="[-+]?(\d+|\d+(\.\d+)?%)(,\s*[-+]?(\d+|\d+(\.\d+)?%))*"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:annotation>
-    <xs:documentation>
-    =================== Generic Attributes ===============================
-    </xs:documentation>
-  </xs:annotation>
-
-  <xs:attributeGroup name="coreattrs">
-    <xs:annotation>
-      <xs:documentation>
-      core attributes common to most elements
-      id       document-wide unique id
-      class    space separated list of classes
-      style    associated style info
-      title    advisory title/amplification
-      </xs:documentation>
-    </xs:annotation>
-    <xs:attribute name="id" type="xs:ID"/>
-    <xs:attribute name="class" type="xs:NMTOKENS"/>
-    <xs:attribute name="style" type="StyleSheet"/>
-    <xs:attribute name="title" type="Text"/>
-  </xs:attributeGroup>
-
-  <xs:attributeGroup name="i18n">
-    <xs:annotation>
-      <xs:documentation>
-      internationalization attributes
-      lang        language code (backwards compatible)
-      xml:lang    language code (as per XML 1.0 spec)
-      dir         direction for weak/neutral text
-      </xs:documentation>
-    </xs:annotation>
-    <xs:attribute name="lang" type="LanguageCode"/>
-    <xs:attribute ref="xml:lang"/>
-    <xs:attribute name="dir">
-      <xs:simpleType>
-        <xs:restriction base="xs:token">
-          <xs:enumeration value="ltr"/>
-          <xs:enumeration value="rtl"/>
-        </xs:restriction>
-      </xs:simpleType>
-    </xs:attribute>
-  </xs:attributeGroup>
-
-  <xs:attributeGroup name="events">
-    <xs:annotation>
-      <xs:documentation>
-      attributes for common UI events
-      onclick     a pointer button was clicked
-      ondblclick  a pointer button was double clicked
-      onmousedown a pointer button was pressed down
-      onmouseup   a pointer button was released
-      onmousemove a pointer was moved onto the element
-      onmouseout  a pointer was moved away from the element
-      onkeypress  a key was pressed and released
-      onkeydown   a key was pressed down
-      onkeyup     a key was released
-      </xs:documentation>
-    </xs:annotation>
-    <xs:attribute name="onclick" type="Script"/>
-    <xs:attribute name="ondblclick" type="Script"/>
-    <xs:attribute name="onmousedown" type="Script"/>
-    <xs:attribute name="onmouseup" type="Script"/>
-    <xs:attribute name="onmouseover" type="Script"/>
-    <xs:attribute name="onmousemove" type="Script"/>
-    <xs:attribute name="onmouseout" type="Script"/>
-    <xs:attribute name="onkeypress" type="Script"/>
-    <xs:attribute name="onkeydown" type="Script"/>
-    <xs:attribute name="onkeyup" type="Script"/>
-  </xs:attributeGroup>
-
-  <xs:attributeGroup name="focus">
-    <xs:annotation>
-      <xs:documentation>
-      attributes for elements that can get the focus
-      accesskey   accessibility key character
-      tabindex    position in tabbing order
-      onfocus     the element got the focus
-      onblur      the element lost the focus
-      </xs:documentation>
-    </xs:annotation>
-    <xs:attribute name="accesskey" type="Character"/>
-    <xs:attribute name="tabindex" type="tabindexNumber"/>
-    <xs:attribute name="onfocus" type="Script"/>
-    <xs:attribute name="onblur" type="Script"/>
-  </xs:attributeGroup>
-
-  <xs:attributeGroup name="attrs">
-    <xs:attributeGroup ref="coreattrs"/>
-    <xs:attributeGroup ref="i18n"/>
-    <xs:attributeGroup ref="events"/>
-  </xs:attributeGroup>
-
-  <xs:annotation>
-    <xs:documentation>
-    =================== Text Elements ====================================
-    </xs:documentation>
-  </xs:annotation>
-
-  <xs:group name="special.pre">
-    <xs:choice>
-      <xs:element ref="br"/>
-      <xs:element ref="span"/>
-      <xs:element ref="bdo"/>
-      <xs:element ref="map"/>
-    </xs:choice>
-  </xs:group>
-
-  <xs:group name="special">
-    <xs:choice>
-      <xs:group ref="special.pre"/>
-      <xs:element ref="object"/>
-      <xs:element ref="img"/>
-    </xs:choice>
-  </xs:group>
-
-  <xs:group name="fontstyle">
-    <xs:choice>
-      <xs:element ref="tt"/>
-      <xs:element ref="i"/>
-      <xs:element ref="b"/>
-      <xs:element ref="big"/>
-      <xs:element ref="small"/>
-    </xs:choice>
-  </xs:group>
-
-  <xs:group name="phrase">
-    <xs:choice>
-      <xs:element ref="em"/>
-      <xs:element ref="strong"/>
-      <xs:element ref="dfn"/>
-      <xs:element ref="code"/>
-      <xs:element ref="q"/>
-      <xs:element ref="samp"/>
-      <xs:element ref="kbd"/>
-      <xs:element ref="var"/>
-      <xs:element ref="cite"/>
-      <xs:element ref="abbr"/>
-      <xs:element ref="acronym"/>
-      <xs:element ref="sub"/>
-      <xs:element ref="sup"/>
-    </xs:choice>
-  </xs:group>
-
-  <xs:group name="inline.forms">
-    <xs:choice>
-      <xs:element ref="input"/>
-      <xs:element ref="select"/>
-      <xs:element ref="textarea"/>
-      <xs:element ref="label"/>
-      <xs:element ref="button"/>
-    </xs:choice>
-  </xs:group>
-
-  <xs:group name="misc.inline">
-    <xs:choice>
-      <xs:element ref="ins"/>
-      <xs:element ref="del"/>
-      <xs:element ref="script"/>
-    </xs:choice>
-  </xs:group>
-
-  <xs:group name="misc">
-    <xs:annotation>
-      <xs:documentation>
-      these can only occur at block level
-      </xs:documentation>
-    </xs:annotation>
-    <xs:choice>
-      <xs:element ref="noscript"/>
-      <xs:group ref="misc.inline"/>
-    </xs:choice>
-  </xs:group>
-
-  <xs:group name="inline">
-    <xs:choice>
-      <xs:element ref="a"/>
-      <xs:group ref="special"/>
-      <xs:group ref="fontstyle"/>
-      <xs:group ref="phrase"/>
-      <xs:group ref="inline.forms"/>
-    </xs:choice>
-  </xs:group>
-
-  <xs:complexType name="Inline" mixed="true">
-    <xs:annotation>
-      <xs:documentation>
-      "Inline" covers inline or "text-level" elements
-      </xs:documentation>
-    </xs:annotation>
-    <xs:choice minOccurs="0" maxOccurs="unbounded">
-      <xs:group ref="inline"/>
-      <xs:group ref="misc.inline"/>
-    </xs:choice>
-  </xs:complexType>
-
-  <xs:annotation>
-    <xs:documentation>
-    ================== Block level elements ==============================
-    </xs:documentation>
-  </xs:annotation>
-
-  <xs:group name="heading">
-    <xs:choice>
-      <xs:element ref="h1"/>
-      <xs:element ref="h2"/>
-      <xs:element ref="h3"/>
-      <xs:element ref="h4"/>
-      <xs:element ref="h5"/>
-      <xs:element ref="h6"/>
-    </xs:choice>
-  </xs:group>
-
-  <xs:group name="lists">
-    <xs:choice>
-      <xs:element ref="ul"/>
-      <xs:element ref="ol"/>
-      <xs:element ref="dl"/>
-    </xs:choice>
-  </xs:group>
-
-  <xs:group name="blocktext">
-    <xs:choice>
-      <xs:element ref="pre"/>
-      <xs:element ref="hr"/>
-      <xs:element ref="blockquote"/>
-      <xs:element ref="address"/>
-    </xs:choice>
-  </xs:group>
-
-  <xs:group name="block">
-    <xs:choice>
-      <xs:element ref="p"/>
-      <xs:group ref="heading"/>
-      <xs:element ref="div"/>
-      <xs:group ref="lists"/>
-      <xs:group ref="blocktext"/>
-      <xs:element ref="fieldset"/>
-      <xs:element ref="table"/>
-    </xs:choice>
-  </xs:group>
-
-  <xs:complexType name="Block">
-    <xs:choice minOccurs="0" maxOccurs="unbounded">
-      <xs:group ref="block"/>
-      <xs:element ref="form"/>
-      <xs:group ref="misc"/>
-    </xs:choice>
-  </xs:complexType>
-
-  <xs:complexType name="Flow" mixed="true">
-    <xs:annotation>
-      <xs:documentation>
-      "Flow" mixes block and inline and is used for list items etc.
-      </xs:documentation>
-    </xs:annotation>
-    <xs:choice minOccurs="0" maxOccurs="unbounded">
-      <xs:group ref="block"/>
-      <xs:element ref="form"/>
-      <xs:group ref="inline"/>
-      <xs:group ref="misc"/>
-    </xs:choice>
-  </xs:complexType>
-
-  <xs:annotation>
-    <xs:documentation>
-    ================== Content models for exclusions =====================
-    </xs:documentation>
-  </xs:annotation>
-
-  <xs:complexType name="a.content" mixed="true">
-    <xs:annotation>
-      <xs:documentation>
-      a elements use "Inline" excluding a
-      </xs:documentation>
-    </xs:annotation>
-    <xs:choice minOccurs="0" maxOccurs="unbounded">
-      <xs:group ref="special"/>
-      <xs:group ref="fontstyle"/>
-      <xs:group ref="phrase"/>
-      <xs:group ref="inline.forms"/>
-      <xs:group ref="misc.inline"/>
-    </xs:choice>
-  </xs:complexType>
-
-  <xs:complexType name="pre.content" mixed="true">
-    <xs:annotation>
-      <xs:documentation>
-      pre uses "Inline" excluding big, small, sup or sup
-      </xs:documentation>
-    </xs:annotation>
-    <xs:choice minOccurs="0" maxOccurs="unbounded">
-      <xs:element ref="a"/>
-      <xs:group ref="fontstyle"/>
-      <xs:group ref="phrase"/>
-      <xs:group ref="special.pre"/>
-      <xs:group ref="misc.inline"/>
-      <xs:group ref="inline.forms"/>
-    </xs:choice>
-  </xs:complexType>
-
-  <xs:complexType name="form.content">
-    <xs:annotation>
-      <xs:documentation>
-      form uses "Block" excluding form
-      </xs:documentation>
-    </xs:annotation>
-    <xs:choice minOccurs="0" maxOccurs="unbounded">
-      <xs:group ref="block"/>
-      <xs:group ref="misc"/>
-    </xs:choice>
-  </xs:complexType>
-
-  <xs:complexType name="button.content" mixed="true">
-    <xs:annotation>
-      <xs:documentation>
-      button uses "Flow" but excludes a, form and form controls
-      </xs:documentation>
-    </xs:annotation>
-    <xs:choice minOccurs="0" maxOccurs="unbounded">
-      <xs:element ref="p"/>
-      <xs:group ref="heading"/>
-      <xs:element ref="div"/>
-      <xs:group ref="lists"/>
-      <xs:group ref="blocktext"/>
-      <xs:element ref="table"/>
-      <xs:group ref="special"/>
-      <xs:group ref="fontstyle"/>
-      <xs:group ref="phrase"/>
-      <xs:group ref="misc"/>
-    </xs:choice>
-  </xs:complexType>
-
-  <xs:annotation>
-    <xs:documentation>
-    ================ Document Structure ==================================
-    </xs:documentation>
-  </xs:annotation>
-
-  <xs:element name="html">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="head"/>
-        <xs:element ref="body"/>
-      </xs:sequence>
-      <xs:attributeGroup ref="i18n"/>
-      <xs:attribute name="id" type="xs:ID"/>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:annotation>
-    <xs:documentation>
-    ================ Document Head =======================================
-    </xs:documentation>
-  </xs:annotation>
-
-  <xs:group name="head.misc">
-    <xs:sequence>
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="script"/>
-        <xs:element ref="style"/>
-        <xs:element ref="meta"/>
-        <xs:element ref="link"/>
-        <xs:element ref="object"/>
-      </xs:choice>
-    </xs:sequence>
-  </xs:group>
-
-  <xs:element name="head">
-    <xs:annotation>
-      <xs:documentation>
-      content model is "head.misc" combined with a single
-      title and an optional base element in any order
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:sequence>
-        <xs:group ref="head.misc"/>
-        <xs:choice>
-          <xs:sequence>
-            <xs:element ref="title"/>
-            <xs:group ref="head.misc"/>
-            <xs:sequence minOccurs="0">
-              <xs:element ref="base"/>
-              <xs:group ref="head.misc"/>
-            </xs:sequence>
-          </xs:sequence>
-          <xs:sequence>
-            <xs:element ref="base"/>
-            <xs:group ref="head.misc"/>
-            <xs:element ref="title"/>
-            <xs:group ref="head.misc"/>
-          </xs:sequence>
-        </xs:choice>
-      </xs:sequence>
-      <xs:attributeGroup ref="i18n"/>
-      <xs:attribute name="id" type="xs:ID"/>
-      <xs:attribute name="profile" type="URI"/>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="title">
-    <xs:annotation>
-      <xs:documentation>
-      The title element is not considered part of the flow of text.
-      It should be displayed, for example as the page header or
-      window title. Exactly one title is required per document.
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType mixed="true">
-      <xs:attributeGroup ref="i18n"/>
-      <xs:attribute name="id" type="xs:ID"/>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="base">
-    <xs:annotation>
-      <xs:documentation>
-      document base URI
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:attribute name="href" use="required" type="URI"/>
-      <xs:attribute name="id" type="xs:ID"/>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="meta">
-    <xs:annotation>
-      <xs:documentation>
-      generic metainformation
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:attributeGroup ref="i18n"/>
-      <xs:attribute name="id" type="xs:ID"/>
-      <xs:attribute name="http-equiv"/>
-      <xs:attribute name="name"/>
-      <xs:attribute name="content" use="required"/>
-      <xs:attribute name="scheme"/>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="link">
-    <xs:annotation>
-      <xs:documentation>
-      Relationship values can be used in principle:
-
-      a) for document specific toolbars/menus when used
-         with the link element in document head e.g.
-           start, contents, previous, next, index, end, help
-      b) to link to a separate style sheet (rel="stylesheet")
-      c) to make a link to a script (rel="script")
-      d) by stylesheets to control how collections of
-         html nodes are rendered into printed documents
-      e) to make a link to a printable version of this document
-         e.g. a PostScript or PDF version (rel="alternate" media="print")
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:attributeGroup ref="attrs"/>
-      <xs:attribute name="charset" type="Charset"/>
-      <xs:attribute name="href" type="URI"/>
-      <xs:attribute name="hreflang" type="LanguageCode"/>
-      <xs:attribute name="type" type="ContentType"/>
-      <xs:attribute name="rel" type="LinkTypes"/>
-      <xs:attribute name="rev" type="LinkTypes"/>
-      <xs:attribute name="media" type="MediaDesc"/>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="style">
-    <xs:annotation>
-      <xs:documentation>
-      style info, which may include CDATA sections
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType mixed="true">
-      <xs:attributeGroup ref="i18n"/>
-      <xs:attribute name="id" type="xs:ID"/>
-      <xs:attribute name="type" use="required" type="ContentType"/>
-      <xs:attribute name="media" type="MediaDesc"/>
-      <xs:attribute name="title" type="Text"/>
-      <xs:attribute ref="xml:space" fixed="preserve"/>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="script">
-    <xs:annotation>
-      <xs:documentation>
-      script statements, which may include CDATA sections
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType mixed="true">
-      <xs:attribute name="id" type="xs:ID"/>
-      <xs:attribute name="charset" type="Charset"/>
-      <xs:attribute name="type" use="required" type="ContentType"/>
-      <xs:attribute name="src" type="URI"/>
-      <xs:attribute name="defer">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="defer"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-      <xs:attribute ref="xml:space" fixed="preserve"/>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="noscript">
-    <xs:annotation>
-      <xs:documentation>
-      alternate content container for non script-based rendering
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:complexContent>
-        <xs:extension base="Block">
-          <xs:attributeGroup ref="attrs"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:annotation>
-    <xs:documentation>
-    =================== Document Body ====================================
-    </xs:documentation>
-  </xs:annotation>
-
-  <xs:element name="body">
-    <xs:complexType>
-      <xs:complexContent>
-        <xs:extension base="Block">
-          <xs:attributeGroup ref="attrs"/>
-          <xs:attribute name="onload" type="Script"/>
-          <xs:attribute name="onunload" type="Script"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="div">
-    <xs:annotation>
-      <xs:documentation>
-      generic language/style container      
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType mixed="true">
-      <xs:complexContent>
-        <xs:extension base="Flow">
-          <xs:attributeGroup ref="attrs"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:annotation>
-    <xs:documentation>
-    =================== Paragraphs =======================================
-    </xs:documentation>
-  </xs:annotation>
-
-  <xs:element name="p">
-    <xs:complexType mixed="true">
-      <xs:complexContent>
-        <xs:extension base="Inline">
-          <xs:attributeGroup ref="attrs"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:annotation>
-    <xs:documentation>
-    =================== Headings =========================================
-
-    There are six levels of headings from h1 (the most important)
-    to h6 (the least important).
-    </xs:documentation>
-  </xs:annotation>
-
-  <xs:element name="h1">
-    <xs:complexType mixed="true">
-      <xs:complexContent>
-        <xs:extension base="Inline">
-          <xs:attributeGroup ref="attrs"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="h2">
-    <xs:complexType mixed="true">
-      <xs:complexContent>
-        <xs:extension base="Inline">
-          <xs:attributeGroup ref="attrs"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="h3">
-    <xs:complexType mixed="true">
-      <xs:complexContent>
-        <xs:extension base="Inline">
-          <xs:attributeGroup ref="attrs"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="h4">
-    <xs:complexType mixed="true">
-      <xs:complexContent>
-        <xs:extension base="Inline">
-          <xs:attributeGroup ref="attrs"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="h5">
-    <xs:complexType mixed="true">
-      <xs:complexContent>
-        <xs:extension base="Inline">
-          <xs:attributeGroup ref="attrs"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="h6">
-    <xs:complexType mixed="true">
-      <xs:complexContent>
-        <xs:extension base="Inline">
-          <xs:attributeGroup ref="attrs"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:annotation>
-    <xs:documentation>
-    =================== Lists ============================================
-    </xs:documentation>
-  </xs:annotation>
-
-  <xs:element name="ul">
-    <xs:annotation>
-      <xs:documentation>
-      Unordered list
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element maxOccurs="unbounded" ref="li"/>
-      </xs:sequence>
-      <xs:attributeGroup ref="attrs"/>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="ol">
-    <xs:annotation>
-      <xs:documentation>
-      Ordered (numbered) list
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element maxOccurs="unbounded" ref="li"/>
-      </xs:sequence>
-      <xs:attributeGroup ref="attrs"/>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="li">
-    <xs:annotation>
-      <xs:documentation>
-      list item
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType mixed="true">
-      <xs:complexContent>
-        <xs:extension base="Flow">
-          <xs:attributeGroup ref="attrs"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:annotation>
-    <xs:documentation>
-    definition lists - dt for term, dd for its definition
-    </xs:documentation>
-  </xs:annotation>
-
-  <xs:element name="dl">
-    <xs:complexType>
-      <xs:choice maxOccurs="unbounded">
-        <xs:element ref="dt"/>
-        <xs:element ref="dd"/>
-      </xs:choice>
-      <xs:attributeGroup ref="attrs"/>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="dt">
-    <xs:complexType mixed="true">
-      <xs:complexContent>
-        <xs:extension base="Inline">
-          <xs:attributeGroup ref="attrs"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="dd">
-    <xs:complexType mixed="true">
-      <xs:complexContent>
-        <xs:extension base="Flow">
-          <xs:attributeGroup ref="attrs"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:annotation>
-    <xs:documentation>
-    =================== Address ==========================================
-    </xs:documentation>
-  </xs:annotation>
-
-  <xs:element name="address">
-    <xs:annotation>
-      <xs:documentation>
-      information on author
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType mixed="true">
-      <xs:complexContent>
-        <xs:extension base="Inline">
-          <xs:attributeGroup ref="attrs"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:annotation>
-    <xs:documentation>
-    =================== Horizontal Rule ==================================
-    </xs:documentation>
-  </xs:annotation>
-
-  <xs:element name="hr">
-    <xs:complexType>
-      <xs:attributeGroup ref="attrs"/>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:annotation>
-    <xs:documentation>
-    =================== Preformatted Text ================================
-    </xs:documentation>
-  </xs:annotation>
-
-  <xs:element name="pre">
-    <xs:annotation>
-      <xs:documentation>
-      content is "Inline" excluding "img|object|big|small|sub|sup"
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType mixed="true">
-      <xs:complexContent>
-        <xs:extension base="pre.content">
-           <xs:attributeGroup ref="attrs"/>
-           <xs:attribute ref="xml:space" fixed="preserve"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:annotation>
-    <xs:documentation>
-    =================== Block-like Quotes ================================
-    </xs:documentation>
-  </xs:annotation>
-
-  <xs:element name="blockquote">
-    <xs:complexType>
-      <xs:complexContent>
-        <xs:extension base="Block">
-          <xs:attributeGroup ref="attrs"/>
-          <xs:attribute name="cite" type="URI"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:annotation>
-    <xs:documentation>
-    =================== Inserted/Deleted Text ============================
-
-    ins/del are allowed in block and inline content, but its
-    inappropriate to include block content within an ins element
-    occurring in inline content.
-    </xs:documentation>
-  </xs:annotation>
-
-  <xs:element name="ins">
-    <xs:complexType mixed="true">
-      <xs:complexContent>
-        <xs:extension base="Flow">
-          <xs:attributeGroup ref="attrs"/>
-          <xs:attribute name="cite" type="URI"/>
-          <xs:attribute name="datetime" type="Datetime"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="del">
-    <xs:complexType mixed="true">
-      <xs:complexContent>
-        <xs:extension base="Flow">
-          <xs:attributeGroup ref="attrs"/>
-          <xs:attribute name="cite" type="URI"/>
-          <xs:attribute name="datetime" type="Datetime"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:annotation>
-    <xs:documentation>
-    ================== The Anchor Element ================================
-    </xs:documentation>
-  </xs:annotation>
-
-  <xs:element name="a">
-    <xs:annotation>
-      <xs:documentation>
-      content is "Inline" except that anchors shouldn't be nested
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType mixed="true">
-      <xs:complexContent>
-        <xs:extension base="a.content">
-          <xs:attributeGroup ref="attrs"/>
-          <xs:attributeGroup ref="focus"/>
-          <xs:attribute name="charset" type="Charset"/>
-          <xs:attribute name="type" type="ContentType"/>
-          <xs:attribute name="name" type="xs:NMTOKEN"/>
-          <xs:attribute name="href" type="URI"/>
-          <xs:attribute name="hreflang" type="LanguageCode"/>
-          <xs:attribute name="rel" type="LinkTypes"/>
-          <xs:attribute name="rev" type="LinkTypes"/>
-          <xs:attribute name="shape" default="rect" type="Shape"/>
-          <xs:attribute name="coords" type="Coords"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:annotation>
-    <xs:documentation>
-    ===================== Inline Elements ================================
-    </xs:documentation>
-  </xs:annotation>
-
-  <xs:element name="span">
-    <xs:annotation>
-      <xs:documentation>
-      generic language/style container
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType mixed="true">
-      <xs:complexContent>
-        <xs:extension base="Inline">
-          <xs:attributeGroup ref="attrs"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="bdo">
-    <xs:annotation>
-      <xs:documentation>
-      I18N BiDi over-ride
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType mixed="true">
-      <xs:complexContent>
-        <xs:extension base="Inline">
-          <xs:attributeGroup ref="coreattrs"/>
-          <xs:attributeGroup ref="events"/>
-          <xs:attribute name="lang" type="LanguageCode"/>
-          <xs:attribute ref="xml:lang"/>
-          <xs:attribute name="dir" use="required">
-            <xs:simpleType>
-              <xs:restriction base="xs:token">
-                <xs:enumeration value="ltr"/>
-                <xs:enumeration value="rtl"/>
-              </xs:restriction>
-            </xs:simpleType>
-          </xs:attribute>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="br">
-    <xs:annotation>
-      <xs:documentation>
-      forced line break
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:attributeGroup ref="coreattrs"/>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="em">
-    <xs:annotation>
-      <xs:documentation>
-      emphasis
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType mixed="true">
-      <xs:complexContent>
-        <xs:extension base="Inline">
-          <xs:attributeGroup ref="attrs"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="strong">
-    <xs:annotation>
-      <xs:documentation>
-      strong emphasis
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType mixed="true">
-      <xs:complexContent>
-        <xs:extension base="Inline">
-          <xs:attributeGroup ref="attrs"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="dfn">
-    <xs:annotation>
-      <xs:documentation>
-      definitional
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType mixed="true">
-      <xs:complexContent>
-        <xs:extension base="Inline">
-          <xs:attributeGroup ref="attrs"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="code">
-    <xs:annotation>
-      <xs:documentation>
-      program code
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType mixed="true">
-      <xs:complexContent>
-        <xs:extension base="Inline">
-          <xs:attributeGroup ref="attrs"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="samp">
-    <xs:annotation>
-      <xs:documentation>
-      sample
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType mixed="true">
-      <xs:complexContent>
-        <xs:extension base="Inline">
-          <xs:attributeGroup ref="attrs"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="kbd">
-    <xs:annotation>
-      <xs:documentation>
-      something user would type
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType mixed="true">
-      <xs:complexContent>
-        <xs:extension base="Inline">
-          <xs:attributeGroup ref="attrs"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="var">
-    <xs:annotation>
-      <xs:documentation>
-      variable
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType mixed="true">
-      <xs:complexContent>
-        <xs:extension base="Inline">
-          <xs:attributeGroup ref="attrs"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="cite">
-    <xs:annotation>
-      <xs:documentation>
-      citation
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType mixed="true">
-      <xs:complexContent>
-        <xs:extension base="Inline">
-          <xs:attributeGroup ref="attrs"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="abbr">
-    <xs:annotation>
-      <xs:documentation>
-      abbreviation
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType mixed="true">
-      <xs:complexContent>
-        <xs:extension base="Inline">
-          <xs:attributeGroup ref="attrs"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="acronym">
-    <xs:annotation>
-      <xs:documentation>
-      acronym
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType mixed="true">
-      <xs:complexContent>
-        <xs:extension base="Inline">
-          <xs:attributeGroup ref="attrs"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="q">
-    <xs:annotation>
-      <xs:documentation>
-      inlined quote
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType mixed="true">
-      <xs:complexContent>
-        <xs:extension base="Inline">
-          <xs:attributeGroup ref="attrs"/>
-          <xs:attribute name="cite" type="URI"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="sub">
-    <xs:annotation>
-      <xs:documentation>
-      subscript
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType mixed="true">
-      <xs:complexContent>
-        <xs:extension base="Inline">
-          <xs:attributeGroup ref="attrs"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="sup">
-    <xs:annotation>
-      <xs:documentation>
-      superscript
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType mixed="true">
-      <xs:complexContent>
-        <xs:extension base="Inline">
-          <xs:attributeGroup ref="attrs"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="tt">
-    <xs:annotation>
-      <xs:documentation>
-      fixed pitch font
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType mixed="true">
-      <xs:complexContent>
-        <xs:extension base="Inline">
-          <xs:attributeGroup ref="attrs"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="i">
-    <xs:annotation>
-      <xs:documentation>
-      italic font
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType mixed="true">
-      <xs:complexContent>
-        <xs:extension base="Inline">
-          <xs:attributeGroup ref="attrs"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="b">
-    <xs:annotation>
-      <xs:documentation>
-      bold font
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType mixed="true">
-      <xs:complexContent>
-        <xs:extension base="Inline">
-          <xs:attributeGroup ref="attrs"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="big">
-    <xs:annotation>
-      <xs:documentation>
-      bigger font
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType mixed="true">
-      <xs:complexContent>
-        <xs:extension base="Inline">
-          <xs:attributeGroup ref="attrs"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="small">
-    <xs:annotation>
-      <xs:documentation>
-      smaller font
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType mixed="true">
-      <xs:complexContent>
-        <xs:extension base="Inline">
-          <xs:attributeGroup ref="attrs"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:annotation>
-    <xs:documentation>
-    ==================== Object ======================================
-
-    object is used to embed objects as part of HTML pages.
-    param elements should precede other content. Parameters
-    can also be expressed as attribute/value pairs on the
-    object element itself when brevity is desired.
-    </xs:documentation>
-  </xs:annotation>
-
-  <xs:element name="object">
-    <xs:complexType mixed="true">
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="param"/>
-        <xs:group ref="block"/>
-        <xs:element ref="form"/>
-        <xs:group ref="inline"/>
-        <xs:group ref="misc"/>
-      </xs:choice>
-      <xs:attributeGroup ref="attrs"/>
-      <xs:attribute name="declare">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="declare"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-      <xs:attribute name="classid" type="URI"/>
-      <xs:attribute name="codebase" type="URI"/>
-      <xs:attribute name="data" type="URI"/>
-      <xs:attribute name="type" type="ContentType"/>
-      <xs:attribute name="codetype" type="ContentType"/>
-      <xs:attribute name="archive" type="UriList"/>
-      <xs:attribute name="standby" type="Text"/>
-      <xs:attribute name="height" type="Length"/>
-      <xs:attribute name="width" type="Length"/>
-      <xs:attribute name="usemap" type="URI"/>
-      <xs:attribute name="name" type="xs:NMTOKEN"/>
-      <xs:attribute name="tabindex" type="tabindexNumber"/>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="param">
-    <xs:annotation>
-      <xs:documentation>
-      param is used to supply a named property value.
-      In XML it would seem natural to follow RDF and support an
-      abbreviated syntax where the param elements are replaced
-      by attribute value pairs on the object start tag.
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:attribute name="id" type="xs:ID"/>
-      <xs:attribute name="name"/>
-      <xs:attribute name="value"/>
-      <xs:attribute name="valuetype" default="data">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="data"/>
-            <xs:enumeration value="ref"/>
-            <xs:enumeration value="object"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-      <xs:attribute name="type" type="ContentType"/>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:annotation>
-    <xs:documentation>
-    =================== Images ===========================================
-
-    To avoid accessibility problems for people who aren't
-    able to see the image, you should provide a text
-    description using the alt and longdesc attributes.
-    In addition, avoid the use of server-side image maps.
-    Note that in this DTD there is no name attribute. That
-    is only available in the transitional and frameset DTD.
-    </xs:documentation>
-  </xs:annotation>
-
-  <xs:element name="img">
-    <xs:complexType>
-      <xs:attributeGroup ref="attrs"/>
-      <xs:attribute name="src" use="required" type="URI"/>
-      <xs:attribute name="alt" use="required" type="Text"/>
-      <xs:attribute name="longdesc" type="URI"/>
-      <xs:attribute name="height" type="Length"/>
-      <xs:attribute name="width" type="Length"/>
-      <xs:attribute name="usemap" type="URI">
-	<xs:annotation>
-	  <xs:documentation>
-          usemap points to a map element which may be in this document
-          or an external document, although the latter is not widely supported
-          </xs:documentation>
-	</xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="ismap">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="ismap"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:annotation>
-    <xs:documentation>
-    ================== Client-side image maps ============================
-
-    These can be placed in the same document or grouped in a
-    separate document although this isn't yet widely supported
-    </xs:documentation>
-  </xs:annotation>
-
-  <xs:element name="map">
-    <xs:complexType>
-      <xs:choice>
-        <xs:choice maxOccurs="unbounded">
-          <xs:group ref="block"/>
-          <xs:element ref="form"/>
-          <xs:group ref="misc"/>
-        </xs:choice>
-        <xs:element maxOccurs="unbounded" ref="area"/>
-      </xs:choice>
-      <xs:attributeGroup ref="i18n"/>
-      <xs:attributeGroup ref="events"/>
-      <xs:attribute name="id" use="required" type="xs:ID"/>
-      <xs:attribute name="class"/>
-      <xs:attribute name="style" type="StyleSheet"/>
-      <xs:attribute name="title" type="Text"/>
-      <xs:attribute name="name" type="xs:NMTOKEN"/>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="area">
-    <xs:complexType>
-        <xs:attributeGroup ref="attrs"/>
-      <xs:attributeGroup ref="focus"/>
-      <xs:attribute name="shape" default="rect" type="Shape"/>
-      <xs:attribute name="coords" type="Coords"/>
-      <xs:attribute name="href" type="URI"/>
-      <xs:attribute name="nohref">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="nohref"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-      <xs:attribute name="alt" use="required" type="Text"/>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:annotation>
-    <xs:documentation>
-    ================ Forms ===============================================
-    </xs:documentation>
-  </xs:annotation>
-
-  <xs:element name="form">
-    <xs:complexType>
-      <xs:complexContent>
-        <xs:extension base="form.content">
-          <xs:attributeGroup ref="attrs"/>
-          <xs:attribute name="action" use="required" type="URI"/>
-          <xs:attribute name="method" default="get">
-            <xs:simpleType>
-              <xs:restriction base="xs:token">
-                <xs:enumeration value="get"/>
-                <xs:enumeration value="post"/>
-              </xs:restriction>
-            </xs:simpleType>
-          </xs:attribute>
-          <xs:attribute name="enctype" type="ContentType" default="application/x-www-form-urlencoded"/>
-          <xs:attribute name="onsubmit" type="Script"/>
-          <xs:attribute name="onreset" type="Script"/>
-          <xs:attribute name="accept" type="ContentTypes"/>
-          <xs:attribute name="accept-charset" type="Charsets"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="label">
-    <xs:annotation>
-      <xs:documentation>
-      Each label must not contain more than ONE field
-      Label elements shouldn't be nested.
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType mixed="true">
-      <xs:complexContent>
-        <xs:extension base="Inline">
-          <xs:attributeGroup ref="attrs"/>
-          <xs:attribute name="for" type="xs:IDREF"/>
-          <xs:attribute name="accesskey" type="Character"/>
-          <xs:attribute name="onfocus" type="Script"/>
-          <xs:attribute name="onblur" type="Script"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:simpleType name="InputType">
-    <xs:restriction base="xs:token">
-      <xs:enumeration value="text"/>
-      <xs:enumeration value="password"/>
-      <xs:enumeration value="checkbox"/>
-      <xs:enumeration value="radio"/>
-      <xs:enumeration value="submit"/>
-      <xs:enumeration value="reset"/>
-      <xs:enumeration value="file"/>
-      <xs:enumeration value="hidden"/>
-      <xs:enumeration value="image"/>
-      <xs:enumeration value="button"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:element name="input">
-    <xs:annotation>
-      <xs:documentation>
-      form control
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:attributeGroup ref="attrs"/>
-      <xs:attributeGroup ref="focus"/>
-      <xs:attribute name="type" default="text" type="InputType"/>
-      <xs:attribute name="name">
-	<xs:annotation>
-	  <xs:documentation>
-          the name attribute is required for all but submit &amp; reset
-          </xs:documentation>
-	</xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="value"/>
-      <xs:attribute name="checked">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="checked"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-      <xs:attribute name="disabled">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="disabled"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-      <xs:attribute name="readonly">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="readonly"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-      <xs:attribute name="size"/>
-      <xs:attribute name="maxlength" type="Number"/>
-      <xs:attribute name="src" type="URI"/>
-      <xs:attribute name="alt"/>
-      <xs:attribute name="usemap" type="URI"/>
-      <xs:attribute name="onselect" type="Script"/>
-      <xs:attribute name="onchange" type="Script"/>
-      <xs:attribute name="accept" type="ContentTypes"/>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="select">
-    <xs:annotation>
-      <xs:documentation>
-      option selector
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:choice maxOccurs="unbounded">
-        <xs:element ref="optgroup"/>
-        <xs:element ref="option"/>
-      </xs:choice>
-      <xs:attributeGroup ref="attrs"/>
-      <xs:attribute name="name"/>
-      <xs:attribute name="size" type="Number"/>
-      <xs:attribute name="multiple">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="multiple"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-      <xs:attribute name="disabled">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="disabled"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-      <xs:attribute name="tabindex" type="tabindexNumber"/>
-      <xs:attribute name="onfocus" type="Script"/>
-      <xs:attribute name="onblur" type="Script"/>
-      <xs:attribute name="onchange" type="Script"/>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="optgroup">
-    <xs:annotation>
-      <xs:documentation>
-      option group
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element maxOccurs="unbounded" ref="option"/>
-      </xs:sequence>
-      <xs:attributeGroup ref="attrs"/>
-      <xs:attribute name="disabled">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="disabled"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-      <xs:attribute name="label" use="required" type="Text"/>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="option">
-    <xs:annotation>
-      <xs:documentation>
-      selectable choice
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType mixed="true">
-      <xs:attributeGroup ref="attrs"/>
-      <xs:attribute name="selected">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="selected"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-      <xs:attribute name="disabled">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="disabled"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-      <xs:attribute name="label" type="Text"/>
-      <xs:attribute name="value"/>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="textarea">
-    <xs:annotation>
-      <xs:documentation>
-      multi-line text field
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType mixed="true">
-      <xs:attributeGroup ref="attrs"/>
-      <xs:attributeGroup ref="focus"/>
-      <xs:attribute name="name"/>
-      <xs:attribute name="rows" use="required" type="Number"/>
-      <xs:attribute name="cols" use="required" type="Number"/>
-      <xs:attribute name="disabled">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="disabled"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-      <xs:attribute name="readonly">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="readonly"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-      <xs:attribute name="onselect" type="Script"/>
-      <xs:attribute name="onchange" type="Script"/>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="fieldset">
-    <xs:annotation>
-      <xs:documentation>
-      The fieldset element is used to group form fields.
-      Only one legend element should occur in the content
-      and if present should only be preceded by whitespace.
-
-      NOTE: this content model is different from the XHTML 1.0 DTD,
-      closer to the intended content model in HTML4 DTD
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType mixed="true">
-      <xs:sequence>
-        <xs:element ref="legend"/>
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:group ref="block"/>
-          <xs:element ref="form"/>
-          <xs:group ref="inline"/>
-          <xs:group ref="misc"/>
-        </xs:choice>
-      </xs:sequence>
-      <xs:attributeGroup ref="attrs"/>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="legend">
-    <xs:annotation>
-      <xs:documentation>
-      fieldset label
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType mixed="true">
-      <xs:complexContent>
-        <xs:extension base="Inline">
-          <xs:attributeGroup ref="attrs"/>
-          <xs:attribute name="accesskey" type="Character"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="button">
-    <xs:annotation>
-      <xs:documentation>
-      Content is "Flow" excluding a, form and form controls
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType mixed="true">
-      <xs:complexContent>
-        <xs:extension base="button.content">
-          <xs:attributeGroup ref="attrs"/>
-          <xs:attributeGroup ref="focus"/>
-          <xs:attribute name="name"/>
-          <xs:attribute name="value"/>
-          <xs:attribute name="type" default="submit">
-            <xs:simpleType>
-              <xs:restriction base="xs:token">
-                <xs:enumeration value="button"/>
-                <xs:enumeration value="submit"/>
-                <xs:enumeration value="reset"/>
-              </xs:restriction>
-            </xs:simpleType>
-          </xs:attribute>
-          <xs:attribute name="disabled">
-            <xs:simpleType>
-              <xs:restriction base="xs:token">
-                <xs:enumeration value="disabled"/>
-              </xs:restriction>
-            </xs:simpleType>
-          </xs:attribute>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:annotation>
-    <xs:documentation>
-    ======================= Tables =======================================
-
-    Derived from IETF HTML table standard, see [RFC1942]
-    </xs:documentation>
-  </xs:annotation>
-
-  <xs:simpleType name="TFrame">
-    <xs:annotation>
-      <xs:documentation>
-      The border attribute sets the thickness of the frame around the
-      table. The default units are screen pixels.
-
-      The frame attribute specifies which parts of the frame around
-      the table should be rendered. The values are not the same as
-      CALS to avoid a name clash with the valign attribute.
-      </xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:token">
-      <xs:enumeration value="void"/>
-      <xs:enumeration value="above"/>
-      <xs:enumeration value="below"/>
-      <xs:enumeration value="hsides"/>
-      <xs:enumeration value="lhs"/>
-      <xs:enumeration value="rhs"/>
-      <xs:enumeration value="vsides"/>
-      <xs:enumeration value="box"/>
-      <xs:enumeration value="border"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="TRules">
-    <xs:annotation>
-      <xs:documentation>
-      The rules attribute defines which rules to draw between cells:
-
-      If rules is absent then assume:
-          "none" if border is absent or border="0" otherwise "all"
-      </xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:token">
-      <xs:enumeration value="none"/>
-      <xs:enumeration value="groups"/>
-      <xs:enumeration value="rows"/>
-      <xs:enumeration value="cols"/>
-      <xs:enumeration value="all"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:attributeGroup name="cellhalign">
-    <xs:annotation>
-      <xs:documentation>
-      horizontal alignment attributes for cell contents
-
-      char        alignment char, e.g. char=':'
-      charoff     offset for alignment char
-      </xs:documentation>
-    </xs:annotation>
-    <xs:attribute name="align">
-      <xs:simpleType>
-        <xs:restriction base="xs:token">
-          <xs:enumeration value="left"/>
-          <xs:enumeration value="center"/>
-          <xs:enumeration value="right"/>
-          <xs:enumeration value="justify"/>
-          <xs:enumeration value="char"/>
-        </xs:restriction>
-      </xs:simpleType>
-    </xs:attribute>
-    <xs:attribute name="char" type="Character"/>
-    <xs:attribute name="charoff" type="Length"/>
-  </xs:attributeGroup>
-
-  <xs:attributeGroup name="cellvalign">
-    <xs:annotation>
-      <xs:documentation>
-      vertical alignment attributes for cell contents
-      </xs:documentation>
-    </xs:annotation>
-    <xs:attribute name="valign">
-      <xs:simpleType>
-        <xs:restriction base="xs:token">
-          <xs:enumeration value="top"/>
-          <xs:enumeration value="middle"/>
-          <xs:enumeration value="bottom"/>
-          <xs:enumeration value="baseline"/>
-        </xs:restriction>
-      </xs:simpleType>
-    </xs:attribute>
-  </xs:attributeGroup>
-
-  <xs:element name="table">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" ref="caption"/>
-        <xs:choice>
-          <xs:element minOccurs="0" maxOccurs="unbounded" ref="col"/>
-          <xs:element minOccurs="0" maxOccurs="unbounded" ref="colgroup"/>
-        </xs:choice>
-        <xs:element minOccurs="0" ref="thead"/>
-        <xs:element minOccurs="0" ref="tfoot"/>
-        <xs:choice>
-          <xs:element maxOccurs="unbounded" ref="tbody"/>
-          <xs:element maxOccurs="unbounded" ref="tr"/>
-        </xs:choice>
-      </xs:sequence>
-      <xs:attributeGroup ref="attrs"/>
-      <xs:attribute name="summary" type="Text"/>
-      <xs:attribute name="width" type="Length"/>
-      <xs:attribute name="border" type="Pixels"/>
-      <xs:attribute name="frame" type="TFrame"/>
-      <xs:attribute name="rules" type="TRules"/>
-      <xs:attribute name="cellspacing" type="Length"/>
-      <xs:attribute name="cellpadding" type="Length"/>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="caption">
-    <xs:complexType mixed="true">
-      <xs:complexContent>
-        <xs:extension base="Inline">
-          <xs:attributeGroup ref="attrs"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:annotation>
-    <xs:documentation>
-    Use thead to duplicate headers when breaking table
-    across page boundaries, or for static headers when
-    tbody sections are rendered in scrolling panel.
-
-    Use tfoot to duplicate footers when breaking table
-    across page boundaries, or for static footers when
-    tbody sections are rendered in scrolling panel.
-
-    Use multiple tbody sections when rules are needed
-    between groups of table rows.
-    </xs:documentation>
-  </xs:annotation>
-
-  <xs:element name="thead">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element maxOccurs="unbounded" ref="tr"/>
-      </xs:sequence>
-      <xs:attributeGroup ref="attrs"/>
-      <xs:attributeGroup ref="cellhalign"/>
-      <xs:attributeGroup ref="cellvalign"/>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="tfoot">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element maxOccurs="unbounded" ref="tr"/>
-      </xs:sequence>
-      <xs:attributeGroup ref="attrs"/>
-      <xs:attributeGroup ref="cellhalign"/>
-      <xs:attributeGroup ref="cellvalign"/>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="tbody">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element maxOccurs="unbounded" ref="tr"/>
-      </xs:sequence>
-      <xs:attributeGroup ref="attrs"/>
-      <xs:attributeGroup ref="cellhalign"/>
-      <xs:attributeGroup ref="cellvalign"/>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="colgroup">
-    <xs:annotation>
-      <xs:documentation>
-      colgroup groups a set of col elements. It allows you to group
-      several semantically related columns together.
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="col"/>
-      </xs:sequence>
-      <xs:attributeGroup ref="attrs"/>
-      <xs:attribute name="span" default="1" type="Number"/>
-      <xs:attribute name="width" type="MultiLength"/>
-      <xs:attributeGroup ref="cellhalign"/>
-      <xs:attributeGroup ref="cellvalign"/>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="col">
-    <xs:annotation>
-      <xs:documentation>
-      col elements define the alignment properties for cells in
-      one or more columns.
-
-      The width attribute specifies the width of the columns, e.g.
-
-          width=64        width in screen pixels
-          width=0.5*      relative width of 0.5
-
-      The span attribute causes the attributes of one
-      col element to apply to more than one column.
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:attributeGroup ref="attrs"/>
-      <xs:attribute name="span" default="1" type="Number"/>
-      <xs:attribute name="width" type="MultiLength"/>
-      <xs:attributeGroup ref="cellhalign"/>
-      <xs:attributeGroup ref="cellvalign"/>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="tr">
-    <xs:complexType>
-      <xs:choice maxOccurs="unbounded">
-        <xs:element ref="th"/>
-        <xs:element ref="td"/>
-      </xs:choice>
-      <xs:attributeGroup ref="attrs"/>
-      <xs:attributeGroup ref="cellhalign"/>
-      <xs:attributeGroup ref="cellvalign"/>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:simpleType name="Scope">
-    <xs:annotation>
-      <xs:documentation>
-      Scope is simpler than headers attribute for common tables
-      </xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:token">
-      <xs:enumeration value="row"/>
-      <xs:enumeration value="col"/>
-      <xs:enumeration value="rowgroup"/>
-      <xs:enumeration value="colgroup"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:annotation>
-    <xs:documentation>
-    th is for headers, td for data and for cells acting as both
-    </xs:documentation>
-  </xs:annotation>
-
-  <xs:element name="th">
-    <xs:complexType mixed="true">
-      <xs:complexContent>
-        <xs:extension base="Flow">
-          <xs:attributeGroup ref="attrs"/>
-          <xs:attribute name="abbr" type="Text"/>
-          <xs:attribute name="axis"/>
-          <xs:attribute name="headers" type="xs:IDREFS"/>
-          <xs:attribute name="scope" type="Scope"/>
-          <xs:attribute name="rowspan" default="1" type="Number"/>
-          <xs:attribute name="colspan" default="1" type="Number"/>
-          <xs:attributeGroup ref="cellhalign"/>
-          <xs:attributeGroup ref="cellvalign"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="td">
-    <xs:complexType mixed="true">
-      <xs:complexContent>
-        <xs:extension base="Flow">
-          <xs:attributeGroup ref="attrs"/>
-          <xs:attribute name="abbr" type="Text"/>
-          <xs:attribute name="axis"/>
-          <xs:attribute name="headers" type="xs:IDREFS"/>
-          <xs:attribute name="scope" type="Scope"/>
-          <xs:attribute name="rowspan" default="1" type="Number"/>
-          <xs:attribute name="colspan" default="1" type="Number"/>
-          <xs:attributeGroup ref="cellhalign"/>
-          <xs:attributeGroup ref="cellvalign"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-</xs:schema>
\ No newline at end of file
diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/xml.xsd b/source/java/org/alfresco/repo/cmis/rest/xsd/xml.xsd
deleted file mode 100644
index 6ec0d476f4..0000000000
--- a/source/java/org/alfresco/repo/cmis/rest/xsd/xml.xsd
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema 
-targetNamespace="http://www.w3.org/XML/1998/namespace" 
-xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-xml:lang="en">
- <xsd:attribute name="lang">
-  <xsd:simpleType>
-   <xsd:union memberTypes="xsd:language">
-    <xsd:simpleType>    
-     <xsd:restriction base="xsd:string">
-      <xsd:enumeration value=""/>
-     </xsd:restriction>
-    </xsd:simpleType>
-   </xsd:union>
-  </xsd:simpleType>
- </xsd:attribute>
-
- <xsd:attribute name="space">
-  <xsd:simpleType>
-   <xsd:restriction base="xsd:NCName">
-    <xsd:enumeration value="default"/>
-    <xsd:enumeration value="preserve"/>
-   </xsd:restriction>
-  </xsd:simpleType>
- </xsd:attribute>
-
- <xsd:attribute name="base" type="xsd:anyURI">
-  <xsd:annotation>
-   <xsd:documentation>See http://www.w3.org/TR/xmlbase/ for
-                     information about this attribute.</xsd:documentation>
-  </xsd:annotation>
- </xsd:attribute>
- 
- <xsd:attribute name="id" type="xsd:ID">
-  <xsd:annotation>
-   <xsd:documentation>See http://www.w3.org/TR/xml-id/ for
-                     information about this attribute.</xsd:documentation>
-  </xsd:annotation>
- </xsd:attribute>
-
- <xsd:attributeGroup name="specialAttrs">
-  <xsd:attribute ref="xml:base"/>
-  <xsd:attribute ref="xml:lang"/>
-  <xsd:attribute ref="xml:space"/>
-  <xsd:attribute ref="xml:id"/>
- </xsd:attributeGroup>
-
-</xsd:schema>
\ No newline at end of file