From: Richard Millet <remillet@berkeley.edu>
Date: Tue, 17 Apr 2012 18:33:26 +0000 (-0700)
Subject: CSPACE-4964: Removed "undelete" from both the cs_default and cs_locking life cycle... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=eb214940e1442d0acab1d3451acf78cb37793f74;p=tmp%2Fjakarta-migration.git

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

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 038f3a7fd..8a48d6d54 100644
--- 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 471a33704..982eaa151 100644
--- 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