From: Patrick Schmitz <pschmitz@berkeley.edu>
Date: Thu, 5 Apr 2012 05:58:42 +0000 (-0700)
Subject: CSPACE-4924 - Adding support for workflowState to core, and to list result items.
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=3a8668b82639674c709d5427608119974b416134;p=tmp%2Fjakarta-migration.git

CSPACE-4924 - Adding support for workflowState to core, and to list result items.
---

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/vocabulary/res/GetVocabularyItems.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/vocabulary/res/GetVocabularyItems.res.xml
index 4a130df47..0f62c72f1 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/vocabulary/res/GetVocabularyItems.res.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/vocabulary/res/GetVocabularyItems.res.xml
@@ -6,7 +6,7 @@
 	<pageNum>0</pageNum>
     <itemsInPage>3</itemsInPage>
     <totalItems>3</totalItems>
-    <fieldsReturned>csid|uri|updatedAt|order|displayName|shortIdentifier|refName|termStatus</fieldsReturned>
+    <fieldsReturned>csid|uri|updatedAt|workflowState|order|displayName|shortIdentifier|refName|termStatus</fieldsReturned>
     <list-item>
         <displayName>${Item3DupeOrder.displayName}</displayName>
         <shortIdentifier>${Item3DupeOrder.itemID}</shortIdentifier>
