Merge pull request #828 from janblok/feature/dialects_in_sub_folders

dialects in sub folders
9tigerio · Dec 7, 2024 · 421cf44 · 421cf44
2 parents c69166e + ceb53bd
commit 421cf44
Show file tree

Hide file tree

Showing 15 changed files with 12 additions and 17 deletions.
diff --git a/mariadb-dialect/pom.xml → dialects/mariadb-dialect/pom.xml b/mariadb-dialect/pom.xml → dialects/mariadb-dialect/pom.xml
@@ -6,8 +6,7 @@
         <groupId>io.9tiger</groupId>
         <artifactId>db2rest-parent</artifactId>
         <version>${revision}</version>
-        <relativePath>../pom.xml</relativePath>
-
+        <relativePath>../../pom.xml</relativePath>
         <!-- lookup parent from repository -->
     </parent>
 

diff --git a/...t/jdbc/config/dialect/MariaDBDialect.java → ...t/jdbc/config/dialect/MariaDBDialect.java b/...t/jdbc/config/dialect/MariaDBDialect.java → ...t/jdbc/config/dialect/MariaDBDialect.java
diff --git a/mssql-dialect/pom.xml → dialects/mssql-dialect/pom.xml b/mssql-dialect/pom.xml → dialects/mssql-dialect/pom.xml
@@ -7,7 +7,7 @@
         <groupId>io.9tiger</groupId>
         <artifactId>db2rest-parent</artifactId>
         <version>${revision}</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
         <!-- lookup parent from repository -->
     </parent>
 

diff --git a/...bc/config/dialect/MsSQLServerDialect.java → ...bc/config/dialect/MsSQLServerDialect.java b/...bc/config/dialect/MsSQLServerDialect.java → ...bc/config/dialect/MsSQLServerDialect.java
diff --git a/mysql-dialect/pom.xml → dialects/mysql-dialect/pom.xml b/mysql-dialect/pom.xml → dialects/mysql-dialect/pom.xml
@@ -6,8 +6,7 @@
         <groupId>io.9tiger</groupId>
         <artifactId>db2rest-parent</artifactId>
         <version>${revision}</version>
-        <relativePath>../pom.xml</relativePath>
-
+        <relativePath>../../pom.xml</relativePath>
         <!-- lookup parent from repository -->
     </parent>
 

diff --git a/...est/jdbc/config/dialect/MySQLDialect.java → ...est/jdbc/config/dialect/MySQLDialect.java b/...est/jdbc/config/dialect/MySQLDialect.java → ...est/jdbc/config/dialect/MySQLDialect.java
diff --git a/oracle-dialect/pom.xml → dialects/oracle-dialect/pom.xml b/oracle-dialect/pom.xml → dialects/oracle-dialect/pom.xml
@@ -6,8 +6,7 @@
         <groupId>io.9tiger</groupId>
         <artifactId>db2rest-parent</artifactId>
         <version>${revision}</version>
-        <relativePath>../pom.xml</relativePath>
-
+        <relativePath>../../pom.xml</relativePath>
         <!-- lookup parent from repository -->
     </parent>
 

diff --git a/...st/jdbc/config/dialect/OracleDialect.java → ...st/jdbc/config/dialect/OracleDialect.java b/...st/jdbc/config/dialect/OracleDialect.java → ...st/jdbc/config/dialect/OracleDialect.java
diff --git a/oracle9i-dialect/pom.xml → dialects/oracle9i-dialect/pom.xml b/oracle9i-dialect/pom.xml → dialects/oracle9i-dialect/pom.xml
@@ -6,8 +6,7 @@
         <groupId>io.9tiger</groupId>
         <artifactId>db2rest-parent</artifactId>
         <version>${revision}</version>
-        <relativePath>../pom.xml</relativePath>
-
+        <relativePath>../../pom.xml</relativePath>
         <!-- lookup parent from repository -->
     </parent>
 

diff --git a/...st/jdbc/config/dialect/OracleDialect.java → ...st/jdbc/config/dialect/OracleDialect.java b/...st/jdbc/config/dialect/OracleDialect.java → ...st/jdbc/config/dialect/OracleDialect.java
diff --git a/pg-dialect/pom.xml → dialects/pg-dialect/pom.xml b/pg-dialect/pom.xml → dialects/pg-dialect/pom.xml
@@ -6,8 +6,7 @@
         <groupId>io.9tiger</groupId>
         <artifactId>db2rest-parent</artifactId>
         <version>${revision}</version>
-        <relativePath>../pom.xml</relativePath>
-
+        <relativePath>../../pom.xml</relativePath>
         <!-- lookup parent from repository -->
     </parent>
 

diff --git a/...dbc/config/dialect/PostGreSQLDialect.java → ...dbc/config/dialect/PostGreSQLDialect.java b/...dbc/config/dialect/PostGreSQLDialect.java → ...dbc/config/dialect/PostGreSQLDialect.java
diff --git a/...config/driver/EnvVarSSLSocketFactory.java → ...config/driver/EnvVarSSLSocketFactory.java b/...config/driver/EnvVarSSLSocketFactory.java → ...config/driver/EnvVarSSLSocketFactory.java
diff --git a/...driver/PgSingleCertValidatingFactory.java → ...driver/PgSingleCertValidatingFactory.java b/...driver/PgSingleCertValidatingFactory.java → ...driver/PgSingleCertValidatingFactory.java
diff --git a/pom.xml b/pom.xml
@@ -89,12 +89,12 @@
         <module>auth</module>
         <module>mongo-support</module>
         <module>rest-common</module>
-        <module>pg-dialect</module>
-        <module>mssql-dialect</module>
-        <module>mysql-dialect</module>
-        <module>mariadb-dialect</module>
-        <module>oracle-dialect</module>
-        <module>oracle9i-dialect</module>
+        <module>dialects/pg-dialect</module>
+        <module>dialects/mssql-dialect</module>
+        <module>dialects/mysql-dialect</module>
+        <module>dialects/mariadb-dialect</module>
+        <module>dialects/oracle-dialect</module>
+        <module>dialects/oracle9i-dialect</module>
         <module>rdbms-common</module>
         <module>db2rest-common</module>
         <module>rdbms-support</module>