From: Patrick Schmitz <pschmitz@berkeley.edu>
Date: Wed, 30 May 2012 22:42:00 +0000 (-0700)
Subject: Merge remote-tracking branch 'remotes/origin/master' into CSPACE-5289
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=92fd2f60700ca1f213979a8ffc48895e3ba7751b;p=tmp%2Fjakarta-migration.git

Merge remote-tracking branch 'remotes/origin/master' into CSPACE-5289
---

92fd2f60700ca1f213979a8ffc48895e3ba7751b
diff --cc services/common/src/main/java/org/collectionspace/services/nuxeo/util/NuxeoUtils.java
index fbd6671a4,ecc0a72a4..6dce9d428
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/util/NuxeoUtils.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/util/NuxeoUtils.java
@@@ -38,10 -39,7 +39,8 @@@ import org.collectionspace.services.com
  import org.collectionspace.services.common.context.ServiceContext;
  import org.collectionspace.services.common.datetime.DateTimeFormatUtils;
  import org.collectionspace.services.common.document.DocumentException;
 +import org.collectionspace.services.common.document.DocumentFilter;
  import org.collectionspace.services.common.query.QueryContext;
- import org.collectionspace.services.config.service.ListResultField;
- import org.collectionspace.services.nuxeo.client.java.DocumentModelHandler;
  
  import org.dom4j.Document;
  import org.dom4j.io.SAXReader;