diff --git a/services/common/src/main/java/org/collectionspace/services/common/vocabulary/RefNameServiceUtils.java b/services/common/src/main/java/org/collectionspace/services/common/vocabulary/RefNameServiceUtils.java
index d26682120..1e4370232 100644
--- a/services/common/src/main/java/org/collectionspace/services/common/vocabulary/RefNameServiceUtils.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/vocabulary/RefNameServiceUtils.java
@@ -458,9 +458,10 @@ public class RefNameServiceUtils {
                 ilistItem.setDocId(csid);
                 ilistItem.setUri(serviceContextPath + csid);
                 try {
+                    ilistItem.setWorkflowState(docModel.getCurrentLifeCycleState());
                 	ilistItem.setUpdatedAt(DocHandlerBase.getUpdatedAtAsString(docModel));
                 } catch(Exception e) {
-                	logger.error("Error getting udpatedAt value for doc ["+csid+"]: "+e.getLocalizedMessage());
+                	logger.error("Error getting core values for doc ["+csid+"]: "+e.getLocalizedMessage());
                 }
                 // The id and URI are the same on all doctypes
                 ilistItem.setDocType(docType);
diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocHandlerBase.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocHandlerBase.java
index 8d13e45c7..b68b62351 100644
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocHandlerBase.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocHandlerBase.java
@@ -68,10 +68,11 @@ public abstract class DocHandlerBase<T> extends RemoteDocumentModelHandlerImpl<T
 
     private AbstractCommonList commonList;
     
-    protected static final int NUM_STANDARD_LIST_RESULT_FIELDS = 3;
+    protected static final int NUM_STANDARD_LIST_RESULT_FIELDS = 4;
     protected static final String STANDARD_LIST_CSID_FIELD = "csid";
-    protected static final String STANDARD_LIST_URI_FIELD = "uri";
-    protected static final String STANDARD_LIST_UPDATED_AT_FIELD = "updatedAt";
+    protected static final String STANDARD_LIST_URI_FIELD = COLLECTIONSPACE_CORE_URI;
+    protected static final String STANDARD_LIST_UPDATED_AT_FIELD = COLLECTIONSPACE_CORE_UPDATED_AT;
+    protected static final String STANDARD_LIST_WORKFLOW_FIELD = COLLECTIONSPACE_CORE_WORKFLOWSTATE;
 
     @Override
     public AbstractCommonList getCommonPartList() {
@@ -190,6 +191,7 @@ public abstract class DocHandlerBase<T> extends RemoteDocumentModelHandlerImpl<T
         fields[0] = STANDARD_LIST_CSID_FIELD;
         fields[1] = STANDARD_LIST_URI_FIELD;
         fields[2] = STANDARD_LIST_UPDATED_AT_FIELD;
+        fields[3] = STANDARD_LIST_WORKFLOW_FIELD;
         for(int i=NUM_STANDARD_LIST_RESULT_FIELDS;i<nFields;i++) {
         	ListResultField field = resultsFields.get(i-NUM_STANDARD_LIST_RESULT_FIELDS); 
         	fields[i]=field.getElement();
@@ -204,6 +206,7 @@ public abstract class DocHandlerBase<T> extends RemoteDocumentModelHandlerImpl<T
             String uri = getUri(docModel);
             item.put(STANDARD_LIST_URI_FIELD, uri);
             item.put(STANDARD_LIST_UPDATED_AT_FIELD, getUpdatedAtAsString(docModel));
+            item.put(STANDARD_LIST_WORKFLOW_FIELD, docModel.getCurrentLifeCycleState());
 
             for (ListResultField field : resultsFields ){
             	String schema = field.getSchema();
diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocumentModelHandler.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocumentModelHandler.java
index 9e890cc9d..fd43e68ef 100644
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocumentModelHandler.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocumentModelHandler.java
@@ -71,7 +71,7 @@ public abstract class DocumentModelHandler<T, TL>
     public final static String COLLECTIONSPACE_CORE_UPDATED_AT = "updatedAt";
     public final static String COLLECTIONSPACE_CORE_CREATED_BY = "createdBy";
     public final static String COLLECTIONSPACE_CORE_UPDATED_BY = "updatedBy";
-    public final static String COLLECTIONSPACE_CORE_CURRENTLIFECYCLESTATE = "currentLifeCycleState";
+    public final static String COLLECTIONSPACE_CORE_WORKFLOWSTATE = "workflowState";
 
     /*
      * We're using the "name" field of Nuxeo's DocumentModel to store
diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java
index 82ec3ad39..d39126761 100644
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java
@@ -215,7 +215,7 @@ public abstract class   RemoteDocumentModelHandlerImpl<T, TL>
     
     private void addExtraCoreValues(DocumentModel docModel, Map<String, Object> unQObjectProperties)
     		throws Exception {
-        unQObjectProperties.put(COLLECTIONSPACE_CORE_CURRENTLIFECYCLESTATE, docModel.getCurrentLifeCycleState());
+        unQObjectProperties.put(COLLECTIONSPACE_CORE_WORKFLOWSTATE, docModel.getCurrentLifeCycleState());
     }
     
     private void addAccountPermissionsPart() throws Exception {
diff --git a/services/jaxb/src/main/resources/authorityrefdocs.xsd b/services/jaxb/src/main/resources/authorityrefdocs.xsd
index 6b555c176..4a4b155d9 100644
--- a/services/jaxb/src/main/resources/authorityrefdocs.xsd
+++ b/services/jaxb/src/main/resources/authorityrefdocs.xsd
@@ -48,6 +48,7 @@
 									<xs:element name="sourceField"     type="xs:string" minOccurs="1" />
 									<xs:element name="uri"             type="xs:anyURI" minOccurs="1" />
 									<xs:element name="updatedAt"       type="xs:string" minOccurs="1" />
+									<xs:element name="workflowState"   type="xs:string" minOccurs="1" />
 								</xs:sequence>
 							</xs:complexType>
 						</xs:element>
diff --git a/services/servicegroup/service/src/main/java/org/collectionspace/services/servicegroup/nuxeo/ServiceGroupDocumentModelHandler.java b/services/servicegroup/service/src/main/java/org/collectionspace/services/servicegroup/nuxeo/ServiceGroupDocumentModelHandler.java
index 3eea303d0..166c2d847 100644
--- a/services/servicegroup/service/src/main/java/org/collectionspace/services/servicegroup/nuxeo/ServiceGroupDocumentModelHandler.java
+++ b/services/servicegroup/service/src/main/java/org/collectionspace/services/servicegroup/nuxeo/ServiceGroupDocumentModelHandler.java
@@ -200,12 +200,13 @@ public class ServiceGroupDocumentModelHandler
 		CommonList list ) {
         int nFields = NUM_META_FIELDS+NUM_STANDARD_LIST_RESULT_FIELDS;
         String fields[] = new String[nFields];
-        fields[0] = "csid";
-        fields[1] = "uri";
-        fields[2] = "updatedAt";
-        fields[3] = DOC_NAME_FIELD;
-        fields[4] = DOC_NUMBER_FIELD;
-        fields[5] = DOC_TYPE_FIELD;
+        fields[0] = STANDARD_LIST_CSID_FIELD;
+        fields[1] = STANDARD_LIST_URI_FIELD;
+        fields[2] = STANDARD_LIST_UPDATED_AT_FIELD;
+        fields[3] = STANDARD_LIST_WORKFLOW_FIELD;
+        fields[4] = DOC_NAME_FIELD;
+        fields[5] = DOC_NUMBER_FIELD;
+        fields[6] = DOC_TYPE_FIELD;
         list.setFieldsReturned(fields);
         Iterator<DocumentModel> iter = docList.iterator();
 		HashMap<String,String> item = new HashMap<String,String>();
@@ -224,8 +225,9 @@ public class ServiceGroupDocumentModelHandler
             item.put(STANDARD_LIST_URI_FIELD, getUriFromServiceBinding(sb, csid));
             try {
             	item.put(STANDARD_LIST_UPDATED_AT_FIELD, getUpdatedAtAsString(docModel));
+                item.put(STANDARD_LIST_WORKFLOW_FIELD, docModel.getCurrentLifeCycleState());
             } catch(Exception e) {
-            	logger.error("Error getting udpatedAt value for doc ["+csid+"]: "+e.getLocalizedMessage());
+            	logger.error("Error getting core values for doc ["+csid+"]: "+e.getLocalizedMessage());
             }
 
             String value = ServiceBindingUtils.getMappedFieldInDoc(sb,