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 88695200B11 for ; Mon, 13 Jun 2016 09:25:54 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 87097160A3C; Mon, 13 Jun 2016 07:25:54 +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 CE0E6160A19 for ; Mon, 13 Jun 2016 09:25:53 +0200 (CEST) Received: (qmail 41831 invoked by uid 500); 13 Jun 2016 07:25:53 -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 41821 invoked by uid 99); 13 Jun 2016 07:25:53 -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, 13 Jun 2016 07:25:53 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CA912DFFAB; Mon, 13 Jun 2016 07:25:52 +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 Message-Id: <950ca2a7e0074f96919c4c67e3f95d55@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: zest-java git commit: ZEST-151 Fix SQL library Date: Mon, 13 Jun 2016 07:25:52 +0000 (UTC) archived-at: Mon, 13 Jun 2016 07:25:54 -0000 Repository: zest-java Updated Branches: refs/heads/develop 6086128b9 -> f718d3993 ZEST-151 Fix SQL library Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/f718d399 Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/f718d399 Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/f718d399 Branch: refs/heads/develop Commit: f718d399363aaab992e3be1310b0e49d2163ab5b Parents: 6086128 Author: Paul Merlin Authored: Mon Jun 13 09:25:42 2016 +0200 Committer: Paul Merlin Committed: Mon Jun 13 09:25:42 2016 +0200 ---------------------------------------------------------------------- ...bstractPooledDataSourceServiceAssembler.java | 3 +- .../sql/datasource/DataSourceConfiguration.java | 5 ++-- .../DataSourceConfigurationValue.java | 30 -------------------- 3 files changed, 4 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/f718d399/libraries/sql/src/main/java/org/apache/zest/library/sql/assembly/AbstractPooledDataSourceServiceAssembler.java ---------------------------------------------------------------------- diff --git a/libraries/sql/src/main/java/org/apache/zest/library/sql/assembly/AbstractPooledDataSourceServiceAssembler.java b/libraries/sql/src/main/java/org/apache/zest/library/sql/assembly/AbstractPooledDataSourceServiceAssembler.java index a01ed9e..e48fff6 100644 --- a/libraries/sql/src/main/java/org/apache/zest/library/sql/assembly/AbstractPooledDataSourceServiceAssembler.java +++ b/libraries/sql/src/main/java/org/apache/zest/library/sql/assembly/AbstractPooledDataSourceServiceAssembler.java @@ -24,7 +24,6 @@ import org.apache.zest.bootstrap.Assemblers; import org.apache.zest.bootstrap.AssemblyException; import org.apache.zest.bootstrap.ModuleAssembly; import org.apache.zest.library.sql.datasource.DataSourceConfiguration; -import org.apache.zest.library.sql.datasource.DataSourceConfigurationValue; public abstract class AbstractPooledDataSourceServiceAssembler extends Assemblers.VisibilityIdentityConfig @@ -35,7 +34,7 @@ public abstract class AbstractPooledDataSourceServiceAssembler public final void assemble( ModuleAssembly module ) throws AssemblyException { - module.values( DataSourceConfigurationValue.class ).visibleIn( Visibility.module ); + module.values( DataSourceConfiguration.class ).visibleIn( Visibility.module ); if( hasConfig() ) { configModule().entities( DataSourceConfiguration.class ).visibleIn( configVisibility() ); http://git-wip-us.apache.org/repos/asf/zest-java/blob/f718d399/libraries/sql/src/main/java/org/apache/zest/library/sql/datasource/DataSourceConfiguration.java ---------------------------------------------------------------------- diff --git a/libraries/sql/src/main/java/org/apache/zest/library/sql/datasource/DataSourceConfiguration.java b/libraries/sql/src/main/java/org/apache/zest/library/sql/datasource/DataSourceConfiguration.java index 727716b..0c0cef1 100644 --- a/libraries/sql/src/main/java/org/apache/zest/library/sql/datasource/DataSourceConfiguration.java +++ b/libraries/sql/src/main/java/org/apache/zest/library/sql/datasource/DataSourceConfiguration.java @@ -19,12 +19,13 @@ */ package org.apache.zest.library.sql.datasource; -import org.apache.zest.api.configuration.ConfigurationComposite; +import org.apache.zest.api.composite.Composite; +import org.apache.zest.api.entity.Identity; /** * Configuration Entity for a DataSource. */ public interface DataSourceConfiguration - extends ConfigurationComposite, DataSourceConfigurationState + extends Identity, Composite, DataSourceConfigurationState { } http://git-wip-us.apache.org/repos/asf/zest-java/blob/f718d399/libraries/sql/src/main/java/org/apache/zest/library/sql/datasource/DataSourceConfigurationValue.java ---------------------------------------------------------------------- diff --git a/libraries/sql/src/main/java/org/apache/zest/library/sql/datasource/DataSourceConfigurationValue.java b/libraries/sql/src/main/java/org/apache/zest/library/sql/datasource/DataSourceConfigurationValue.java deleted file mode 100644 index e6efcd7..0000000 --- a/libraries/sql/src/main/java/org/apache/zest/library/sql/datasource/DataSourceConfigurationValue.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * 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. - * - * - */ -package org.apache.zest.library.sql.datasource; - -import org.apache.zest.api.value.ValueComposite; - -/** - * DataSource configuration as a Value to be used outside of UoWs. - */ -public interface DataSourceConfigurationValue - extends ValueComposite, DataSourceConfigurationState -{ -}