diff --git a/pom.xml b/pom.xml index 1d854f6eb..00077c0fa 100644 --- a/pom.xml +++ b/pom.xml @@ -157,9 +157,9 @@ sqlg-core sqlg-test - sqlg-postgres - sqlg-hsqldb - sqlg-h2 + sqlg-postgres-parent + sqlg-hsqldb-parent + sqlg-h2-parent sqlg-benchmark sqlg-benchmark-postgres sqlg-benchmark-hsqldb @@ -198,6 +198,11 @@ sqlg-postgres ${sqlg.version} + + org.umlg + sqlg-postgres-dialect + ${sqlg.version} + net.postgis postgis-jdbc @@ -214,6 +219,11 @@ sqlg-hsqldb ${sqlg.version} + + org.umlg + sqlg-hsqldb-dialect + ${sqlg.version} + org.umlg sqlg-test @@ -239,6 +249,16 @@ sqlg-h2 ${sqlg.version} + + org.umlg + sqlg-h2-dialect + ${sqlg.version} + + + org.apache.commons + commons-lang3 + 3.3.1 + diff --git a/sqlg-core/pom.xml b/sqlg-core/pom.xml index 79d77bb33..f31fc652c 100755 --- a/sqlg-core/pom.xml +++ b/sqlg-core/pom.xml @@ -16,8 +16,8 @@ gremlin-core - org.apache.tinkerpop - gremlin-groovy + org.apache.commons + commons-lang3 com.mchange diff --git a/sqlg-h2-parent/pom.xml b/sqlg-h2-parent/pom.xml new file mode 100644 index 000000000..5bc315d04 --- /dev/null +++ b/sqlg-h2-parent/pom.xml @@ -0,0 +1,20 @@ + + + + sqlg + org.umlg + 1.3.0-SNAPSHOT + + 4.0.0 + + sqlg-h2-parent + pom + + + sqlg-h2-dialect + sqlg-h2 + + + diff --git a/sqlg-h2/pom.xml b/sqlg-h2-parent/sqlg-h2-dialect/pom.xml similarity index 89% rename from sqlg-h2/pom.xml rename to sqlg-h2-parent/sqlg-h2-dialect/pom.xml index 8083081fc..d0439d1e6 100644 --- a/sqlg-h2/pom.xml +++ b/sqlg-h2-parent/sqlg-h2-dialect/pom.xml @@ -3,14 +3,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - sqlg + sqlg-h2-parent org.umlg 1.3.0-SNAPSHOT 4.0.0 - sqlg-h2 - sqlg :: h2 + sqlg-h2-dialect + sqlg :: h2 dialect diff --git a/sqlg-h2/src/main/java/org/umlg/sqlg/H2Dialect.java b/sqlg-h2-parent/sqlg-h2-dialect/src/main/java/org/umlg/sqlg/H2Dialect.java similarity index 100% rename from sqlg-h2/src/main/java/org/umlg/sqlg/H2Dialect.java rename to sqlg-h2-parent/sqlg-h2-dialect/src/main/java/org/umlg/sqlg/H2Dialect.java diff --git a/sqlg-h2/src/main/java/org/umlg/sqlg/H2Plugin.java b/sqlg-h2-parent/sqlg-h2-dialect/src/main/java/org/umlg/sqlg/H2Plugin.java similarity index 100% rename from sqlg-h2/src/main/java/org/umlg/sqlg/H2Plugin.java rename to sqlg-h2-parent/sqlg-h2-dialect/src/main/java/org/umlg/sqlg/H2Plugin.java diff --git a/sqlg-h2/src/main/resources/META-INF/services/org.umlg.sqlg.SqlgPlugin b/sqlg-h2-parent/sqlg-h2-dialect/src/main/resources/META-INF/services/org.umlg.sqlg.SqlgPlugin similarity index 100% rename from sqlg-h2/src/main/resources/META-INF/services/org.umlg.sqlg.SqlgPlugin rename to sqlg-h2-parent/sqlg-h2-dialect/src/main/resources/META-INF/services/org.umlg.sqlg.SqlgPlugin diff --git a/sqlg-h2-parent/sqlg-h2/pom.xml b/sqlg-h2-parent/sqlg-h2/pom.xml new file mode 100644 index 000000000..4f6219fe8 --- /dev/null +++ b/sqlg-h2-parent/sqlg-h2/pom.xml @@ -0,0 +1,40 @@ + + + + sqlg-h2-parent + org.umlg + 1.3.0-SNAPSHOT + + 4.0.0 + + sqlg-h2 + sqlg :: h2 + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + + + + + org.apache.tinkerpop + gremlin-groovy + + + org.umlg + sqlg-h2-dialect + + + org.umlg + sqlg-test + test + + + + diff --git a/sqlg-h2/src/main/java/org/umlg/sqlg/groovy/plugin/SqlgH2GremlinPlugin.java b/sqlg-h2-parent/sqlg-h2/src/main/java/org/umlg/sqlg/groovy/plugin/SqlgH2GremlinPlugin.java similarity index 100% rename from sqlg-h2/src/main/java/org/umlg/sqlg/groovy/plugin/SqlgH2GremlinPlugin.java rename to sqlg-h2-parent/sqlg-h2/src/main/java/org/umlg/sqlg/groovy/plugin/SqlgH2GremlinPlugin.java diff --git a/sqlg-h2/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin b/sqlg-h2-parent/sqlg-h2/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin similarity index 100% rename from sqlg-h2/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin rename to sqlg-h2-parent/sqlg-h2/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin diff --git a/sqlg-h2/src/test/java/org/umlg/sqlg/test/H2AllTest.java b/sqlg-h2-parent/sqlg-h2/src/test/java/org/umlg/sqlg/test/H2AllTest.java similarity index 100% rename from sqlg-h2/src/test/java/org/umlg/sqlg/test/H2AllTest.java rename to sqlg-h2-parent/sqlg-h2/src/test/java/org/umlg/sqlg/test/H2AllTest.java diff --git a/sqlg-h2/src/test/java/org/umlg/sqlg/test/H2AnyTest.java b/sqlg-h2-parent/sqlg-h2/src/test/java/org/umlg/sqlg/test/H2AnyTest.java similarity index 100% rename from sqlg-h2/src/test/java/org/umlg/sqlg/test/H2AnyTest.java rename to sqlg-h2-parent/sqlg-h2/src/test/java/org/umlg/sqlg/test/H2AnyTest.java diff --git a/sqlg-h2/src/test/java/org/umlg/sqlg/test/tp3/SqlgH2Provider.java b/sqlg-h2-parent/sqlg-h2/src/test/java/org/umlg/sqlg/test/tp3/SqlgH2Provider.java similarity index 100% rename from sqlg-h2/src/test/java/org/umlg/sqlg/test/tp3/SqlgH2Provider.java rename to sqlg-h2-parent/sqlg-h2/src/test/java/org/umlg/sqlg/test/tp3/SqlgH2Provider.java diff --git a/sqlg-h2/src/test/java/org/umlg/sqlg/test/tp3/groovy/SqlgH2GroovyEnvironmentIntegrateTest.java b/sqlg-h2-parent/sqlg-h2/src/test/java/org/umlg/sqlg/test/tp3/groovy/SqlgH2GroovyEnvironmentIntegrateTest.java similarity index 100% rename from sqlg-h2/src/test/java/org/umlg/sqlg/test/tp3/groovy/SqlgH2GroovyEnvironmentIntegrateTest.java rename to sqlg-h2-parent/sqlg-h2/src/test/java/org/umlg/sqlg/test/tp3/groovy/SqlgH2GroovyEnvironmentIntegrateTest.java diff --git a/sqlg-h2/src/test/java/org/umlg/sqlg/test/tp3/groovy/SqlgH2GroovyEnvironmentPerformanceTest.java b/sqlg-h2-parent/sqlg-h2/src/test/java/org/umlg/sqlg/test/tp3/groovy/SqlgH2GroovyEnvironmentPerformanceTest.java similarity index 100% rename from sqlg-h2/src/test/java/org/umlg/sqlg/test/tp3/groovy/SqlgH2GroovyEnvironmentPerformanceTest.java rename to sqlg-h2-parent/sqlg-h2/src/test/java/org/umlg/sqlg/test/tp3/groovy/SqlgH2GroovyEnvironmentPerformanceTest.java diff --git a/sqlg-h2/src/test/java/org/umlg/sqlg/test/tp3/groovy/SqlgH2GroovyEnvironmentTest.java b/sqlg-h2-parent/sqlg-h2/src/test/java/org/umlg/sqlg/test/tp3/groovy/SqlgH2GroovyEnvironmentTest.java similarity index 100% rename from sqlg-h2/src/test/java/org/umlg/sqlg/test/tp3/groovy/SqlgH2GroovyEnvironmentTest.java rename to sqlg-h2-parent/sqlg-h2/src/test/java/org/umlg/sqlg/test/tp3/groovy/SqlgH2GroovyEnvironmentTest.java diff --git a/sqlg-h2/src/test/java/org/umlg/sqlg/test/tp3/process/SqlgH2GroovyProcessStandardTest.java b/sqlg-h2-parent/sqlg-h2/src/test/java/org/umlg/sqlg/test/tp3/process/SqlgH2GroovyProcessStandardTest.java similarity index 100% rename from sqlg-h2/src/test/java/org/umlg/sqlg/test/tp3/process/SqlgH2GroovyProcessStandardTest.java rename to sqlg-h2-parent/sqlg-h2/src/test/java/org/umlg/sqlg/test/tp3/process/SqlgH2GroovyProcessStandardTest.java diff --git a/sqlg-h2/src/test/java/org/umlg/sqlg/test/tp3/process/SqlgH2ProcessPerformanceTest.java b/sqlg-h2-parent/sqlg-h2/src/test/java/org/umlg/sqlg/test/tp3/process/SqlgH2ProcessPerformanceTest.java similarity index 100% rename from sqlg-h2/src/test/java/org/umlg/sqlg/test/tp3/process/SqlgH2ProcessPerformanceTest.java rename to sqlg-h2-parent/sqlg-h2/src/test/java/org/umlg/sqlg/test/tp3/process/SqlgH2ProcessPerformanceTest.java diff --git a/sqlg-h2/src/test/java/org/umlg/sqlg/test/tp3/process/SqlgH2ProcessStandardTest.java b/sqlg-h2-parent/sqlg-h2/src/test/java/org/umlg/sqlg/test/tp3/process/SqlgH2ProcessStandardTest.java similarity index 100% rename from sqlg-h2/src/test/java/org/umlg/sqlg/test/tp3/process/SqlgH2ProcessStandardTest.java rename to sqlg-h2-parent/sqlg-h2/src/test/java/org/umlg/sqlg/test/tp3/process/SqlgH2ProcessStandardTest.java diff --git a/sqlg-h2/src/test/java/org/umlg/sqlg/test/tp3/structure/SqlgH2GroovyStructurePerformanceTest.java b/sqlg-h2-parent/sqlg-h2/src/test/java/org/umlg/sqlg/test/tp3/structure/SqlgH2GroovyStructurePerformanceTest.java similarity index 100% rename from sqlg-h2/src/test/java/org/umlg/sqlg/test/tp3/structure/SqlgH2GroovyStructurePerformanceTest.java rename to sqlg-h2-parent/sqlg-h2/src/test/java/org/umlg/sqlg/test/tp3/structure/SqlgH2GroovyStructurePerformanceTest.java diff --git a/sqlg-h2/src/test/java/org/umlg/sqlg/test/tp3/structure/SqlgH2StructurePerformanceTest.java b/sqlg-h2-parent/sqlg-h2/src/test/java/org/umlg/sqlg/test/tp3/structure/SqlgH2StructurePerformanceTest.java similarity index 100% rename from sqlg-h2/src/test/java/org/umlg/sqlg/test/tp3/structure/SqlgH2StructurePerformanceTest.java rename to sqlg-h2-parent/sqlg-h2/src/test/java/org/umlg/sqlg/test/tp3/structure/SqlgH2StructurePerformanceTest.java diff --git a/sqlg-h2/src/test/java/org/umlg/sqlg/test/tp3/structure/SqlgH2StructureStandardTest.java b/sqlg-h2-parent/sqlg-h2/src/test/java/org/umlg/sqlg/test/tp3/structure/SqlgH2StructureStandardTest.java similarity index 100% rename from sqlg-h2/src/test/java/org/umlg/sqlg/test/tp3/structure/SqlgH2StructureStandardTest.java rename to sqlg-h2-parent/sqlg-h2/src/test/java/org/umlg/sqlg/test/tp3/structure/SqlgH2StructureStandardTest.java diff --git a/sqlg-h2/src/test/resources/sqlg.properties b/sqlg-h2-parent/sqlg-h2/src/test/resources/sqlg.properties similarity index 100% rename from sqlg-h2/src/test/resources/sqlg.properties rename to sqlg-h2-parent/sqlg-h2/src/test/resources/sqlg.properties diff --git a/sqlg-hsqldb-parent/pom.xml b/sqlg-hsqldb-parent/pom.xml new file mode 100644 index 000000000..b57f319e8 --- /dev/null +++ b/sqlg-hsqldb-parent/pom.xml @@ -0,0 +1,20 @@ + + + + sqlg + org.umlg + 1.3.0-SNAPSHOT + + 4.0.0 + + sqlg-hsqldb-parent + pom + + + sqlg-hsqldb-dialect + sqlg-hsqldb + + + diff --git a/sqlg-hsqldb/pom.xml b/sqlg-hsqldb-parent/sqlg-hsqldb-dialect/pom.xml similarity index 88% rename from sqlg-hsqldb/pom.xml rename to sqlg-hsqldb-parent/sqlg-hsqldb-dialect/pom.xml index f26627837..96239931c 100755 --- a/sqlg-hsqldb/pom.xml +++ b/sqlg-hsqldb-parent/sqlg-hsqldb-dialect/pom.xml @@ -4,11 +4,11 @@ 4.0.0 org.umlg - sqlg + sqlg-hsqldb-parent 1.3.0-SNAPSHOT - sqlg-hsqldb - sqlg :: hsqldb + sqlg-hsqldb-dialect + sqlg :: hsqldb dialect diff --git a/sqlg-hsqldb/src/main/java/org/umlg/sqlg/HsqldbPlugin.java b/sqlg-hsqldb-parent/sqlg-hsqldb-dialect/src/main/java/org/umlg/sqlg/HsqldbPlugin.java similarity index 100% rename from sqlg-hsqldb/src/main/java/org/umlg/sqlg/HsqldbPlugin.java rename to sqlg-hsqldb-parent/sqlg-hsqldb-dialect/src/main/java/org/umlg/sqlg/HsqldbPlugin.java diff --git a/sqlg-hsqldb/src/main/java/org/umlg/sqlg/sql/dialect/HsqldbDialect.java b/sqlg-hsqldb-parent/sqlg-hsqldb-dialect/src/main/java/org/umlg/sqlg/sql/dialect/HsqldbDialect.java similarity index 100% rename from sqlg-hsqldb/src/main/java/org/umlg/sqlg/sql/dialect/HsqldbDialect.java rename to sqlg-hsqldb-parent/sqlg-hsqldb-dialect/src/main/java/org/umlg/sqlg/sql/dialect/HsqldbDialect.java diff --git a/sqlg-hsqldb/src/main/resources/META-INF/services/org.umlg.sqlg.SqlgPlugin b/sqlg-hsqldb-parent/sqlg-hsqldb-dialect/src/main/resources/META-INF/services/org.umlg.sqlg.SqlgPlugin similarity index 100% rename from sqlg-hsqldb/src/main/resources/META-INF/services/org.umlg.sqlg.SqlgPlugin rename to sqlg-hsqldb-parent/sqlg-hsqldb-dialect/src/main/resources/META-INF/services/org.umlg.sqlg.SqlgPlugin diff --git a/sqlg-hsqldb-parent/sqlg-hsqldb/pom.xml b/sqlg-hsqldb-parent/sqlg-hsqldb/pom.xml new file mode 100755 index 000000000..94a172073 --- /dev/null +++ b/sqlg-hsqldb-parent/sqlg-hsqldb/pom.xml @@ -0,0 +1,38 @@ + + + 4.0.0 + + org.umlg + sqlg-hsqldb-parent + 1.3.0-SNAPSHOT + + sqlg-hsqldb + sqlg :: hsqldb + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + + + + + org.apache.tinkerpop + gremlin-groovy + + + org.umlg + sqlg-hsqldb-dialect + + + org.umlg + sqlg-test + test + + + + diff --git a/sqlg-hsqldb/src/main/java/org/umlg/sqlg/groovy/plugin/SqlgHsqldbGremlinPlugin.java b/sqlg-hsqldb-parent/sqlg-hsqldb/src/main/java/org/umlg/sqlg/groovy/plugin/SqlgHsqldbGremlinPlugin.java similarity index 100% rename from sqlg-hsqldb/src/main/java/org/umlg/sqlg/groovy/plugin/SqlgHsqldbGremlinPlugin.java rename to sqlg-hsqldb-parent/sqlg-hsqldb/src/main/java/org/umlg/sqlg/groovy/plugin/SqlgHsqldbGremlinPlugin.java diff --git a/sqlg-hsqldb/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin b/sqlg-hsqldb-parent/sqlg-hsqldb/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin similarity index 100% rename from sqlg-hsqldb/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin rename to sqlg-hsqldb-parent/sqlg-hsqldb/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin diff --git a/sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/HsqldbAllTest.java b/sqlg-hsqldb-parent/sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/HsqldbAllTest.java similarity index 100% rename from sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/HsqldbAllTest.java rename to sqlg-hsqldb-parent/sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/HsqldbAllTest.java diff --git a/sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/HsqldbAnyTest.java b/sqlg-hsqldb-parent/sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/HsqldbAnyTest.java similarity index 100% rename from sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/HsqldbAnyTest.java rename to sqlg-hsqldb-parent/sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/HsqldbAnyTest.java diff --git a/sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/tp3/SqlgHsqldbProvider.java b/sqlg-hsqldb-parent/sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/tp3/SqlgHsqldbProvider.java similarity index 100% rename from sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/tp3/SqlgHsqldbProvider.java rename to sqlg-hsqldb-parent/sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/tp3/SqlgHsqldbProvider.java diff --git a/sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/tp3/groovy/SqlgHsqldbGroovyEnvironmentIntegrateTest.java b/sqlg-hsqldb-parent/sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/tp3/groovy/SqlgHsqldbGroovyEnvironmentIntegrateTest.java similarity index 100% rename from sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/tp3/groovy/SqlgHsqldbGroovyEnvironmentIntegrateTest.java rename to sqlg-hsqldb-parent/sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/tp3/groovy/SqlgHsqldbGroovyEnvironmentIntegrateTest.java diff --git a/sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/tp3/groovy/SqlgHsqldbGroovyEnvironmentPerformanceTest.java b/sqlg-hsqldb-parent/sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/tp3/groovy/SqlgHsqldbGroovyEnvironmentPerformanceTest.java similarity index 100% rename from sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/tp3/groovy/SqlgHsqldbGroovyEnvironmentPerformanceTest.java rename to sqlg-hsqldb-parent/sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/tp3/groovy/SqlgHsqldbGroovyEnvironmentPerformanceTest.java diff --git a/sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/tp3/groovy/SqlgHsqldbGroovyEnvironmentTest.java b/sqlg-hsqldb-parent/sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/tp3/groovy/SqlgHsqldbGroovyEnvironmentTest.java similarity index 100% rename from sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/tp3/groovy/SqlgHsqldbGroovyEnvironmentTest.java rename to sqlg-hsqldb-parent/sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/tp3/groovy/SqlgHsqldbGroovyEnvironmentTest.java diff --git a/sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/tp3/process/SqlgHsqldbGroovyProcessStandardTest.java b/sqlg-hsqldb-parent/sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/tp3/process/SqlgHsqldbGroovyProcessStandardTest.java similarity index 100% rename from sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/tp3/process/SqlgHsqldbGroovyProcessStandardTest.java rename to sqlg-hsqldb-parent/sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/tp3/process/SqlgHsqldbGroovyProcessStandardTest.java diff --git a/sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/tp3/process/SqlgHsqldbProcessPerformanceTest.java b/sqlg-hsqldb-parent/sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/tp3/process/SqlgHsqldbProcessPerformanceTest.java similarity index 100% rename from sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/tp3/process/SqlgHsqldbProcessPerformanceTest.java rename to sqlg-hsqldb-parent/sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/tp3/process/SqlgHsqldbProcessPerformanceTest.java diff --git a/sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/tp3/process/SqlgHsqldbProcessStandardTest.java b/sqlg-hsqldb-parent/sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/tp3/process/SqlgHsqldbProcessStandardTest.java similarity index 100% rename from sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/tp3/process/SqlgHsqldbProcessStandardTest.java rename to sqlg-hsqldb-parent/sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/tp3/process/SqlgHsqldbProcessStandardTest.java diff --git a/sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/tp3/structure/SqlgHsqldbGroovyStructurePerformanceTest.java b/sqlg-hsqldb-parent/sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/tp3/structure/SqlgHsqldbGroovyStructurePerformanceTest.java similarity index 100% rename from sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/tp3/structure/SqlgHsqldbGroovyStructurePerformanceTest.java rename to sqlg-hsqldb-parent/sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/tp3/structure/SqlgHsqldbGroovyStructurePerformanceTest.java diff --git a/sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/tp3/structure/SqlgHsqldbStructurePerformanceTest.java b/sqlg-hsqldb-parent/sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/tp3/structure/SqlgHsqldbStructurePerformanceTest.java similarity index 100% rename from sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/tp3/structure/SqlgHsqldbStructurePerformanceTest.java rename to sqlg-hsqldb-parent/sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/tp3/structure/SqlgHsqldbStructurePerformanceTest.java diff --git a/sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/tp3/structure/SqlgHsqldbStructureStandardTest.java b/sqlg-hsqldb-parent/sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/tp3/structure/SqlgHsqldbStructureStandardTest.java similarity index 100% rename from sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/tp3/structure/SqlgHsqldbStructureStandardTest.java rename to sqlg-hsqldb-parent/sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/tp3/structure/SqlgHsqldbStructureStandardTest.java diff --git a/sqlg-hsqldb/src/test/resources/sqlg.properties b/sqlg-hsqldb-parent/sqlg-hsqldb/src/test/resources/sqlg.properties similarity index 100% rename from sqlg-hsqldb/src/test/resources/sqlg.properties rename to sqlg-hsqldb-parent/sqlg-hsqldb/src/test/resources/sqlg.properties diff --git a/sqlg-postgres-parent/pom.xml b/sqlg-postgres-parent/pom.xml new file mode 100644 index 000000000..df6d6048a --- /dev/null +++ b/sqlg-postgres-parent/pom.xml @@ -0,0 +1,20 @@ + + + + sqlg + org.umlg + 1.3.0-SNAPSHOT + + 4.0.0 + + sqlg-postgres-parent + pom + + + sqlg-postgres-dialect + sqlg-postgres + + + diff --git a/sqlg-postgres/pom.xml b/sqlg-postgres-parent/sqlg-postgres-dialect/pom.xml similarity index 93% rename from sqlg-postgres/pom.xml rename to sqlg-postgres-parent/sqlg-postgres-dialect/pom.xml index 640043be6..199e788ad 100755 --- a/sqlg-postgres/pom.xml +++ b/sqlg-postgres-parent/sqlg-postgres-dialect/pom.xml @@ -4,11 +4,11 @@ 4.0.0 org.umlg - sqlg + sqlg-postgres-parent 1.3.0-SNAPSHOT - sqlg-postgres - sqlg :: postgres + sqlg-postgres-dialect + sqlg :: postgres dialect diff --git a/sqlg-postgres/src/main/java/org/umlg/sqlg/PostgresPlugin.java b/sqlg-postgres-parent/sqlg-postgres-dialect/src/main/java/org/umlg/sqlg/PostgresPlugin.java similarity index 100% rename from sqlg-postgres/src/main/java/org/umlg/sqlg/PostgresPlugin.java rename to sqlg-postgres-parent/sqlg-postgres-dialect/src/main/java/org/umlg/sqlg/PostgresPlugin.java diff --git a/sqlg-postgres/src/main/java/org/umlg/sqlg/gis/GeographyPoint.java b/sqlg-postgres-parent/sqlg-postgres-dialect/src/main/java/org/umlg/sqlg/gis/GeographyPoint.java similarity index 100% rename from sqlg-postgres/src/main/java/org/umlg/sqlg/gis/GeographyPoint.java rename to sqlg-postgres-parent/sqlg-postgres-dialect/src/main/java/org/umlg/sqlg/gis/GeographyPoint.java diff --git a/sqlg-postgres/src/main/java/org/umlg/sqlg/gis/GeographyPolygon.java b/sqlg-postgres-parent/sqlg-postgres-dialect/src/main/java/org/umlg/sqlg/gis/GeographyPolygon.java similarity index 100% rename from sqlg-postgres/src/main/java/org/umlg/sqlg/gis/GeographyPolygon.java rename to sqlg-postgres-parent/sqlg-postgres-dialect/src/main/java/org/umlg/sqlg/gis/GeographyPolygon.java diff --git a/sqlg-postgres/src/main/java/org/umlg/sqlg/gis/Gis.java b/sqlg-postgres-parent/sqlg-postgres-dialect/src/main/java/org/umlg/sqlg/gis/Gis.java similarity index 100% rename from sqlg-postgres/src/main/java/org/umlg/sqlg/gis/Gis.java rename to sqlg-postgres-parent/sqlg-postgres-dialect/src/main/java/org/umlg/sqlg/gis/Gis.java diff --git a/sqlg-postgres/src/main/java/org/umlg/sqlg/sql/dialect/PostgresDialect.java b/sqlg-postgres-parent/sqlg-postgres-dialect/src/main/java/org/umlg/sqlg/sql/dialect/PostgresDialect.java similarity index 100% rename from sqlg-postgres/src/main/java/org/umlg/sqlg/sql/dialect/PostgresDialect.java rename to sqlg-postgres-parent/sqlg-postgres-dialect/src/main/java/org/umlg/sqlg/sql/dialect/PostgresDialect.java diff --git a/sqlg-postgres/src/main/resources/META-INF/services/org.umlg.sqlg.SqlgPlugin b/sqlg-postgres-parent/sqlg-postgres-dialect/src/main/resources/META-INF/services/org.umlg.sqlg.SqlgPlugin similarity index 100% rename from sqlg-postgres/src/main/resources/META-INF/services/org.umlg.sqlg.SqlgPlugin rename to sqlg-postgres-parent/sqlg-postgres-dialect/src/main/resources/META-INF/services/org.umlg.sqlg.SqlgPlugin diff --git a/sqlg-postgres/src/test/java/org/umlg/sqlg/test/gis/TestGis.java b/sqlg-postgres-parent/sqlg-postgres-dialect/src/test/java/org/umlg/sqlg/test/gis/TestGis.java similarity index 100% rename from sqlg-postgres/src/test/java/org/umlg/sqlg/test/gis/TestGis.java rename to sqlg-postgres-parent/sqlg-postgres-dialect/src/test/java/org/umlg/sqlg/test/gis/TestGis.java diff --git a/sqlg-postgres/src/test/resources/sqlg.properties b/sqlg-postgres-parent/sqlg-postgres-dialect/src/test/resources/sqlg.properties similarity index 100% rename from sqlg-postgres/src/test/resources/sqlg.properties rename to sqlg-postgres-parent/sqlg-postgres-dialect/src/test/resources/sqlg.properties diff --git a/sqlg-postgres-parent/sqlg-postgres/pom.xml b/sqlg-postgres-parent/sqlg-postgres/pom.xml new file mode 100755 index 000000000..a88be53b4 --- /dev/null +++ b/sqlg-postgres-parent/sqlg-postgres/pom.xml @@ -0,0 +1,37 @@ + + + 4.0.0 + + org.umlg + sqlg-postgres-parent + 1.3.0-SNAPSHOT + + sqlg-postgres + sqlg :: postgres + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + + + + + org.apache.tinkerpop + gremlin-groovy + + + org.umlg + sqlg-postgres-dialect + + + org.umlg + sqlg-test + test + + + diff --git a/sqlg-postgres/src/main/java/org/umlg/sqlg/groovy/plugin/SqlgPostgresGremlinPlugin.java b/sqlg-postgres-parent/sqlg-postgres/src/main/java/org/umlg/sqlg/groovy/plugin/SqlgPostgresGremlinPlugin.java similarity index 100% rename from sqlg-postgres/src/main/java/org/umlg/sqlg/groovy/plugin/SqlgPostgresGremlinPlugin.java rename to sqlg-postgres-parent/sqlg-postgres/src/main/java/org/umlg/sqlg/groovy/plugin/SqlgPostgresGremlinPlugin.java diff --git a/sqlg-postgres/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin b/sqlg-postgres-parent/sqlg-postgres/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin similarity index 100% rename from sqlg-postgres/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin rename to sqlg-postgres-parent/sqlg-postgres/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin diff --git a/sqlg-postgres/src/test/java/org/umlg/sqlg/test/PostgresAllTest.java b/sqlg-postgres-parent/sqlg-postgres/src/test/java/org/umlg/sqlg/test/PostgresAllTest.java similarity index 100% rename from sqlg-postgres/src/test/java/org/umlg/sqlg/test/PostgresAllTest.java rename to sqlg-postgres-parent/sqlg-postgres/src/test/java/org/umlg/sqlg/test/PostgresAllTest.java diff --git a/sqlg-postgres/src/test/java/org/umlg/sqlg/test/PostgresAnyTest.java b/sqlg-postgres-parent/sqlg-postgres/src/test/java/org/umlg/sqlg/test/PostgresAnyTest.java similarity index 100% rename from sqlg-postgres/src/test/java/org/umlg/sqlg/test/PostgresAnyTest.java rename to sqlg-postgres-parent/sqlg-postgres/src/test/java/org/umlg/sqlg/test/PostgresAnyTest.java diff --git a/sqlg-postgres/src/test/java/org/umlg/sqlg/test/tp3/SqlgPostgresProvider.java b/sqlg-postgres-parent/sqlg-postgres/src/test/java/org/umlg/sqlg/test/tp3/SqlgPostgresProvider.java similarity index 100% rename from sqlg-postgres/src/test/java/org/umlg/sqlg/test/tp3/SqlgPostgresProvider.java rename to sqlg-postgres-parent/sqlg-postgres/src/test/java/org/umlg/sqlg/test/tp3/SqlgPostgresProvider.java diff --git a/sqlg-postgres/src/test/java/org/umlg/sqlg/test/tp3/groovy/SqlgPostgresGroovyEnvironmentIntegrateTest.java b/sqlg-postgres-parent/sqlg-postgres/src/test/java/org/umlg/sqlg/test/tp3/groovy/SqlgPostgresGroovyEnvironmentIntegrateTest.java similarity index 100% rename from sqlg-postgres/src/test/java/org/umlg/sqlg/test/tp3/groovy/SqlgPostgresGroovyEnvironmentIntegrateTest.java rename to sqlg-postgres-parent/sqlg-postgres/src/test/java/org/umlg/sqlg/test/tp3/groovy/SqlgPostgresGroovyEnvironmentIntegrateTest.java diff --git a/sqlg-postgres/src/test/java/org/umlg/sqlg/test/tp3/groovy/SqlgPostgresGroovyEnvironmentPerformanceTest.java b/sqlg-postgres-parent/sqlg-postgres/src/test/java/org/umlg/sqlg/test/tp3/groovy/SqlgPostgresGroovyEnvironmentPerformanceTest.java similarity index 100% rename from sqlg-postgres/src/test/java/org/umlg/sqlg/test/tp3/groovy/SqlgPostgresGroovyEnvironmentPerformanceTest.java rename to sqlg-postgres-parent/sqlg-postgres/src/test/java/org/umlg/sqlg/test/tp3/groovy/SqlgPostgresGroovyEnvironmentPerformanceTest.java diff --git a/sqlg-postgres/src/test/java/org/umlg/sqlg/test/tp3/groovy/SqlgPostgresGroovyEnvironmentTest.java b/sqlg-postgres-parent/sqlg-postgres/src/test/java/org/umlg/sqlg/test/tp3/groovy/SqlgPostgresGroovyEnvironmentTest.java similarity index 100% rename from sqlg-postgres/src/test/java/org/umlg/sqlg/test/tp3/groovy/SqlgPostgresGroovyEnvironmentTest.java rename to sqlg-postgres-parent/sqlg-postgres/src/test/java/org/umlg/sqlg/test/tp3/groovy/SqlgPostgresGroovyEnvironmentTest.java diff --git a/sqlg-postgres/src/test/java/org/umlg/sqlg/test/tp3/process/SqlgGraphPostgresProcessPerformanceTest.java b/sqlg-postgres-parent/sqlg-postgres/src/test/java/org/umlg/sqlg/test/tp3/process/SqlgGraphPostgresProcessPerformanceTest.java similarity index 100% rename from sqlg-postgres/src/test/java/org/umlg/sqlg/test/tp3/process/SqlgGraphPostgresProcessPerformanceTest.java rename to sqlg-postgres-parent/sqlg-postgres/src/test/java/org/umlg/sqlg/test/tp3/process/SqlgGraphPostgresProcessPerformanceTest.java diff --git a/sqlg-postgres/src/test/java/org/umlg/sqlg/test/tp3/process/SqlgGraphPostgresProcessStandardTest.java b/sqlg-postgres-parent/sqlg-postgres/src/test/java/org/umlg/sqlg/test/tp3/process/SqlgGraphPostgresProcessStandardTest.java similarity index 100% rename from sqlg-postgres/src/test/java/org/umlg/sqlg/test/tp3/process/SqlgGraphPostgresProcessStandardTest.java rename to sqlg-postgres-parent/sqlg-postgres/src/test/java/org/umlg/sqlg/test/tp3/process/SqlgGraphPostgresProcessStandardTest.java diff --git a/sqlg-postgres/src/test/java/org/umlg/sqlg/test/tp3/process/SqlgPostgresGroovyProcessStandardTest.java b/sqlg-postgres-parent/sqlg-postgres/src/test/java/org/umlg/sqlg/test/tp3/process/SqlgPostgresGroovyProcessStandardTest.java similarity index 100% rename from sqlg-postgres/src/test/java/org/umlg/sqlg/test/tp3/process/SqlgPostgresGroovyProcessStandardTest.java rename to sqlg-postgres-parent/sqlg-postgres/src/test/java/org/umlg/sqlg/test/tp3/process/SqlgPostgresGroovyProcessStandardTest.java diff --git a/sqlg-postgres/src/test/java/org/umlg/sqlg/test/tp3/structure/SqlgPostgresGroovyStructurePerformanceTest.java b/sqlg-postgres-parent/sqlg-postgres/src/test/java/org/umlg/sqlg/test/tp3/structure/SqlgPostgresGroovyStructurePerformanceTest.java similarity index 100% rename from sqlg-postgres/src/test/java/org/umlg/sqlg/test/tp3/structure/SqlgPostgresGroovyStructurePerformanceTest.java rename to sqlg-postgres-parent/sqlg-postgres/src/test/java/org/umlg/sqlg/test/tp3/structure/SqlgPostgresGroovyStructurePerformanceTest.java diff --git a/sqlg-postgres/src/test/java/org/umlg/sqlg/test/tp3/structure/SqlgPostgresStructurePerformanceTest.java b/sqlg-postgres-parent/sqlg-postgres/src/test/java/org/umlg/sqlg/test/tp3/structure/SqlgPostgresStructurePerformanceTest.java similarity index 100% rename from sqlg-postgres/src/test/java/org/umlg/sqlg/test/tp3/structure/SqlgPostgresStructurePerformanceTest.java rename to sqlg-postgres-parent/sqlg-postgres/src/test/java/org/umlg/sqlg/test/tp3/structure/SqlgPostgresStructurePerformanceTest.java diff --git a/sqlg-postgres/src/test/java/org/umlg/sqlg/test/tp3/structure/SqlgPostgresStructureStandardTest.java b/sqlg-postgres-parent/sqlg-postgres/src/test/java/org/umlg/sqlg/test/tp3/structure/SqlgPostgresStructureStandardTest.java similarity index 100% rename from sqlg-postgres/src/test/java/org/umlg/sqlg/test/tp3/structure/SqlgPostgresStructureStandardTest.java rename to sqlg-postgres-parent/sqlg-postgres/src/test/java/org/umlg/sqlg/test/tp3/structure/SqlgPostgresStructureStandardTest.java diff --git a/sqlg-postgres/src/test/resources/jsonExample1.json b/sqlg-postgres-parent/sqlg-postgres/src/test/resources/jsonExample1.json similarity index 100% rename from sqlg-postgres/src/test/resources/jsonExample1.json rename to sqlg-postgres-parent/sqlg-postgres/src/test/resources/jsonExample1.json diff --git a/sqlg-postgres/src/test/resources/jsonExample2.json b/sqlg-postgres-parent/sqlg-postgres/src/test/resources/jsonExample2.json similarity index 100% rename from sqlg-postgres/src/test/resources/jsonExample2.json rename to sqlg-postgres-parent/sqlg-postgres/src/test/resources/jsonExample2.json diff --git a/sqlg-postgres/src/test/resources/jsonExample3.json b/sqlg-postgres-parent/sqlg-postgres/src/test/resources/jsonExample3.json similarity index 100% rename from sqlg-postgres/src/test/resources/jsonExample3.json rename to sqlg-postgres-parent/sqlg-postgres/src/test/resources/jsonExample3.json diff --git a/sqlg-postgres/src/test/resources/jsonExample4.json b/sqlg-postgres-parent/sqlg-postgres/src/test/resources/jsonExample4.json similarity index 100% rename from sqlg-postgres/src/test/resources/jsonExample4.json rename to sqlg-postgres-parent/sqlg-postgres/src/test/resources/jsonExample4.json diff --git a/sqlg-postgres/src/test/resources/jsonExample5.json b/sqlg-postgres-parent/sqlg-postgres/src/test/resources/jsonExample5.json similarity index 100% rename from sqlg-postgres/src/test/resources/jsonExample5.json rename to sqlg-postgres-parent/sqlg-postgres/src/test/resources/jsonExample5.json diff --git a/sqlg-postgres-parent/sqlg-postgres/src/test/resources/sqlg.properties b/sqlg-postgres-parent/sqlg-postgres/src/test/resources/sqlg.properties new file mode 100644 index 000000000..265291058 --- /dev/null +++ b/sqlg-postgres-parent/sqlg-postgres/src/test/resources/sqlg.properties @@ -0,0 +1,8 @@ +jdbc.url=jdbc:postgresql://localhost:5432/sqlgraphdb +jdbc.username=postgres +jdbc.password=postgres +#cache.vertices=false +implement.foreign.keys=true +hazelcast.members=127.0.0.1 +#bulk.edge.copy.location=/var/lib/postgres/data +bulk.within.count=2