From 27d8c7a4be0b41aa820fbf5cef37e67b60802478 Mon Sep 17 00:00:00 2001 From: Aron Roberts Date: Fri, 4 Feb 2011 20:37:51 +0000 Subject: [PATCH] CSPACE-2497: Trivial reformatting / pretty printing of tenant bindings file prior to editing. Fixed one log statement for add indicies operation that appears during startup. --- .../main/config/services/tenant-bindings.xml | 330 ++++++++---------- .../services/common/init/AddIndices.java | 2 +- 2 files changed, 150 insertions(+), 182 deletions(-) diff --git a/services/common/src/main/config/services/tenant-bindings.xml b/services/common/src/main/config/services/tenant-bindings.xml index 424092ab2..cb39e0bff 100644 --- a/services/common/src/main/config/services/tenant-bindings.xml +++ b/services/common/src/main/config/services/tenant-bindings.xml @@ -11,7 +11,7 @@ xmlns:types='http://collectionspace.org/services/common/types' xsi:schemaLocation='http://collectionspace.org/services/common/tenant http://collectionspace.org/services/common/tenant.xsd' > - + @@ -172,21 +172,21 @@ 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 - + blobs + blobs + name|mimeType|encoding|length|uri|csid + org.collectionspace.services.blob.BlobsCommonList + org.collectionspace.services.blob.BlobsCommonList$BlobListItem + getBlobListItem + + + setName + name + setMimeType - mimeType + mimeType @@ -197,8 +197,8 @@ setLength length - - + + @@ -273,7 +273,7 @@ authRefvaluer authRefinsurers|insurer authRefconditionCheckersOrAssessors|conditionCheckerOrAssessor - + 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 - - + 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 + lenderGroupList/[0]/lender - setLoanReturnDate loanReturnDate @@ -339,15 +337,6 @@ org.collectionspace.services.loanin.nuxeo.LoaninValidatorHandler - org.collectionspace.services.common.init.InitHandler @@ -363,25 +352,21 @@ mytpe2 myparam, myparam2B - my keymy value my key 2my value 2 - - - - datePatternMMM dd, yyyy - datePatterndd.MM.yyyy - - localeLanguageen - - + datePatternMMM dd, yyyy + datePatterndd.MM.yyyy + + localeLanguageen + + @@ -501,23 +486,22 @@ 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 - - + objectexit + objectexit + exitNumber|currentOwner|uri|csid + org.collectionspace.services.objectexit.ObjectexitCommonList + org.collectionspace.services.objectexit.ObjectexitCommonList$ObjectexitListItem + getObjectexitListItem + + + setExitNumber + exitNumber + setCurrentOwner - currentOwner + currentOwner - + @@ -574,33 +558,30 @@ 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 - - + media + media + title|source|filename|identificationNumber|uri|csid + org.collectionspace.services.media.MediaCommonList + org.collectionspace.services.media.MediaCommonList$MediaListItem + getMediaListItem + + + setTitle + title + setSource - source + source - setFilename filename - setIdentificationNumber identificationNumber - - + + @@ -628,7 +609,7 @@ authRefpublisher authRefrightsHolder authRefsubjects|subject - + - + @@ -1193,23 +1174,21 @@ 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 - - + acquisition + acquisition + acquisitionReferenceNumber|acquisitionSources|owners|uri|csid + org.collectionspace.services.acquisition.AcquisitionsCommonList + org.collectionspace.services.acquisition.AcquisitionsCommonList$AcquisitionListItem + getAcquisitionListItem + + + setAcquisitionReferenceNumber + acquisitionReferenceNumber + setAcquisitionSource - acquisitionSources/[0] + acquisitionSources/[0] - setOwner owners/[0] @@ -1688,7 +1667,7 @@ - + @@ -1727,7 +1706,7 @@ - + @@ -1738,7 +1717,7 @@ - + @@ -1869,7 +1848,6 @@ - @@ -1895,33 +1873,30 @@ 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 - - + blobs + blobs + name|mimeType|encoding|length|uri|csid + org.collectionspace.services.blob.BlobsCommonList + org.collectionspace.services.blob.BlobsCommonList$BlobListItem + getBlobListItem + + + setName + name + setMimeType - mimeType + mimeType - setEncoding encoding - setLength length - - + + @@ -1952,7 +1927,7 @@ - + @@ -1996,7 +1971,7 @@ authRefvaluer authRefinsurers|insurer authRefconditionCheckersOrAssessors|conditionCheckerOrAssessor - + 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 - - + 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 + lenderGroupList/[0]/lender - setLoanReturnDate loanReturnDate @@ -2166,7 +2139,7 @@ - + @@ -2178,23 +2151,23 @@ 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 - + objectexit + objectexit + exitNumber|currentOwner|uri|csid + org.collectionspace.services.objectexit.ObjectexitCommonList + org.collectionspace.services.objectexit.ObjectexitCommonList$ObjectexitListItem + getObjectexitListItem + + + setExitNumber + exitNumber + setCurrentOwner - currentOwner + currentOwner - + @@ -2251,33 +2224,30 @@ 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 - - + media + media + title|source|filename|identificationNumber|uri|csid + org.collectionspace.services.media.MediaCommonList + org.collectionspace.services.media.MediaCommonList$MediaListItem + getMediaListItem + + + setTitle + title + setSource - source + source - setFilename filename - setIdentificationNumber identificationNumber - - + + @@ -2306,7 +2276,7 @@ authRefpublisher authRefrightsHolder authRefsubjects|subject - + 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 - - + acquisition + acquisition + acquisitionReferenceNumber|acquisitionSources|owners|uri|csid + org.collectionspace.services.acquisition.AcquisitionsCommonList + org.collectionspace.services.acquisition.AcquisitionsCommonList$AcquisitionListItem + getAcquisitionListItem + + + setAcquisitionReferenceNumber + acquisitionReferenceNumber + setAcquisitionSource - acquisitionSources/[0] + acquisitionSources/[0] - setOwner owners/[0] @@ -3305,7 +3273,7 @@ - + @@ -3345,7 +3313,7 @@ - + diff --git a/services/common/src/main/java/org/collectionspace/services/common/init/AddIndices.java b/services/common/src/main/java/org/collectionspace/services/common/init/AddIndices.java index f4491e6ef..0b8a9b6f8 100755 --- a/services/common/src/main/java/org/collectionspace/services/common/init/AddIndices.java +++ b/services/common/src/main/java/org/collectionspace/services/common/init/AddIndices.java @@ -82,7 +82,7 @@ public class AddIndices extends InitHandler implements IInitHandler { //todo: all post-init tasks for services, or delegate to services that override. int rows = 0; String sql = ""; - logger.info("Modifying field datatypes for " + sbt.getName() + logger.info("Creating indicies for designated fields in " + sbt.getName() + " for repository domain " + sbt.getRepositoryDomain().trim() + "..."); for (Field field : fields) { -- 2.47.3