Merge "fixed config so data-router start"

1 files changed, 22 insertions, 8 deletions

diff --git a/kubernetes/aai/charts/aai-data-router/resources/config/schemaIngest.properties b/kubernetes/aai/charts/aai-data-router/resources/config/schemaIngest.properties
index d0916515fe..8c680b5820 100644
--- a/kubernetes/aai/charts/aai-data-router/resources/config/schemaIngest.properties
+++ b/kubernetes/aai/charts/aai-data-router/resources/config/schemaIngest.properties
@@ -20,13 +20,27 @@
 # ============LICENSE_END=========================================================

 #

 

-# Properties for the SchemaLocationsBean

 

-# The AAI Schema jar will be unpacked to bundleconfig/etc

-schemaConfig=NA

-# OXM files named aai_oxm_v*.xml are unpacked here:

-nodeDir=/opt/app/data-router/bundleconfig/etc/oxm

-# DB Edge Rules are unpacked here:

+# Properties for the SchemaLocationsBean

+# Files named aai_oxm_v*.xml are unpacked here:

+nodeDir=/opt/app/data-router/onap/oxm

+# Dummy folder/directory:

 edgeDir=

-# DB Edge Property files are copied here:

-edgePropsDir=

+

+# Properties required by the aai-common - aai-schema-ingest lib as of 1.3.0

+schema.configuration.location=N/A

+schema.nodes.location=/opt/app/data-router/onap/oxm/

+schema.edges.location=

+# These versions need to exist if they are included in the list

+schema.version.list=v9,v10,v11,v12,v13,v14

+# Decalares the oxm version to load

+schema.version.api.default=v14

+

+# Don't use these properties in our application, need to be set to prevent an exception on startup (see SchemaVersions bean)

+schema.version.depth.start=v14

+schema.version.related.link.start=v14

+schema.version.app.root.start=v14

+schema.version.namespace.change.start=v14

+schema.version.edge.label.start=v14

+~

+