diff --git a/jpa/configurationless-tests/README.adoc b/jpa/integrationtests/README.adoc similarity index 97% rename from jpa/configurationless-tests/README.adoc rename to jpa/integrationtests/README.adoc index 60574ea1ce7a7..3f03983eacf5a 100644 --- a/jpa/configurationless-tests/README.adoc +++ b/jpa/integrationtests/README.adoc @@ -60,7 +60,7 @@ Finally add the relevant configuration properties in `{config-file}`. [source,properties] -- -shamrock.datasource.url: jdbc:postgresql://localhost:5432/jpa-configurationless +shamrock.datasource.url: jdbc:postgresql://localhost:5432/mydatabase shamrock.datasource.driver: org.postgresql.Driver shamrock.datasource.username: sarah shamrock.datasource.password: connor @@ -270,5 +270,5 @@ Start the database first. [source] -- -docker run --ulimit memlock=-1:-1 -it --rm=true --memory-swappiness=0 --name postgres-protean-jpa -e POSTGRES_USER=jpa-configurationless -e POSTGRES_PASSWORD=jpa-configurationless -e POSTGRES_DB=jpa-configurationless -p 5431:5432 postgres:10.5 +docker run --ulimit memlock=-1:-1 -it --rm=true --memory-swappiness=0 --name postgres-protean-jpa -e POSTGRES_USER=jpa-integrationtests -e POSTGRES_PASSWORD=jpa-integrationtests -e POSTGRES_DB=jpa-integrationtests -p 5431:5432 postgres:10.5 -- diff --git a/jpa/configurationless-tests/pom.xml b/jpa/integrationtests/pom.xml similarity index 95% rename from jpa/configurationless-tests/pom.xml rename to jpa/integrationtests/pom.xml index a0b660eaa7d11..80bf1771077c1 100644 --- a/jpa/configurationless-tests/pom.xml +++ b/jpa/integrationtests/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - shamrock-jpa-configurationless-tests + shamrock-jpa-integration-tests @@ -124,7 +124,7 @@ - jdbc:postgresql://localhost:5431/jpa-configurationless + jdbc:postgresql://localhost:5431/jpa-integrationtests @@ -139,9 +139,9 @@ postgresql - jpa-configurationless - jpa-configurationless - jpa-configurationless + jpa-integrationtests + jpa-integrationtests + jpa-integrationtests 5431:5432 diff --git a/jpa/configurationless-tests/src/main/java/org/shamrock/jpa/tests/configurationless/CRUDResource.java b/jpa/integrationtests/src/main/java/org/shamrock/jpa/tests/configurationless/CRUDResource.java similarity index 100% rename from jpa/configurationless-tests/src/main/java/org/shamrock/jpa/tests/configurationless/CRUDResource.java rename to jpa/integrationtests/src/main/java/org/shamrock/jpa/tests/configurationless/CRUDResource.java diff --git a/jpa/configurationless-tests/src/main/java/org/shamrock/jpa/tests/configurationless/ConfigurationlessApp.java b/jpa/integrationtests/src/main/java/org/shamrock/jpa/tests/configurationless/ConfigurationlessApp.java similarity index 100% rename from jpa/configurationless-tests/src/main/java/org/shamrock/jpa/tests/configurationless/ConfigurationlessApp.java rename to jpa/integrationtests/src/main/java/org/shamrock/jpa/tests/configurationless/ConfigurationlessApp.java diff --git a/jpa/configurationless-tests/src/main/java/org/shamrock/jpa/tests/configurationless/Gift.java b/jpa/integrationtests/src/main/java/org/shamrock/jpa/tests/configurationless/Gift.java similarity index 100% rename from jpa/configurationless-tests/src/main/java/org/shamrock/jpa/tests/configurationless/Gift.java rename to jpa/integrationtests/src/main/java/org/shamrock/jpa/tests/configurationless/Gift.java diff --git a/jpa/configurationless-tests/src/main/resources/META-INF/microprofile-config.properties b/jpa/integrationtests/src/main/resources/META-INF/microprofile-config.properties similarity index 100% rename from jpa/configurationless-tests/src/main/resources/META-INF/microprofile-config.properties rename to jpa/integrationtests/src/main/resources/META-INF/microprofile-config.properties diff --git a/jpa/configurationless-tests/src/main/resources/META-INF/some-persistence.xml b/jpa/integrationtests/src/main/resources/META-INF/some-persistence.xml similarity index 100% rename from jpa/configurationless-tests/src/main/resources/META-INF/some-persistence.xml rename to jpa/integrationtests/src/main/resources/META-INF/some-persistence.xml diff --git a/jpa/configurationless-tests/src/test/java/org/shamrock/jpa/tests/configurationless/JPAConfigurationlessTest.java b/jpa/integrationtests/src/test/java/org/shamrock/jpa/tests/configurationless/JPAConfigurationlessTest.java similarity index 100% rename from jpa/configurationless-tests/src/test/java/org/shamrock/jpa/tests/configurationless/JPAConfigurationlessTest.java rename to jpa/integrationtests/src/test/java/org/shamrock/jpa/tests/configurationless/JPAConfigurationlessTest.java diff --git a/jpa/configurationless-tests/src/test/java/org/shamrock/jpa/tests/configurationless/PersistenceAndShamrockConfigTest.java b/jpa/integrationtests/src/test/java/org/shamrock/jpa/tests/configurationless/PersistenceAndShamrockConfigTest.java similarity index 100% rename from jpa/configurationless-tests/src/test/java/org/shamrock/jpa/tests/configurationless/PersistenceAndShamrockConfigTest.java rename to jpa/integrationtests/src/test/java/org/shamrock/jpa/tests/configurationless/PersistenceAndShamrockConfigTest.java diff --git a/jpa/pom.xml b/jpa/pom.xml index 2b75d672076f6..b104087a6849a 100644 --- a/jpa/pom.xml +++ b/jpa/pom.xml @@ -32,7 +32,7 @@ deployment runtime - configurationless-tests + integrationtests