summaryrefslogtreecommitdiffstats
path: root/aai-schema-service/src
diff options
context:
space:
mode:
authorLaMont, William(wl2432) <wl2432@att.com>2020-06-12 13:35:23 -0400
committerLaMont, William(wl2432) <wl2432@att.com>2020-06-18 16:09:01 -0400
commita8ce62a3bae5976982f6d1432723251a414e2878 (patch)
tree1f03bc2c46e35e45a954a3396a492dba79a8d6d2 /aai-schema-service/src
parentdecb7c92edf67ba67facb7d20d0c8f66d08a46d0 (diff)
v20 support in schema-service without javafx
Issue-ID: AAI-2930 Change-Id: I68ba45069f465988e21602521e8e665cb27318d1 Signed-off-by: LaMont, William(wl2432) <wl2432@att.com>
Diffstat (limited to 'aai-schema-service/src')
-rw-r--r--aai-schema-service/src/main/assembly/descriptor.xml3
-rw-r--r--aai-schema-service/src/main/resources/application.properties4
-rw-r--r--aai-schema-service/src/main/scripts/common_functions.sh1
-rw-r--r--aai-schema-service/src/main/scripts/getTool.sh2
-rw-r--r--aai-schema-service/src/test/java/org/onap/aai/schemaservice/SchemaServiceTest.java4
-rw-r--r--aai-schema-service/src/test/resources/application-test.properties4
6 files changed, 10 insertions, 8 deletions
diff --git a/aai-schema-service/src/main/assembly/descriptor.xml b/aai-schema-service/src/main/assembly/descriptor.xml
index 2c33dd0..a4399da 100644
--- a/aai-schema-service/src/main/assembly/descriptor.xml
+++ b/aai-schema-service/src/main/assembly/descriptor.xml
@@ -13,6 +13,7 @@
<includes>
<include>**/*</include>
</includes>
+ <fileMode>755</fileMode>
</fileSet>
<fileSet>
<directory>${project.basedir}/src/main/scripts</directory>
@@ -20,6 +21,7 @@
<includes>
<include>**/*</include>
</includes>
+ <fileMode>777</fileMode>
</fileSet>
<fileSet>
<directory>${project.build.directory}</directory>
@@ -27,6 +29,7 @@
<includes>
<include>${project.artifactId}-${project.version}.jar</include>
</includes>
+ <fileMode>755</fileMode>
</fileSet>
</fileSets>
</assembly>
diff --git a/aai-schema-service/src/main/resources/application.properties b/aai-schema-service/src/main/resources/application.properties
index ea8934f..c586bfd 100644
--- a/aai-schema-service/src/main/resources/application.properties
+++ b/aai-schema-service/src/main/resources/application.properties
@@ -49,7 +49,7 @@ schema.ingest.file=${server.local.startpath}/application.properties
schema.uri.base.path=/aai/schema-service
# Lists all of the versions in the schema
-schema.version.list=v10,v11,v12,v13,v14,v15,v16,v17,v18,v19
+schema.version.list=v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20
# Specifies from which version should the depth parameter to default to zero
schema.version.depth.start=v10
# Specifies from which version should the related link be displayed in response payload
@@ -62,4 +62,4 @@ schema.version.namespace.change.start=v12
# Specifies from which version should the client start seeing the edge label in payload
schema.version.edge.label.start=v12
# Specifies the version that the application should default to
-schema.version.api.default=v19
+schema.version.api.default=v20
diff --git a/aai-schema-service/src/main/scripts/common_functions.sh b/aai-schema-service/src/main/scripts/common_functions.sh
index 7dfda25..dd235c2 100644
--- a/aai-schema-service/src/main/scripts/common_functions.sh
+++ b/aai-schema-service/src/main/scripts/common_functions.sh
@@ -36,7 +36,6 @@ check_user(){
# Sources the profile and sets the project home
source_profile(){
- . /etc/profile.d/aai.sh
PROJECT_HOME=/opt/app/aai-schema-service
}
diff --git a/aai-schema-service/src/main/scripts/getTool.sh b/aai-schema-service/src/main/scripts/getTool.sh
index 9b8b26e..1241145 100644
--- a/aai-schema-service/src/main/scripts/getTool.sh
+++ b/aai-schema-service/src/main/scripts/getTool.sh
@@ -58,7 +58,7 @@ if [ "${userid}" != "aaiadmin" ]; then
exit 1
fi
-. /etc/profile.d/aai.sh
+
PROJECT_HOME=/opt/app/aai-schema-service
prop_file=$PROJECT_HOME/resources/etc/appprops/aaiconfig.properties
log_dir=$PROJECT_HOME/logs/misc
diff --git a/aai-schema-service/src/test/java/org/onap/aai/schemaservice/SchemaServiceTest.java b/aai-schema-service/src/test/java/org/onap/aai/schemaservice/SchemaServiceTest.java
index 308f43b..5b24be2 100644
--- a/aai-schema-service/src/test/java/org/onap/aai/schemaservice/SchemaServiceTest.java
+++ b/aai-schema-service/src/test/java/org/onap/aai/schemaservice/SchemaServiceTest.java
@@ -105,7 +105,7 @@ public class SchemaServiceTest {
ResponseEntity responseEntity;
responseEntity = restTemplate.exchange(
- baseUrl + "/aai/schema-service/v1/nodes?version=v19",
+ baseUrl + "/aai/schema-service/v1/nodes?version=v20",
HttpMethod.GET,
httpEntity,
String.class
@@ -117,7 +117,7 @@ public class SchemaServiceTest {
httpEntity = new HttpEntity(headers);
responseEntity = restTemplate.exchange(
- baseUrl + "/aai/schema-service/v1/edgerules?version=v19",
+ baseUrl + "/aai/schema-service/v1/edgerules?version=v20",
HttpMethod.GET,
httpEntity,
String.class
diff --git a/aai-schema-service/src/test/resources/application-test.properties b/aai-schema-service/src/test/resources/application-test.properties
index e80397f..bad8309 100644
--- a/aai-schema-service/src/test/resources/application-test.properties
+++ b/aai-schema-service/src/test/resources/application-test.properties
@@ -40,7 +40,7 @@ schema.ingest.file=${server.local.startpath}/application.properties
# Schema Version Related Attributes
schema.uri.base.path=/aai/schema-service
# Lists all of the versions in the schema
-schema.version.list=v10,v11,v12,v13,v14,v15,v16,v17,v18,v19
+schema.version.list=v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20
# Specifies from which version should the depth parameter to default to zero
schema.version.depth.start=v10
# Specifies from which version should the related link be displayed in response payload
@@ -53,4 +53,4 @@ schema.version.namespace.change.start=v12
# Specifies from which version should the client start seeing the edge label in payload
schema.version.edge.label.start=v12
# Specifies the version that the application should default to
-schema.version.api.default=v19
+schema.version.api.default=v20