CSPACE-4081: Update username in XmlReplay-based Integration Tests to reflect name...

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 e69e2f2df1f75977dfbb627df9d563fc98226855..b7184dd016ed0f98b2a38738290bf0ec84515df2 100644 (file)
--- 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 @@
   <ns2:account_permission xmlns:ns2="http://collectionspace.org/services/authorization">
     <account>
       <accountId>74bb3d58-a8cb-4367-86da-d48f8fa5aece</accountId>
-      <userId>admin@collectionspace.org</userId>
+      <userId>admin@core.collectionspace.org</userId>
     </account>
     <permission>
       <permRelationshipId>71</permRelationshipId>

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 479a04d3f6302cbc340a677c159f02b39f9bc4c4..80d16789c66a8b34eab18955afa2922c3d580aed 100755 (executable)
--- 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 @@
 <xmlReplay>\r
     <auths>\r
         <!-- IMPORTANT: THESE ARE STICKY :: THEY STICK AROUND UNTIL RESET, IN EXEC ORDER OF THIS FILE. -->\r
-        <auth ID="admin@collectionspace.org">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>\r
+        <auth ID="admin@core.collectionspace.org">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>\r
         <auth ID="testAdministator">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>\r
     </auths>\r
    \r

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 308a9355043d3ea5a0d6d8e6062af942dcc202cf..10298be2e579362815d8a13863c54ef89971114c 100644 (file)
--- 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 @@
 <xmlReplay>\r
        <auths>\r
                <!-- IMPORTANT: THESE ARE STICKY :: THEY STICK AROUND UNTIL RESET, IN EXEC ORDER OF THIS FILE. -->\r
-               <auth ID="admin@collectionspace.org">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>\r
+               <auth ID="admin@core.collectionspace.org">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>\r
                <auth ID="testAdministator">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>\r
        </auths>\r
        <testGroup ID="testSingle" autoDeletePOSTS="true">\r

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 0224862b8d1b9afa227755e5b3f8113e1f143159..236ddbfab2d52bfb0e7f2426ddb4a490eb0aac06 100644 (file)
--- 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 @@
     <!-- legal values for dumpServiceResult=[minimal,detailed,full,auto] -->\r
     <dump payloads="false" dumpServiceResult="detailed" />\r
     \r
-    <auths default="admin@collectionspace.org">\r
-       <auth ID="admin@collectionspace.org">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>\r
+    <auths default="admin@core.collectionspace.org">\r
+       <auth ID="admin@core.collectionspace.org">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>\r
     </auths>\r
     \r
        <!-- EXAMPLES. JUST UNCOMMENT THEM, AND RUN AS SHOWN ABOVE.\r

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/dimension-master.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/dimension-master.xml
index 4a709dd7b790dffb997aed025c3f4124f2b5ea37..aabc6fce5f80c876b0ac1885a4cd678314756e78 100755 (executable)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/dimension-master.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/dimension-master.xml
@@ -5,8 +5,8 @@
     <!-- legal values for dumpServiceResult=[minimal,detailed,full,auto] -->\r
     <dump payloads="false" dumpServiceResult="auto" />\r
     \r
-    <auths default="admin@collectionspace.org">\r
-       <auth ID="admin@collectionspace.org">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>\r
+    <auths default="admin@core.collectionspace.org">\r
+       <auth ID="admin@core.collectionspace.org">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>\r
     </auths>\r
 \r
     \r

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 d591c887fd8462ff62ee3bddc1b5903e49cc3474..7f0220dd06fd549e3b2c4097189d85d239bc5704 100755 (executable)
--- 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 @@
 <xmlReplay>\r
     <auths>\r
         <!-- IMPORTANT: THESE ARE STICKY :: THEY STICK AROUND UNTIL RESET, IN EXEC ORDER OF THIS FILE. -->\r
-        <auth ID="admin@collectionspace.org">59PnafP1k9rcuGNMxbCfyQ3TphxKBqecsJI2Yv5vrms=</auth>\r
+        <auth ID="admin@core.collectionspace.org">59PnafP1k9rcuGNMxbCfyQ3TphxKBqecsJI2Yv5vrms=</auth>\r
         <auth ID="bigbird2010">YmlnYmlyZDIwMTA6YmlnYmlyZDIwMTA=</auth>\r
     </auths>\r
     \r
@@ -21,7 +21,7 @@
         </test>\r
 \r
         <!-- should succeed on auth="test" since test is admin user. -->\r
