CSPACE-6301: Change configuration for the cs_default and cs_locking lifecycles to...

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 4b63194bb82fdadf12ed14fa40a625a926708433..14c955b5fd76b0a8ef321e09740d4ba285c3f635 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,6 +17,9 @@
         <transition name="delete" destinationState="deleted">
           <description>Move document to trash (temporary delete)</description>
         </transition>
+        <transition name="undelete" destinationState="project">
+          <description>Undelete the document.</description>
+        </transition>        
       </transitions>
       <states>
         <state name="project" description="Default state" initial="true">
@@ -25,7 +28,9 @@
           </transitions>
         </state>
         <state name="deleted" description="Document is deleted">
-               <!-- No transitions allowed from locked state. -->
+          <transitions>
+            <transition>undelete</transition>
+          </transitions>
         </state>
       </states>
     </lifecycle>
@@ -43,6 +48,9 @@
         <transition name="delete" destinationState="deleted">
           <description>Move document to trash (temporary delete)</description>
         </transition>
+        <transition name="undelete" destinationState="project">
+          <description>Undelete the document.</description>
+        </transition>        
       </transitions>     
       <states>
         <state name="project" description="Default state" initial="true">
@@ -55,7 +63,9 @@
                <!-- No transitions allowed from locked state. -->
         </state>
         <state name="deleted" description="Document is deleted">
-               <!-- No transitions allowed from locked state. -->
+          <transitions>
+            <transition>undelete</transition>
+          </transitions>
         </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 982eaa151180a5a9e125b45a8f0f1f1f08331139..4d2e26365e93255c5bfbfe1e46ea0913fc7af79a 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 = 2 + 2; //2 seeded base resource permissions and 2 workflow-related permissions
+               int EXPECTED_ITEMS = 2 + 4; //2 seeded base resource permissions and 4 workflow-related permissions
                int actual = list.getPermission().size();
                if (logger.isDebugEnabled()) {
                    logger.debug(testName + ": received = " + actual