From 0e788a5cd98a657852de3ec0681e246e5be30ff7 Mon Sep 17 00:00:00 2001 From: alx652 <58182629+alx652@users.noreply.github.com> Date: Tue, 19 Nov 2024 18:35:24 -0500 Subject: [PATCH 1/5] awmisc_fixes --- gateway/src/main/resources/application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gateway/src/main/resources/application.yml b/gateway/src/main/resources/application.yml index 17eb2e9..3e17c23 100644 --- a/gateway/src/main/resources/application.yml +++ b/gateway/src/main/resources/application.yml @@ -149,7 +149,7 @@ zuul: ############################# invitropharmacology_core: path: ${api.base.path}/api/v1/invitropharmacology/** - url: http://localhost:8090/invitro-pharmacology/api/v1/invitropharmacology + url: http://localhost:8090/api/v1/invitropharmacology serviceId: invitropharmacology_core ############################# #END invitro-pharmacology section From 5b9c081b34e0add101d23258e3a54dcfdc7c54b1 Mon Sep 17 00:00:00 2001 From: alx652 <58182629+alx652@users.noreply.github.com> Date: Tue, 19 Nov 2024 18:42:34 -0500 Subject: [PATCH 2/5] Update application.conf --- .../src/main/resources/application.conf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/invitro-pharmacology/src/main/resources/application.conf b/invitro-pharmacology/src/main/resources/application.conf index 0a99672..c7114c0 100644 --- a/invitro-pharmacology/src/main/resources/application.conf +++ b/invitro-pharmacology/src/main/resources/application.conf @@ -38,13 +38,13 @@ ix.h2 { ################################################################## # H2 Database Connection BEGIN ******* -spring.datasource.url="jdbc:h2:"${ix.h2.base}"/sprinxight;" +spring.datasource.url="jdbc:h2:file:../substances/ginas.ix/h2/sprinxight;AUTO_SERVER=TRUE" spring.datasource.driverClassName=org.h2.Driver spring.datasource.connectionTimeout=120000 spring.jpa.database-platform=org.hibernate.dialect.H2Dialect -spring.jpa.hibernate.ddl-auto=update +spring.jpa.hibernate.ddl-auto=none -invitropharmacology.datasource.url="jdbc:h2:"${ix.h2.base}"/appinxight;" +invitropharmacology.datasource.url="jdbc:h2:"${ix.h2.base}"/appinxight;AUTO_SERVER=TRUE" invitropharmacology.datasource.driverClassName=org.h2.Driver invitropharmacology.datasource.connectionTimeout=120000 invitropharmacology.jpa.database-platform=org.hibernate.dialect.H2Dialect @@ -53,8 +53,8 @@ invitropharmacology.jpa.hibernate.ddl-auto=update # !!!!! IMPORTANT, KEEP TO "none" for non-memory databases such as ORACLE, MYSQL, etc. # Otherwise all the tables can be dropped or deleted -spring.jpa.hibernate.ddl-auto=none -invitropharmacology.jpa.hibernate.ddl-auto=none +# spring.jpa.hibernate.ddl-auto=none +# invitropharmacology.jpa.hibernate.ddl-auto=none ################################################################## # SUBSTANCE API CONFIGURATION BEGIN ## From 0880160bac40fd35fcbd1845424058cb9972d55d Mon Sep 17 00:00:00 2001 From: alx652 <58182629+alx652@users.noreply.github.com> Date: Tue, 19 Nov 2024 18:51:53 -0500 Subject: [PATCH 3/5] Update application.conf --- products/src/main/resources/application.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/products/src/main/resources/application.conf b/products/src/main/resources/application.conf index c70c693..2b27d22 100644 --- a/products/src/main/resources/application.conf +++ b/products/src/main/resources/application.conf @@ -56,7 +56,7 @@ spring.jpa.hibernate.ddl-auto=update product.datasource.url="jdbc:h2:"${ix.h2.base}"/appinxight;AUTO_SERVER=TRUE" product.datasource.driverClassName=org.h2.Driver -product.datasource.connectionTimeout=1120000 +product.datasource.connectionTimeout=120000 product.datasource.username="sa" product.datasource.password="" product.jpa.database-platform=org.hibernate.dialect.H2Dialect From 42d6a8eed7c152614ac99579815f856b02a99616 Mon Sep 17 00:00:00 2001 From: alx652 Date: Tue, 19 Nov 2024 19:17:38 -0500 Subject: [PATCH 4/5] fixes while testing --- gateway/src/main/resources/application.yml | 2 +- .../src/main/resources/application.conf | 11 ++++++----- products/src/main/resources/application.conf | 2 +- ssg4m/src/main/resources/application.conf | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/gateway/src/main/resources/application.yml b/gateway/src/main/resources/application.yml index 17eb2e9..3e17c23 100644 --- a/gateway/src/main/resources/application.yml +++ b/gateway/src/main/resources/application.yml @@ -149,7 +149,7 @@ zuul: ############################# invitropharmacology_core: path: ${api.base.path}/api/v1/invitropharmacology/** - url: http://localhost:8090/invitro-pharmacology/api/v1/invitropharmacology + url: http://localhost:8090/api/v1/invitropharmacology serviceId: invitropharmacology_core ############################# #END invitro-pharmacology section diff --git a/invitro-pharmacology/src/main/resources/application.conf b/invitro-pharmacology/src/main/resources/application.conf index 0a99672..105ef90 100644 --- a/invitro-pharmacology/src/main/resources/application.conf +++ b/invitro-pharmacology/src/main/resources/application.conf @@ -38,13 +38,13 @@ ix.h2 { ################################################################## # H2 Database Connection BEGIN ******* -spring.datasource.url="jdbc:h2:"${ix.h2.base}"/sprinxight;" +spring.datasource.url="jdbc:h2:file:../substances/ginas.ix/h2/sprinxight;AUTO_SERVER=TRUE" spring.datasource.driverClassName=org.h2.Driver spring.datasource.connectionTimeout=120000 spring.jpa.database-platform=org.hibernate.dialect.H2Dialect -spring.jpa.hibernate.ddl-auto=update +spring.jpa.hibernate.ddl-auto=none -invitropharmacology.datasource.url="jdbc:h2:"${ix.h2.base}"/appinxight;" +invitropharmacology.datasource.url="jdbc:h2:"${ix.h2.base}"/appinxight;AUTO_SERVER=TRUE" invitropharmacology.datasource.driverClassName=org.h2.Driver invitropharmacology.datasource.connectionTimeout=120000 invitropharmacology.jpa.database-platform=org.hibernate.dialect.H2Dialect @@ -53,8 +53,8 @@ invitropharmacology.jpa.hibernate.ddl-auto=update # !!!!! IMPORTANT, KEEP TO "none" for non-memory databases such as ORACLE, MYSQL, etc. # Otherwise all the tables can be dropped or deleted -spring.jpa.hibernate.ddl-auto=none -invitropharmacology.jpa.hibernate.ddl-auto=none +# spring.jpa.hibernate.ddl-auto=none +# invitropharmacology.jpa.hibernate.ddl-auto=none ################################################################## # SUBSTANCE API CONFIGURATION BEGIN ## @@ -113,3 +113,4 @@ gsrs.indexers.list=[ "class" = "gov.hhs.gsrs.invitropharmacology.models.InvitroAssayInformation" } ] + diff --git a/products/src/main/resources/application.conf b/products/src/main/resources/application.conf index c70c693..2b27d22 100644 --- a/products/src/main/resources/application.conf +++ b/products/src/main/resources/application.conf @@ -56,7 +56,7 @@ spring.jpa.hibernate.ddl-auto=update product.datasource.url="jdbc:h2:"${ix.h2.base}"/appinxight;AUTO_SERVER=TRUE" product.datasource.driverClassName=org.h2.Driver -product.datasource.connectionTimeout=1120000 +product.datasource.connectionTimeout=120000 product.datasource.username="sa" product.datasource.password="" product.jpa.database-platform=org.hibernate.dialect.H2Dialect diff --git a/ssg4m/src/main/resources/application.conf b/ssg4m/src/main/resources/application.conf index 08d3d73..b1a1bd3 100644 --- a/ssg4m/src/main/resources/application.conf +++ b/ssg4m/src/main/resources/application.conf @@ -56,5 +56,5 @@ spring.hibernate.show-sql=false # !!!!! IMPORTANT, KEEP TO "none" for non-memory databases such as ORACLE, MYSQL, etc. # Otherwise all the tables can be dropped or deleted -spring.jpa.hibernate.ddl-auto=none +# spring.jpa.hibernate.ddl-auto=none From 3aff8722d71df841f73b336462a3c8067186ccef Mon Sep 17 00:00:00 2001 From: alx652 Date: Tue, 19 Nov 2024 19:25:16 -0500 Subject: [PATCH 5/5] save --- ssg4m/src/main/resources/application.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ssg4m/src/main/resources/application.conf b/ssg4m/src/main/resources/application.conf index 08d3d73..b1a1bd3 100644 --- a/ssg4m/src/main/resources/application.conf +++ b/ssg4m/src/main/resources/application.conf @@ -56,5 +56,5 @@ spring.hibernate.show-sql=false # !!!!! IMPORTANT, KEEP TO "none" for non-memory databases such as ORACLE, MYSQL, etc. # Otherwise all the tables can be dropped or deleted -spring.jpa.hibernate.ddl-auto=none +# spring.jpa.hibernate.ddl-auto=none