-        <test ID="dimension2"  auth="admin@collectionspace.org">\r
+        <test ID="dimension2"  auth="admin@core.collectionspace.org">\r
             <!-- actually, this one should succeed since "test" is admin, but it fails now. -->\r
             <expectedCodes>201,403</expectedCodes>\r
             <method>POST</method>\r
@@ -37,7 +37,7 @@
 \r
     <testGroup ID="dimensionCRUDGroup" autoDeletePOSTS="true">\r
          <!-- should succeed on auth="test" since test is admin user. -->\r
-         <test ID="dimPOST"  auth="admin@collectionspace.org">\r
+         <test ID="dimPOST"  auth="admin@core.collectionspace.org">\r
              <!-- actually, this one should succeed since "test" is admin, but it fails now. -->\r
              <expectedCodes>201</expectedCodes>\r
              <method>POST</method>\r
@@ -48,13 +48,13 @@
              </part>\r
          </test>\r
 \r
-        <test ID="dimGET"  auth="admin@collectionspace.org">\r
+        <test ID="dimGET"  auth="admin@core.collectionspace.org">\r
             <!-- actually, this one should succeed since "test" is admin, but it fails now. -->\r
             <method>GET</method>\r
             <uri>/cspace-services/dimensions/${dimPOST.CSID}</uri>\r
         </test>\r
 \r
-        <test ID="dimPUT"  auth="admin@collectionspace.org">\r
+        <test ID="dimPUT"  auth="admin@core.collectionspace.org">\r
             <method>PUT</method>\r
             <uri>/cspace-services/dimensions/${dimPOST.CSID}</uri>\r
             <part>\r
@@ -63,7 +63,7 @@
             </part>\r
         </test>\r
 \r
-        <test ID="dimGET2"  auth="admin@collectionspace.org">\r
+        <test ID="dimGET2"  auth="admin@core.collectionspace.org">\r
             <method>GET</method>\r
             <uri>/cspace-services/dimensions/${dimPOST.CSID}</uri>\r
         </test>\r

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 42ff68a83ae6a937c6ff6fcca45ae01ae0648e82..0a3e7236714b0c30e4db0a6468307579dd53a692 100755 (executable)
--- 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 @@
 <xmlReplay>\r
     <auths>\r
         <!-- IMPORTANT: THESE ARE STICKY :: THEY STICK AROUND UNTIL RESET, IN EXEC ORDER OF THIS FILE. -->\r
-        <auth ID="admin@collectionspace.org">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>\r
+        <auth ID="admin@core.collectionspace.org">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>\r
         <auth ID="testAdministator">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>\r
     </auths>\r
    \r

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 58d360a625e4a4634c8a0837e07542ded16ea10c..ee8686c5c841ecb09a67344f5ab483b9a5fb59c9 100644 (file)
--- 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 @@
 <xmlReplay>
     <auths>
         <!-- IMPORTANT: THESE ARE STICKY :: THEY STICK AROUND UNTIL RESET, IN EXEC ORDER OF THIS FILE. -->
-        <auth ID="admin@collectionspace.org">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>
+        <auth ID="admin@core.collectionspace.org">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>
         <auth ID="testAdministator">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>
     </auths>
    

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 e9260fe5611d7016e7fcb852dfd3d17731299fea..e821a218edff2a60d72ca138accd52b44e7fdc29 100644 (file)
--- 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 @@
 <xmlReplay>
        <testGroup ID="HierarchicLocation" autoDeletePOSTS="true">
        
-           <test ID="LocationAuth1" auth="admin@collectionspace.org">
+           <test ID="LocationAuth1" auth="admin@core.collectionspace.org">
             <method>POST</method>
             <uri>/cspace-services/locationauthorities/</uri>
             <filename>location/hierarchy/1-authority.xml</filename>
@@ -11,13 +11,13 @@
                <var ID="displayName">LocationAuth1-displayName</var>
             </vars>
         </test>
-        <test ID="GETLocationAuth1" auth="admin@collectionspace.org">
+        <test ID="GETLocationAuth1" auth="admin@core.collectionspace.org">
             <method>GET</method>
             <uri>/cspace-services/locationauthorities/${LocationAuth1.CSID}</uri>
         </test>
         
        
