git.aero2k.de Git - tmp/jakarta-migration.git/commit

]> git.aero2k.de Git - tmp/jakarta-migration.git/commit

projects / tmp / jakarta-migration.git / commit

author	Aron Roberts <aron@socrates.berkeley.edu>
	Tue, 22 Nov 2011 05:26:57 +0000 (05:26 +0000)
committer	Aron Roberts <aron@socrates.berkeley.edu>
	Tue, 22 Nov 2011 05:26:57 +0000 (05:26 +0000)
commit	7191cc8fbdbd7d97de336d6541fe8faf7920ff9f
tree	081ebd50a45131fd14dd4547e102477c4ade2eb6	tree \| snapshot
parent	2ed99d4f68cacf86430d2507806eed2f39792ad1	commit \| diff

CSPACE-4256: Merged services trunk changes from r5918 through r6056 into the Apache 6 / Nuxeo 5.4.2 services branch. All tests ran successfully, except for two individual test cases in an authRefs-related XmlReplay test group, which have been commented out for now: afterUpdateGetLoan5 and afterUpdateGetLoan9. (Both appear to test if changes to a display name in a Person record are propagated to the display name in authRef-containing field(s) in Loan In.)

97 files changed:

services/IntegrationTests/src/test/java/org/collectionspace/services/IntegrationTests/test/CollectionSpaceIntegrationTest.java		diff \| blob \| history
services/IntegrationTests/src/test/java/org/collectionspace/services/IntegrationTests/test/RelationIntegrationTest.java		diff \| blob \| history
services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/ac1.xml		diff \| blob \| history
services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/ac2.xml		diff \| blob \| history
services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/res/ac1.res.xml		diff \| blob \| history
services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/res/ac2.res.xml		diff \| blob \| history
services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/res/ac3.res.xml		diff \| blob \| history
services/IntegrationTests/src/test/resources/test-data/xmlreplay/authrefs/authrefs.xml	[new file with mode: 0644]	blob
services/IntegrationTests/src/test/resources/test-data/xmlreplay/authrefs/loanout.xml	[new file with mode: 0644]	blob
services/IntegrationTests/src/test/resources/test-data/xmlreplay/authrefs/newPerson1.xml	[new file with mode: 0644]	blob
services/IntegrationTests/src/test/resources/test-data/xmlreplay/authrefs/newPerson2.xml	[new file with mode: 0644]	blob
services/IntegrationTests/src/test/resources/test-data/xmlreplay/authrefs/newPersonAuthority.xml		diff \| blob \| history
services/IntegrationTests/src/test/resources/test-data/xmlreplay/authrefs/res/loanout.res.xml	[new file with mode: 0644]	blob
services/IntegrationTests/src/test/resources/test-data/xmlreplay/authrefs/updatePerson1.xml	[new file with mode: 0644]	blob
services/IntegrationTests/src/test/resources/test-data/xmlreplay/authrefs/updatePerson2.xml	[new file with mode: 0644]	blob
services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/person.xml		diff \| blob \| history
services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/personTermStatusSearch.xml	[new file with mode: 0644]	blob
services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/person_pmadry.xml		diff \| blob \| history
services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/person_pschmitz.xml		diff \| blob \| history
services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_w_relations.xml		diff \| blob \| history
services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_w_relations_2.xml		diff \| blob \| history
services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_w_relations_3.xml		diff \| blob \| history
services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/res/personlistActive.res.xml	[new file with mode: 0644]	blob
services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/res/personlistAll.res.xml	[new file with mode: 0644]	blob
services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/res/personlistNone.res.xml	[new file with mode: 0644]	blob
services/IntegrationTests/src/test/resources/test-data/xmlreplay/relation/r-1.xml		diff \| blob \| history
services/IntegrationTests/src/test/resources/test-data/xmlreplay/relation/r-2.xml		diff \| blob \| history
services/IntegrationTests/src/test/resources/test-data/xmlreplay/relation/relation.xml		diff \| blob \| history
services/IntegrationTests/src/test/resources/test-data/xmlreplay/vocabulary/res/GetVocabularyItems.res.xml		diff \| blob \| history
services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master.xml		diff \| blob \| history
services/PerformanceTests/src/test/java/org/collectionspace/services/PerformanceTests/test/CollectionSpacePerformanceTest.java		diff \| blob \| history
services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/schemas/acquisitions_common.xsd		diff \| blob \| history
services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionServiceTest.java		diff \| blob \| history
services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityResource.java		diff \| blob \| history
services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/RefNameServiceUtils.java		diff \| blob \| history
services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityDocumentModelHandler.java		diff \| blob \| history
services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityItemDocumentModelHandler.java		diff \| blob \| history
services/batch/service/src/main/java/org/collectionspace/services/batch/nuxeo/CreateAndLinkLoanOutBatchJob.java		diff \| blob \| history
services/blob/3rdparty/nuxeo-platform-cs-blob/src/main/resources/schemas/blobs_common.xsd		diff \| blob \| history
services/client/src/main/java/org/collectionspace/services/client/IQueryManager.java		diff \| blob \| history
services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/src/main/resources/schemas/collectionobjects_naturalhistory.xsd		diff \| blob \| history
services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/schemas/collectionobjects_common.xsd		diff \| blob \| history
services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectServiceTest.java		diff \| blob \| history
services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd		diff \| blob \| history
services/common-api/src/main/java/org/collectionspace/services/common/api/Tools.java		diff \| blob \| history
services/common/build.xml		diff \| blob \| history
services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml		diff \| blob \| history
services/common/src/main/java/org/collectionspace/services/common/config/TenantBindingConfigReaderImpl.java		diff \| blob \| history
services/common/src/main/java/org/collectionspace/services/common/context/ServiceBindingUtils.java		diff \| blob \| history
services/common/src/main/java/org/collectionspace/services/common/datetime/DateTimeFormatUtils.java		diff \| blob \| history
services/common/src/main/java/org/collectionspace/services/common/datetime/GregorianCalendarDateTimeUtils.java		diff \| blob \| history
services/common/src/main/java/org/collectionspace/services/common/document/DocumentUtils.java		diff \| blob \| history
services/common/src/main/java/org/collectionspace/services/common/imaging/nuxeo/NuxeoImageUtils.java		diff \| blob \| history
services/common/src/main/java/org/collectionspace/services/common/query/QueryManager.java		diff \| blob \| history
services/common/src/main/java/org/collectionspace/services/common/query/nuxeo/QueryManagerNuxeoImpl.java		diff \| blob \| history
services/common/src/main/java/org/collectionspace/services/common/relation/RelationJAXBSchema.java		diff \| blob \| history
services/common/src/main/java/org/collectionspace/services/common/relation/nuxeo/RelationsUtils.java		diff \| blob \| history
services/common/src/main/java/org/collectionspace/services/common/repository/RepositoryClient.java		diff \| blob \| history
services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocHandlerBase.java		diff \| blob \| history
services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java		diff \| blob \| history
services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java		diff \| blob \| history
services/contact/service/src/main/java/org/collectionspace/services/contact/AuthorityResourceWithContacts.java		diff \| blob \| history
services/imports/service/src/test/resources/requests/collectionobject-request.xml		diff \| blob \| history
services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/schemas/intakes_common.xsd		diff \| blob \| history
services/intake/client/src/test/java/org/collectionspace/services/client/test/IntakeAuthRefsTest.java		diff \| blob \| history
services/intake/client/src/test/java/org/collectionspace/services/client/test/IntakeServiceTest.java		diff \| blob \| history
services/intake/client/src/test/java/org/collectionspace/services/client/test/OrganizationAuthRefDocsTest.java		diff \| blob \| history
services/intake/client/src/test/java/org/collectionspace/services/client/test/PersonAuthRefDocsTest.java		diff \| blob \| history
services/jaxb/src/main/resources/authorityrefdocs.xsd		diff \| blob \| history
services/jaxb/src/main/resources/blobs_common.xsd		diff \| blob \| history
services/jaxb/src/main/resources/relations_common.xsd		diff \| blob \| history
services/loanin/3rdparty/nuxeo-platform-cs-loanin/src/main/resources/schemas/loansin_common.xsd		diff \| blob \| history
services/loanin/client/src/test/java/org/collectionspace/services/client/test/LoaninAuthRefsTest.java		diff \| blob \| history
services/loanin/client/src/test/java/org/collectionspace/services/client/test/LoaninServiceTest.java		diff \| blob \| history
services/loanin/jaxb/src/main/resources/loansin-common.xsd		diff \| blob \| history
services/loanout/3rdparty/nuxeo-platform-cs-loanout/src/main/resources/schemas/loansout_common.xsd		diff \| blob \| history
services/loanout/client/src/test/java/org/collectionspace/services/client/test/LoanoutAuthRefsTest.java		diff \| blob \| history
services/loanout/client/src/test/java/org/collectionspace/services/client/test/LoanoutServiceTest.java		diff \| blob \| history
services/loanout/jaxb/src/main/resources/loansout-common.xsd		diff \| blob \| history
services/location/3rdparty/nuxeo-platform-cs-location/src/main/resources/schemas/locations_common.xsd		diff \| blob \| history
services/location/client/src/test/java/org/collectionspace/services/client/test/LocationAuthorityServiceTest.java		diff \| blob \| history
services/media/3rdparty/nuxeo-platform-cs-media/src/main/resources/schemas/media_common.xsd		diff \| blob \| history
services/media/jaxb/src/main/resources/media_common.xsd		diff \| blob \| history
services/movement/3rdparty/nuxeo-platform-cs-movement/src/main/resources/schemas/movements_common.xsd		diff \| blob \| history
services/movement/client/src/test/java/org/collectionspace/services/client/test/MovementServiceTest.java		diff \| blob \| history
services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/src/main/resources/schemas/objectexit_common.xsd		diff \| blob \| history
services/objectexit/client/src/test/java/org/collectionspace/services/client/test/ObjectExitAuthRefsTest.java		diff \| blob \| history
services/objectexit/jaxb/src/main/resources/objectexit_common.xsd		diff \| blob \| history
services/person/service/src/main/java/org/collectionspace/services/person/nuxeo/PersonAuthorityValidatorHandler.java		diff \| blob \| history
services/person/service/src/main/java/org/collectionspace/services/person/nuxeo/PersonDocumentModelHandler.java		diff \| blob \| history
services/person/service/src/main/java/org/collectionspace/services/person/nuxeo/PersonValidatorHandler.java		diff \| blob \| history
services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/OSGI-INF/layouts-contrib.xml		diff \| blob \| history
services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/schemas/relations_common.xsd		diff \| blob \| history
services/relation/client/src/test/java/org/collectionspace/services/client/test/RelationServiceTest.java		diff \| blob \| history
services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationDocumentModelHandler.java		diff \| blob \| history
services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationValidatorHandler.java		diff \| blob \| history
services/taxonomy/service/src/main/java/org/collectionspace/services/taxonomy/nuxeo/TaxonDocumentModelHandler.java		diff \| blob \| history

RSS Atom