Make the DataSourceDefinition configureable using MicroProfile Config…

… variables in annotation options. IQSS#7418 IQSS#7000
poikilotherm · Nov 18, 2020 · b92e465 · b92e465
1 parent 9dfe7b8
commit b92e465
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/DataSourceProducer.java b/src/main/java/edu/harvard/iq/dataverse/util/DataSourceProducer.java
@@ -11,11 +11,10 @@
  name = "java:app/jdbc/dataverse",
  // Using PGXADataSource instead of deprecated PGPoolingDataSource
  className = "org.postgresql.xa.PGXADataSource",
- user = "dataverse",
- password = "${ALIAS=db_password_alias}",
- serverName = "postgresql",
- portNumber = 5432,
- databaseName = "dataverse",
+ user = "${MPCONFIG=dataverse.db.user}",
+ password = "${MPCONFIG=dataverse.db.password}",
+ serverName = "${MPCONFIG=dataverse.db.host}",
+ url = "jdbc:postgresql://${MPCONFIG=dataverse.db.host}:${MPCONFIG=dataverse.db.port}/${MPCONFIG=dataverse.db.name}",
  minPoolSize = 10,
  maxPoolSize = 200)
 public class DataSourceProducer {