-           <test ID="LocationAuth2" auth="admin@collectionspace.org">
+           <test ID="LocationAuth2" auth="admin@core.collectionspace.org">
             <method>POST</method>
             <uri>/cspace-services/locationauthorities/</uri>
             <filename>location/hierarchy/1-authority.xml</filename>
@@ -26,7 +26,7 @@
                <var ID="displayName">LocationAuth1-displayName</var>
             </vars>
         </test>
-        <test ID="GETLocationAuth2" auth="admin@collectionspace.org">
+        <test ID="GETLocationAuth2" auth="admin@core.collectionspace.org">
             <method>GET</method>
             <uri>/cspace-services/locationauthorities/${LocationAuth2.CSID}</uri>
         </test>

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 6ebd34339a07350508e8f03229a28ffc0528f48d..a7d2d51050d2b205fa4cd4b239b8e2b3686a8858 100644 (file)
--- 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 @@
 <xmlReplay>
        <testGroup ID="HierarchicLocationTooManyParents" autoDeletePOSTS="true">
        
-           <test ID="LocationAuth1" auth="admin@collectionspace.org">
+           <test ID="LocationAuth1" auth="admin@core.collectionspace.org">
             <method>POST</method>
             <uri>/cspace-services/locationauthorities/</uri>
             <filename>location/hierarchy/1-authority.xml</filename>

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 0b67e3cb95051e662bb7ffc44c9089ada3345da4..c09c83336b250587099da4ebd1b1a102c1dbbc2a 100644 (file)
--- 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 @@
 <xmlReplay>
        <testGroup ID="HierarchicLocation" autoDeletePOSTS="true">
        
-           <test ID="LocationAuth1" auth="admin@collectionspace.org">
+           <test ID="LocationAuth1" auth="admin@core.collectionspace.org">
             <method>POST</method>
             <uri>/cspace-services/locationauthorities/</uri>
             <filename>location/hierarchy/1-authority.xml</filename>
@@ -11,7 +11,7 @@
                <var ID="displayName">LocationAuth1-displayName</var>
             </vars>
         </test>
-        <test ID="GETLocationAuth1" auth="admin@collectionspace.org">
+        <test ID="GETLocationAuth1" auth="admin@core.collectionspace.org">
             <method>GET</method>
             <uri>/cspace-services/locationauthorities/${LocationAuth1.CSID}</uri>
         </test>

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 058ab5b82b0f9c66df377c719aff84adc7dc2d75..8b1313289e925cdd19a17395969c1ab49f0a016b 100644 (file)
--- 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 @@
 <xmlReplay>
        <testGroup ID="HierarchicLocation" autoDeletePOSTS="true">
        
-           <test ID="LocationAuth1" auth="admin@collectionspace.org">
+           <test ID="LocationAuth1" auth="admin@core.collectionspace.org">
             <method>POST</method>
             <uri>/cspace-services/locationauthorities/</uri>
             <filename>location/hierarchy/1-authority.xml</filename>
@@ -12,7 +12,7 @@
             </vars>
         </test>
         
-        <test ID="LocationAuth2" auth="admin@collectionspace.org">
+        <test ID="LocationAuth2" auth="admin@core.collectionspace.org">
             <method>POST</method>
             <uri>/cspace-services/locationauthorities/</uri>
             <filename>location/hierarchy/1-authority.xml</filename>
@@ -22,12 +22,12 @@
             </vars>
         </test>
         
-        <test ID="GETLocationAuth1" auth="admin@collectionspace.org">
+        <test ID="GETLocationAuth1" auth="admin@core.collectionspace.org">
             <method>GET</method>
             <uri>/cspace-services/locationauthorities/${LocationAuth1.CSID}</uri>
         </test>
         
-        <test ID="GETLocationAuth2" auth="admin@collectionspace.org">
+        <test ID="GETLocationAuth2" auth="admin@core.collectionspace.org">
             <method>GET</method>
             <uri>/cspace-services/locationauthorities/${LocationAuth2.CSID}</uri>
         </test>

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 5b5e783b4b7768b91b783c150e881ca8bb09994f..cb2718aa69a8813d9c6b6b4f799b24358c204bbe 100755 (executable)
--- 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 @@
 <xmlReplay>\r
     <auths>\r
         <!-- IMPORTANT: THESE ARE STICKY :: THEY STICK AROUND UNTIL RESET, IN EXEC ORDER OF THIS FILE. -->\r
