From: Threefoot, Jane (jt6620) Date: Thu, 15 Mar 2018 21:00:40 +0000 (-0400) Subject: schemaIngest file no longer mandatory on classpath X-Git-Tag: v1.2.1~8 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=6160cab9935b424407c25e3d137e088f4cae1320;p=aai%2Faai-common.git schemaIngest file no longer mandatory on classpath Fixed bug where users had to have schemaIngest.properties on the classpath even if they were using schemaIngestPropLoc instead. Issue-ID: AAI-887 Change-Id: Id8f15871f945d0a575203f7c3ce0679b6dbb2242 Signed-off-by: Threefoot, Jane (jt6620) --- diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaLocationsBean.java b/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaLocationsBean.java index 96c63447..b5b878af 100644 --- a/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaLocationsBean.java +++ b/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaLocationsBean.java @@ -29,7 +29,7 @@ import org.springframework.context.annotation.PropertySource; import org.springframework.context.support.PropertySourcesPlaceholderConfigurer; @Configuration -@PropertySource("classpath:schemaIngest.properties") +@PropertySource(value = "classpath:schemaIngest.properties", ignoreResourceNotFound=true) @PropertySource(value = "file:${schemaIngestPropLoc}", ignoreResourceNotFound=true) public class SchemaLocationsBean { /*