tamaya-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anat...@apache.org
Subject incubator-tamaya git commit: Minor fixes and a trvial refactoring (no API change).
Date Fri, 26 Aug 2016 14:50:35 GMT
Repository: incubator-tamaya
Updated Branches:
  refs/heads/master 5e16e4b20 -> bf9007a4e


Minor fixes and a trvial refactoring (no API change).


Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/bf9007a4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/bf9007a4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/bf9007a4

Branch: refs/heads/master
Commit: bf9007a4e9d5643efed3be889f11197ed5c51cfd
Parents: 5e16e4b
Author: anatole <anatole@apache.org>
Authored: Fri Aug 26 16:50:23 2016 +0200
Committer: anatole <anatole@apache.org>
Committed: Fri Aug 26 16:50:23 2016 +0200

----------------------------------------------------------------------
 code/api/pom.xml                                               | 1 -
 code/api/src/main/java/org/apache/tamaya/Configuration.java    | 1 -
 .../src/main/java/org/apache/tamaya/ConfigurationProvider.java | 6 +++++-
 .../test/java/org/apache/tamaya/TestConfigurationProvider.java | 3 +++
 code/core/pom.xml                                              | 1 -
 5 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/bf9007a4/code/api/pom.xml
----------------------------------------------------------------------
diff --git a/code/api/pom.xml b/code/api/pom.xml
index 23d75cd..087a3a7 100644
--- a/code/api/pom.xml
+++ b/code/api/pom.xml
@@ -23,7 +23,6 @@ under the License.
         <groupId>org.apache.tamaya</groupId>
         <artifactId>tamaya-code</artifactId>
         <version>0.3-incubating-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>tamaya-api</artifactId>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/bf9007a4/code/api/src/main/java/org/apache/tamaya/Configuration.java
----------------------------------------------------------------------
diff --git a/code/api/src/main/java/org/apache/tamaya/Configuration.java b/code/api/src/main/java/org/apache/tamaya/Configuration.java
index 08a14b1..c677ef5 100644
--- a/code/api/src/main/java/org/apache/tamaya/Configuration.java
+++ b/code/api/src/main/java/org/apache/tamaya/Configuration.java
@@ -20,7 +20,6 @@ package org.apache.tamaya;
 
 import org.apache.tamaya.spi.ConfigurationContext;
 
-import java.util.Collections;
 import java.util.Map;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/bf9007a4/code/api/src/main/java/org/apache/tamaya/ConfigurationProvider.java
----------------------------------------------------------------------
diff --git a/code/api/src/main/java/org/apache/tamaya/ConfigurationProvider.java b/code/api/src/main/java/org/apache/tamaya/ConfigurationProvider.java
index 5b9c3f1..bc4cd13 100644
--- a/code/api/src/main/java/org/apache/tamaya/ConfigurationProvider.java
+++ b/code/api/src/main/java/org/apache/tamaya/ConfigurationProvider.java
@@ -41,6 +41,11 @@ public final class ConfigurationProvider {
         if(spi==null){
             throw new IllegalStateException("ConfigurationProviderSpi not available.");
         }
+        showBanner();
+        return spi;
+    }
+
+    private static void showBanner() {
         BufferedReader reader = null;
         try{
             URL url = ConfigurationProvider.class.getResource("/tamaya-banner.txt");
@@ -67,7 +72,6 @@ public final class ConfigurationProvider {
                 }
             }
         }
-        return spi;
     }
 
     private ConfigurationProvider() {

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/bf9007a4/code/api/src/test/java/org/apache/tamaya/TestConfigurationProvider.java
----------------------------------------------------------------------
diff --git a/code/api/src/test/java/org/apache/tamaya/TestConfigurationProvider.java b/code/api/src/test/java/org/apache/tamaya/TestConfigurationProvider.java
index 1a02903..1c84b83 100644
--- a/code/api/src/test/java/org/apache/tamaya/TestConfigurationProvider.java
+++ b/code/api/src/test/java/org/apache/tamaya/TestConfigurationProvider.java
@@ -22,9 +22,12 @@ import org.apache.tamaya.spi.ConfigurationContext;
 import org.apache.tamaya.spi.ConfigurationContextBuilder;
 import org.apache.tamaya.spi.ConfigurationProviderSpi;
 
+import javax.annotation.Priority;
+
 /**
  * Test Configuration class, that is used to testdata the default methods provided by the
API.
  */
+@Priority(0)
 public class TestConfigurationProvider implements ConfigurationProviderSpi {
 
     private static final Configuration config = new TestConfiguration();

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/bf9007a4/code/core/pom.xml
----------------------------------------------------------------------
diff --git a/code/core/pom.xml b/code/core/pom.xml
index 109681f..a002a3a 100644
--- a/code/core/pom.xml
+++ b/code/core/pom.xml
@@ -23,7 +23,6 @@ under the License.
         <groupId>org.apache.tamaya</groupId>
         <artifactId>tamaya-code</artifactId>
         <version>0.3-incubating-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>tamaya-core</artifactId>


Mime
View raw message