-        <auth ID="admin@collectionspace.org">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>\r
+        <auth ID="admin@core.collectionspace.org">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>\r
         <auth ID="testAdministator">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>\r
     </auths>\r
 \r

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 3ef6018f45447ac8bd8338d86180548aa5e3a849..e8be5f9aacff828a0664556ce22abf6fa0b64376 100644 (file)
--- 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 @@
 <xmlReplay>\r
     <auths>\r
         <!-- IMPORTANT: THESE ARE STICKY :: THEY STICK AROUND UNTIL RESET, IN EXEC ORDER OF THIS FILE. -->\r
-        <auth ID="admin@collectionspace.org">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>\r
+        <auth ID="admin@core.collectionspace.org">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>\r
         <auth ID="testAdministator">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>\r
     </auths>\r
    \r
@@ -142,7 +142,7 @@
 \r
 \r
     <testGroup ID="repeat" autoDeletePOSTS="true">\r
-        <test ID="oeRepeat"  auth="admin@collectionspace.org">\r
+        <test ID="oeRepeat"  auth="admin@core.collectionspace.org">\r
             <method>POST</method>\r
             <uri>/cspace-services/objectexit/</uri>\r
             <part>\r
@@ -155,7 +155,7 @@
     <!-- ================================================================================ -->\r
 \r
      <testGroup ID="CRUDL" autoDeletePOSTS="true">\r
-         <test ID="oe1"  auth="admin@collectionspace.org">\r
+         <test ID="oe1"  auth="admin@core.collectionspace.org">\r
              <method>POST</method>\r
              <uri>/cspace-services/objectexit/</uri>\r
              <part>\r
@@ -359,7 +359,7 @@
     <!-- =========== domlist Walk a DOM ================================================ -->\r
 \r
     <testGroup ID="domlist" autoDeletePOSTS="true">\r
-         <test ID="oe1"  auth="admin@collectionspace.org">\r
+         <test ID="oe1"  auth="admin@core.collectionspace.org">\r
              <method>POST</method>\r
              <uri>/cspace-services/objectexit/</uri>\r
              <part>\r

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 d87e87c6990c69c586d6b641c3247ec01bffffa7..f7845ad40cddb2813b62a187e15a010933fecc96 100644 (file)
--- 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 @@
   <ns2:account_permission xmlns:ns2="http://collectionspace.org/services/authorization">
     <account>
       <accountId>6b296c92-bb90-42d8-a804-3ec87c5e21d6</accountId>
-      <userId>admin@collectionspace.org</userId>
+      <userId>admin@core.collectionspace.org</userId>
     </account>
     <permission>
       <permRelationshipId>70</permRelationshipId>

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 60eb04d5e120bac7a250ea8a8e53d2e8cb4815a7..27d07505d64b19c89b8ddefb95a104b928870501 100755 (executable)
--- 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 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <xmlReplay>\r
     <testGroup ID="organization" autoDeletePOSTS="true">\r
-        <test ID="OrgAuth1" auth="admin@collectionspace.org">\r
+        <test ID="OrgAuth1" auth="admin@core.collectionspace.org">\r
             <method>POST</method>\r
             <uri>/cspace-services/orgauthorities/</uri>\r
             <part>\r

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 b3ac368a86c3175ed5997f68111486b1f460f1f4..19e335ec1e76604c2b4939f1f6d887b4b27c5c5e 100644 (file)
--- 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 @@
 <xmlReplay>
        <testGroup ID="HierarchicOrganization" autoDeletePOSTS="true">
        
-           <test ID="OrganizationAuth1" auth="admin@collectionspace.org">
+           <test ID="OrganizationAuth1" auth="admin@core.collectionspace.org">
             <method>POST</method>
             <uri>/cspace-services/orgauthorities/</uri>
             <filename>organization/hierarchy/1-authority.xml</filename>

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 fb810e49c94657500e8aaf67498604434f583322..cec5f002995dcd612131d5f0bf5be320ea8fcced 100755 (executable)
--- 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"\r
     -->\r
     <testGroup ID="person" autoDeletePOSTS="true">\r
-        <test ID="PersonAuth1" auth="admin@collectionspace.org">\r
+        <test ID="PersonAuth1" auth="admin@core.collectionspace.org">\r
             <method>POST</method>\r
             <uri>/cspace-services/personauthorities/</uri>\r
             <filename>person/personauthorities_common.xml</filename>\r
