CSPACE-4964: Removed "undelete" from both the cs_default and cs_locking life cycle...

diff --git a/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/OSGI-INF/default-life-cycle-contrib.xml b/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/OSGI-INF/default-life-cycle-contrib.xml
index 038f3a7fd74a28d86f5e0f7ce651d26912b504d8..8a48d6d548a9676137cf44f9645445b96c34679e 100644 (file)
--- a/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/OSGI-INF/default-life-cycle-contrib.xml
+++ b/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/OSGI-INF/default-life-cycle-contrib.xml
@@ -17,9 +17,6 @@
         <transition name="delete" destinationState="deleted">
           <description>Move document to trash (temporary delete)</description>
         </transition>
-        <transition name="undelete" destinationState="project">
-          <description>Recover the document from trash</description>
-        </transition>
       </transitions>
       <states>
         <state name="project" description="Default state" initial="true">
@@ -28,9 +25,7 @@
           </transitions>
         </state>
         <state name="deleted" description="Document is deleted">
-          <transitions>
-            <transition>undelete</transition>
-          </transitions>
+               <!-- No transitions allowed from locked state. -->
         </state>
       </states>
     </lifecycle>
@@ -48,9 +43,6 @@
         <transition name="delete" destinationState="deleted">
           <description>Move document to trash (temporary delete)</description>
         </transition>
-        <transition name="undelete" destinationState="project">
-          <description>Recover the document from trash</description>
-        </transition>
       </transitions>     
       <states>
         <state name="project" description="Default state" initial="true">
@@ -63,9 +55,7 @@
                <!-- No transitions allowed from locked state. -->
         </state>
         <state name="deleted" description="Document is deleted">
-          <transitions>
-            <transition>undelete</transition>
-          </transitions>
+               <!-- No transitions allowed from locked state. -->
         </state>
       </states>
     </lifecycle>

diff --git a/services/authorization-mgt/client/src/test/java/org/collectionspace/services/authorization/client/test/PermissionServiceTest.java b/services/authorization-mgt/client/src/test/java/org/collectionspace/services/authorization/client/test/PermissionServiceTest.java
index 471a33704dd06a540a9c27b89434421b21329f83..982eaa151180a5a9e125b45a8f0f1f1f08331139 100644 (file)
--- a/services/authorization-mgt/client/src/test/java/org/collectionspace/services/authorization/client/test/PermissionServiceTest.java
+++ b/services/authorization-mgt/client/src/test/java/org/collectionspace/services/authorization/client/test/PermissionServiceTest.java
@@ -146,7 +146,7 @@ public class PermissionServiceTest extends AbstractServiceTestImpl<PermissionsLi
         try {
                assertStatusCode(res, testName);
                PermissionsList list = res.getEntity(PermissionsList.class);
-               int EXPECTED_ITEMS = 4 + 2; //4 seeded base resource permissions and 2 workflow permissions
+               int EXPECTED_ITEMS = 2 + 2; //2 seeded base resource permissions and 2 workflow-related permissions
                int actual = list.getPermission().size();
                if (logger.isDebugEnabled()) {
                    logger.debug(testName + ": received = " + actual