From 35894e4bb4dd1251e8511e670662001f844a4354 Mon Sep 17 00:00:00 2001 From: aserkes Date: Sun, 28 Aug 2022 14:24:42 +0200 Subject: [PATCH 1/3] add configuration to connect to DB and script to initialize DB Signed-off-by: aserkes --- .../microprofile-config.properties.mustache | 8 +++---- .../src/main/archetype/mp/custom/database.xml | 24 +++++++++++-------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/archetypes/helidon/src/main/archetype/mp/common/files/src/main/resources/META-INF/microprofile-config.properties.mustache b/archetypes/helidon/src/main/archetype/mp/common/files/src/main/resources/META-INF/microprofile-config.properties.mustache index 426b898f95e..da79cfc6eee 100644 --- a/archetypes/helidon/src/main/archetype/mp/common/files/src/main/resources/META-INF/microprofile-config.properties.mustache +++ b/archetypes/helidon/src/main/archetype/mp/common/files/src/main/resources/META-INF/microprofile-config.properties.mustache @@ -13,12 +13,12 @@ metrics.rest-request.enabled=false # Datasource properties javax.sql.DataSource.{{ds-name}}.dataSourceClassName={{jdbcDataSource}} javax.sql.DataSource.{{ds-name}}.dataSource.url={{databaseUrl}} -javax.sql.DataSource.{{ds-name}}.dataSource.user=db_user -javax.sql.DataSource.{{ds-name}}.dataSource.password=user_password +javax.sql.DataSource.{{ds-name}}.dataSource.user={{dbUser}} +javax.sql.DataSource.{{ds-name}}.dataSource.password={{userPassword}} {{/database-hikari}} {{#database-ucp}} oracle.ucp.jdbc.PoolDataSource.{{ds-name}}.url={{databaseUrl}} oracle.ucp.jdbc.PoolDataSource.{{ds-name}}.connectionFactoryClassName={{jdbcDataSource}} -oracle.ucp.jdbc.PoolDataSource.{{ds-name}}.user=db_user -oracle.ucp.jdbc.PoolDataSource.{{ds-name}}.password=user_password +oracle.ucp.jdbc.PoolDataSource.{{ds-name}}.user={{dbUser}} +oracle.ucp.jdbc.PoolDataSource.{{ds-name}}.password={{dbUser}} {{/database-ucp}} \ No newline at end of file diff --git a/archetypes/helidon/src/main/archetype/mp/custom/database.xml b/archetypes/helidon/src/main/archetype/mp/custom/database.xml index 8085030f32c..044bb7b0bb4 100644 --- a/archetypes/helidon/src/main/archetype/mp/custom/database.xml +++ b/archetypes/helidon/src/main/archetype/mp/custom/database.xml @@ -196,6 +196,8 @@ Instructions for H2 can be found here: https://www.h2database.com/html/cheatShee org.h2.jdbcx.JdbcDataSource jdbc:h2:mem:test;DB_CLOSE_DELAY=-1 + sa + - - - jakarta.persistence.sql-load-script-source - META-INF/init_script.sql - - - jakarta.persistence.schema-generation.database.action - drop-and-create - - @@ -306,6 +298,9 @@ docker run --rm --name mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=root -e MYSQL_D com.mysql.cj.jdbc.MysqlDataSource + jdbc:mysql://127.0.0.1:3306/pokemon?useSSL=false + user + password @@ -346,6 +341,9 @@ docker run --rm --name xe -p 1521:1521 -p 8888:8080 -e ORACLE_PWD=oracle wnamele oracle.jdbc.pool.OracleDataSource + jdbc:oracle:thin:@localhost:1521:XE + sys + oracle @@ -482,6 +480,12 @@ docker run --rm --name xe -p 1521:1521 -p 8888:8080 -e ORACLE_PWD=oracle wnamele ]]> + + + jakarta.persistence.sql-load-script-source + META-INF/init_script.sql + + From 54b7cc9e503f8017bded7485b7d15b74b24d0980 Mon Sep 17 00:00:00 2001 From: aserkes Date: Mon, 29 Aug 2022 11:01:14 +0200 Subject: [PATCH 2/3] change db config in MP templates Signed-off-by: aserkes --- .../resources/META-INF/microprofile-config.properties.mustache | 2 +- archetypes/helidon/src/main/archetype/mp/custom/database.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/archetypes/helidon/src/main/archetype/mp/common/files/src/main/resources/META-INF/microprofile-config.properties.mustache b/archetypes/helidon/src/main/archetype/mp/common/files/src/main/resources/META-INF/microprofile-config.properties.mustache index da79cfc6eee..a9abb5ceba8 100644 --- a/archetypes/helidon/src/main/archetype/mp/common/files/src/main/resources/META-INF/microprofile-config.properties.mustache +++ b/archetypes/helidon/src/main/archetype/mp/common/files/src/main/resources/META-INF/microprofile-config.properties.mustache @@ -20,5 +20,5 @@ javax.sql.DataSource.{{ds-name}}.dataSource.password={{userPassword}} oracle.ucp.jdbc.PoolDataSource.{{ds-name}}.url={{databaseUrl}} oracle.ucp.jdbc.PoolDataSource.{{ds-name}}.connectionFactoryClassName={{jdbcDataSource}} oracle.ucp.jdbc.PoolDataSource.{{ds-name}}.user={{dbUser}} -oracle.ucp.jdbc.PoolDataSource.{{ds-name}}.password={{dbUser}} +oracle.ucp.jdbc.PoolDataSource.{{ds-name}}.password={{userPassword}} {{/database-ucp}} \ No newline at end of file diff --git a/archetypes/helidon/src/main/archetype/mp/custom/database.xml b/archetypes/helidon/src/main/archetype/mp/custom/database.xml index 044bb7b0bb4..00ae48ce1ba 100644 --- a/archetypes/helidon/src/main/archetype/mp/custom/database.xml +++ b/archetypes/helidon/src/main/archetype/mp/custom/database.xml @@ -342,7 +342,7 @@ docker run --rm --name xe -p 1521:1521 -p 8888:8080 -e ORACLE_PWD=oracle wnamele oracle.jdbc.pool.OracleDataSource jdbc:oracle:thin:@localhost:1521:XE - sys + sys as sysdba oracle From dcd80f6d8defe23f397a547bd316cc7e8f62bcce Mon Sep 17 00:00:00 2001 From: aserkes Date: Mon, 29 Aug 2022 13:50:51 +0200 Subject: [PATCH 3/3] change DB config in templates Signed-off-by: aserkes --- .../src/main/archetype/mp/custom/database.xml | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/archetypes/helidon/src/main/archetype/mp/custom/database.xml b/archetypes/helidon/src/main/archetype/mp/custom/database.xml index 00ae48ce1ba..3ca536aa75a 100644 --- a/archetypes/helidon/src/main/archetype/mp/custom/database.xml +++ b/archetypes/helidon/src/main/archetype/mp/custom/database.xml @@ -259,6 +259,16 @@ Instructions for H2 can be found here: https://www.h2database.com/html/cheatShee } ]]> + + + jakarta.persistence.sql-load-script-source + META-INF/init_script.sql + + + jakarta.persistence.schema-generation.database.action + drop-and-create + + @@ -360,6 +370,10 @@ docker run --rm --name xe -p 1521:1521 -p 8888:8080 -e ORACLE_PWD=oracle wnamele eclipselink.ddl-generation drop-and-create-tables + + jakarta.persistence.sql-load-script-source + META-INF/init_script.sql + @@ -480,12 +494,6 @@ docker run --rm --name xe -p 1521:1521 -p 8888:8080 -e ORACLE_PWD=oracle wnamele ]]> - - - jakarta.persistence.sql-load-script-source - META-INF/init_script.sql - -