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 2017/11/22 12:54:46 UTC
incubator-tamaya-sandbox git commit: TAMAYA-320 Fixed test failures.
Repository: incubator-tamaya-sandbox
Updated Branches:
refs/heads/master 67245331e -> 8919e1ab5
TAMAYA-320 Fixed test failures.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/commit/8919e1ab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/tree/8919e1ab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/diff/8919e1ab
Branch: refs/heads/master
Commit: 8919e1ab55464d2b6ca80752d980a5b1e8f9bf0a
Parents: 6724533
Author: Anatole Tresch <an...@apache.org>
Authored: Wed Nov 22 13:54:37 2017 +0100
Committer: Anatole Tresch <an...@apache.org>
Committed: Wed Nov 22 13:54:37 2017 +0100
----------------------------------------------------------------------
.../jsr382/JavaConfigConfigBuilderTest.java | 2 +-
.../resources/META-INF/javaconfig.properties | 105 +++++++++++++++++++
.../META-INF/microprofile-config.properties | 105 -------------------
.../services/javax.config.spi.ConfigSource | 19 ++++
.../javax.config.spi.ConfigSourceProvider | 19 ++++
...eclipse.microprofile.config.spi.ConfigSource | 19 ----
...microprofile.config.spi.ConfigSourceProvider | 19 ----
7 files changed, 144 insertions(+), 144 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/8919e1ab/configjsr/src/test/java/org/apache/tamaya/jsr382/JavaConfigConfigBuilderTest.java
----------------------------------------------------------------------
diff --git a/configjsr/src/test/java/org/apache/tamaya/jsr382/JavaConfigConfigBuilderTest.java b/configjsr/src/test/java/org/apache/tamaya/jsr382/JavaConfigConfigBuilderTest.java
index 05b5553..445102e 100644
--- a/configjsr/src/test/java/org/apache/tamaya/jsr382/JavaConfigConfigBuilderTest.java
+++ b/configjsr/src/test/java/org/apache/tamaya/jsr382/JavaConfigConfigBuilderTest.java
@@ -116,7 +116,7 @@ public class JavaConfigConfigBuilderTest {
.containsExactlyInAnyOrder("paris",
"SystemPropertySource",
"environment-properties",
- "META-INF/JavaConfig-config.properties");
+ "META-INF/javaconfig.properties");
}
@Test
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/8919e1ab/configjsr/src/test/resources/META-INF/javaconfig.properties
----------------------------------------------------------------------
diff --git a/configjsr/src/test/resources/META-INF/javaconfig.properties b/configjsr/src/test/resources/META-INF/javaconfig.properties
new file mode 100644
index 0000000..68d7655
--- /dev/null
+++ b/configjsr/src/test/resources/META-INF/javaconfig.properties
@@ -0,0 +1,105 @@
+#
+# Copyright (c) 2016-2017 Contributors to the Eclipse Foundation
+#
+# See the NOTICES file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# Licensed 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.
+#
+
+my.optional.int.property=1234
+my.optional.string.property=hello
+
+tck.config.test.javaconfig.properties.key1=VALue1
+
+
+tck.config.test.overwritten.in.custompropertyfile.key1=value from JavaConfig-config.properties
+
+
+tck.config.test.javaconfig.converter.integervalue = 1234
+tck.config.test.javaconfig.converter.integervalue.broken = xxx
+
+tck.config.test.javaconfig.converter.longvalue = 1234567890
+tck.config.test.javaconfig.converter.longvalue.broken = xxx
+
+tck.config.test.javaconfig.converter.floatvalue = 12.34
+tck.config.test.javaconfig.converter.floatvalue.broken = alfasdf
+
+tck.config.test.javaconfig.converter.doublevalue = 12.34
+tck.config.test.javaconfig.converter.doublevalue.broken = alfasdf
+
+tck.config.test.javaconfig.converter.durationvalue = PT15M
+tck.config.test.javaconfig.converter.durationvalue.broken = alfasdf
+
+tck.config.test.javaconfig.converter.localtimevalue = 10:37
+tck.config.test.javaconfig.converter.localtimevalue.broken = alfasdf
+
+tck.config.test.javaconfig.converter.localdatevalue = 2017-12-24
+tck.config.test.javaconfig.converter.localdatevalue.broken = alfasdf
+
+tck.config.test.javaconfig.converter.localdatetimevalue = 2017-12-24T10:25:30
+tck.config.test.javaconfig.converter.localdatetimevalue.broken = alfasdf
+
+tck.config.test.javaconfig.converter.offsetdatetimevalue = 2007-12-03T10:15:30+01:00
+tck.config.test.javaconfig.converter.offsetdatetimevalue.broken = alfasdf
+
+tck.config.test.javaconfig.converter.offsettimevalue = 13:45:30.123456789+02:00
+tck.config.test.javaconfig.converter.offsettimevalue.broken = alfasdf
+
+tck.config.test.javaconfig.converter.instantvalue = 2015-06-02T21:34:33.616Z
+tck.config.test.javaconfig.converter.instantvalue.broken = alfasdf
+
+tck.config.test.javaconfig.configvalue.key1=value1
+
+# test BooleanConverter START
+tck.config.test.javaconfig.configvalue.boolean.true=true
+tck.config.test.javaconfig.configvalue.boolean.true_uppercase=TRUE
+tck.config.test.javaconfig.configvalue.boolean.true_mixedcase=TruE
+tck.config.test.javaconfig.configvalue.boolean.false=false
+
+tck.config.test.javaconfig.configvalue.boolean.one=1
+tck.config.test.javaconfig.configvalue.boolean.zero=0
+tck.config.test.javaconfig.configvalue.boolean.seventeen=17
+
+tck.config.test.javaconfig.configvalue.boolean.yes=yes
+tck.config.test.javaconfig.configvalue.boolean.yes_uppercase=YES
+tck.config.test.javaconfig.configvalue.boolean.yes_mixedcase=Yes
+tck.config.test.javaconfig.configvalue.boolean.no=no
+
+tck.config.test.javaconfig.configvalue.boolean.y=y
+tck.config.test.javaconfig.configvalue.boolean.y_uppercase=Y
+tck.config.test.javaconfig.configvalue.boolean.n=n
+
+tck.config.test.javaconfig.configvalue.boolean.on=on
+tck.config.test.javaconfig.configvalue.boolean.on_uppercase=ON
+tck.config.test.javaconfig.configvalue.boolean.on_mixedcase=oN
+tck.config.test.javaconfig.configvalue.boolean.off=off
+
+# test BooleanConverter END
+
+# various other converter
+tck.config.test.javaconfig.configvalue.integer=1234
+tck.config.test.javaconfig.configvalue.long=1234567890123456
+tck.config.test.javaconfig.configvalue.float=12.34
+tck.config.test.javaconfig.configvalue.double=12.34567890123456
+
+# Custom Converter tests
+tck.config.test.javaconfig.converter.duckname=Hannelore
+
+# URL Converter tests
+tck.config.test.javaconfig.converter.urlvalue=http://JavaConfig.io
+tck.config.test.javaconfig.converter.urlvalue.broken=tt:--location$
+
+# Empty values
+my.empty.property.in.config.file=
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/8919e1ab/configjsr/src/test/resources/META-INF/microprofile-config.properties
----------------------------------------------------------------------
diff --git a/configjsr/src/test/resources/META-INF/microprofile-config.properties b/configjsr/src/test/resources/META-INF/microprofile-config.properties
deleted file mode 100644
index 68d7655..0000000
--- a/configjsr/src/test/resources/META-INF/microprofile-config.properties
+++ /dev/null
@@ -1,105 +0,0 @@
-#
-# Copyright (c) 2016-2017 Contributors to the Eclipse Foundation
-#
-# See the NOTICES file(s) distributed with this work for additional
-# information regarding copyright ownership.
-#
-# Licensed 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.
-#
-
-my.optional.int.property=1234
-my.optional.string.property=hello
-
-tck.config.test.javaconfig.properties.key1=VALue1
-
-
-tck.config.test.overwritten.in.custompropertyfile.key1=value from JavaConfig-config.properties
-
-
-tck.config.test.javaconfig.converter.integervalue = 1234
-tck.config.test.javaconfig.converter.integervalue.broken = xxx
-
-tck.config.test.javaconfig.converter.longvalue = 1234567890
-tck.config.test.javaconfig.converter.longvalue.broken = xxx
-
-tck.config.test.javaconfig.converter.floatvalue = 12.34
-tck.config.test.javaconfig.converter.floatvalue.broken = alfasdf
-
-tck.config.test.javaconfig.converter.doublevalue = 12.34
-tck.config.test.javaconfig.converter.doublevalue.broken = alfasdf
-
-tck.config.test.javaconfig.converter.durationvalue = PT15M
-tck.config.test.javaconfig.converter.durationvalue.broken = alfasdf
-
-tck.config.test.javaconfig.converter.localtimevalue = 10:37
-tck.config.test.javaconfig.converter.localtimevalue.broken = alfasdf
-
-tck.config.test.javaconfig.converter.localdatevalue = 2017-12-24
-tck.config.test.javaconfig.converter.localdatevalue.broken = alfasdf
-
-tck.config.test.javaconfig.converter.localdatetimevalue = 2017-12-24T10:25:30
-tck.config.test.javaconfig.converter.localdatetimevalue.broken = alfasdf
-
-tck.config.test.javaconfig.converter.offsetdatetimevalue = 2007-12-03T10:15:30+01:00
-tck.config.test.javaconfig.converter.offsetdatetimevalue.broken = alfasdf
-
-tck.config.test.javaconfig.converter.offsettimevalue = 13:45:30.123456789+02:00
-tck.config.test.javaconfig.converter.offsettimevalue.broken = alfasdf
-
-tck.config.test.javaconfig.converter.instantvalue = 2015-06-02T21:34:33.616Z
-tck.config.test.javaconfig.converter.instantvalue.broken = alfasdf
-
-tck.config.test.javaconfig.configvalue.key1=value1
-
-# test BooleanConverter START
-tck.config.test.javaconfig.configvalue.boolean.true=true
-tck.config.test.javaconfig.configvalue.boolean.true_uppercase=TRUE
-tck.config.test.javaconfig.configvalue.boolean.true_mixedcase=TruE
-tck.config.test.javaconfig.configvalue.boolean.false=false
-
-tck.config.test.javaconfig.configvalue.boolean.one=1
-tck.config.test.javaconfig.configvalue.boolean.zero=0
-tck.config.test.javaconfig.configvalue.boolean.seventeen=17
-
-tck.config.test.javaconfig.configvalue.boolean.yes=yes
-tck.config.test.javaconfig.configvalue.boolean.yes_uppercase=YES
-tck.config.test.javaconfig.configvalue.boolean.yes_mixedcase=Yes
-tck.config.test.javaconfig.configvalue.boolean.no=no
-
-tck.config.test.javaconfig.configvalue.boolean.y=y
-tck.config.test.javaconfig.configvalue.boolean.y_uppercase=Y
-tck.config.test.javaconfig.configvalue.boolean.n=n
-
-tck.config.test.javaconfig.configvalue.boolean.on=on
-tck.config.test.javaconfig.configvalue.boolean.on_uppercase=ON
-tck.config.test.javaconfig.configvalue.boolean.on_mixedcase=oN
-tck.config.test.javaconfig.configvalue.boolean.off=off
-
-# test BooleanConverter END
-
-# various other converter
-tck.config.test.javaconfig.configvalue.integer=1234
-tck.config.test.javaconfig.configvalue.long=1234567890123456
-tck.config.test.javaconfig.configvalue.float=12.34
-tck.config.test.javaconfig.configvalue.double=12.34567890123456
-
-# Custom Converter tests
-tck.config.test.javaconfig.converter.duckname=Hannelore
-
-# URL Converter tests
-tck.config.test.javaconfig.converter.urlvalue=http://JavaConfig.io
-tck.config.test.javaconfig.converter.urlvalue.broken=tt:--location$
-
-# Empty values
-my.empty.property.in.config.file=
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/8919e1ab/configjsr/src/test/resources/META-INF/services/javax.config.spi.ConfigSource
----------------------------------------------------------------------
diff --git a/configjsr/src/test/resources/META-INF/services/javax.config.spi.ConfigSource b/configjsr/src/test/resources/META-INF/services/javax.config.spi.ConfigSource
new file mode 100644
index 0000000..49faebf
--- /dev/null
+++ b/configjsr/src/test/resources/META-INF/services/javax.config.spi.ConfigSource
@@ -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.jsr382.ConfigSourceParis
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/8919e1ab/configjsr/src/test/resources/META-INF/services/javax.config.spi.ConfigSourceProvider
----------------------------------------------------------------------
diff --git a/configjsr/src/test/resources/META-INF/services/javax.config.spi.ConfigSourceProvider b/configjsr/src/test/resources/META-INF/services/javax.config.spi.ConfigSourceProvider
new file mode 100644
index 0000000..4641e92
--- /dev/null
+++ b/configjsr/src/test/resources/META-INF/services/javax.config.spi.ConfigSourceProvider
@@ -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.jsr382.ConfigSourceProviderMinsk
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/8919e1ab/configjsr/src/test/resources/META-INF/services/org.eclipse.microprofile.config.spi.ConfigSource
----------------------------------------------------------------------
diff --git a/configjsr/src/test/resources/META-INF/services/org.eclipse.microprofile.config.spi.ConfigSource b/configjsr/src/test/resources/META-INF/services/org.eclipse.microprofile.config.spi.ConfigSource
deleted file mode 100644
index 49faebf..0000000
--- a/configjsr/src/test/resources/META-INF/services/org.eclipse.microprofile.config.spi.ConfigSource
+++ /dev/null
@@ -1,19 +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 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.jsr382.ConfigSourceParis
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/8919e1ab/configjsr/src/test/resources/META-INF/services/org.eclipse.microprofile.config.spi.ConfigSourceProvider
----------------------------------------------------------------------
diff --git a/configjsr/src/test/resources/META-INF/services/org.eclipse.microprofile.config.spi.ConfigSourceProvider b/configjsr/src/test/resources/META-INF/services/org.eclipse.microprofile.config.spi.ConfigSourceProvider
deleted file mode 100644
index 4641e92..0000000
--- a/configjsr/src/test/resources/META-INF/services/org.eclipse.microprofile.config.spi.ConfigSourceProvider
+++ /dev/null
@@ -1,19 +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 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.jsr382.ConfigSourceProviderMinsk
\ No newline at end of file