CSPACE-5564: Fixed in bug in the import service that was causing an incorrect HTTP...

diff --git a/.gitignore b/.gitignore
index a98863c2d836b1cfe5a3f2a420b7d21edb8a67a8..2dc9f6c898ab0e73c88694462209ba796930d2c2 100644 (file)
--- 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 f0055dca640e3a32c47d6d74bd6a188d45c183c0..759e25e9d46665f7475af259eff525e9ec2115d8 100644 (file)
--- 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;
        }