Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

awmisc_fixes #22

Merged
merged 6 commits into from
Nov 20, 2024
Merged

awmisc_fixes #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0e788a5
awmisc_fixes
alx652 Nov 19, 2024
5b9c081
Update application.conf
alx652 Nov 19, 2024
0880160
Update application.conf
alx652 Nov 19, 2024
42d6a8e
fixes while testing
alx652 Nov 20, 2024
3aff872
save
alx652 Nov 20, 2024
64e4f91
Merge branch 'awmisc_temp' into awmisc_fixes
alx652 Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gateway/src/main/resources/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 6 additions & 5 deletions invitro-pharmacology/src/main/resources/application.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 ##
Expand Down Expand Up @@ -113,3 +113,4 @@ gsrs.indexers.list=[
"class" = "gov.hhs.gsrs.invitropharmacology.models.InvitroAssayInformation"
}
]

2 changes: 1 addition & 1 deletion products/src/main/resources/application.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ssg4m/src/main/resources/application.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Loading