From 2038468b41277a0ccaa2fbc20c39b6311eb53b7b Mon Sep 17 00:00:00 2001
From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Fri, 7 Sep 2012 11:47:50 -0700
Subject: [PATCH] CSPACE-5518,CSPACE-5520: Remove dev-master, committed
 temporarily to master branch during CSPACE-5518 work. Add missing objectName
 var in XmlReplay test of structured objects.

---
 .../collectionobject-hierarchy.xml            |  1 +
 .../test-data/xmlreplay/dev-master.xml        | 45 -------------------
 2 files changed, 1 insertion(+), 45 deletions(-)
 delete mode 100644 services/IntegrationTests/src/test/resources/test-data/xmlreplay/dev-master.xml

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/collectionobject-hierarchy.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/collectionobject-hierarchy.xml
index d5b658a0e..da4720e78 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/collectionobject-hierarchy.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/collectionobject-hierarchy.xml
@@ -145,6 +145,7 @@
             <uri>/cspace-services/collectionobjects</uri>
             <filename>collectionobject/hierarchy/2-collectionobjects-with-relations-create.xml</filename>
             <vars>
+                <var ID="objectNumber">CSPACE-5518-BlackRook</var>
                 <var ID="chessSetBoxCSID">${CreateChessSetBox.CSID}</var>
                 <var ID="chessBoardCSID">${CreateChessBoard.CSID}</var>
                 <var ID="bagOfWhiteChessPiecesCSID">${CreateBagOfWhiteChessPieces.CSID}</var>
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/dev-master.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/dev-master.xml
deleted file mode 100644
index 5a8f528ca..000000000
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/dev-master.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xmlReplayMaster>
-<!-- Use this file to drive local testing.  
-
-     To run this file, copy the checked-in file to your own local version of the correct name
-     in the same location.  If it is named dev-master.xml, then XmlReplayDevTest will pick it up.
-     If it is not there, XmlReplayDevTest will skip it, which is what we want for production, since 
-     production runs XmlReplayMasterTest which calls xml-replay-master.xml
-     
-     	  cd trunk/services/IntegrationTests/src/test/resources/test-data/xmlreplay/
-     	  cp dev-master-example.xml dev-master.xml
-
-     IMPORTANT :: DO NOT CHECK IN YOUR LOCAL COPY, CALLED dev-master.xml
-                  EITHER LEAVE IT AROUND AND IGNORE THE SVN UNVERSIONED FILE MESSAGE, 
-                    OR DELETE IT IF IT BOTHERS YOU.
-     
-     Then, to run this file, you can execute the following: 
-     
-          cd trunk/services/IntegrationTests
-          mvn test -Dtest=XmlReplayDevTest
-
-     Maven surefire will kick off XmlReplayDevTest.
-     
-                  
-     This file can be used to point at a controlFile 
-		  and a testGroup, so you can test just one thing at a time, or a limited suite.
-     
-     You can find other tests to run in two places:
-       The tests that get run on nightly: 
-     	 xml-replay-master.xml
-       The set of possible tests, including ones that don't work:
-         dev-all.xml
--->
-    <protoHostPort>http://localhost:8180</protoHostPort>
-    
-    <!-- legal values for dumpServiceResult=[minimal,detailed,full,auto] -->
-    <dump payloads="true" dumpServiceResult="full" />
-    
-    <auths default="admin@core.collectionspace.org">
-       <auth ID="admin@core.collectionspace.org">YWRtaW5AY29yZS5jb2xsZWN0aW9uc3BhY2Uub3JnOkFkbWluaXN0cmF0b3I=</auth>
-    </auths>
-    
-    <run controlFile="collectionobject/collectionobject-hierarchy.xml" testGroup="HierarchicCollectionObject" />
-</xmlReplayMaster>
-
-- 
2.47.3