]> git.aero2k.de Git - tmp/jakarta-migration.git/commitdiff
Merge remote-tracking branch 'remotes/origin/master' into CSPACE-5289
authorPatrick Schmitz <pschmitz@berkeley.edu>
Wed, 30 May 2012 22:42:00 +0000 (15:42 -0700)
committerPatrick Schmitz <pschmitz@berkeley.edu>
Wed, 30 May 2012 22:42:00 +0000 (15:42 -0700)
1  2 
services/common/src/main/java/org/collectionspace/services/nuxeo/util/NuxeoUtils.java

index fbd6671a42a21e5b5c59c9edc8ad51e14832ddb7,ecc0a72a44b0233b8152999dc0b14d21f6038765..6dce9d4288072d73fc023263ec3a720a95a3f84f
@@@ -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;