From d8e43aac915b0bd461724d3c879525350f871f39 Mon Sep 17 00:00:00 2001 From: Patrick Schmitz Date: Tue, 1 Feb 2011 09:06:14 +0000 Subject: [PATCH] CSPACE-2597 Updated DocHandlerBase to fetch DocHandlerParams from the service bindings, and then moved definitions for Media, Blob, ObjectExit and Acquisition to tenant-bindings.xml. Reduced the associated document handlers to minimal declarations. --- .../AcquisitionDocumentModelHandler.java | 41 --- .../blob/nuxeo/BlobDocumentModelHandler.java | 61 ----- .../main/config/services/tenant-bindings.xml | 253 ++++++++++++++++++ .../services/common/ServiceMain.java | 44 +-- .../nuxeo/client/java/DocHandlerBase.java | 25 +- .../nuxeo/LoaninDocumentModelHandler.java | 45 ---- .../nuxeo/MediaDocumentModelHandler.java | 44 --- .../nuxeo/ObjectExitDocumentModelHandler.java | 40 +-- 8 files changed, 269 insertions(+), 284 deletions(-) diff --git a/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/nuxeo/AcquisitionDocumentModelHandler.java b/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/nuxeo/AcquisitionDocumentModelHandler.java index bdc2fcf5f..bc262b11c 100644 --- a/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/nuxeo/AcquisitionDocumentModelHandler.java +++ b/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/nuxeo/AcquisitionDocumentModelHandler.java @@ -23,14 +23,9 @@ */ package org.collectionspace.services.acquisition.nuxeo; -import java.util.ArrayList; -import java.util.List; - import org.collectionspace.services.acquisition.AcquisitionsCommon; import org.collectionspace.services.jaxb.AbstractCommonList; import org.collectionspace.services.nuxeo.client.java.DocHandlerBase; -import org.collectionspace.services.common.service.DocHandlerParams; -import org.collectionspace.services.common.service.ListResultField; /** AcquisitionDocumentModelHandler * $LastChangedRevision: $ @@ -38,41 +33,5 @@ import org.collectionspace.services.common.service.ListResultField; */ public class AcquisitionDocumentModelHandler extends DocHandlerBase { - - private static DocHandlerParams.Params params; - static { - params = new DocHandlerParams.Params(); - params.setSchemaName("acquisition"); - params.setDublinCoreTitle("");//"CollectionSpace-Acquisition"; - params.setSummaryFields("acquisitionReferenceNumber|acquisitionSources|owners|uri|csid"); - params.setAbstractCommonListClassname("org.collectionspace.services.acquisition.AcquisitionsCommonList"); - params.setCommonListItemClassname("org.collectionspace.services.acquisition.AcquisitionsCommonList$AcquisitionListItem"); - params.setListResultsItemMethodName("getAcquisitionListItem"); - DocHandlerParams.Params.ListResultsFields lrfs = - new DocHandlerParams.Params.ListResultsFields(); - params.setListResultsFields(lrfs); - List lrfl = lrfs.getListResultField(); - ListResultField lrf = new ListResultField(); - lrf.setSetter("setAcquisitionReferenceNumber"); - lrf.setXpath("acquisitionReferenceNumber"); - lrfl.add( lrf ); - lrf = new ListResultField(); - lrf.setSetter("setAcquisitionSource"); - lrf.setXpath("acquisitionSources/[0]"); - lrfl.add( lrf ); - lrf = new ListResultField(); - lrf.setSetter("setOwner"); - lrf.setXpath("owners/[0]"); - lrfl.add( lrf ); - /* - {"setAcquisitionReferenceNumber","acquisitionReferenceNumber"}, - {"setAcquisitionSource","acquisitionSources/[0]"}, - {"setOwner","owners/[0]"} - }; */ - } - public DocHandlerParams.Params getDocHandlerParams(){ - return params; - } - } diff --git a/services/blob/service/src/main/java/org/collectionspace/services/blob/nuxeo/BlobDocumentModelHandler.java b/services/blob/service/src/main/java/org/collectionspace/services/blob/nuxeo/BlobDocumentModelHandler.java index fdeca9b75..e79ae7dd2 100644 --- a/services/blob/service/src/main/java/org/collectionspace/services/blob/nuxeo/BlobDocumentModelHandler.java +++ b/services/blob/service/src/main/java/org/collectionspace/services/blob/nuxeo/BlobDocumentModelHandler.java @@ -32,8 +32,6 @@ import org.collectionspace.services.common.blob.BlobUtil; import org.collectionspace.services.common.context.ServiceContext; import org.collectionspace.services.common.document.DocumentWrapper; import org.collectionspace.services.common.imaging.nuxeo.NuxeoImageUtils; -import org.collectionspace.services.common.service.DocHandlerParams; -import org.collectionspace.services.common.service.ListResultField; import org.collectionspace.services.jaxb.AbstractCommonList; import org.collectionspace.services.jaxb.BlobJAXBSchema; import org.nuxeo.ecm.core.api.ClientException; @@ -54,48 +52,6 @@ extends DocHandlerBase { /** The logger. */ private final Logger logger = LoggerFactory.getLogger(BlobDocumentModelHandler.class); - private static DocHandlerParams.Params params; - static { - params = new DocHandlerParams.Params(); - params.setSchemaName("blobs"); - params.setDublinCoreTitle("");//"CollectionSpace-Blob"; - params.setSummaryFields("name|mimeType|encoding|length|uri|csid"); - params.setAbstractCommonListClassname("org.collectionspace.services.blob.BlobsCommonList"); - params.setCommonListItemClassname("org.collectionspace.services.blob.BlobsCommonList$BlobListItem"); - params.setListResultsItemMethodName("getBlobListItem"); - DocHandlerParams.Params.ListResultsFields lrfs = - new DocHandlerParams.Params.ListResultsFields(); - params.setListResultsFields(lrfs); - List lrfl = lrfs.getListResultField(); - ListResultField lrf = new ListResultField(); - lrf.setSetter("setName"); - lrf.setXpath("name"); - lrfl.add( lrf ); - lrf = new ListResultField(); - lrf.setSetter("setMimeType"); - lrf.setXpath("mimeType"); - lrfl.add( lrf ); - lrf = new ListResultField(); - lrf.setSetter("setEncoding"); - lrf.setXpath("encoding"); - lrfl.add( lrf ); - lrf = new ListResultField(); - lrf.setSetter("setLength"); - lrf.setXpath("length"); - lrfl.add( lrf ); - /* - clr.ListItemsArray = new String[][] {{"setEncoding", "encoding"}, - {"setMimeType", "mimeType"}, - {"setName", "name"}, - {"setLength", "length"} - }; - */ - } - - public DocHandlerParams.Params getDocHandlerParams(){ - return params; - } - //============================================================================== private String getDerivativePathBase(DocumentModel docModel) { @@ -103,23 +59,6 @@ extends DocHandlerBase { BlobInput.URI_DERIVATIVES_PATH + "/"; } - /*public Object createItemForCommonList(DocumentModel docModel, String label, String id) throws Exception { - BlobListItem item = new BlobListItem(); - item.setEncoding((String) - docModel.getProperty(label, BlobJAXBSchema.encoding)); - item.setMimeType((String) - docModel.getProperty(label, BlobJAXBSchema.mimeType)); - //String theData = (String) - docModel.getProperty(label, BlobJAXBSchema.data); - item.setName((String) - docModel.getProperty(label, BlobJAXBSchema.name)); - item.setLength((String) - docModel.getProperty(label, BlobJAXBSchema.length)); - item.setUri(getServiceContextPath() + id); - item.setCsid(id); - return item; - } - */ private BlobsCommon getCommonPartProperties(DocumentModel docModel) throws Exception { String label = getServiceContext().getCommonPartLabel(); BlobsCommon result = new BlobsCommon(); diff --git a/services/common/src/main/config/services/tenant-bindings.xml b/services/common/src/main/config/services/tenant-bindings.xml index 623f47d8f..424092ab2 100644 --- a/services/common/src/main/config/services/tenant-bindings.xml +++ b/services/common/src/main/config/services/tenant-bindings.xml @@ -169,6 +169,38 @@ org.collectionspace.services.blob.nuxeo.BlobDocumentModelHandler + + org.collectionspace.services.blob.nuxeo.BlobDocumentModelHandler + + blobs + blobs + name|mimeType|encoding|length|uri|csid + org.collectionspace.services.blob.BlobsCommonList + org.collectionspace.services.blob.BlobsCommonList$BlobListItem + getBlobListItem + + + setName + name + + + + setMimeType + mimeType + + + + setEncoding + encoding + + + + setLength + length + + + + org.collectionspace.services.blob.nuxeo.BlobValidatorHandler @@ -466,6 +498,28 @@ org.collectionspace.services.objectexit.nuxeo.ObjectExitDocumentModelHandler + + org.collectionspace.services.objectexit.nuxeo.ObjectExitDocumentModelHandler + + objectexit + objectexit + exitNumber|currentOwner|uri|csid + org.collectionspace.services.objectexit.ObjectexitCommonList + org.collectionspace.services.objectexit.ObjectexitCommonList$ObjectexitListItem + getObjectexitListItem + + + setExitNumber + exitNumber + + + + setCurrentOwner + currentOwner + + + + org.collectionspace.services.objectexit.nuxeo.ObjectExitValidatorHandler @@ -517,6 +571,38 @@ org.collectionspace.services.media.nuxeo.MediaDocumentModelHandler + + org.collectionspace.services.media.nuxeo.MediaDocumentModelHandler + + media + media + title|source|filename|identificationNumber|uri|csid + org.collectionspace.services.media.MediaCommonList + org.collectionspace.services.media.MediaCommonList$MediaListItem + getMediaListItem + + + setTitle + title + + + + setSource + source + + + + setFilename + filename + + + + setIdentificationNumber + identificationNumber + + + + org.collectionspace.services.media.nuxeo.MediaValidatorHandler @@ -1104,6 +1190,33 @@ org.collectionspace.services.acquisition.nuxeo.AcquisitionDocumentModelHandler + + org.collectionspace.services.loanin.nuxeo.AcquisitionDocumentModelHandler + + acquisition + acquisition + acquisitionReferenceNumber|acquisitionSources|owners|uri|csid + org.collectionspace.services.acquisition.AcquisitionsCommonList + org.collectionspace.services.acquisition.AcquisitionsCommonList$AcquisitionListItem + getAcquisitionListItem + + + setAcquisitionReferenceNumber + acquisitionReferenceNumber + + + + setAcquisitionSource + acquisitionSources/[0] + + + + setOwner + owners/[0] + + + + org.collectionspace.services.acquisition.nuxeo.AcquisitionValidatorHandler @@ -1779,6 +1892,38 @@ org.collectionspace.services.blob.nuxeo.BlobDocumentModelHandler + + org.collectionspace.services.blob.nuxeo.BlobDocumentModelHandler + + blobs + blobs + name|mimeType|encoding|length|uri|csid + org.collectionspace.services.blob.BlobsCommonList + org.collectionspace.services.blob.BlobsCommonList$BlobListItem + getBlobListItem + + + setName + name + + + + setMimeType + mimeType + + + + setEncoding + encoding + + + + setLength + length + + + + org.collectionspace.services.blob.nuxeo.BlobValidatorHandler @@ -1886,6 +2031,33 @@ org.collectionspace.services.loanin.nuxeo.LoaninDocumentModelHandler + + org.collectionspace.services.loanin.nuxeo.LoaninDocumentModelHandler + + loansin + loansin + loanInNumber|lenderList|loanReturnDate|uri|csid + org.collectionspace.services.loanin.LoansinCommonList + org.collectionspace.services.loanin.LoansinCommonList$LoaninListItem + getLoaninListItem + + + setLoanInNumber + loanInNumber + + + + setLender + lenderGroupList/[0]/lender + + + + setLoanReturnDate + loanReturnDate + + + + org.collectionspace.services.loanin.nuxeo.LoaninValidatorHandler @@ -2003,6 +2175,28 @@ org.collectionspace.services.objectexit.nuxeo.ObjectExitDocumentModelHandler + + org.collectionspace.services.objectexit.nuxeo.ObjectExitDocumentModelHandler + + objectexit + objectexit + exitNumber|currentOwner|uri|csid + org.collectionspace.services.objectexit.ObjectexitCommonList + org.collectionspace.services.objectexit.ObjectexitCommonList$ObjectexitListItem + getObjectexitListItem + + + setExitNumber + exitNumber + + + + setCurrentOwner + currentOwner + + + + org.collectionspace.services.objectexit.nuxeo.ObjectExitValidatorHandler @@ -2054,6 +2248,38 @@ org.collectionspace.services.media.nuxeo.MediaDocumentModelHandler + + org.collectionspace.services.media.nuxeo.MediaDocumentModelHandler + + media + media + title|source|filename|identificationNumber|uri|csid + org.collectionspace.services.media.MediaCommonList + org.collectionspace.services.media.MediaCommonList$MediaListItem + getMediaListItem + + + setTitle + title + + + + setSource + source + + + + setFilename + filename + + + + setIdentificationNumber + identificationNumber + + + + org.collectionspace.services.media.nuxeo.MediaValidatorHandler @@ -2581,6 +2807,33 @@ org.collectionspace.services.acquisition.nuxeo.AcquisitionDocumentModelHandler + + org.collectionspace.services.loanin.nuxeo.AcquisitionDocumentModelHandler + + acquisition + acquisition + acquisitionReferenceNumber|acquisitionSources|owners|uri|csid + org.collectionspace.services.acquisition.AcquisitionsCommonList + org.collectionspace.services.acquisition.AcquisitionsCommonList$AcquisitionListItem + getAcquisitionListItem + + + setAcquisitionReferenceNumber + acquisitionReferenceNumber + + + + setAcquisitionSource + acquisitionSources/[0] + + + + setOwner + owners/[0] + + + + org.collectionspace.services.acquisition.nuxeo.AcquisitionValidatorHandler diff --git a/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java b/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java index 416829902..2043cde1a 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java +++ b/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java @@ -88,7 +88,8 @@ public class ServiceMain { return instance; } - private void initialize() throws Exception { setServerRootDir(); + private void initialize() throws Exception { + setServerRootDir(); readConfig(); propagateConfiguredProperties(); try { @@ -97,7 +98,6 @@ public class ServiceMain { logger.error("Default Account setup failed on exception: "+e.getLocalizedMessage()); } try { - //loadDocHandlers(); firePostInitHandlers(); } catch(Exception e) { logger.error("ServiceMain.initialize firePostInitHandlers failed on exception: "+e.getLocalizedMessage()); @@ -560,46 +560,6 @@ public class ServiceMain { return null; } - /* - private void loadDocHandlers() throws Exception { - Hashtable tenantBindingTypeMap = tenantBindingConfigReader.getTenantBindings(); - for (TenantBindingType tbt: tenantBindingTypeMap.values()){ - String name = tbt.getName(); - String id = tbt.getId(); - - List sbtList = tbt.getServiceBindings(); - for (ServiceBindingType sbt: sbtList){ - DocHandlerParams params = sbt.getDocHandlerParams(); - if (params!=null){ - params.getClassname(); - DocHandlerParams.Params p = params.getParams(); - DocHandlerBase.CommonListReflection clr = new DocHandlerBase.CommonListReflection(); - clr.ListItemsArray = - p.getListResultsFields().getListResultField(); - /* - int size = items.size(); - String[][] rows = new String[size][4]; - int r = 0; - for (ListResultField item: items){ - String[] row = rows[r]; - row[0] = item.getSetter(); - row[1] = item.getXpath(); - r++; - } - clr.ListItemsArray = rows; - * / - clr.AbstractCommonListClassname = p.getAbstractCommonListClassname(); - clr.CommonListItemClassname = p.getCommonListItemClassname(); - clr.DublinCoreTitle = p.getDublinCoreTitle(); - clr.ListResultsItemMethodName = p.getListResultsItemMethodName(); - clr.SchemaName = p.getSchemaName(); - clr.SummaryFields = p.getSummaryFields(); - } - } - } - } - */ - private Connection getConnection() throws LoginException, SQLException { return JDBCTools.getConnection(DEFAULT_REPOSITORY_NAME); } diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocHandlerBase.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocHandlerBase.java index 6800cf479..f53148760 100755 --- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocHandlerBase.java +++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocHandlerBase.java @@ -32,6 +32,8 @@ import org.collectionspace.services.common.ReflectionMapper; import org.collectionspace.services.common.Tools; import org.collectionspace.services.common.service.ListResultField; import org.collectionspace.services.common.service.DocHandlerParams; +import org.collectionspace.services.common.service.ServiceBindingType; +import org.collectionspace.services.common.context.MultipartServiceContext; import org.collectionspace.services.common.document.DocumentWrapper; import org.collectionspace.services.jaxb.AbstractCommonList; import org.collectionspace.services.nuxeo.client.java.RemoteDocumentModelHandlerImpl; @@ -98,19 +100,15 @@ public abstract class DocHandlerBase extends RemoteDocumentModelHandlerIm docModel, label, id, true); } - /* - public static class CommonListReflection { - public String SchemaName; // May be Repository schema, or a pseudo schema we manage - public String DublinCoreTitle; // TODO: for CollectionObjectDocumentModelHandler, NUXEO_DC_TITLE = "CollectionSpace-CollectionObject" - public String SummaryFields; - public String AbstractCommonListClassname; - public String CommonListItemClassname; - public String ListResultsItemMethodName; - public List ListItemsArray; //setter, xpath + public DocHandlerParams.Params getDocHandlerParams(){ + MultipartServiceContext sc = (MultipartServiceContext) getServiceContext(); + ServiceBindingType sb = sc.getServiceBinding(); + DocHandlerParams dhb = sb.getDocHandlerParams(); + if(dhb!=null&&dhb.getParams()!=null) { + return dhb.getParams(); + } + throw new RuntimeException("No DocHandlerParams configured for: "+sb.getName()); } - */ - - public abstract DocHandlerParams.Params getDocHandlerParams(); public String getSummaryFields(AbstractCommonList commonList){ return getDocHandlerParams().getSummaryFields(); @@ -212,7 +210,8 @@ public abstract class DocHandlerBase extends RemoteDocumentModelHandlerIm * field for you if specified. */ public List createItemsList(AbstractCommonList commonList) throws Exception { - return createItemsList(commonList, getDocHandlerParams().getListResultsItemMethodName()); + return createItemsList(commonList, + getDocHandlerParams().getListResultsItemMethodName()); } /** e.g. createItemsList(commonList, "getObjectexitListItem" */ diff --git a/services/loanin/service/src/main/java/org/collectionspace/services/loanin/nuxeo/LoaninDocumentModelHandler.java b/services/loanin/service/src/main/java/org/collectionspace/services/loanin/nuxeo/LoaninDocumentModelHandler.java index 82d4232e6..4867715d8 100644 --- a/services/loanin/service/src/main/java/org/collectionspace/services/loanin/nuxeo/LoaninDocumentModelHandler.java +++ b/services/loanin/service/src/main/java/org/collectionspace/services/loanin/nuxeo/LoaninDocumentModelHandler.java @@ -23,11 +23,6 @@ */ package org.collectionspace.services.loanin.nuxeo; -import java.util.ArrayList; -import java.util.List; - -import org.collectionspace.services.common.service.ListResultField; -import org.collectionspace.services.common.service.DocHandlerParams; import org.collectionspace.services.jaxb.AbstractCommonList; import org.collectionspace.services.loanin.LoansinCommon; import org.collectionspace.services.nuxeo.client.java.DocHandlerBase; @@ -38,45 +33,5 @@ import org.collectionspace.services.nuxeo.client.java.DocHandlerBase; */ public class LoaninDocumentModelHandler extends DocHandlerBase { - - private static DocHandlerParams.Params params; - static { - params = new DocHandlerParams.Params(); - params.setSchemaName("loanin"); - params.setDublinCoreTitle("");//"CollectionSpace-Media"; - params.setSummaryFields("loanInNumber|lender|loanReturnDate|uri|csid"); - params.setAbstractCommonListClassname("org.collectionspace.services.loanin.LoansinCommonList"); - params.setCommonListItemClassname("org.collectionspace.services.loanin.LoansinCommonList$LoaninListItem"); - params.setListResultsItemMethodName("getLoaninListItem"); - DocHandlerParams.Params.ListResultsFields lrfs = - new DocHandlerParams.Params.ListResultsFields(); - params.setListResultsFields(lrfs); - List lrfl = lrfs.getListResultField(); - ListResultField lrf = new ListResultField(); - lrf.setSetter("setLoanInNumber"); - lrf.setXpath("loanInNumber"); - lrfl.add( lrf ); - lrf = new ListResultField(); - lrf.setSetter("setLender"); - lrf.setXpath("lenderGroupList/[0]/lender"); - lrfl.add( lrf ); - lrf = new ListResultField(); - lrf.setSetter("setLoanReturnDate"); - lrf.setXpath("loanReturnDate"); - lrfl.add( lrf ); - /* - //ListItemsArray array elements: SETTER=0, ELEMENT=1, CONTAINER=2, SUBELEMENT=3; - clr.ListItemsArray = new String[][] { - {"setLoanInNumber", "loanInNumber"}, - {"setLender", "lenderGroupList/[0]/lender"}, - {"setLoanReturnDate", "loanReturnDate"} - }; - */ - } - - public DocHandlerParams.Params getDocHandlerParams(){ - return params; - } - } diff --git a/services/media/service/src/main/java/org/collectionspace/services/media/nuxeo/MediaDocumentModelHandler.java b/services/media/service/src/main/java/org/collectionspace/services/media/nuxeo/MediaDocumentModelHandler.java index cc47980b8..7b10a27fa 100644 --- a/services/media/service/src/main/java/org/collectionspace/services/media/nuxeo/MediaDocumentModelHandler.java +++ b/services/media/service/src/main/java/org/collectionspace/services/media/nuxeo/MediaDocumentModelHandler.java @@ -25,8 +25,6 @@ package org.collectionspace.services.media.nuxeo; import org.collectionspace.services.MediaJAXBSchema; import org.collectionspace.services.nuxeo.client.java.DocHandlerBase; -import org.collectionspace.services.common.service.DocHandlerParams; -import org.collectionspace.services.common.service.ListResultField; import org.collectionspace.services.common.blob.BlobInput; import org.collectionspace.services.common.blob.BlobUtil; import org.collectionspace.services.common.context.ServiceContext; @@ -44,48 +42,6 @@ import java.util.List; public class MediaDocumentModelHandler extends DocHandlerBase { - private static DocHandlerParams.Params params; - static { - params = new DocHandlerParams.Params(); - params.setSchemaName("media"); - params.setDublinCoreTitle("");//"CollectionSpace-Media"; - params.setSummaryFields("title|source|filename|identificationNumber|uri|csid"); - params.setAbstractCommonListClassname("org.collectionspace.services.media.MediaCommonList"); - params.setCommonListItemClassname("org.collectionspace.services.media.MediaCommonList$MediaListItem"); - params.setListResultsItemMethodName("getMediaListItem"); - DocHandlerParams.Params.ListResultsFields lrfs = - new DocHandlerParams.Params.ListResultsFields(); - params.setListResultsFields(lrfs); - List lrfl = lrfs.getListResultField(); - ListResultField lrf = new ListResultField(); - lrf.setSetter("setTitle"); - lrf.setXpath("title"); - lrfl.add( lrf ); - lrf = new ListResultField(); - lrf.setSetter("setSource"); - lrf.setXpath("source"); - lrfl.add( lrf ); - lrf = new ListResultField(); - lrf.setSetter("setFilename"); - lrf.setXpath("filename"); - lrfl.add( lrf ); - lrf = new ListResultField(); - lrf.setSetter("setIdentificationNumber"); - lrf.setXpath("identificationNumber"); - lrfl.add( lrf ); - /* - clr.ListItemsArray = new String[][] - {{"setTitle", "title"}, - {"setSource", "source"}, - {"setFilename", "filename"}, - {"setIdentificationNumber", "identificationNumber"} - }; - */ - } - - public DocHandlerParams.Params getDocHandlerParams(){ - return params; - } //============================================================================== private MediaCommon getCommonPartProperties(DocumentModel docModel) throws Exception { diff --git a/services/objectexit/service/src/main/java/org/collectionspace/services/objectexit/nuxeo/ObjectExitDocumentModelHandler.java b/services/objectexit/service/src/main/java/org/collectionspace/services/objectexit/nuxeo/ObjectExitDocumentModelHandler.java index 903f26523..fded45254 100644 --- a/services/objectexit/service/src/main/java/org/collectionspace/services/objectexit/nuxeo/ObjectExitDocumentModelHandler.java +++ b/services/objectexit/service/src/main/java/org/collectionspace/services/objectexit/nuxeo/ObjectExitDocumentModelHandler.java @@ -23,47 +23,11 @@ */ package org.collectionspace.services.objectexit.nuxeo; -import org.collectionspace.services.common.service.ListResultField; -import org.collectionspace.services.common.service.DocHandlerParams; - -import java.util.ArrayList; -import java.util.List; - import org.collectionspace.services.nuxeo.client.java.DocHandlerBase; import org.collectionspace.services.objectexit.ObjectexitCommon; import org.collectionspace.services.jaxb.AbstractCommonList; -public class ObjectExitDocumentModelHandler extends DocHandlerBase { - private static DocHandlerParams.Params params; - static { - params = new DocHandlerParams.Params(); - params.setSchemaName("objectexit"); - params.setDublinCoreTitle("");//"CollectionSpace-Media"; - params.setSummaryFields("exitNumber|currentOwner|uri|csid"); - params.setAbstractCommonListClassname("org.collectionspace.services.objectexit.ObjectexitCommonList"); - params.setCommonListItemClassname("org.collectionspace.services.objectexit.ObjectexitCommonList$ObjectexitListItem"); - params.setListResultsItemMethodName("getObjectexitListItem"); - DocHandlerParams.Params.ListResultsFields lrfs = - new DocHandlerParams.Params.ListResultsFields(); - params.setListResultsFields(lrfs); - List lrfl = lrfs.getListResultField(); - ListResultField lrf = new ListResultField(); - lrf.setSetter("setExitNumber"); - lrf.setXpath("exitNumber"); - lrfl.add( lrf ); - lrf = new ListResultField(); - lrf.setSetter("setCurrentOwner"); - lrf.setXpath("currentOwner"); - lrfl.add( lrf ); - - /*clr.ListItemsArray = new String[][] { - {"setExitNumber", "exitNumber"}, - {"setCurrentOwner", "currentOwner"}}; - */ - } - - public DocHandlerParams.Params getDocHandlerParams(){ - return params; - } +public class ObjectExitDocumentModelHandler + extends DocHandlerBase { } -- 2.47.3