From: Amy Wieliczka <amywieliczka@berkeley.edu>
Date: Fri, 11 May 2012 21:08:44 +0000 (-0700)
Subject: Merged remote-tracking branch 'upstream/master' into CSPACE-5128, reset org and perso... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=4671b6ca11a81636da3e677dac1ae4d21fb0af56;p=tmp%2Fjakarta-migration.git

Merged remote-tracking branch 'upstream/master' into CSPACE-5128, reset org and person to regular date groups
---

4671b6ca11a81636da3e677dac1ae4d21fb0af56
diff --cc services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionAuthRefsTest.java
index c082b632e,2c068d838..4a6ebbc9a
--- 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
@@@ -44,8 -44,7 +44,8 @@@ import org.collectionspace.services.acq
  import org.collectionspace.services.acquisition.AcquisitionFundingList;
  import org.collectionspace.services.acquisition.AcquisitionSourceList;
  import org.collectionspace.services.acquisition.OwnerList;
 +import org.collectionspace.services.acquisition.StructuredDateGroup;
- 
+ import org.collectionspace.services.person.PersonTermGroup;
  
  import org.jboss.resteasy.client.ClientResponse;
  
diff --cc services/objectexit/client/src/test/java/org/collectionspace/services/client/test/ObjectExitAuthRefsTest.java
index d51cb017d,2f7bf8776..afe004f9e
--- 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
@@@ -41,8 -41,8 +41,9 @@@ import org.collectionspace.services.cli
  import org.collectionspace.services.common.authorityref.AuthorityRefList;
  import org.collectionspace.services.common.datetime.GregorianCalendarDateTimeUtils;
  import org.collectionspace.services.jaxb.AbstractCommonList;
 +import org.collectionspace.services.objectexit.StructuredDateGroup;
  import org.collectionspace.services.objectexit.ObjectexitCommon;
+ import org.collectionspace.services.person.PersonTermGroup;
  
  import org.jboss.resteasy.client.ClientResponse;