Return-Path: X-Original-To: apmail-zest-commits-archive@minotaur.apache.org Delivered-To: apmail-zest-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CEF2318B35 for ; Mon, 6 Jul 2015 16:04:38 +0000 (UTC) Received: (qmail 82122 invoked by uid 500); 6 Jul 2015 16:04:38 -0000 Delivered-To: apmail-zest-commits-archive@zest.apache.org Received: (qmail 82068 invoked by uid 500); 6 Jul 2015 16:04:38 -0000 Mailing-List: contact commits-help@zest.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@zest.apache.org Delivered-To: mailing list commits@zest.apache.org Received: (qmail 81946 invoked by uid 99); 6 Jul 2015 16:04:38 -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, 06 Jul 2015 16:04:38 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 49693E03CE; Mon, 6 Jul 2015 16:04:38 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: paulmerlin@apache.org To: commits@zest.apache.org Date: Mon, 06 Jul 2015 16:04:43 -0000 Message-Id: <44ee0cae1f254e27b7642d8fc52ed033@git.apache.org> In-Reply-To: <70815e63c37b49d884b106c439b180ee@git.apache.org> References: <70815e63c37b49d884b106c439b180ee@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [6/8] zest-qi4j git commit: ZEST-14 Remove libraries/sql-c3p0 ZEST-14 Remove libraries/sql-c3p0 Project: http://git-wip-us.apache.org/repos/asf/zest-qi4j/repo Commit: http://git-wip-us.apache.org/repos/asf/zest-qi4j/commit/48f5dc90 Tree: http://git-wip-us.apache.org/repos/asf/zest-qi4j/tree/48f5dc90 Diff: http://git-wip-us.apache.org/repos/asf/zest-qi4j/diff/48f5dc90 Branch: refs/heads/develop Commit: 48f5dc90d47243245c4014fae6eb1d94f774a8d0 Parents: e0be080 Author: Paul Merlin Authored: Mon Jul 6 17:53:17 2015 +0200 Committer: Paul Merlin Committed: Mon Jul 6 17:53:17 2015 +0200 ---------------------------------------------------------------------- libraries/sql-liquibase/build.gradle | 2 +- .../org/qi4j/library/sql/liquibase/LiquibaseServiceTest.java | 4 ++-- .../sql/jmx/DataSourceConfigurationManagerServiceTest.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/48f5dc90/libraries/sql-liquibase/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/sql-liquibase/build.gradle b/libraries/sql-liquibase/build.gradle index 309644b..4ccc5e3 100644 --- a/libraries/sql-liquibase/build.gradle +++ b/libraries/sql-liquibase/build.gradle @@ -27,7 +27,7 @@ dependencies { compile libraries.slf4j_api testCompile(project(":org.qi4j.core:org.qi4j.core.testsupport")) - testCompile(project(":org.qi4j.libraries:org.qi4j.library.sql-bonecp")) + testCompile(project(":org.qi4j.libraries:org.qi4j.library.sql-dbcp")) testRuntime(project(":org.qi4j.core:org.qi4j.core.runtime")) testRuntime(libraries.derby) http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/48f5dc90/libraries/sql-liquibase/src/test/java/org/qi4j/library/sql/liquibase/LiquibaseServiceTest.java ---------------------------------------------------------------------- diff --git a/libraries/sql-liquibase/src/test/java/org/qi4j/library/sql/liquibase/LiquibaseServiceTest.java b/libraries/sql-liquibase/src/test/java/org/qi4j/library/sql/liquibase/LiquibaseServiceTest.java index cc9a62f..82e56e8 100644 --- a/libraries/sql-liquibase/src/test/java/org/qi4j/library/sql/liquibase/LiquibaseServiceTest.java +++ b/libraries/sql-liquibase/src/test/java/org/qi4j/library/sql/liquibase/LiquibaseServiceTest.java @@ -37,8 +37,8 @@ import org.qi4j.functional.Function; import org.qi4j.io.Inputs; import org.qi4j.io.Outputs; import org.qi4j.library.sql.assembly.DataSourceAssembler; -import org.qi4j.library.sql.bonecp.BoneCPDataSourceServiceAssembler; import org.qi4j.library.sql.common.Databases; +import org.qi4j.library.sql.dbcp.DBCPDataSourceServiceAssembler; import org.qi4j.test.EntityTestAssembler; import static org.hamcrest.CoreMatchers.equalTo; @@ -66,7 +66,7 @@ public class LiquibaseServiceTest // Create in-memory store for configurations new EntityTestAssembler().assemble( configModule ); - new BoneCPDataSourceServiceAssembler(). + new DBCPDataSourceServiceAssembler(). identifiedBy( "datasource-service" ). withConfig( configModule, Visibility.layer ). assemble( module ); http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/48f5dc90/libraries/sql/src/test/java/org/qi4j/library/sql/jmx/DataSourceConfigurationManagerServiceTest.java ---------------------------------------------------------------------- diff --git a/libraries/sql/src/test/java/org/qi4j/library/sql/jmx/DataSourceConfigurationManagerServiceTest.java b/libraries/sql/src/test/java/org/qi4j/library/sql/jmx/DataSourceConfigurationManagerServiceTest.java index 261e932..a428c05 100644 --- a/libraries/sql/src/test/java/org/qi4j/library/sql/jmx/DataSourceConfigurationManagerServiceTest.java +++ b/libraries/sql/src/test/java/org/qi4j/library/sql/jmx/DataSourceConfigurationManagerServiceTest.java @@ -34,9 +34,9 @@ import org.qi4j.library.circuitbreaker.CircuitBreaker; import org.qi4j.library.jmx.JMXAssembler; import org.qi4j.library.sql.assembly.DataSourceAssembler; import org.qi4j.library.sql.assembly.DataSourceJMXAssembler; -import org.qi4j.library.sql.bonecp.BoneCPDataSourceServiceAssembler; import org.qi4j.library.sql.common.Databases; import org.qi4j.library.sql.datasource.DataSources; +import org.qi4j.library.sql.dbcp.DBCPDataSourceServiceAssembler; import org.qi4j.library.sql.liquibase.LiquibaseConfiguration; import org.qi4j.library.sql.liquibase.LiquibaseService; import org.qi4j.test.EntityTestAssembler; @@ -80,7 +80,7 @@ public class DataSourceConfigurationManagerServiceTest new EntityTestAssembler().visibleIn( Visibility.layer ).assemble( module ); // Set up DataSource service that will manage the connection pools - new BoneCPDataSourceServiceAssembler().identifiedBy( "datasource-service" ).visibleIn( Visibility.layer ).assemble( module ); + new DBCPDataSourceServiceAssembler().identifiedBy( "datasource-service" ).visibleIn( Visibility.layer ).assemble( module ); { ModuleAssembly testModule = module.layer().module( "TestDS" );