Skip to content

Commit

Permalink
revert to autodetected jdbc-drivers; fixes run from IDE
Browse files Browse the repository at this point in the history
  • Loading branch information
casparderksen committed Jan 5, 2019
1 parent 1acbf95 commit cf2986a
Show file tree
Hide file tree
Showing 10 changed files with 3 additions and 74 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ dependencies to the deployment.
Note that `@DefaultDeployment` only adds classes in the current package. Place your tests in
a package that includes all dependencies.

The file [`project-testing.yml`](myapp/src/test/resources/project-testing.yml) contains configuration
required for testing, in particular an H2 datasource. In Thorntail 4, this file can be removed
The file [`project-stages.yml`](myapp/src/test/resources/project-stages.yml) contains configuration
required for testing, in particular an H2 datasource. In Thorntail 4, this file may be removed
and replaced with profiles that are activated through the `thorntail.profiles` property.

## Running Arquillian tests from the IDE
Expand Down
11 changes: 0 additions & 11 deletions myapp/src/main/resources/modules/com/h2database/h2/main/module.xml

This file was deleted.

10 changes: 0 additions & 10 deletions myapp/src/main/resources/modules/com/mysql/main/module.xml

This file was deleted.

10 changes: 0 additions & 10 deletions myapp/src/main/resources/modules/com/oracle/main/module.xml

This file was deleted.

10 changes: 0 additions & 10 deletions myapp/src/main/resources/modules/org/postgresql/main/module.xml

This file was deleted.

6 changes: 0 additions & 6 deletions myapp/src/main/resources/project-h2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,5 @@ thorntail:
user-name: sa
password: sa

jdbc-drivers:
h2:
driver-class-name: org.h2.Driver
xa-datasource-class-name: org.h2.jdbcx.JdbcDataSource
driver-module-name: com.h2database.h2

flyway:
locations: classpath:db/migration/h2
6 changes: 0 additions & 6 deletions myapp/src/main/resources/project-mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,5 @@ thorntail:
background-validation: false
exception-sorter-class-name: org.jboss.jca.adapters.jdbc.extensions.mysql.MySQLExceptionSorter

jdbc-drivers:
mysql:
driver-class-name: com.mysql.jdbc.Driver
xa-datasource-class-name: com.mysql.jdbc.jdbc2.optional.MysqlXADataSource
driver-module-name: com.mysql

flyway:
locations: classpath:db/migration/mysql
6 changes: 0 additions & 6 deletions myapp/src/main/resources/project-oracle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,5 @@ thorntail:
stale-connection-checker-class-name: org.jboss.jca.adapters.jdbc.extensions.oracle.OracleStaleConnectionChecker
exception-sorter-class-name: org.jboss.jca.adapters.jdbc.extensions.oracle.OracleExceptionSorter

jdbc-drivers:
oracle:
driver-class-name: oracle.jdbc.OracleDriver
xa-datasource-class: oracle.jdbc.xa.client.OracleXADataSource
driver-module-name: com.oracle

flyway:
locations: classpath:db/migration/oracle
6 changes: 0 additions & 6 deletions myapp/src/main/resources/project-postgresql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,5 @@ thorntail:
background-validation: false
exception-sorter-class-name: org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLExceptionSorter

jdbc-drivers:
postgresql:
driver-class-name: org.postgresql.Driver
xa-datasource-class: org.postgresql.xa.PGXADataSource
driver-module-name: org.postgresql

flyway:
locations: classpath:db/migration/postgresql
8 changes: 1 addition & 7 deletions myapp/src/test/resources/project-stages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,9 @@ thorntail:
level: DEBUG

datasources:
jdbc-drivers:
h2testing:
driver-class-name: org.h2.Driver
xa-datasource-class-name: org.h2.jdbcx.JdbcDataSource
driver-module-name: com.h2database.h2

data-sources:
MyDS:
driver-name: h2testing
driver-name: h2
connection-url: jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
user-name: sa
password: sa
Expand Down

0 comments on commit cf2986a

Please sign in to comment.