From: Richard Millet <remillet@berkeley.edu>
Date: Thu, 31 Jan 2013 19:35:18 +0000 (-0800)
Subject: CSPACE-5564: Fixed in bug in the import service that was causing an incorrect HTTP... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=d8fa9f41245be4fdaf14f4b1a7a9431aa22737e8;p=tmp%2Fjakarta-migration.git

CSPACE-5564: Fixed in bug in the import service that was causing an incorrect HTTP status result of 200 to be returned when the request fails because of a missing config file.
---

diff --git a/.gitignore b/.gitignore
index a98863c2d..2dc9f6c89 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,20 @@
+services/publicitem/.project
+services/publicitem/.settings/
+services/publicitem/3rdparty/.project
+services/publicitem/3rdparty/.settings/
+services/publicitem/3rdparty/nuxeo-platform-cs-publicitem/.classpath
+services/publicitem/3rdparty/nuxeo-platform-cs-publicitem/.project
+services/publicitem/3rdparty/nuxeo-platform-cs-publicitem/.settings/
+services/publicitem/client/.classpath
+services/publicitem/client/.project
+services/publicitem/client/.settings/
+services/publicitem/client/src/test/resources/
+services/publicitem/jaxb/.classpath
+services/publicitem/jaxb/.project
+services/publicitem/jaxb/.settings/
+services/publicitem/service/.classpath
+services/publicitem/service/.project
+services/publicitem/service/.settings/
 3rdparty/nuxeo/nuxeo-platform-listener/.project
 services/article/service/.project
 services/article/service/.settings/
@@ -7,22 +24,7 @@ services/article/service/.settings/
 3rdparty/nuxeo/nuxeo-platform-listener/updaterelationsondelete/.classpath
 3rdparty/nuxeo/nuxeo-platform-listener/updaterelationsondelete/.project
 3rdparty/nuxeo/nuxeo-platform-listener/updaterelationsondelete/.settings/
-services/article/.project
-services/article/.settings/
-services/article/3rdparty/.project
-services/article/3rdparty/.settings/
-services/article/3rdparty/nuxeo-platform-cs-article/.classpath
-services/article/3rdparty/nuxeo-platform-cs-article/.project
-services/article/3rdparty/nuxeo-platform-cs-article/.settings/
-services/article/client/.classpath
-services/article/client/.project
-services/article/client/.settings/
-services/article/client/src/test/resources/
-services/article/jaxb/.classpath
-services/article/jaxb/.project
-services/article/jaxb/.settings/
-services/article/service/.classpath
-services/article/service/.project3rdparty/nuxeo/nuxeo-platform-listener/.project
+
 3rdparty/nuxeo/nuxeo-platform-listener/.settings/
 services/JaxRsServiceProvider/.settings/.jsdtscope
 *org.eclipse.wst*
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 f0055dca6..759e25e9d 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
@@ -137,13 +137,18 @@ public class ImportsResource extends AbstractCollectionSpaceResourceImpl<PoxPayl
 
 	private static String _templateDir = null;
 
-	public static String getTemplateDir() {
+	public static String getTemplateDir() throws FileNotFoundException {
 		if (_templateDir == null) {
 			TenantBindingConfigReaderImpl tReader = ServiceMain.getInstance()
 					.getTenantBindingConfigReader();
 			_templateDir = tReader.getResourcesDir() + File.separator
 					+ "templates";
 		}
+		
+		File templateDir = new File(_templateDir);  // We need to make sure the 'templates' directory is not missing
+		if (templateDir.exists() == false) {
+			throw new FileNotFoundException("The Import service's template directory is missing: " + _templateDir);
+		}
 		return _templateDir;
 	}