From: remillet <remillet@yahoo.com>
Date: Tue, 17 Oct 2017 21:25:42 +0000 (-0700)
Subject: NOJIRA: Added additional logging and error reporting to Import service.
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=21c0a5caf283ac8cb8b1bd6dc7107d08a6a3eb01;p=tmp%2Fjakarta-migration.git

NOJIRA: Added additional logging and error reporting to Import service.
---

diff --git a/services/IntegrationTests/README.txt b/services/IntegrationTests/README.txt
new file mode 100644
index 000000000..35443bc93
--- /dev/null
+++ b/services/IntegrationTests/README.txt
@@ -0,0 +1,13 @@
+To See XMLReplay test reports, look in the source directory: ..\services\IntegrationTests\target\xml-replay-reports\index.xml-replay-master.xml.html
+
+### To run a subset of XMLReplay tests
+
+Modify the dev-master.xml file to include just the tests you are debugging:
+	..\services\services\IntegrationTests\src\test\resources\test-data\xmlreplay\dev-master.xml
+
+Then run this command:
+
+	mvn test -Dtest=XmlReplayDevTest -Dmaven.surefire.debug=true
+
+Notes on Using XMLReplay with CollectionSpace Services - http://wiki.collectionspace.org/display/~remillet/Notes+on+Using+XMLReplay+with+CollectionSpace+Services
+
diff --git a/services/imports/service/src/main/java/org/collectionspace/services/imports/ImportsResource.java b/services/imports/service/src/main/java/org/collectionspace/services/imports/ImportsResource.java
index adc5e8ed4..361bb37a5 100644
--- a/services/imports/service/src/main/java/org/collectionspace/services/imports/ImportsResource.java
+++ b/services/imports/service/src/main/java/org/collectionspace/services/imports/ImportsResource.java
@@ -203,7 +203,7 @@ public class ImportsResource extends AbstractCollectionSpaceResourceImpl<PoxPayl
 	public Response create(@Context UriInfo ui,
 			String xmlPayload) {
 		String result = null;
-		ResponseBuilder rb = Response.serverError();
+		ResponseBuilder rb = Response.serverError(); // Assume we'll fail to successfully fulfill the request.
 		
 		try {
             ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = createServiceContext(ui);
@@ -213,6 +213,9 @@ public class ImportsResource extends AbstractCollectionSpaceResourceImpl<PoxPayl
 			// result = createFromInputSource(inputSource);
 			String inputFilename = payloadToFilename(xmlPayload);
 			result = createFromFilename(inputFilename, timeout);
+			if (result.contains("ERROR") == false) {
+				rb = Response.ok(); // SUCCESS
+			}
 	        rb.entity(result);
 		} catch (Exception e) {
 	        result = e.getMessage();