Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id EA72E200D24 for ; Mon, 18 Sep 2017 17:21:00 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id E92CF1609D8; Mon, 18 Sep 2017 15:21:00 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 392BD1609E5 for ; Mon, 18 Sep 2017 17:21:00 +0200 (CEST) Received: (qmail 60499 invoked by uid 500); 18 Sep 2017 15:20:59 -0000 Mailing-List: contact commits-help@polygene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@polygene.apache.org Delivered-To: mailing list commits@polygene.apache.org Received: (qmail 60267 invoked by uid 99); 18 Sep 2017 15:20:59 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Sep 2017 15:20:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 06B95F5753; Mon, 18 Sep 2017 15:20:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: niclas@apache.org To: commits@polygene.apache.org Date: Mon, 18 Sep 2017 15:21:06 -0000 Message-Id: <2472893d27354cf0838b52e115887459@git.apache.org> In-Reply-To: <67e0fc97294c4572b0f4013e21c99f08@git.apache.org> References: <67e0fc97294c4572b0f4013e21c99f08@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [10/15] polygene-java git commit: Introducing the whole test suite from entitystore-sqlkv and starting to solidify the implementation against all these SQL systems. archived-at: Mon, 18 Sep 2017 15:21:01 -0000 http://git-wip-us.apache.org/repos/asf/polygene-java/blob/0f8f0b8d/tools/generator-polygene/app/index.js ---------------------------------------------------------------------- diff --git a/tools/generator-polygene/app/index.js b/tools/generator-polygene/app/index.js index 9d220a7..565f455 100644 --- a/tools/generator-polygene/app/index.js +++ b/tools/generator-polygene/app/index.js @@ -112,6 +112,7 @@ module.exports = generators.Base.extend( 'JClouds', 'Jdbm', 'LevelDB', + 'MariaDbSQL', 'Memory', 'MongoDB', 'MySQL', http://git-wip-us.apache.org/repos/asf/polygene-java/blob/0f8f0b8d/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/bootstrap.tmpl ---------------------------------------------------------------------- diff --git a/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/bootstrap.tmpl b/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/bootstrap.tmpl index 8a990c8..95f1e1e 100644 --- a/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/bootstrap.tmpl +++ b/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/bootstrap.tmpl @@ -34,7 +34,7 @@ import org.apache.polygene.entitystore.<%- polygene.entitystoremodule %>.<%- pol } if( polygene.entitystore.indexOf('SQL') >= 0 ) { %> -import org.apache.polygene.entitystore.sql.SQLEntityStoreConfiguration; +import org.apache.polygene.entitystore.sql.SqlEntityStoreConfiguration; <% } %> http://git-wip-us.apache.org/repos/asf/polygene-java/blob/0f8f0b8d/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-es-mariadb.properties ---------------------------------------------------------------------- diff --git a/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-es-mariadb.properties b/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-es-mariadb.properties new file mode 100644 index 0000000..c1fd527 --- /dev/null +++ b/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-es-mariadb.properties @@ -0,0 +1,24 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# +# +enabled=true +url=jdbc:mysql://127.0.0.1:3306/<%= polygene.name %>?profileSQL=false&useLegacyDatetimeCode=false&serverTimezone=UTC&nullCatalogMeansCurrent=true&nullNamePatternMatchesAll=true +driver=com.mysql.cj.jdbc.Driver +username=polygene +password=ThisIsGreat! http://git-wip-us.apache.org/repos/asf/polygene-java/blob/0f8f0b8d/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-es-sqlite.properties ---------------------------------------------------------------------- diff --git a/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-es-sqlite.properties b/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-es-sqlite.properties index 5c49ece..bebe32b 100644 --- a/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-es-sqlite.properties +++ b/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-es-sqlite.properties @@ -18,7 +18,7 @@ # # enabled=true -url=jdbc:sqlite:sqlite-entities/ +url=jdbc:sqlite:sqlite-entities.db driver=org.sqlite.JDBC username=polygene password=ThisIsGreat http://git-wip-us.apache.org/repos/asf/polygene-java/blob/0f8f0b8d/tools/generator-polygene/app/templates/RestAPIApplication/bootstrap-test.tmpl ---------------------------------------------------------------------- diff --git a/tools/generator-polygene/app/templates/RestAPIApplication/bootstrap-test.tmpl b/tools/generator-polygene/app/templates/RestAPIApplication/bootstrap-test.tmpl index 1e50b00..7a0174e 100644 --- a/tools/generator-polygene/app/templates/RestAPIApplication/bootstrap-test.tmpl +++ b/tools/generator-polygene/app/templates/RestAPIApplication/bootstrap-test.tmpl @@ -43,7 +43,7 @@ if( polygene.entitystore !== 'Memory' && polygene.entitystore !== 'Preferences' if( polygene.entitystore.indexOf('SQL') < 0 ) { %>import org.apache.polygene.entitystore.<%= polygene.entitystore.toLowerCase() %>.<%= polygene.entitystore %>EntityStoreConfiguration; <% } else { -%>import org.apache.polygene.entitystore.sql.SQLEntityStoreConfiguration; +%>import org.apache.polygene.entitystore.sql.SqlEntityStoreConfiguration; <% } }