CSPACE-4813: Just getting things to compile while Aron and I work on this branch...

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 a71c0297d0d3803880050c33b39a64198f60c7f3..a7980074e1c111f8e8e3b647b28eb975f7b4cbe6 100644 (file)
--- 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<AbstractCommonList>
                PersonAuthorityClient personAuthClient = new PersonAuthorityClient();
                PoxPayloadOut multipart = 
                        PersonAuthorityClientUtils.createPersonInstance(personAuthCSID, 
-                                       authRefName, personInfo, personAuthClient.getItemCommonPartName());
+                                       authRefName, personInfo, null, personAuthClient.getItemCommonPartName());
                ClientResponse<Response> 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 70d6e0b07e4dcfd64dc306830908c13adbbc8d3a..990782cc421103db2fb80160b20728e24cfc9376 100644 (file)
--- 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";\r
         final static String PREFERRED_TERM_NAME_XPATH ="termGroupList/0/termName";\r
         final static String PREFERRED_TERM_STATUS_XPATH ="termGroupList/0/termStatus";\r
-        // CSPACE-4813\r
-        /*\r
+        final static String TERM_INFO_GROUP_SCHEMA_NAME = ""; //FIXME: REM - Needs to be defined.\r
+        // CSPACE-4813 - Remove all the below values and recompile all authorityitem related classes\r
        final static String DISPLAY_NAME = "displayName";\r
        final static String DISPLAY_NAME_COMPUTED = "displayNameComputed";\r
        final static String SHORT_DISPLAY_NAME = "shortDisplayName";\r
        final static String SHORT_DISPLAY_NAME_COMPUTED = "shortDisplayNameComputed";\r
-       final static String TERM_STATUS = "termStatus";\r
-        *\r
-        */\r
+       //final static String TERM_STATUS = "termStatus";\r
 }\r
 \r
 \r

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 ee07f9a8ee6101f1470187cf98e733dffc6db863..8f56264715cdcfb65a6101ba705cad60c9f87e4d 100644 (file)
--- 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<AbstractCommonList> {
         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<Response> 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 aaa9b193d08beebd02571c9e1fd7101122e7d25a..666fa56bb6f77cec4d27eee70610b449b2cacafb 100644 (file)
--- 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<AbstractCommon
         PersonAuthorityClient personAuthClient = new PersonAuthorityClient();
        PoxPayloadOut multipart =
                PersonAuthorityClientUtils.createPersonInstance(personAuthCSID,
-                               personAuthRefName, personInfo, personAuthClient.getItemCommonPartName());
+                               personAuthRefName, personInfo, null, personAuthClient.getItemCommonPartName());
         ClientResponse<Response> 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 cb27abf31f341590ff8fae9750a9922e5e4a1110..394649af226aaca4e1959c2425d013e65df2b8c5 100644 (file)
--- 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<AbstractCommonList> {
         personInfo.put(PersonJAXBSchema.SHORT_IDENTIFIER, shortId);
         PoxPayloadOut multipart = 
                PersonAuthorityClientUtils.createPersonInstance(personAuthCSID, 
-                               authRefName, personInfo, personAuthClient.getItemCommonPartName());
+                               authRefName, personInfo, null, personAuthClient.getItemCommonPartName());
         ClientResponse<Response> 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 c73cf1fbd198b66814b1be49759d81b3dacd2b66..f5ae2be1ac3abf3f1d1e9f2418b2e1bc74350401 100644 (file)
--- 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<AbstractCommonList> {
         personInfo.put(PersonJAXBSchema.SHORT_IDENTIFIER, shortId);
         PoxPayloadOut multipart =
                 PersonAuthorityClientUtils.createPersonInstance(personAuthCSID,
-                authRefName, personInfo, personAuthClient.getItemCommonPartName());
+                authRefName, personInfo, null, personAuthClient.getItemCommonPartName());
         ClientResponse<Response> 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 6b7c49be01db4714b47ceee367908191338df947..0b382bde26dd5e1d762166ad7ce46f8205634790 100644 (file)
--- 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<AbstractCommonList> {
         personInfo.put(PersonJAXBSchema.SHORT_IDENTIFIER, shortId);
        PoxPayloadOut multipart =
                PersonAuthorityClientUtils.createPersonInstance(personAuthCSID, 
-                               authRefName, personInfo, personAuthClient.getItemCommonPartName());
+                               authRefName, personInfo, null, personAuthClient.getItemCommonPartName());
         ClientResponse<Response> 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 a352ee6d09c23054b1246b55daa755eb43212213..cf5eb9b3de0e7fb3c1f0fd733e245b763f98dc42 100644 (file)
--- 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<AbstractCommonList> {
         personInfo.put(PersonJAXBSchema.SHORT_IDENTIFIER, shortId);
         PoxPayloadOut multipart =
                PersonAuthorityClientUtils.createPersonInstance(personAuthCSID,
-                               authRefName, personInfo, personAuthClient.getItemCommonPartName());
+                               authRefName, personInfo, null, personAuthClient.getItemCommonPartName());
         ClientResponse<Response> 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 48d2819a2d83e625d737c7eee86b1799ea0efcce..6e18ebf668e2fcab8f666a5350a122426d2abc39 100644 (file)
--- 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<AbstractCommonList> {
         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<Response> 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 1d1f22e2724975e8a286f172c8038bb578c07135..a1b38a63be5e94de32f9ea394cd767519531c3f5 100644 (file)
--- 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<AbstractCommonList> {
         personInfo.put(PersonJAXBSchema.SHORT_IDENTIFIER, shortId);
        PoxPayloadOut multipart =
                PersonAuthorityClientUtils.createPersonInstance(personAuthCSID, 
-                               authRefName, personInfo, personAuthClient.getItemCommonPartName());
+                               authRefName, personInfo, null, personAuthClient.getItemCommonPartName());
         ClientResponse<Response> 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 92529ab89349e5db53913ae5ddefed1c012d0a96..53836d43154ed12e84269788bb1e5060887e5c20 100644 (file)
--- 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<AbstractCommonList>
         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<Response> 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 86bb6562d39027427585a7cfa8d26f5343249add..f705278bf13ad9f6751095feea036dd86c6cc2d8 100644 (file)
--- 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<AbstractCommonList
         personInfo.put(PersonJAXBSchema.SHORT_IDENTIFIER, shortId);
        PoxPayloadOut multipart = 
            PersonAuthorityClientUtils.createPersonInstance(personAuthCSID,
-                       authRefName, personInfo, personAuthClient.getItemCommonPartName());
+                       authRefName, personInfo, null, personAuthClient.getItemCommonPartName());
         
        String result = null;
        ClientResponse<Response> 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 feaabf021670119107f0c177d44cdc6361124b16..0b21eb46f32d49680d16753227a7f421129855ca 100644 (file)
--- 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<RelationsCom
         personInfo.put(PersonJAXBSchema.SHORT_IDENTIFIER, shortId);
         PoxPayloadOut multipart =
                 PersonAuthorityClientUtils.createPersonInstance(personAuthCSID,
-                authRefName, personInfo, personAuthClient.getItemCommonPartName());
+                authRefName, personInfo, null, personAuthClient.getItemCommonPartName());
         ClientResponse<Response> res = personAuthClient.createItem(personAuthCSID, multipart);
         int statusCode = res.getStatus();