You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by an...@apache.org on 2014/12/20 15:34:32 UTC
incubator-tamaya git commit: Fixed merge issues.
Repository: incubator-tamaya
Updated Branches:
refs/heads/master c8c513565 -> be0e7eee5
Fixed merge issues.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/be0e7eee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/be0e7eee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/be0e7eee
Branch: refs/heads/master
Commit: be0e7eee5b0c2b893e619b8a99d3ffb20cb3b82e
Parents: c8c5135
Author: anatole <an...@apache.org>
Authored: Sat Dec 20 15:34:22 2014 +0100
Committer: anatole <an...@apache.org>
Committed: Sat Dec 20 15:34:22 2014 +0100
----------------------------------------------------------------------
.../org/apache/tamaya/core/config/AbstractConfiguration.java | 7 +------
.../tamaya/core/internal/el/SystemPropertyResolver.java | 1 +
2 files changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/be0e7eee/core/src/main/java/org/apache/tamaya/core/config/AbstractConfiguration.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/config/AbstractConfiguration.java b/core/src/main/java/org/apache/tamaya/core/config/AbstractConfiguration.java
index 6829181..c89e269 100644
--- a/core/src/main/java/org/apache/tamaya/core/config/AbstractConfiguration.java
+++ b/core/src/main/java/org/apache/tamaya/core/config/AbstractConfiguration.java
@@ -21,12 +21,7 @@ package org.apache.tamaya.core.config;
import java.util.Optional;
import java.util.UUID;
-import org.apache.tamaya.ConfigChangeSet;
-import org.apache.tamaya.ConfigChangeSetBuilder;
-import org.apache.tamaya.ConfigException;
-import org.apache.tamaya.Configuration;
-import org.apache.tamaya.MetaInfo;
-import org.apache.tamaya.PropertyAdapter;
+import org.apache.tamaya.*;
import org.apache.tamaya.core.properties.AbstractPropertySource;
import org.apache.tamaya.core.spi.AdapterProviderSpi;
import org.apache.tamaya.spi.ServiceContext;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/be0e7eee/core/src/main/java/org/apache/tamaya/core/internal/el/SystemPropertyResolver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/el/SystemPropertyResolver.java b/core/src/main/java/org/apache/tamaya/core/internal/el/SystemPropertyResolver.java
index c384a1d..c6eb298 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/el/SystemPropertyResolver.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/el/SystemPropertyResolver.java
@@ -21,6 +21,7 @@ package org.apache.tamaya.core.internal.el;
import java.util.Optional;
import org.apache.tamaya.ConfigException;
+import org.apache.tamaya.Configuration;
import org.apache.tamaya.core.spi.ExpressionResolver;
/**