@@ -99,7 +99,7 @@
        </testGroup>\r
        \r
        <testGroup ID="updatePerson" autoDeletePOSTS="true">\r
-           <test ID="PersonAuth1" auth="admin@collectionspace.org">\r
+           <test ID="PersonAuth1" auth="admin@core.collectionspace.org">\r
             <method>POST</method>\r
             <uri>/cspace-services/personauthorities/</uri>\r
             <filename>person/personauthorities_common.xml</filename>\r
@@ -239,7 +239,7 @@
        !-- ========================= POST a person ===================================================== -->\r
        \r
        <testGroup ID="postPerson" autoDeletePOSTS="true">\r
-           <test ID="PersonAuth1" auth="admin@collectionspace.org">\r
+           <test ID="PersonAuth1" auth="admin@core.collectionspace.org">\r
             <method>POST</method>\r
             <uri>/cspace-services/personauthorities/</uri>\r
             <filename>person/personauthorities_common.xml</filename>\r
@@ -369,7 +369,7 @@
        </testGroup>\r
        \r
        <testGroup ID="PersonAddRelsDeleteRels" autoDeletePOSTS="true">\r
-           <test ID="PersonAuth1" auth="admin@collectionspace.org">\r
+           <test ID="PersonAuth1" auth="admin@core.collectionspace.org">\r
             <method>POST</method>\r
             <uri>/cspace-services/personauthorities/</uri>\r
             <filename>person/personauthorities_common.xml</filename>\r

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 0ce0f6decf2eda1c4fd80608ad1b075cac9bbf21..ee559645dd969dceb60a6099c0c8541995ad8c75 100644 (file)
--- 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 @@
 <xmlReplay>\r
     <auths>\r
         <!-- IMPORTANT: THESE ARE STICKY :: THEY STICK AROUND UNTIL RESET, IN EXEC ORDER OF THIS FILE. -->\r
-        <auth ID="admin@collectionspace.org">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>\r
+        <auth ID="admin@core.collectionspace.org">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>\r
     </auths>\r
    \r
     <testGroup ID="makeRelations" autoDeletePOSTS="true">\r

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 b39bb270498b4e1ff155d92ca3bc06cd35100ce9..2d4a52be2fdb580570aa529c5bf73c3547380681 100755 (executable)
--- 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 @@
 <xmlReplay>\r
     <auths>\r
         <!-- IMPORTANT: THESE ARE STICKY :: THEY STICK AROUND UNTIL RESET, IN EXEC ORDER OF THIS FILE. -->\r
-        <auth ID="admin@collectionspace.org">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>\r
+        <auth ID="admin@core.collectionspace.org">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>\r
         <auth ID="user1@museum1">dXNlcjFAbXVzZXVtMS5vcmc6dXNlcjFAbXVzZXVtMS5vcmc=</auth>\r
         <auth ID="bigbird2010">YmlnYmlyZDIwMTA6YmlnYmlyZDIwMTA=</auth>\r
         <auth ID="elmo2010">ZWxtbzIwMTA6ZWxtbzIwMTA=</auth>\r
@@ -26,7 +26,7 @@
             <filename>security/6-account-elmo.xml</filename>\r
         </test>\r
 \r
-               <test ID="dimension1"  auth="admin@collectionspace.org">\r
+               <test ID="dimension1"  auth="admin@core.collectionspace.org">\r
             <method>POST</method>\r
             <uri>/cspace-services/dimensions/</uri>\r
             <filename>dimension/1.xml</filename>\r
@@ -36,7 +36,7 @@
             <method>DELETE</method>\r
             <fromTestID>dimension1</fromTestID>\r
         </test>\r
-        <test ID="dimensionAdminDELETE" auth="admin@collectionspace.org">\r
+        <test ID="dimensionAdminDELETE" auth="admin@core.collectionspace.org">\r
             <method>DELETE</method>\r
             <fromTestID>dimension1</fromTestID>\r
         </test>\r
@@ -62,7 +62,7 @@
         </test>\r
 \r
         <!--Next, set up permissions and roles, and test bigbird2010 and elmo2010. -->\r
-        <test ID="permBigbird" auth="admin@collectionspace.org">\r
+        <test ID="permBigbird" auth="admin@core.collectionspace.org">\r
             <method>POST</method>\r
             <uri>/cspace-services/authorization/permissions</uri>\r
             <filename>security/1-bigbird-permission.xml</filename>\r
