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 <[email protected]> Authored: Mon Jun 13 09:25:42 2016 +0200 Committer: Paul Merlin <[email protected]> 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<AssemblerType> extends Assemblers.VisibilityIdentityConfig<AssemblerType> @@ -35,7 +34,7 @@ public abstract class AbstractPooledDataSourceServiceAssembler<AssemblerType> 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 -{ -}
