From: Richard Millet Date: Wed, 2 May 2012 17:21:22 +0000 (-0700) Subject: CSPACE-4813: Just getting things to compile while Aron and I work on this branch... X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=283db02986cf15ca5b71c83cdea4f648d5e49a66;p=tmp%2Fjakarta-migration.git CSPACE-4813: Just getting things to compile while Aron and I work on this branch together. Calls to PersonAuthorityClientUtils.createPersonInstance require a new term related param. Passing NULL in most of the places for now. We'll need to change this as we get all the tests working again. --- diff --git a/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionAuthRefsTest.java b/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionAuthRefsTest.java index a71c0297d..a7980074e 100644 --- a/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionAuthRefsTest.java +++ b/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionAuthRefsTest.java @@ -203,7 +203,7 @@ public class AcquisitionAuthRefsTest extends BaseServiceTest PersonAuthorityClient personAuthClient = new PersonAuthorityClient(); PoxPayloadOut multipart = PersonAuthorityClientUtils.createPersonInstance(personAuthCSID, - authRefName, personInfo, personAuthClient.getItemCommonPartName()); + authRefName, personInfo, null, personAuthClient.getItemCommonPartName()); ClientResponse res = personAuthClient.createItem(personAuthCSID, multipart); int statusCode = res.getStatus(); diff --git a/services/authority/jaxb/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityItemJAXBSchema.java b/services/authority/jaxb/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityItemJAXBSchema.java index 70d6e0b07..990782cc4 100644 --- a/services/authority/jaxb/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityItemJAXBSchema.java +++ b/services/authority/jaxb/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityItemJAXBSchema.java @@ -39,15 +39,13 @@ public interface AuthorityItemJAXBSchema { final static String PREFERRED_TERM_DISPLAY_NAME_XPATH ="termGroupList/0/termDisplayName"; final static String PREFERRED_TERM_NAME_XPATH ="termGroupList/0/termName"; final static String PREFERRED_TERM_STATUS_XPATH ="termGroupList/0/termStatus"; - // CSPACE-4813 - /* + final static String TERM_INFO_GROUP_SCHEMA_NAME = ""; //FIXME: REM - Needs to be defined. + // CSPACE-4813 - Remove all the below values and recompile all authorityitem related classes final static String DISPLAY_NAME = "displayName"; final static String DISPLAY_NAME_COMPUTED = "displayNameComputed"; final static String SHORT_DISPLAY_NAME = "shortDisplayName"; final static String SHORT_DISPLAY_NAME_COMPUTED = "shortDisplayNameComputed"; - final static String TERM_STATUS = "termStatus"; - * - */ + //final static String TERM_STATUS = "termStatus"; } diff --git a/services/blob/client/src/test/java/org/collectionspace/services/client/test/BlobAuthRefsTest.java b/services/blob/client/src/test/java/org/collectionspace/services/client/test/BlobAuthRefsTest.java index ee07f9a8e..8f5626471 100644 --- a/services/blob/client/src/test/java/org/collectionspace/services/client/test/BlobAuthRefsTest.java +++ b/services/blob/client/src/test/java/org/collectionspace/services/client/test/BlobAuthRefsTest.java @@ -157,7 +157,8 @@ public class BlobAuthRefsTest extends BaseServiceTest { personInfo.put(PersonJAXBSchema.FORE_NAME, firstName); personInfo.put(PersonJAXBSchema.SUR_NAME, surName); personInfo.put(PersonJAXBSchema.SHORT_IDENTIFIER, shortId); - PoxPayloadOut multipart = PersonAuthorityClientUtils.createPersonInstance(personAuthCSID, authRefName, personInfo, personAuthClient.getItemCommonPartName()); + PoxPayloadOut multipart = PersonAuthorityClientUtils.createPersonInstance(personAuthCSID, + authRefName, personInfo, null, personAuthClient.getItemCommonPartName()); ClientResponse res = personAuthClient.createItem(personAuthCSID, multipart); try { assertStatusCode(res, "createPerson (not a surefire test)"); diff --git a/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectAuthRefsTest.java b/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectAuthRefsTest.java index aaa9b193d..666fa56bb 100644 --- a/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectAuthRefsTest.java +++ b/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectAuthRefsTest.java @@ -249,7 +249,7 @@ public class CollectionObjectAuthRefsTest extends BaseServiceTest res = personAuthClient.createItem(personAuthCSID, multipart); int statusCode = res.getStatus(); diff --git a/services/intake/client/src/test/java/org/collectionspace/services/client/test/IntakeAuthRefsTest.java b/services/intake/client/src/test/java/org/collectionspace/services/client/test/IntakeAuthRefsTest.java index cb27abf31..394649af2 100644 --- a/services/intake/client/src/test/java/org/collectionspace/services/client/test/IntakeAuthRefsTest.java +++ b/services/intake/client/src/test/java/org/collectionspace/services/client/test/IntakeAuthRefsTest.java @@ -204,7 +204,7 @@ public class IntakeAuthRefsTest extends BaseServiceTest { personInfo.put(PersonJAXBSchema.SHORT_IDENTIFIER, shortId); PoxPayloadOut multipart = PersonAuthorityClientUtils.createPersonInstance(personAuthCSID, - authRefName, personInfo, personAuthClient.getItemCommonPartName()); + authRefName, personInfo, null, personAuthClient.getItemCommonPartName()); ClientResponse res = personAuthClient.createItem(personAuthCSID, multipart); int statusCode = res.getStatus(); diff --git a/services/intake/client/src/test/java/org/collectionspace/services/client/test/PersonAuthRefDocsTest.java b/services/intake/client/src/test/java/org/collectionspace/services/client/test/PersonAuthRefDocsTest.java index c73cf1fbd..f5ae2be1a 100644 --- a/services/intake/client/src/test/java/org/collectionspace/services/client/test/PersonAuthRefDocsTest.java +++ b/services/intake/client/src/test/java/org/collectionspace/services/client/test/PersonAuthRefDocsTest.java @@ -230,7 +230,7 @@ public class PersonAuthRefDocsTest extends BaseServiceTest { personInfo.put(PersonJAXBSchema.SHORT_IDENTIFIER, shortId); PoxPayloadOut multipart = PersonAuthorityClientUtils.createPersonInstance(personAuthCSID, - authRefName, personInfo, personAuthClient.getItemCommonPartName()); + authRefName, personInfo, null, personAuthClient.getItemCommonPartName()); ClientResponse res = personAuthClient.createItem(personAuthCSID, multipart); int statusCode = res.getStatus(); diff --git a/services/loanin/client/src/test/java/org/collectionspace/services/client/test/LoaninAuthRefsTest.java b/services/loanin/client/src/test/java/org/collectionspace/services/client/test/LoaninAuthRefsTest.java index 6b7c49be0..0b382bde2 100644 --- a/services/loanin/client/src/test/java/org/collectionspace/services/client/test/LoaninAuthRefsTest.java +++ b/services/loanin/client/src/test/java/org/collectionspace/services/client/test/LoaninAuthRefsTest.java @@ -211,7 +211,7 @@ public class LoaninAuthRefsTest extends BaseServiceTest { personInfo.put(PersonJAXBSchema.SHORT_IDENTIFIER, shortId); PoxPayloadOut multipart = PersonAuthorityClientUtils.createPersonInstance(personAuthCSID, - authRefName, personInfo, personAuthClient.getItemCommonPartName()); + authRefName, personInfo, null, personAuthClient.getItemCommonPartName()); ClientResponse res = personAuthClient.createItem(personAuthCSID, multipart); int statusCode = res.getStatus(); diff --git a/services/loanout/client/src/test/java/org/collectionspace/services/client/test/LoanoutAuthRefsTest.java b/services/loanout/client/src/test/java/org/collectionspace/services/client/test/LoanoutAuthRefsTest.java index a352ee6d0..cf5eb9b3d 100644 --- a/services/loanout/client/src/test/java/org/collectionspace/services/client/test/LoanoutAuthRefsTest.java +++ b/services/loanout/client/src/test/java/org/collectionspace/services/client/test/LoanoutAuthRefsTest.java @@ -205,7 +205,7 @@ public class LoanoutAuthRefsTest extends BaseServiceTest { personInfo.put(PersonJAXBSchema.SHORT_IDENTIFIER, shortId); PoxPayloadOut multipart = PersonAuthorityClientUtils.createPersonInstance(personAuthCSID, - authRefName, personInfo, personAuthClient.getItemCommonPartName()); + authRefName, personInfo, null, personAuthClient.getItemCommonPartName()); ClientResponse res = personAuthClient.createItem(personAuthCSID, multipart); int statusCode = res.getStatus(); diff --git a/services/media/client/src/test/java/org/collectionspace/services/client/test/MediaAuthRefsTest.java b/services/media/client/src/test/java/org/collectionspace/services/client/test/MediaAuthRefsTest.java index 48d2819a2..6e18ebf66 100644 --- a/services/media/client/src/test/java/org/collectionspace/services/client/test/MediaAuthRefsTest.java +++ b/services/media/client/src/test/java/org/collectionspace/services/client/test/MediaAuthRefsTest.java @@ -158,7 +158,7 @@ public class MediaAuthRefsTest extends BaseServiceTest { personInfo.put(PersonJAXBSchema.SUR_NAME, surName); personInfo.put(PersonJAXBSchema.SHORT_IDENTIFIER, shortId); PoxPayloadOut multipart = PersonAuthorityClientUtils.createPersonInstance( - personAuthCSID, authRefName, personInfo, personAuthClient.getItemCommonPartName()); + personAuthCSID, authRefName, personInfo, null, personAuthClient.getItemCommonPartName()); ClientResponse res = personAuthClient.createItem(personAuthCSID, multipart); try { assertStatusCode(res, "createPerson (not a surefire test)"); diff --git a/services/movement/client/src/test/java/org/collectionspace/services/client/test/MovementAuthRefsTest.java b/services/movement/client/src/test/java/org/collectionspace/services/client/test/MovementAuthRefsTest.java index 1d1f22e27..a1b38a63b 100644 --- a/services/movement/client/src/test/java/org/collectionspace/services/client/test/MovementAuthRefsTest.java +++ b/services/movement/client/src/test/java/org/collectionspace/services/client/test/MovementAuthRefsTest.java @@ -181,7 +181,7 @@ public class MovementAuthRefsTest extends BaseServiceTest { personInfo.put(PersonJAXBSchema.SHORT_IDENTIFIER, shortId); PoxPayloadOut multipart = PersonAuthorityClientUtils.createPersonInstance(personAuthCSID, - authRefName, personInfo, personAuthClient.getItemCommonPartName()); + authRefName, personInfo, null, personAuthClient.getItemCommonPartName()); ClientResponse res = personAuthClient.createItem(personAuthCSID, multipart); int statusCode = res.getStatus(); diff --git a/services/objectexit/client/src/test/java/org/collectionspace/services/client/test/ObjectExitAuthRefsTest.java b/services/objectexit/client/src/test/java/org/collectionspace/services/client/test/ObjectExitAuthRefsTest.java index 92529ab89..53836d431 100644 --- a/services/objectexit/client/src/test/java/org/collectionspace/services/client/test/ObjectExitAuthRefsTest.java +++ b/services/objectexit/client/src/test/java/org/collectionspace/services/client/test/ObjectExitAuthRefsTest.java @@ -165,7 +165,7 @@ public class ObjectExitAuthRefsTest extends BaseServiceTest personInfo.put(PersonJAXBSchema.FORE_NAME, firstName); personInfo.put(PersonJAXBSchema.SUR_NAME, surName); personInfo.put(PersonJAXBSchema.SHORT_IDENTIFIER, shortId); - PoxPayloadOut multipart = PersonAuthorityClientUtils.createPersonInstance(personAuthCSID, authRefName, personInfo, personAuthClient.getItemCommonPartName()); + PoxPayloadOut multipart = PersonAuthorityClientUtils.createPersonInstance(personAuthCSID, authRefName, personInfo, null, personAuthClient.getItemCommonPartName()); ClientResponse res = personAuthClient.createItem(personAuthCSID, multipart); try { assertStatusCode(res, "createPerson (not a surefire test)"); diff --git a/services/organization/client/src/test/java/org/collectionspace/services/client/test/OrgAuthorityAuthRefsTest.java b/services/organization/client/src/test/java/org/collectionspace/services/client/test/OrgAuthorityAuthRefsTest.java index 86bb6562d..f705278bf 100644 --- a/services/organization/client/src/test/java/org/collectionspace/services/client/test/OrgAuthorityAuthRefsTest.java +++ b/services/organization/client/src/test/java/org/collectionspace/services/client/test/OrgAuthorityAuthRefsTest.java @@ -271,7 +271,7 @@ public class OrgAuthorityAuthRefsTest extends BaseServiceTest res = personAuthClient.createItem(personAuthCSID, multipart); diff --git a/services/relation/client/src/test/java/org/collectionspace/services/client/test/RelationServiceTest.java b/services/relation/client/src/test/java/org/collectionspace/services/client/test/RelationServiceTest.java index feaabf021..0b21eb46f 100644 --- a/services/relation/client/src/test/java/org/collectionspace/services/client/test/RelationServiceTest.java +++ b/services/relation/client/src/test/java/org/collectionspace/services/client/test/RelationServiceTest.java @@ -149,7 +149,7 @@ public class RelationServiceTest extends AbstractPoxServiceTestImpl res = personAuthClient.createItem(personAuthCSID, multipart); int statusCode = res.getStatus();