@@ -161,7 +161,7 @@
         -->\r
 \r
 \r
-        <test ID="dimensionBigBirdDELETEpermroles" auth="admin@collectionspace.org">\r
+        <test ID="dimensionBigBirdDELETEpermroles" auth="admin@core.collectionspace.org">\r
             <method>DELETE</method>\r
             <uri>/cspace-services/authorization/permissions/${permBigbird.CSID}/permroles</uri>\r
             <!-- don't do <fromTestID>, no CSID of permrole on end of url, but deleteURL will put one there for you, so don't use it.\r
@@ -191,7 +191,7 @@
         </test>\r
 \r
         \r
-        <test ID="accountroles2" auth="admin@collectionspace.org">\r
+        <test ID="accountroles2" auth="admin@core.collectionspace.org">\r
             <method>DELETE</method>\r
             <uri>/cspace-services/accounts/${accountBigbird.CSID}/accountroles</uri>\r
         </test>\r
@@ -237,12 +237,12 @@
         </test>\r
 \r
         <!--Next, set up permissions and roles, and test bigbird2010.-->\r
-        <test ID="permBigbird" auth="admin@collectionspace.org">\r
+        <test ID="permBigbird" auth="admin@core.collectionspace.org">\r
             <method>POST</method>\r
             <uri>/cspace-services/authorization/permissions</uri>\r
             <filename>security/1-bigbird-permission.xml</filename>\r
         </test>\r
-        <test ID="roleTestCM"  auth="admin@collectionspace.org">\r
+        <test ID="roleTestCM"  auth="admin@core.collectionspace.org">\r
             <method>POST</method>\r
             <uri>/cspace-services/authorization/roles</uri>\r
             <filename>security/3-role-test-cm.xml</filename>\r
@@ -292,7 +292,7 @@
         \r
         <!--  NOW **REMOVE** PERMROLES FROM BIGBIRD -->\r
         \r
-        <test ID="deletePermrolesBigbird" auth="admin@collectionspace.org">\r
+        <test ID="deletePermrolesBigbird" auth="admin@core.collectionspace.org">\r
             <msg>Deleting permroles from bigbird2010</msg>\r
             <method>DELETE</method>\r
             <uri>/cspace-services/authorization/permissions/${permBigbird.CSID}/permroles</uri>\r
@@ -327,12 +327,12 @@
 \r
         <!--  NOW **ADD** PERMS CRU TO BIGBIRD -->\r
 \r
-        <test ID="permBigbird_CRU" auth="admin@collectionspace.org">\r
+        <test ID="permBigbird_CRU" auth="admin@core.collectionspace.org">\r
             <method>POST</method>\r
             <uri>/cspace-services/authorization/permissions</uri>\r
             <filename>security/11-bigbird-permission-CRU.xml</filename>\r
         </test>\r
-        <test ID="bigbirdPermrolesCRU" auth="admin@collectionspace.org">\r
+        <test ID="bigbirdPermrolesCRU" auth="admin@core.collectionspace.org">\r
             <method>POST</method>\r
             <uri>/cspace-services/authorization/permissions/${permBigbird_CRU.CSID}/permroles</uri>\r
             <filename>security/11-permissionroles-bigbird-CRU.xml</filename>\r
@@ -363,7 +363,7 @@
 \r
         <!--  NOW **REMOVE** PERMROLES FROM BIGBIRD -->\r
         \r
-        <test ID="deletePermrolesBigbird" auth="admin@collectionspace.org">\r
+        <test ID="deletePermrolesBigbird" auth="admin@core.collectionspace.org">\r
             <msg>Deleting permroles from bigbird2010</msg>\r
             <method>DELETE</method>\r
             <uri>/cspace-services/authorization/permissions/${permBigbird_CRU.CSID}/permroles</uri>\r
@@ -371,12 +371,12 @@
         \r
         <!--  NOW **ADD** PERMS R TO BIGBIRD -->\r
 \r
-        <test ID="permBigbird_R" auth="admin@collectionspace.org">\r
+        <test ID="permBigbird_R" auth="admin@core.collectionspace.org">\r
             <method>POST</method>\r
             <uri>/cspace-services/authorization/permissions</uri>\r
             <filename>security/12-bigbird-permission-R.xml</filename>\r
         </test>\r
