CSPACE-4789: Added support for a query param impTimout that specifies…

… a timeout period in seconds -the default is 600 Conflicts: services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master.xml
cspace-deployment · Jun 20, 2012 · 5037105 · 5037105
1 parent 45d0635
commit 5037105
Show file tree

Hide file tree

Showing 5 changed files with 399 additions and 312 deletions.
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
@@ -37,16 +37,12 @@
     <run controlFile="objectexit/object-exit.xml" testGroup="makeone" />
     <run controlFile="objectexit/object-exit.xml" testGroup="checkList" />
     <run controlFile="objectexit/object-exit-display.xml" testGroup="refNameDisplayNameOnly" />
-<!--     
- -->
 
     <run controlFile="collectionobject/collectionobject-adv-search.xml" testGroup="advSearchCommonSchema" />
     <run controlFile="collectionobject/collectionobject-adv-search.xml" testGroup="advSearchExtensionSchema" />
     <run controlFile="acquisitions/acquisitions.xml" testGroup="makeone" />
     <run controlFile="acquisitions/acquisitions.xml" testGroup="testList" />
     <run controlFile="relation/relation.xml" testGroup="makeRelations" />
-<!--
--->
 
 <!-- No - this test is broken
 	<run controlFile="relation/relation.xml" testGroup="r2only" />
@@ -66,6 +62,5 @@
     <run controlFile="authrefs/authrefsSimple.xml" testGroup="AuthRefsSimple" />
     <run controlFile="authrefs/authrefsComplex.xml" testGroup="AuthRefsComplex" />
     <run controlFile="imports/imports.xml" testGroup="importsTestGroup" />
-
 </xmlReplayMaster>
 
diff --git a/services/client/src/main/java/org/collectionspace/services/client/IClientQueryParams.java b/services/client/src/main/java/org/collectionspace/services/client/IClientQueryParams.java
@@ -31,5 +31,6 @@ public interface IClientQueryParams {
     public static final String PAGE_SIZE_PARAM = "pgSz";
     public static final String START_PAGE_PARAM = "pgNum";
     public static final String SORT_BY_PARAM = "sortBy";
+    public static final String IMPORT_TIMEOUT_PARAM = "impTimout";
 
 }