From c48ce4b76edaffa8d5d991769aba848006985eaa Mon Sep 17 00:00:00 2001 From: rv871f Date: Wed, 29 Aug 2018 14:56:02 -0400 Subject: aai-schema and ingest fixes Issue-ID: AAI-1554 Change-Id: I0a27cf320d3d69d8e715af8c27d5afeaa2951da5 Signed-off-by: rv871f --- .../config/application-oxm-default.properties | 1 + .../config/application-oxm-override.properties | 2 +- .../config/application-oxm-schema-dev.properties | 2 +- .../config/application-oxm-schema-prod.properties | 2 +- .../config/schemaIngest.properties | 20 +++++++++++++++++--- .../config/spring-beans/sparky-oxm-default.xml | 3 ++- .../config/spring-beans/sparky-oxm-override.xml | 2 +- .../config/spring-beans/sparky-oxm.xml | 8 ++++++-- 8 files changed, 30 insertions(+), 10 deletions(-) create mode 100644 sparkybe-onap-application/config/application-oxm-default.properties (limited to 'sparkybe-onap-application/config') diff --git a/sparkybe-onap-application/config/application-oxm-default.properties b/sparkybe-onap-application/config/application-oxm-default.properties new file mode 100644 index 0000000..5c362d8 --- /dev/null +++ b/sparkybe-onap-application/config/application-oxm-default.properties @@ -0,0 +1 @@ +oxm.apiVersion=v14 \ No newline at end of file diff --git a/sparkybe-onap-application/config/application-oxm-override.properties b/sparkybe-onap-application/config/application-oxm-override.properties index 1fa006e..e795b1f 100644 --- a/sparkybe-onap-application/config/application-oxm-override.properties +++ b/sparkybe-onap-application/config/application-oxm-override.properties @@ -1 +1 @@ -oxm.apiVersionOverride=V11 \ No newline at end of file +oxm.apiVersion=v11 \ No newline at end of file diff --git a/sparkybe-onap-application/config/application-oxm-schema-dev.properties b/sparkybe-onap-application/config/application-oxm-schema-dev.properties index 66efe1d..332fe75 100644 --- a/sparkybe-onap-application/config/application-oxm-schema-dev.properties +++ b/sparkybe-onap-application/config/application-oxm-schema-dev.properties @@ -1 +1 @@ -oxm.schemaNodeDir=${APP_HOME}/target/oxm \ No newline at end of file +oxm.schemaNodeDir=${APP_HOME}/target/oxm/onap/oxm \ No newline at end of file diff --git a/sparkybe-onap-application/config/application-oxm-schema-prod.properties b/sparkybe-onap-application/config/application-oxm-schema-prod.properties index 111a63f..79cb12a 100644 --- a/sparkybe-onap-application/config/application-oxm-schema-prod.properties +++ b/sparkybe-onap-application/config/application-oxm-schema-prod.properties @@ -1 +1 @@ -oxm.schemaNodeDir=${APP_HOME}/oxm \ No newline at end of file +oxm.schemaNodeDir=${APP_HOME}/onap/oxm \ No newline at end of file diff --git a/sparkybe-onap-application/config/schemaIngest.properties b/sparkybe-onap-application/config/schemaIngest.properties index 4d06763..1f5a13a 100644 --- a/sparkybe-onap-application/config/schemaIngest.properties +++ b/sparkybe-onap-application/config/schemaIngest.properties @@ -1,7 +1,21 @@ # Properties for the SchemaLocationsBean -# The AAI Schema jar will be unpacked -schemaConfig=NA # Files named aai_oxm_v*.xml are unpacked here: nodeDir=${oxm.schemaNodeDir} # Dummy folder/directory: -edgeDir= \ No newline at end of file +edgeDir= + +# New propterties required by the aai-common - aai-schema-ingest lib as of 1.3.0 +schema.configuration.location=N/A +schema.nodes.location=${oxm.schemaNodeDir} +schema.edges.location= +# These versions need to exist if they are included in the list +schema.version.list=v8,v9,v10,v11,v12,v13,v14 +# Decalares the oxm version to load +schema.version.api.default=${oxm.apiVersion} + +# Setting this values to ${oxm.apiVersion} only to ensure the value used exists (we don't use this properties in our application) +schema.version.depth.start=${oxm.apiVersion} +schema.version.related.link.start=${oxm.apiVersion} +schema.version.app.root.start=${oxm.apiVersion} +schema.version.namespace.change.start=${oxm.apiVersion} +schema.version.edge.label.start=${oxm.apiVersion} \ No newline at end of file diff --git a/sparkybe-onap-application/config/spring-beans/sparky-oxm-default.xml b/sparkybe-onap-application/config/spring-beans/sparky-oxm-default.xml index 98ce1ad..b44d626 100644 --- a/sparkybe-onap-application/config/spring-beans/sparky-oxm-default.xml +++ b/sparkybe-onap-application/config/spring-beans/sparky-oxm-default.xml @@ -3,11 +3,12 @@ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - + + \ No newline at end of file diff --git a/sparkybe-onap-application/config/spring-beans/sparky-oxm-override.xml b/sparkybe-onap-application/config/spring-beans/sparky-oxm-override.xml index 5c6839b..3c2d76b 100644 --- a/sparkybe-onap-application/config/spring-beans/sparky-oxm-override.xml +++ b/sparkybe-onap-application/config/spring-beans/sparky-oxm-override.xml @@ -6,7 +6,7 @@ - + diff --git a/sparkybe-onap-application/config/spring-beans/sparky-oxm.xml b/sparkybe-onap-application/config/spring-beans/sparky-oxm.xml index fe1eab0..c392153 100644 --- a/sparkybe-onap-application/config/spring-beans/sparky-oxm.xml +++ b/sparkybe-onap-application/config/spring-beans/sparky-oxm.xml @@ -42,9 +42,13 @@ - - + + + + + + -- cgit 1.2.3-korg