From d0b9453417f15ecc694d224e1ec54815a9db1261 Mon Sep 17 00:00:00 2001 From: Aron Roberts Date: Thu, 16 Jun 2011 12:39:38 +0000 Subject: [PATCH] CSPACE-4081: Update username in XmlReplay-based Integration Tests to reflect name change of tenant 1 to core.collectionspace.org, from collectionspace.org --- .../xmlreplay/XmlCompareJdom/1-right.xml | 2 +- .../xmlreplay/acquisitions/acquisitions.xml | 2 +- .../test-data/xmlreplay/batch/batch.xml | 2 +- .../xmlreplay/dev-master-example.xml | 4 +-- .../test-data/xmlreplay/dimension-master.xml | 4 +-- .../test-data/xmlreplay/dimension.xml | 12 +++---- .../test-data/xmlreplay/loanin/loanin.xml | 2 +- .../test-data/xmlreplay/loanout/loanout.xml | 2 +- .../location/location-2-authorities.xml | 8 ++--- .../location-hierarchy-dual-parents.xml | 2 +- .../xmlreplay/location/location-hierarchy.xml | 4 +-- .../location/location-mixed-hierarchy.xml | 8 ++--- .../objectexit/object-exit-display.xml | 2 +- .../xmlreplay/objectexit/object-exit.xml | 8 ++--- .../objectexit/res/oePersonDisplayGET.res.xml | 2 +- .../test-data/xmlreplay/organization.xml | 2 +- .../organization/organization-hierarchy.xml | 2 +- .../test-data/xmlreplay/person/person.xml | 8 ++--- .../test-data/xmlreplay/relation/relation.xml | 2 +- .../test-data/xmlreplay/security.xml | 32 +++++++++---------- .../xmlreplay/vocabulary/vocabulary.xml | 6 ++-- .../xmlreplay/xml-replay-master-self-test.xml | 4 +-- .../test-data/xmlreplay/xml-replay-master.xml | 4 +-- .../xmlreplay/xml-replay-self-test.xml | 2 +- 24 files changed, 63 insertions(+), 63 deletions(-) diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/XmlCompareJdom/1-right.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/XmlCompareJdom/1-right.xml index e69e2f2df..b7184dd01 100644 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/XmlCompareJdom/1-right.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/XmlCompareJdom/1-right.xml @@ -33,7 +33,7 @@ 74bb3d58-a8cb-4367-86da-d48f8fa5aece - admin@collectionspace.org + admin@core.collectionspace.org 71 diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/acquisitions.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/acquisitions.xml index 479a04d3f..80d16789c 100755 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/acquisitions.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/acquisitions.xml @@ -2,7 +2,7 @@ - YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y + YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/batch/batch.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/batch/batch.xml index 308a93550..10298be2e 100644 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/batch/batch.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/batch/batch.xml @@ -2,7 +2,7 @@ - YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y + YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/dev-master-example.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/dev-master-example.xml index 0224862b8..236ddbfab 100644 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/dev-master-example.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/dev-master-example.xml @@ -36,8 +36,8 @@ - - YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y + + YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y - - YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y + + YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/dimension.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/dimension.xml index d591c887f..7f0220dd0 100755 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/dimension.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/dimension.xml @@ -2,7 +2,7 @@ - 59PnafP1k9rcuGNMxbCfyQ3TphxKBqecsJI2Yv5vrms= + 59PnafP1k9rcuGNMxbCfyQ3TphxKBqecsJI2Yv5vrms= YmlnYmlyZDIwMTA6YmlnYmlyZDIwMTA= @@ -21,7 +21,7 @@ - + 201,403 POST @@ -37,7 +37,7 @@ - + 201 POST @@ -48,13 +48,13 @@ - + GET /cspace-services/dimensions/${dimPOST.CSID} - + PUT /cspace-services/dimensions/${dimPOST.CSID} @@ -63,7 +63,7 @@ - + GET /cspace-services/dimensions/${dimPOST.CSID} diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/loanin/loanin.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/loanin/loanin.xml index 42ff68a83..0a3e72367 100755 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/loanin/loanin.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/loanin/loanin.xml @@ -2,7 +2,7 @@ - YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y + YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/loanout/loanout.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/loanout/loanout.xml index 58d360a62..ee8686c5c 100644 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/loanout/loanout.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/loanout/loanout.xml @@ -2,7 +2,7 @@ - YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y + YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/location/location-2-authorities.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/location/location-2-authorities.xml index e9260fe56..e821a218e 100644 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/location/location-2-authorities.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/location/location-2-authorities.xml @@ -2,7 +2,7 @@ - + POST /cspace-services/locationauthorities/ location/hierarchy/1-authority.xml @@ -11,13 +11,13 @@ LocationAuth1-displayName - + GET /cspace-services/locationauthorities/${LocationAuth1.CSID} - + POST /cspace-services/locationauthorities/ location/hierarchy/1-authority.xml @@ -26,7 +26,7 @@ LocationAuth1-displayName - + GET /cspace-services/locationauthorities/${LocationAuth2.CSID} diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/location/location-hierarchy-dual-parents.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/location/location-hierarchy-dual-parents.xml index 6ebd34339..a7d2d5105 100644 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/location/location-hierarchy-dual-parents.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/location/location-hierarchy-dual-parents.xml @@ -2,7 +2,7 @@ - + POST /cspace-services/locationauthorities/ location/hierarchy/1-authority.xml diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/location/location-hierarchy.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/location/location-hierarchy.xml index 0b67e3cb9..c09c83336 100644 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/location/location-hierarchy.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/location/location-hierarchy.xml @@ -2,7 +2,7 @@ - + POST /cspace-services/locationauthorities/ location/hierarchy/1-authority.xml @@ -11,7 +11,7 @@ LocationAuth1-displayName - + GET /cspace-services/locationauthorities/${LocationAuth1.CSID} diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/location/location-mixed-hierarchy.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/location/location-mixed-hierarchy.xml index 058ab5b82..8b1313289 100644 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/location/location-mixed-hierarchy.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/location/location-mixed-hierarchy.xml @@ -2,7 +2,7 @@ - + POST /cspace-services/locationauthorities/ location/hierarchy/1-authority.xml @@ -12,7 +12,7 @@ - + POST /cspace-services/locationauthorities/ location/hierarchy/1-authority.xml @@ -22,12 +22,12 @@ - + GET /cspace-services/locationauthorities/${LocationAuth1.CSID} - + GET /cspace-services/locationauthorities/${LocationAuth2.CSID} diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/object-exit-display.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/object-exit-display.xml index 5b5e783b4..cb2718aa6 100755 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/object-exit-display.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/object-exit-display.xml @@ -2,7 +2,7 @@ - YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y + YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/object-exit.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/object-exit.xml index 3ef6018f4..e8be5f9aa 100644 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/object-exit.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/object-exit.xml @@ -2,7 +2,7 @@ - YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y + YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y @@ -142,7 +142,7 @@ - + POST /cspace-services/objectexit/ @@ -155,7 +155,7 @@ - + POST /cspace-services/objectexit/ @@ -359,7 +359,7 @@ - + POST /cspace-services/objectexit/ diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/res/oePersonDisplayGET.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/res/oePersonDisplayGET.res.xml index d87e87c69..f7845ad40 100644 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/res/oePersonDisplayGET.res.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/res/oePersonDisplayGET.res.xml @@ -18,7 +18,7 @@ 6b296c92-bb90-42d8-a804-3ec87c5e21d6 - admin@collectionspace.org + admin@core.collectionspace.org 70 diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/organization.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/organization.xml index 60eb04d5e..27d07505d 100755 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/organization.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/organization.xml @@ -1,7 +1,7 @@ - + POST /cspace-services/orgauthorities/ diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/organization/organization-hierarchy.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/organization/organization-hierarchy.xml index b3ac368a8..19e335ec1 100644 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/organization/organization-hierarchy.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/organization/organization-hierarchy.xml @@ -2,7 +2,7 @@ - + POST /cspace-services/orgauthorities/ organization/hierarchy/1-authority.xml diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/person.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/person.xml index fb810e49c..cec5f0029 100755 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/person.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/person.xml @@ -5,7 +5,7 @@ For now, use ID="updatePerson" --> - + POST /cspace-services/personauthorities/ person/personauthorities_common.xml @@ -99,7 +99,7 @@ - + POST /cspace-services/personauthorities/ person/personauthorities_common.xml @@ -239,7 +239,7 @@ !-- ========================= POST a person ===================================================== --> - + POST /cspace-services/personauthorities/ person/personauthorities_common.xml @@ -369,7 +369,7 @@ - + POST /cspace-services/personauthorities/ person/personauthorities_common.xml diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/relation/relation.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/relation/relation.xml index 0ce0f6dec..ee559645d 100644 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/relation/relation.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/relation/relation.xml @@ -2,7 +2,7 @@ - YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y + YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/security.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/security.xml index b39bb2704..2d4a52be2 100755 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/security.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/security.xml @@ -2,7 +2,7 @@ - YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y + YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y dXNlcjFAbXVzZXVtMS5vcmc6dXNlcjFAbXVzZXVtMS5vcmc= YmlnYmlyZDIwMTA6YmlnYmlyZDIwMTA= ZWxtbzIwMTA6ZWxtbzIwMTA= @@ -26,7 +26,7 @@ security/6-account-elmo.xml - + POST /cspace-services/dimensions/ dimension/1.xml @@ -36,7 +36,7 @@ DELETE dimension1 - + DELETE dimension1 @@ -62,7 +62,7 @@ - + POST /cspace-services/authorization/permissions security/1-bigbird-permission.xml @@ -161,7 +161,7 @@ --> - + DELETE /cspace-services/authorization/permissions/${permBigbird.CSID}/permroles - + POST /cspace-services/authorization/permissions security/1-bigbird-permission.xml - + POST /cspace-services/authorization/roles security/3-role-test-cm.xml @@ -292,7 +292,7 @@ - + Deleting permroles from bigbird2010 DELETE /cspace-services/authorization/permissions/${permBigbird.CSID}/permroles @@ -327,12 +327,12 @@ - + POST /cspace-services/authorization/permissions security/11-bigbird-permission-CRU.xml - + POST /cspace-services/authorization/permissions/${permBigbird_CRU.CSID}/permroles security/11-permissionroles-bigbird-CRU.xml @@ -363,7 +363,7 @@ - + Deleting permroles from bigbird2010 DELETE /cspace-services/authorization/permissions/${permBigbird_CRU.CSID}/permroles @@ -371,12 +371,12 @@ - + POST /cspace-services/authorization/permissions security/12-bigbird-permission-R.xml - + POST /cspace-services/authorization/permissions/${permBigbird_R.CSID}/permroles security/12-permissionroles-bigbird-R.xml @@ -410,12 +410,12 @@ - + Deleting permroles from bigbird2010 DELETE /cspace-services/authorization/permissions/${permBigbird.CSID}/permroles - + DELETE /cspace-services/accounts/${accountBigbird.CSID}/accountroles diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/vocabulary/vocabulary.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/vocabulary/vocabulary.xml index 8b2281404..d7009cef5 100644 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/vocabulary/vocabulary.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/vocabulary/vocabulary.xml @@ -2,7 +2,7 @@ - YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y + YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y @@ -47,12 +47,12 @@ - + GET /cspace-services/vocabularies/ - + GET /cspace-services/vocabularies/${Vocabulary1.CSID}/items/ diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master-self-test.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master-self-test.xml index 8e5f0baf4..429b628aa 100755 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master-self-test.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master-self-test.xml @@ -5,8 +5,8 @@ - - YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y + + YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y - - YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y + + YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y