incubator-tamaya-site git commit: Update docs
Repository: incubator-tamaya-site Updated Branches: refs/heads/master 73ee5387b -> 1391ae8ec Update docs Fix broken deprecated link. Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/commit/1391ae8e Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/tree/1391ae8e Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/diff/1391ae8e Branch: refs/heads/master Commit: 1391ae8ec9436278c756ccb39af3a62018311673 Parents: 73ee538 Author: Phil Ottlinger Authored: Mon Aug 7 21:49:26 2017 +0200 Committer: Phil Ottlinger Committed: Mon Aug 7 21:49:26 2017 +0200 -- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/1391ae8e/README.md -- diff --git a/README.md b/README.md index ef1cde1..b1bc111 100644 --- a/README.md +++ b/README.md @@ -82,12 +82,13 @@ $ ./copy-site.sh $ git checkout asf-site $ cp -r pathToTamayaCoreRepo/target/site/apidocs . ``` +1. If you do not want to change the already published Javadoc, make sure that your commit does not change the base index.html, that renders https://tamaya.incubator.apache.org/apidocs/index.html 1. Push your changes ``` $ git push ``` 1. Wait a couple of minutes for the gitpubsub to happen. -1. Go to https://tamaya.incubator.apache.org/jbake/ in your browser +1. Go to https://tamaya.incubator.apache.org/ in your browser Jenkins / CI integration
[2/2] incubator-tamaya-sandbox git commit: TAMAYA-256: Added missing config file.
TAMAYA-256: Added missing config file. 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/e52a5a3a Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/tree/e52a5a3a Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/diff/e52a5a3a Branch: refs/heads/java8 Commit: e52a5a3ac66d585e8b9dec7b4112b53ead367a89 Parents: 2eb290d Author: anatole Authored: Mon Aug 7 18:03:36 2017 +0200 Committer: anatole Committed: Mon Aug 7 18:03:36 2017 +0200 -- .../META-INF/javaconfiguration.properties| 19 +++ 1 file changed, 19 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/e52a5a3a/vertx/src/test/resources/META-INF/javaconfiguration.properties -- diff --git a/vertx/src/test/resources/META-INF/javaconfiguration.properties b/vertx/src/test/resources/META-INF/javaconfiguration.properties new file mode 100644 index 000..fbe9178 --- /dev/null +++ b/vertx/src/test/resources/META-INF/javaconfiguration.properties @@ -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. +# +message=Good Bye from Apache Tamaya! \ No newline at end of file
[1/2] incubator-tamaya-sandbox git commit: TAMAYA-274: Moved to Java 8, fixed Javadoc issues.
Repository: incubator-tamaya-sandbox Updated Branches: refs/heads/java8 31b9c0e1d -> e52a5a3ac TAMAYA-274: Moved to Java 8, fixed Javadoc issues. 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/2eb290de Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/tree/2eb290de Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/diff/2eb290de Branch: refs/heads/java8 Commit: 2eb290dec00b49e5fab1a35965a62397caa1ce3f Parents: 31b9c0e Author: anatole Authored: Mon Aug 7 17:58:46 2017 +0200 Committer: anatole Committed: Mon Aug 7 17:58:46 2017 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/2eb290de/pom.xml -- diff --git a/pom.xml b/pom.xml index a788354..afc8a0e 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,7 @@ under the License. 3.0-incubating-SNAPSHOT 2.5 false -1.7 +1.8 5.0.0 ${osgi.version} ${jdkVersion}
[2/2] incubator-tamaya-extensions git commit: TAMAYA-274: Moved to Java 8, fixed Javadoc issues.
TAMAYA-274: Moved to Java 8, fixed Javadoc issues. Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/commit/5cb0e696 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/5cb0e696 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/5cb0e696 Branch: refs/heads/java8 Commit: 5cb0e696ef63607f28600e129c8574293e7e1421 Parents: 6fdd34c Author: anatole Authored: Mon Aug 7 17:51:55 2017 +0200 Committer: anatole Committed: Mon Aug 7 17:51:55 2017 +0200 -- .../apache/tamaya/events/FrozenConfiguration.java| 2 +- .../java/org/apache/tamaya/inject/api/Config.java| 15 --- .../apache/tamaya/inject/spi/BaseDynamicValue.java | 2 +- 3 files changed, 6 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/5cb0e696/modules/events/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java -- diff --git a/modules/events/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java b/modules/events/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java index 295a609..61e8abe 100644 --- a/modules/events/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java +++ b/modules/events/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java @@ -209,7 +209,7 @@ public final class FrozenConfiguration implements Configuration, Serializable { * * The time is taken from {@linkplain System#currentTimeMillis()} * - * @see {@linkplain System#currentTimeMillis()} + * @see System#currentTimeMillis() * @return the moment in time when this configruration has been created */ public long getFrozenAt() { http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/5cb0e696/modules/injection/injection-api/src/main/java/org/apache/tamaya/inject/api/Config.java -- diff --git a/modules/injection/injection-api/src/main/java/org/apache/tamaya/inject/api/Config.java b/modules/injection/injection-api/src/main/java/org/apache/tamaya/inject/api/Config.java index 6ce55ed..67a3bfc 100644 --- a/modules/injection/injection-api/src/main/java/org/apache/tamaya/inject/api/Config.java +++ b/modules/injection/injection-api/src/main/java/org/apache/tamaya/inject/api/Config.java @@ -34,15 +34,12 @@ import java.lang.annotation.Target; * Simplest variant * Below the most simple variant of a configured class is given: * - * {@code * package a.b; * * public class ConfiguredItem { - * - * @Config + * &Config * private String aValue; * } - * } * * Configuration resolution is implemented as follows: * @@ -57,14 +54,12 @@ import java.lang.annotation.Target; * Explicit annotations * In the next example we explicitly define the configuration keys to be used: * - * {@code - * @ConfigDefaultSections("section1") + * &ConfigDefaultSections("section1") * public class ConfiguredItem { * - * @Config(value = {"b", "[a.b.deprecated.keys]", "a"}, defaultValue = "myDefaultValue") + * &Config(value = {"b", "[a.b.deprecated.keys]", "a"}, defaultValue = "myDefaultValue") * private String aValue; * } - * } * * * Within this example we evaluate multiple possible keys: {@code section1.b, a.b.deprecated.keys, section1.a}. @@ -76,15 +71,13 @@ import java.lang.annotation.Target; * In the last example we explicitly define the configuration keys but omit the section part, letting the default * section names to be taken: * - * {@code * package a.b; * * public class ConfiguredItem { * - * @Config(value = {"b", "[a.b.deprecated.keys]", "a"}, defaultValue = "myDefaultValue") + * &Config(value = {"b", "[a.b.deprecated.keys]", "a"}, defaultValue = "myDefaultValue") * private String aValue; * } - * } * * * Key resolution is similar to above, but now the default package names are used, resulting in http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/5cb0e696/modules/injection/injection-api/src/main/java/org/apache/tamaya/inject/spi/BaseDynamicValue.java -- diff --git a/modules/injection/injection-api/src/main/java/org/apache/tamaya/inject/spi/BaseDynamicValue.java b/modules/injection/injection-api/src/main/java/org/apache/tamaya/inject/spi/BaseDynamicValue.java index f9e2079..a23a85c 100644 --- a/modules/injection/injection-api/src/main/java/org/apache/tamaya/inject/spi/BaseDynamicValue.java +++ b/modules/injection/injection-api/src/main/java/org/apache/tamaya/inject/spi/BaseDynamicValue.java @@ -28,7 +28,7 @@ import
[1/2] incubator-tamaya-extensions git commit: TAMAYA-274: Moved to Java 8.
Repository: incubator-tamaya-extensions Updated Branches: refs/heads/java8 [created] 5cb0e696e TAMAYA-274: Moved to Java 8. Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/commit/6fdd34c7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/6fdd34c7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/6fdd34c7 Branch: refs/heads/java8 Commit: 6fdd34c759fb9dae915438b9fc9a75f93d131d1e Parents: 46beb9a Author: anatole Authored: Mon Aug 7 17:34:25 2017 +0200 Committer: anatole Committed: Mon Aug 7 17:34:25 2017 +0200 -- .../org/apache/tamaya/events/ConfigEventListener.java | 1 + .../java/org/apache/tamaya/functions/KeyMapper.java| 2 +- .../java/org/apache/tamaya/functions/Predicate.java| 13 ++--- .../org/apache/tamaya/functions/PropertyMatcher.java | 2 +- .../java/org/apache/tamaya/functions/Supplier.java | 10 ++ .../tamaya/mutableconfig/ChangePropagationPolicy.java | 1 + .../java/org/apache/tamaya/optional/ValueProvider.java | 1 + .../org/apache/tamaya/resource/ResourceLocator.java| 1 + .../spisupport/DefaultConfigurationContextBuilder.java | 3 ++- pom.xml| 2 +- 10 files changed, 13 insertions(+), 23 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/6fdd34c7/modules/events/src/main/java/org/apache/tamaya/events/ConfigEventListener.java -- diff --git a/modules/events/src/main/java/org/apache/tamaya/events/ConfigEventListener.java b/modules/events/src/main/java/org/apache/tamaya/events/ConfigEventListener.java index 7fb32c8..fd08191 100644 --- a/modules/events/src/main/java/org/apache/tamaya/events/ConfigEventListener.java +++ b/modules/events/src/main/java/org/apache/tamaya/events/ConfigEventListener.java @@ -21,6 +21,7 @@ package org.apache.tamaya.events; /** * Interface to be implemented for listening on changes on {@link org.apache.tamaya.Configuration} instances. */ +@FunctionalInterface public interface ConfigEventListener { /** * Called if an event occurred. http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/6fdd34c7/modules/functions/src/main/java/org/apache/tamaya/functions/KeyMapper.java -- diff --git a/modules/functions/src/main/java/org/apache/tamaya/functions/KeyMapper.java b/modules/functions/src/main/java/org/apache/tamaya/functions/KeyMapper.java index 2666c1b..bf6e6d3 100644 --- a/modules/functions/src/main/java/org/apache/tamaya/functions/KeyMapper.java +++ b/modules/functions/src/main/java/org/apache/tamaya/functions/KeyMapper.java @@ -23,7 +23,7 @@ package org.apache.tamaya.functions; * if mapped to null). * */ -//@FunctionalInterface +@FunctionalInterface public interface KeyMapper { /** http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/6fdd34c7/modules/functions/src/main/java/org/apache/tamaya/functions/Predicate.java -- diff --git a/modules/functions/src/main/java/org/apache/tamaya/functions/Predicate.java b/modules/functions/src/main/java/org/apache/tamaya/functions/Predicate.java index 3061746..5c8869e 100644 --- a/modules/functions/src/main/java/org/apache/tamaya/functions/Predicate.java +++ b/modules/functions/src/main/java/org/apache/tamaya/functions/Predicate.java @@ -26,17 +26,8 @@ package org.apache.tamaya.functions; * * @param the type of the input to the predicate */ -//@FunctionalInterface -public interface Predicate { - -/** - * Evaluates this predicate on the given argument. - * - * @param t the input argument - * @return {@code true} if the input argument matches the predicate, - * otherwise {@code false} - */ -boolean test(T t); +@FunctionalInterface +public interface Predicate extends java.util.function.Predicate{ } http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/6fdd34c7/modules/functions/src/main/java/org/apache/tamaya/functions/PropertyMatcher.java -- diff --git a/modules/functions/src/main/java/org/apache/tamaya/functions/PropertyMatcher.java b/modules/functions/src/main/java/org/apache/tamaya/functions/PropertyMatcher.java index 45d44ee..cfb207e 100644 --- a/modules/functions/src/main/java/org/apache/tamaya/functions/PropertyMatcher.java +++ b/modules/functions/src/main/java/org/apache/tamaya/functions/PropertyMatcher.java @@ -22,7 +22,7 @@ package org.apache.tamaya.functions; * Represents a selector
[1/2] incubator-tamaya-sandbox git commit: TAMAYA-145: Fxed conversion issue and invalid config syntax.
Repository: incubator-tamaya-sandbox Updated Branches: refs/heads/java8 [created] 31b9c0e1d TAMAYA-145: Fxed conversion issue and invalid config syntax. 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/1fec344c Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/tree/1fec344c Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/diff/1fec344c Branch: refs/heads/java8 Commit: 1fec344c1bf98eb8accea00fbb0c51968bb47685 Parents: 9731be7 Author: anatole Authored: Mon May 1 22:50:40 2017 +0200 Committer: anatole Committed: Mon May 1 22:50:40 2017 +0200 -- .../apache/tamaya/metamodel/internal/ComponentConfigurator.java | 4 metamodel/src/test/resources/IntegrationTests/context-test.xml | 2 +- metamodel/src/test/resources/tamaya-config.xml | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/1fec344c/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/ComponentConfigurator.java -- diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/ComponentConfigurator.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/ComponentConfigurator.java index 6e7ea75..30463d4 100644 --- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/ComponentConfigurator.java +++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/ComponentConfigurator.java @@ -176,6 +176,10 @@ public final class ComponentConfigurator { case "Number": return Float.valueOf(value); default: +if(Enum.class.isAssignableFrom(targetType)){ +Method m = targetType.getDeclaredMethod("valueOf", String.class); +return m.invoke(null, value); +} Constructor c = targetType.getConstructor(String.class); if (!Modifier.isPublic(c.getModifiers())) { LOG.fine("Setting constructor as accessible: " + targetType.getSimpleName() + "#(String)"); http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/1fec344c/metamodel/src/test/resources/IntegrationTests/context-test.xml -- diff --git a/metamodel/src/test/resources/IntegrationTests/context-test.xml b/metamodel/src/test/resources/IntegrationTests/context-test.xml index e1073f7..2b7ffb4 100644 --- a/metamodel/src/test/resources/IntegrationTests/context-test.xml +++ b/metamodel/src/test/resources/IntegrationTests/context-test.xml @@ -22,7 +22,7 @@ ${properties:system:STAGE?default=DEV} ${properties:system:configdir?default=.} ${properties:system:APP?default=NONE} -${java:org.apache.tamaya.metamodel.MetaContext#id()} +${java:java.util.UUID.randomUUID()} http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/1fec344c/metamodel/src/test/resources/tamaya-config.xml -- diff --git a/metamodel/src/test/resources/tamaya-config.xml b/metamodel/src/test/resources/tamaya-config.xml index bdb3269..d372249 100644 --- a/metamodel/src/test/resources/tamaya-config.xml +++ b/metamodel/src/test/resources/tamaya-config.xml @@ -64,7 +64,7 @@ - + @@ -74,7 +74,7 @@ "METACONTEXT: " + MetaContext.getInstance().getProperties() -"CONFIG : " + Configuration.getInstance().getProperties() +"CONFIG : " + config
[incubator-tamaya] Git Push Summary
Repository: incubator-tamaya Updated Branches: refs/heads/java8 [created] 0402fd349
[2/2] incubator-tamaya-sandbox git commit: TAMAYA-145: Added meta logging feature.
TAMAYA-145: Added meta logging feature. 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/31b9c0e1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/tree/31b9c0e1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/diff/31b9c0e1 Branch: refs/heads/java8 Commit: 31b9c0e1db95143e67dc945f25694f676d8cb00c Parents: 1fec344 Author: anatole Authored: Mon Aug 7 17:33:38 2017 +0200 Committer: anatole Committed: Mon Aug 7 17:33:38 2017 +0200 -- .../internal/resolver/LoggingReader.java| 79 ...tamaya.metamodel.spi.MetaConfigurationReader | 19 + 2 files changed, 98 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/31b9c0e1/metamodel/src/test/java/org/apache/tamaya/metamodel/internal/resolver/LoggingReader.java -- diff --git a/metamodel/src/test/java/org/apache/tamaya/metamodel/internal/resolver/LoggingReader.java b/metamodel/src/test/java/org/apache/tamaya/metamodel/internal/resolver/LoggingReader.java new file mode 100644 index 000..c0d67bc --- /dev/null +++ b/metamodel/src/test/java/org/apache/tamaya/metamodel/internal/resolver/LoggingReader.java @@ -0,0 +1,79 @@ +/* + * 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.tamaya.metamodel.internal.resolver; + +import org.apache.tamaya.Configuration; +import org.apache.tamaya.ConfigurationProvider; +import org.apache.tamaya.metamodel.MetaContext; +import org.apache.tamaya.metamodel.spi.MetaConfigurationReader; +import org.apache.tamaya.spi.ConfigurationContext; +import org.apache.tamaya.spi.ConfigurationContextBuilder; +import org.w3c.dom.Document; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.StringReader; +import java.util.HashMap; +import java.util.Map; +import java.util.Timer; +import java.util.TimerTask; + +/** + * Created by atsticks on 01.05.17. + */ +public class LoggingReader implements MetaConfigurationReader{ + +private static final JavaResolver resolver = new JavaResolver(); + +@Override +public void read(final Document document, ConfigurationContextBuilder contextBuilder) { +new Timer(true).schedule(new TimerTask() { +@Override +public void run() { +Map meta = new HashMap<>(); +meta.put("context", ConfigurationProvider.getConfiguration().getContext()); +meta.put("config", ConfigurationProvider.getConfiguration()); +NodeList nodeList = document.getDocumentElement().getElementsByTagName("context"); +for(int i=0;ihttp://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/31b9c0e1/metamodel/src/test/resources/META-INF/services/org.apache.tamaya.metamodel.spi.MetaConfigurationReader -- diff --git a/metamodel/src/test/resources/META-INF/services/org.apache.tamaya.metamodel.spi.MetaConfigurationReader b/metamodel/src/test/resources/META-INF/services/org.apache.tamaya.metamodel.spi.MetaConfigurationReader new file mode 100644 index 000..ace072c --- /dev/null +++ b/metamodel/src/test/resources/META-INF/services/org.apache.tamaya.metamodel.spi.MetaConfigurationReader @@ -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 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