Issue #296: move to cleaner structure

quarkusio · Dec 19, 2018 · eb87b62 · eb87b62
1 parent a20b1f7
commit eb87b62
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 8 deletions.
diff --git a/jpa/configurationless-tests/README.adoc → jpa/integrationtests/README.adoc b/jpa/configurationless-tests/README.adoc → 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 → jpa/integrationtests/pom.xml b/jpa/configurationless-tests/pom.xml → jpa/integrationtests/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>shamrock-jpa-configurationless-tests</artifactId>
+    <artifactId>shamrock-jpa-integration-tests</artifactId>
 
     <dependencies>
         <dependency>
@@ -124,7 +124,7 @@
                 </property>
             </activation>
             <properties>
-                <postgres.url>jdbc:postgresql://localhost:5431/jpa-configurationless</postgres.url>
+                <postgres.url>jdbc:postgresql://localhost:5431/jpa-integrationtests</postgres.url>
             </properties>
             <build>
                 <plugins>
@@ -139,9 +139,9 @@
                                     <alias>postgresql</alias>
                                     <run>
                                         <env>
-                                            <POSTGRES_USER>jpa-configurationless</POSTGRES_USER>
-                                            <POSTGRES_PASSWORD>jpa-configurationless</POSTGRES_PASSWORD>
-                                            <POSTGRES_DB>jpa-configurationless</POSTGRES_DB>
+                                            <POSTGRES_USER>jpa-integrationtests</POSTGRES_USER>
+                                            <POSTGRES_PASSWORD>jpa-integrationtests</POSTGRES_PASSWORD>
+                                            <POSTGRES_DB>jpa-integrationtests</POSTGRES_DB>
                                         </env>
                                         <ports>
                                             <port>5431:5432</port>

diff --git a/...tests/configurationless/CRUDResource.java → ...tests/configurationless/CRUDResource.java b/...tests/configurationless/CRUDResource.java → ...tests/configurationless/CRUDResource.java
diff --git a/...nfigurationless/ConfigurationlessApp.java → ...nfigurationless/ConfigurationlessApp.java b/...nfigurationless/ConfigurationlessApp.java → ...nfigurationless/ConfigurationlessApp.java
diff --git a/...ock/jpa/tests/configurationless/Gift.java → ...ock/jpa/tests/configurationless/Gift.java b/...ock/jpa/tests/configurationless/Gift.java → ...ock/jpa/tests/configurationless/Gift.java
diff --git a/...s/META-INF/microprofile-config.properties → ...s/META-INF/microprofile-config.properties b/...s/META-INF/microprofile-config.properties → ...s/META-INF/microprofile-config.properties
diff --git a/...n/resources/META-INF/some-persistence.xml → ...n/resources/META-INF/some-persistence.xml b/...n/resources/META-INF/some-persistence.xml → ...n/resources/META-INF/some-persistence.xml
diff --git a/...urationless/JPAConfigurationlessTest.java → ...urationless/JPAConfigurationlessTest.java b/...urationless/JPAConfigurationlessTest.java → ...urationless/JPAConfigurationlessTest.java
diff --git a/...ess/PersistenceAndShamrockConfigTest.java → ...ess/PersistenceAndShamrockConfigTest.java b/...ess/PersistenceAndShamrockConfigTest.java → ...ess/PersistenceAndShamrockConfigTest.java
diff --git a/jpa/pom.xml b/jpa/pom.xml
@@ -32,7 +32,7 @@
     <modules>
         <module>deployment</module>
         <module>runtime</module>
-        <module>configurationless-tests</module>
+        <module>integrationtests</module>
     </modules>