tamaya-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anat...@apache.org
Subject [4/4] incubator-tamaya git commit: TAMAYA-42, 43, 44: Readded test code and service configs.
Date Sun, 04 Jan 2015 01:50:48 GMT
TAMAYA-42,43,44: Readded test code and service configs.


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

Branch: refs/heads/master
Commit: 7272198b6f863e83092364589e6373193e0f2335
Parents: 3b29a32
Author: anatole <anatole@apache.org>
Authored: Sun Jan 4 02:50:35 2015 +0100
Committer: anatole <anatole@apache.org>
Committed: Sun Jan 4 02:50:35 2015 +0100

----------------------------------------------------------------------
 ...g.apache.tamaya.core.resources.ResourceLoader | 19 +++++++++++++++++++
 .../TestPropertyDefaultSourceProvider.java       |  2 +-
 .../testdata/TestPropertySourceProvider.java     |  2 +-
 3 files changed, 21 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/7272198b/core/src/main/resources/META-INF/services/org.apache.tamaya.core.resources.ResourceLoader
----------------------------------------------------------------------
diff --git a/core/src/main/resources/META-INF/services/org.apache.tamaya.core.resources.ResourceLoader
b/core/src/main/resources/META-INF/services/org.apache.tamaya.core.resources.ResourceLoader
new file mode 100644
index 0000000..d3242e4
--- /dev/null
+++ b/core/src/main/resources/META-INF/services/org.apache.tamaya.core.resources.ResourceLoader
@@ -0,0 +1,19 @@
+#
+# 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 current 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.
+#
+org.apache.tamaya.core.internal.resource.DefaultResourceLoader

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/7272198b/core/src/test/java/org/apache/tamaya/core/testdata/TestPropertyDefaultSourceProvider.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/tamaya/core/testdata/TestPropertyDefaultSourceProvider.java
b/core/src/test/java/org/apache/tamaya/core/testdata/TestPropertyDefaultSourceProvider.java
index 5fa90b1..dffe67d 100644
--- a/core/src/test/java/org/apache/tamaya/core/testdata/TestPropertyDefaultSourceProvider.java
+++ b/core/src/test/java/org/apache/tamaya/core/testdata/TestPropertyDefaultSourceProvider.java
@@ -27,6 +27,6 @@ import org.apache.tamaya.core.formats.PropertiesFormat;
 public class TestPropertyDefaultSourceProvider extends PathBasedPropertySourceProvider{
 
     public TestPropertyDefaultSourceProvider() {
-        super("default-testdata-properties", new PropertiesFormat(100), "classpath:cfg/defaults/**/*.properties");
+        super("default-testdata-properties", new PropertiesFormat(100), "cfg/defaults/test1.properties");
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/7272198b/core/src/test/java/org/apache/tamaya/core/testdata/TestPropertySourceProvider.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/tamaya/core/testdata/TestPropertySourceProvider.java
b/core/src/test/java/org/apache/tamaya/core/testdata/TestPropertySourceProvider.java
index beafbf9..718aaae 100644
--- a/core/src/test/java/org/apache/tamaya/core/testdata/TestPropertySourceProvider.java
+++ b/core/src/test/java/org/apache/tamaya/core/testdata/TestPropertySourceProvider.java
@@ -27,6 +27,6 @@ import org.apache.tamaya.core.formats.PropertiesFormat;
 public class TestPropertySourceProvider extends PathBasedPropertySourceProvider{
 
     public TestPropertySourceProvider() {
-        super("final-testdata-properties", new PropertiesFormat(200), "classpath:cfg/final/**/*.properties");
+        super("final-testdata-properties", new PropertiesFormat(200), "cfg/final/anotherTestFile.properties");
     }
 }


Mime
View raw message