-        <test ID="bigbirdPermroles_R" auth="admin@collectionspace.org">\r
+        <test ID="bigbirdPermroles_R" auth="admin@core.collectionspace.org">\r
             <method>POST</method>\r
             <uri>/cspace-services/authorization/permissions/${permBigbird_R.CSID}/permroles</uri>\r
             <filename>security/12-permissionroles-bigbird-R.xml</filename>\r
@@ -410,12 +410,12 @@
         \r
         <!-- CLEANUP -->\r
         \r
-        <test ID="deletePermrolesBigbird" auth="admin@collectionspace.org">\r
+        <test ID="deletePermrolesBigbird" auth="admin@core.collectionspace.org">\r
             <msg>Deleting permroles from bigbird2010</msg>\r
             <method>DELETE</method>\r
             <uri>/cspace-services/authorization/permissions/${permBigbird.CSID}/permroles</uri>\r
         </test>\r
-        <test  auth="admin@collectionspace.org">\r
+        <test  auth="admin@core.collectionspace.org">\r
             <method>DELETE</method>\r
             <uri>/cspace-services/accounts/${accountBigbird.CSID}/accountroles</uri>\r
         </test>\r

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 8b2281404b180a4366d50c92d2ed0a52e18a0050..d7009cef5e7cf1bc8bef39cd361b34d4b55137c8 100644 (file)
--- 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 @@
 <xmlReplay>
        <auths>
                <!-- IMPORTANT: THESE ARE STICKY :: THEY STICK AROUND UNTIL RESET, IN EXEC ORDER OF THIS FILE. -->
-               <auth ID="admin@collectionspace.org">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>
+               <auth ID="admin@core.collectionspace.org">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>
                <auth ID="testAdministator">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>
        </auths>
        <testGroup ID="TestOrder" autoDeletePOSTS="true">
@@ -47,12 +47,12 @@
                        </vars>
                </test>
                
-               <test ID="GetVocabularies" auth="admin@collectionspace.org">
+               <test ID="GetVocabularies" auth="admin@core.collectionspace.org">
             <method>GET</method>
             <uri>/cspace-services/vocabularies/</uri>
         </test>
         
-        <test ID="GetVocabularyItems" auth="admin@collectionspace.org">
+        <test ID="GetVocabularyItems" auth="admin@core.collectionspace.org">
             <method>GET</method>
             <uri>/cspace-services/vocabularies/${Vocabulary1.CSID}/items/</uri>
             <response>

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 8e5f0baf49f5d8c21ff243cc616a296ac1176924..429b628aa3d9c8feef1cf4ad83ca21e0331f4af9 100755 (executable)
--- 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 @@
     <!-- legal values for dumpServiceResult=[minimal,detailed,full,auto] -->\r
     <dump payloads="false" dumpServiceResult="auto" />\r
     \r
-    <auths default="admin@collectionspace.org">\r
-       <auth ID="admin@collectionspace.org">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>\r
+    <auths default="admin@core.collectionspace.org">\r
+       <auth ID="admin@core.collectionspace.org">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>\r
     </auths>\r
 \r
     <!-- commenting out... I think this runs from test code anyway...  \r

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master.xml
index 6b29eeb880d3dbcb92892275cc785c0278e4e97f..3adb8a21569ced6a2e8f0da01dc48af44e824a2a 100755 (executable)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master.xml
@@ -5,8 +5,8 @@
     <!-- legal values for dumpServiceResult=[minimal,detailed,full,auto] -->\r
     <dump payloads="false" dumpServiceResult="auto" />\r
     \r
-    <auths default="admin@collectionspace.org">\r
-       <auth ID="admin@collectionspace.org">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>\r
+    <auths default="admin@core.collectionspace.org">\r
+       <auth ID="admin@core.collectionspace.org">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>\r
     </auths>\r
 \r
     <!--\r

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-self-test.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-self-test.xml
index aee2d4022dace62d2f6d4ed471524d7fa57123c5..12a695c0ccab1da9b9d23c20402b16919f370a40 100755 (executable)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-self-test.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-self-test.xml
@@ -2,7 +2,7 @@
 <xmlReplay>\r
 <!--\r
     <testGroup ID="selftestGroup" autoDeletePOSTS="true">\r
-        <test ID="OrgAuth1" auth="admin@collectionspace.org">\r
+        <test ID="OrgAuth1" auth="admin@core.collectionspace.org">\r
             <method>POST</method>\r
             <uri>/cspace-services/orgauthorities/</uri>\r
             <part>\r