Merge DEV\WCM_SERVICES2 to HEAD

12513 Implementation of Asset.getProperties
    12469 Implement paths relative to web app.  And unit tests.   Asset Test is now clean of TODOs.
    12413  Implementation of WCM Asset.    Still work remaining but this is 80% of the implementation.
    12404 WCM Services
        - asset service - fix rename/move folder issue (folders are not locked)
        - sandbox service - fix delete sandbox test
    12374 WCM Services - optimise get/is web project
    12347  WCM Services - "asset service" - add/remove/has aspect, get aspects
    12341  WCM Services - "asset service" checkpoint (locking fixes, bulk import, more tests added)




git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12547 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/wcm/sandbox/SandboxServiceImplTest.java

@@ -33,12 +33,10 @@ import java.util.Map;
 
 import junit.framework.TestCase;
 
-import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.content.MimetypeMap;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.security.permissions.AccessDeniedException;
-import org.alfresco.service.cmr.avm.AVMNotFoundException;
 import org.alfresco.service.cmr.avm.AVMService;
 import org.alfresco.service.cmr.avm.VersionDescriptor;
 import org.alfresco.service.cmr.repository.ContentReader;
@@ -419,7 +417,7 @@ public class SandboxServiceImplTest extends TestCase
             sbService.deleteSandbox(sbInfo.getSandboxId());
             fail("Shouldn't be able to delete staging sandbox");
         }
-        catch (AlfrescoRuntimeException exception)
+        catch (AccessDeniedException exception)
         {
             // Expected
         }
@@ -430,7 +428,7 @@ public class SandboxServiceImplTest extends TestCase
             sbService.deleteSandbox("some-random-staging-sandbox");
             fail("Shouldn't be able to delete non-existant sandbox");
         }
-        catch (AVMNotFoundException exception)
+        catch (AccessDeniedException exception)
         {
             // Expected
         }