[21/50] [abbrv] incubator-tamaya-extensions git commit: Simplified events module, adapted documentation as well. Removed model dependency from events, since events is the more general module here.
Simplified events module, adapted documentation as well. Removed model dependency from events, since events is the more general module here. 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/384b09eb Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/384b09eb Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/384b09eb Branch: refs/heads/master Commit: 384b09eb8cc3dca3d4699a4353b4f6a420904623 Parents: c87ace0 Author: anatoleAuthored: Wed Dec 16 08:37:17 2015 +0100 Committer: Oliver B. Fischer Committed: Tue Sep 27 00:18:31 2016 +0200 -- .../tamaya/events/ChangeNotification.java | 66 - .../org/apache/tamaya/events/ChangeType.java| 28 ++ .../org/apache/tamaya/events/ConfigEvent.java | 58 .../tamaya/events/ConfigEventListener.java | 5 +- .../tamaya/events/ConfigEventManager.java | 112 ++-- .../apache/tamaya/events/ConfigListener.java| 31 --- .../tamaya/events/ConfigurationChange.java | 222 +++ .../events/ConfigurationChangeBuilder.java | 272 +++ .../events/ConfigurationContextChange.java | 208 ++ .../ConfigurationContextChangeBuilder.java | 173 .../tamaya/events/ConfigurationObserver.java| 107 .../tamaya/events/PropertySourceChange.java | 242 + .../events/PropertySourceChangeBuilder.java | 258 ++ .../apache/tamaya/events/delta/ChangeType.java | 28 -- .../events/delta/ConfigurationChange.java | 216 --- .../delta/ConfigurationChangeBuilder.java | 262 -- .../delta/ConfigurationContextChange.java | 192 - .../ConfigurationContextChangeBuilder.java | 159 --- .../events/delta/PropertySourceChange.java | 236 .../delta/PropertySourceChangeBuilder.java | 258 -- .../folderobserver/FileChangeListener.java | 3 +- .../ObservingPropertySourceProvider.java| 8 +- .../internal/DefaultConfigChangeObserver.java | 107 .../internal/DefaultConfigEventManagerSpi.java | 162 --- .../internal/DefaultConfigObserverSpi.java | 158 --- ...faultConfigurationContextChangeListener.java | 57 ++-- .../events/internal/LoggingConfigListener.java | 14 +- .../org/apache/tamaya/events/package-info.java | 3 +- .../tamaya/events/spi/BaseConfigEvent.java | 69 + .../events/spi/ConfigEventManagerSpi.java | 83 +- .../tamaya/events/spi/ConfigObserverSpi.java| 71 - ...org.apache.tamaya.events.ConfigEventListener | 2 +- ...g.apache.tamaya.events.spi.ConfigObserverSpi | 2 +- .../events/ChangeableGlobalPropertySource.java | 62 + .../ChangeableThreadLocalPropertySource.java| 57 .../tamaya/events/ConfigEventManagerTest.java | 25 +- .../org/apache/tamaya/events/SimpleEvent.java | 13 + .../events/delta/ConfigurationChangeTest.java | 4 +- .../delta/ConfigurationContextChangeTest.java | 9 +- .../events/delta/PropertySourceChangeTest.java | 5 +- .../DefaultConfigEventManagerSpiTest.java | 19 +- 41 files changed, 2151 insertions(+), 1915 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/384b09eb/src/main/java/org/apache/tamaya/events/ChangeNotification.java -- diff --git a/src/main/java/org/apache/tamaya/events/ChangeNotification.java b/src/main/java/org/apache/tamaya/events/ChangeNotification.java deleted file mode 100644 index 73a4fa9..000 --- a/src/main/java/org/apache/tamaya/events/ChangeNotification.java +++ /dev/null @@ -1,66 +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 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.events; - -import java.beans.PropertyChangeEvent; -import java.util.Collection; - -
[25/50] [abbrv] incubator-tamaya-extensions git commit: [maven-release-plugin] prepare release vote02-tamaya-0.2-incubating
[maven-release-plugin] prepare release vote02-tamaya-0.2-incubating 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/2cab8900 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/2cab8900 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/2cab8900 Branch: refs/heads/master Commit: 2cab8900243f29885892e45991e7be1c13b4e12c Parents: d285054 Author: anatoleAuthored: Tue Apr 5 18:56:54 2016 +0200 Committer: Oliver B. Fischer Committed: Tue Sep 27 00:18:31 2016 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/2cab8900/pom.xml -- diff --git a/pom.xml b/pom.xml index 21269ed..a019a94 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.tamaya.ext tamaya-extensions -0.2-incubating-SNAPSHOT +0.2-incubating tamaya-events
[50/50] [abbrv] incubator-tamaya-extensions git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions 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/c641421b Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/c641421b Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/c641421b Branch: refs/heads/master Commit: c641421b66cbc7da07ed7c7ef728ffb0691d2afc Parents: 36011cf 4900aa7 Author: Phil OttlingerAuthored: Mon Oct 17 20:54:51 2016 +0200 Committer: Phil Ottlinger Committed: Mon Oct 17 20:54:51 2016 +0200 -- .gitignore | 19 ++ dummy | 0 events/pom.xml | 2 - filter/pom.xml | 81 .../tamaya/filter/ConfigurationFilter.java | 121 .../tamaya/filter/ProgrammableFilter.java | 118 .../tamaya/filter/RegexPropertyFilter.java | 56 ++ .../filter/internal/DefaultMetadataFilter.java | 43 + .../org.apache.tamaya.spi.PropertyFilter| 19 ++ .../tamaya/filter/ConfigurationFilterTest.java | 122 .../tamaya/filter/ProgrammableFilterTest.java | 141 ++ .../tamaya/filter/RegexPropertyFilterTest.java | 55 ++ json/pom.xml| 147 ++ .../java/org/apache/tamaya/json/JSONFormat.java | 85 + .../apache/tamaya/json/JSONPropertySource.java | 149 +++ .../org/apache/tamaya/json/JSONVisitor.java | 119 ...org.apache.tamaya.format.ConfigurationFormat | 19 ++ .../json/CommonJSONTestCaseCollection.java | 190 +++ .../org/apache/tamaya/json/JSONFormatIT.java| 48 + .../org/apache/tamaya/json/JSONFormatTest.java | 75 .../tamaya/json/JSONPropertySourceTest.java | 56 ++ json/src/test/resources/arquillian.xml | 30 +++ .../test/resources/configs/invalid/array.json | 21 ++ .../resources/configs/invalid/empty-file.json | 18 ++ .../configs/invalid/only-opening-bracket.json | 19 ++ .../resources/configs/invalid/with-array.json | 27 +++ .../test/resources/configs/valid/cyrillic.json | 22 +++ .../configs/valid/empty-object-config.json | 20 ++ .../valid/simple-flat-string-only-config.json | 23 +++ .../simple-nested-string-only-config-1.json | 27 +++ .../simple-nested-string-only-config-2.json | 26 +++ .../configs/valid/with-explicit-priority.json | 25 +++ 32 files changed, 1921 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/c641421b/events/pom.xml -- diff --cc events/pom.xml index fb6c3b3,d274633..0a2de38 --- a/events/pom.xml +++ b/events/pom.xml @@@ -94,6 -95,6 +94,4 @@@ under the License -- --
[19/50] [abbrv] incubator-tamaya-extensions git commit: Simplified events module, adapted documentation as well. Removed model dependency from events, since events is the more general module here.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/384b09eb/src/test/java/org/apache/tamaya/events/ChangeableThreadLocalPropertySource.java -- diff --git a/src/test/java/org/apache/tamaya/events/ChangeableThreadLocalPropertySource.java b/src/test/java/org/apache/tamaya/events/ChangeableThreadLocalPropertySource.java new file mode 100644 index 000..759d429 --- /dev/null +++ b/src/test/java/org/apache/tamaya/events/ChangeableThreadLocalPropertySource.java @@ -0,0 +1,57 @@ +/* + * 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.events; + +import org.apache.tamaya.core.propertysource.BasePropertySource; + +import java.util.HashMap; +import java.util.Map; + + +/** + * PropertySource implementation that accesses properties that are stored on ThreadLocal level, e.g. good to use for + * testing.. + */ +public class ChangeableThreadLocalPropertySource extends BasePropertySource{ + +private static ThreadLocal
[20/50] [abbrv] incubator-tamaya-extensions git commit: Simplified events module, adapted documentation as well. Removed model dependency from events, since events is the more general module here.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/384b09eb/src/main/java/org/apache/tamaya/events/delta/ConfigurationChangeBuilder.java -- diff --git a/src/main/java/org/apache/tamaya/events/delta/ConfigurationChangeBuilder.java b/src/main/java/org/apache/tamaya/events/delta/ConfigurationChangeBuilder.java deleted file mode 100644 index ff5e26b..000 --- a/src/main/java/org/apache/tamaya/events/delta/ConfigurationChangeBuilder.java +++ /dev/null @@ -1,262 +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 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.events.delta; - -import org.apache.tamaya.Configuration; - -import java.beans.PropertyChangeEvent; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.SortedMap; -import java.util.TreeMap; - -/** - * Models a set current changes applied to a {@link org.apache.tamaya.spi.PropertySource}. Consumers of these events - * can observing changes to property sources and - * - * Check if their current configuration instance ({@link org.apache.tamaya.spi.ConfigurationContext} - * contains the changed {@link org.apache.tamaya.spi.PropertySource} (Note: the reference tova property source is never affected by a - * change, its only the data of the property source). - * If so corresponding action may be taken, such as reevaluating the configuration values (depending on - * the update policy) or reevaluating the complete {@link org.apache.tamaya.Configuration} to create a change - * event on configuration level. - * - */ -public final class ConfigurationChangeBuilder { -/** - * The recorded changes. - */ -final SortedMapdelta = new TreeMap<>(); -/** - * The underlying configuration/provider. - */ -Configuration source; -/** - * The version configured, or null, for generating a default. - */ -String version; -/** - * The optional timestamp in millis of this epoch. - */ -Long timestamp; - -/** - * Constructor. - * - * @param configuration the underlying configuration, not null. - */ -private ConfigurationChangeBuilder(Configuration configuration) { -this.source = Objects.requireNonNull(configuration); -} - -/** - * Creates a new instance current this builder. - * - * @param configuration the configuration changed, not null. - * @return the builder for chaining. - */ -public static ConfigurationChangeBuilder of(Configuration configuration) { -return new ConfigurationChangeBuilder(configuration); -} - -/** - * Compares the two property config/configurations and creates a collection current all changes - * that must be appied to render {@code map1} into {@code map2}. - * - * @param map1 the source map, not null. - * @param map2 the target map, not null. - * @return a collection current change events, never null. - */ -public static Collection compare(Configuration map1, Configuration map2) { -List changes = new ArrayList<>(); -for (Map.Entry en : map1.getProperties().entrySet()) { -String val = map2.get(en.getKey()); -if (val == null) { -changes.add(new PropertyChangeEvent(map1, en.getKey(), null, en.getValue())); -} else if (!val.equals(en.getValue())) { -changes.add(new PropertyChangeEvent(map1, en.getKey(), val, en.getValue())); -} -} -for (Map.Entry en : map2.getProperties().entrySet()) { -String val = map1.get(en.getKey()); -if (val == null) { -changes.add(new PropertyChangeEvent(map1, en.getKey(), null, en.getValue())); -} else if (!val.equals(en.getValue())) { -changes.add(new PropertyChangeEvent(map1, en.getKey(), val, en.getValue())); -} -} -return changes; -} - -/* - * Apply a version/UUID to the set being built. - * @param version the version to apply, or null,
[37/50] [abbrv] incubator-tamaya-extensions git commit: Added dep to functions module for EMPTY instances.
Added dep to functions module for EMPTY instances. 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/9065c011 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/9065c011 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/9065c011 Branch: refs/heads/master Commit: 9065c011a608a194f4b7222bb0df0f7e86dd7538 Parents: 2494bf8 Author: anatoleAuthored: Mon Mar 14 00:41:46 2016 +0100 Committer: Oliver B. Fischer Committed: Tue Sep 27 00:18:31 2016 +0200 -- pom.xml | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/9065c011/pom.xml -- diff --git a/pom.xml b/pom.xml index 33d8659..21269ed 100644 --- a/pom.xml +++ b/pom.xml @@ -41,11 +41,11 @@ under the License. ${project.version} provided - - - - - + +org.apache.tamaya.ext +tamaya-functions +${project.version} + org.apache.tamaya tamaya-core
[23/50] [abbrv] incubator-tamaya-extensions git commit: Removed unused imports.
Removed unused imports. 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/da820c75 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/da820c75 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/da820c75 Branch: refs/heads/master Commit: da820c7546ca20a48c5093e847bf7e20647dc184 Parents: 7e7d57c Author: anatoleAuthored: Wed Dec 16 08:45:14 2015 +0100 Committer: Oliver B. Fischer Committed: Tue Sep 27 00:18:31 2016 +0200 -- src/main/java/org/apache/tamaya/events/ConfigEvent.java | 3 --- .../apache/tamaya/events/folderobserver/FileChangeListener.java | 3 +-- .../events/folderobserver/ObservingPropertySourceProvider.java | 4 +--- .../tamaya/events/internal/DefaultConfigChangeObserver.java | 5 - .../apache/tamaya/events/internal/LoggingConfigListener.java| 1 - .../org/apache/tamaya/events/spi/ConfigEventManagerSpi.java | 1 - 6 files changed, 6 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/da820c75/src/main/java/org/apache/tamaya/events/ConfigEvent.java -- diff --git a/src/main/java/org/apache/tamaya/events/ConfigEvent.java b/src/main/java/org/apache/tamaya/events/ConfigEvent.java index b56145e..5a713d7 100644 --- a/src/main/java/org/apache/tamaya/events/ConfigEvent.java +++ b/src/main/java/org/apache/tamaya/events/ConfigEvent.java @@ -18,9 +18,6 @@ */ package org.apache.tamaya.events; -import java.beans.PropertyChangeEvent; -import java.util.Collection; - /** * Event that contains a set current changes that were applied or could be applied. http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/da820c75/src/main/java/org/apache/tamaya/events/folderobserver/FileChangeListener.java -- diff --git a/src/main/java/org/apache/tamaya/events/folderobserver/FileChangeListener.java b/src/main/java/org/apache/tamaya/events/folderobserver/FileChangeListener.java index af51063..3427ce8 100644 --- a/src/main/java/org/apache/tamaya/events/folderobserver/FileChangeListener.java +++ b/src/main/java/org/apache/tamaya/events/folderobserver/FileChangeListener.java @@ -19,7 +19,6 @@ package org.apache.tamaya.events.folderobserver; import org.apache.tamaya.ConfigException; -import org.apache.tamaya.events.PropertySourceChange; import java.io.IOException; import java.nio.file.FileSystem; @@ -35,7 +34,7 @@ import java.util.logging.Logger; /** * Class that has the responsibility to watch the folder and then publish the changes to a - * {@link PropertySourceChange}. + * {@link org.apache.tamaya.events.PropertySourceChange}. * @see ObservingPropertySourceProvider * This listener will wait to events and wait to one second to watch again. * If new file was created or modified will commit from this file. http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/da820c75/src/main/java/org/apache/tamaya/events/folderobserver/ObservingPropertySourceProvider.java -- diff --git a/src/main/java/org/apache/tamaya/events/folderobserver/ObservingPropertySourceProvider.java b/src/main/java/org/apache/tamaya/events/folderobserver/ObservingPropertySourceProvider.java index 14692f4..8387504 100644 --- a/src/main/java/org/apache/tamaya/events/folderobserver/ObservingPropertySourceProvider.java +++ b/src/main/java/org/apache/tamaya/events/folderobserver/ObservingPropertySourceProvider.java @@ -19,9 +19,7 @@ package org.apache.tamaya.events.folderobserver; import org.apache.tamaya.ConfigException; -import org.apache.tamaya.ConfigurationProvider; import org.apache.tamaya.events.ConfigEventManager; -import org.apache.tamaya.events.PropertySourceChange; import org.apache.tamaya.events.ConfigurationContextChange; import org.apache.tamaya.events.ConfigurationContextChangeBuilder; import org.apache.tamaya.format.ConfigurationData; @@ -52,7 +50,7 @@ import java.util.logging.Logger; * This implementation run in a folder taking up all file compatible with the given * ConfigurationFormats. When a file is added, deleted or modified the PropertySourceProvider * will adapt the changes automatically and trigger according - * {@link PropertySourceChange} events. + * {@link org.apache.tamaya.events.PropertySourceChange} events. * The default folder is META-INF/config, but you can change using the absolute path in * "-Dtamaya.configdir" parameter. */
[06/50] [abbrv] incubator-tamaya-extensions git commit: Replaced the name 'area' with 'section'. Implemented management JMX extension for Tamaya incl a minimal test bed. Added documentation/doc update
Replaced the name 'area' with 'section'. Implemented management JMX extension for Tamaya incl a minimal test bed. Added documentation/doc updates. 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/37786b5a Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/37786b5a Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/37786b5a Branch: refs/heads/master Commit: 37786b5a90670d4bef38be841adeab5fa3ffddc6 Parents: a5c7046 Author: anatoleAuthored: Mon Aug 24 18:24:32 2015 +0200 Committer: Oliver B. Fischer Committed: Tue Sep 27 00:18:31 2016 +0200 -- src/main/java/org/apache/tamaya/events/FrozenConfiguration.java | 2 +- src/main/java/org/apache/tamaya/events/FrozenPropertySource.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/37786b5a/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java -- diff --git a/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java b/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java index 290e1a9..7afac7a 100644 --- a/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java +++ b/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java @@ -36,7 +36,7 @@ import java.util.logging.Logger; /** * /** - * Configuration implementation that stores all current values of a given (possibly dynamic, contextual and non remote + * Configuration implementation that stores all current values of a given (possibly dynamic, contextual and non server * capable instance) and is fully serializable. Note that hereby only the scannable key/value pairs are considered. */ public final class FrozenConfiguration implements Configuration, Serializable { http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/37786b5a/src/main/java/org/apache/tamaya/events/FrozenPropertySource.java -- diff --git a/src/main/java/org/apache/tamaya/events/FrozenPropertySource.java b/src/main/java/org/apache/tamaya/events/FrozenPropertySource.java index 71f5294..12778be 100644 --- a/src/main/java/org/apache/tamaya/events/FrozenPropertySource.java +++ b/src/main/java/org/apache/tamaya/events/FrozenPropertySource.java @@ -26,7 +26,7 @@ import java.util.HashMap; import java.util.Map; /** - * PropertySource implementation that stores all current values of a given (possibly dynamic, contextual and non remote + * PropertySource implementation that stores all current values of a given (possibly dynamic, contextual and non server * capable instance) and is fully serializable. Note that hereby only the scannable key/value pairs are considered. */ public final class FrozenPropertySource implements PropertySource, Serializable {
[30/50] [abbrv] incubator-tamaya-extensions git commit: Removed all dependencies to Hamcrest versions < 2.0.0.0
Removed all dependencies to Hamcrest versions < 2.0.0.0 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/cfbcf272 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/cfbcf272 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/cfbcf272 Branch: refs/heads/master Commit: cfbcf272f7fd5606ab6a80ee715603c96d1126b2 Parents: 626e424 Author: Oliver B. FischerAuthored: Fri Mar 4 04:39:46 2016 +0100 Committer: Oliver B. Fischer Committed: Tue Sep 27 00:18:31 2016 +0200 -- pom.xml | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/cfbcf272/pom.xml -- diff --git a/pom.xml b/pom.xml index 7ac7f28..33d8659 100644 --- a/pom.xml +++ b/pom.xml @@ -52,6 +52,12 @@ under the License. ${project.version} provided + + +org.hamcrest +java-hamcrest + + junit junit @@ -87,4 +93,4 @@ under the License. - \ No newline at end of file +
[47/50] [abbrv] incubator-tamaya-extensions git commit: TAMAYA-154: LHF: fix javadoc while stduying findbugs warning
TAMAYA-154: LHF: fix javadoc while stduying findbugs warning 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/ff86b0ca Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/ff86b0ca Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/ff86b0ca Branch: refs/heads/master Commit: ff86b0cad49acb15b5c5a167abdc48bcd157ba0b Parents: 2163c3a Author: Phil OttlingerAuthored: Wed Aug 31 20:41:23 2016 +0200 Committer: Oliver B. Fischer Committed: Tue Sep 27 00:18:31 2016 +0200 -- .../java/org/apache/tamaya/events/PropertySourceChangeBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/ff86b0ca/src/main/java/org/apache/tamaya/events/PropertySourceChangeBuilder.java -- diff --git a/src/main/java/org/apache/tamaya/events/PropertySourceChangeBuilder.java b/src/main/java/org/apache/tamaya/events/PropertySourceChangeBuilder.java index 0858fdb..fa2cf5e 100644 --- a/src/main/java/org/apache/tamaya/events/PropertySourceChangeBuilder.java +++ b/src/main/java/org/apache/tamaya/events/PropertySourceChangeBuilder.java @@ -87,7 +87,7 @@ public final class PropertySourceChangeBuilder { /** * Compares the two property config/configurations and creates a collection current all changes - * that must be appied to render {@code map1} into {@code map2}. + * that must be applied to render {@code map1} into {@code map2}. * * @param map1 the source map, not null. * @param map2 the target map, not null.
[43/50] [abbrv] incubator-tamaya-extensions git commit: Fixed UI module, adding modularity. Added initial version for the vents module.
Fixed UI module, adding modularity. Added initial version for the vents module. 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/eb79d078 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/eb79d078 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/eb79d078 Branch: refs/heads/master Commit: eb79d078878bdc0a385a4291593dd984f8284635 Parents: 36e2bfd Author: anatoleAuthored: Sat Apr 16 08:21:36 2016 +0200 Committer: Oliver B. Fischer Committed: Tue Sep 27 00:18:31 2016 +0200 -- pom.xml | 14 -- .../ObservingPropertySourceProvider.java | 3 ++- 2 files changed, 14 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/eb79d078/pom.xml -- diff --git a/pom.xml b/pom.xml index 74d3a4b..0952795 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,6 @@ under the License. org.apache.tamaya tamaya-api ${project.version} -provided org.apache.tamaya.ext @@ -47,10 +46,21 @@ under the License. ${project.version} +org.apache.tamaya.ext +tamaya-spisupport +${project.version} + + org.apache.tamaya tamaya-core ${project.version} -provided +runtime + + +org.apache.tamaya.ext +tamaya-ui +${project.version} +true http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/eb79d078/src/main/java/org/apache/tamaya/events/folderobserver/ObservingPropertySourceProvider.java -- diff --git a/src/main/java/org/apache/tamaya/events/folderobserver/ObservingPropertySourceProvider.java b/src/main/java/org/apache/tamaya/events/folderobserver/ObservingPropertySourceProvider.java index 347576f..feddd70 100644 --- a/src/main/java/org/apache/tamaya/events/folderobserver/ObservingPropertySourceProvider.java +++ b/src/main/java/org/apache/tamaya/events/folderobserver/ObservingPropertySourceProvider.java @@ -40,12 +40,12 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.apache.tamaya.ConfigException; -import org.apache.tamaya.core.propertysource.BasePropertySource; import org.apache.tamaya.events.ConfigEventManager; import org.apache.tamaya.events.ConfigurationContextChange; import org.apache.tamaya.events.ConfigurationContextChangeBuilder; import org.apache.tamaya.spi.PropertySource; import org.apache.tamaya.spi.PropertySourceProvider; +import org.apache.tamaya.spisupport.BasePropertySource; /** * This implementation runs in a folder taking up all files compatible with the given @@ -118,6 +118,7 @@ public class ObservingPropertySourceProvider implements PropertySourceProvider, protected Collection getPropertySources(final Path file) { return Arrays.asList(new PropertySource[]{new BasePropertySource() { private final Map props = readProperties(file); + @Override public Map getProperties() { return props;
[09/50] [abbrv] incubator-tamaya-extensions git commit: TAMAYA-113: Remove Java 8 related parts - basic work done.
TAMAYA-113: Remove Java 8 related parts - basic work done. 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/25d1b3e6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/25d1b3e6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/25d1b3e6 Branch: refs/heads/master Commit: 25d1b3e68d1f022b36be3ab07c204d4b7d6ed7c7 Parents: 9c7f405 Author: anatoleAuthored: Tue Sep 29 01:31:22 2015 +0200 Committer: Oliver B. Fischer Committed: Tue Sep 27 00:18:31 2016 +0200 -- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/25d1b3e6/pom.xml -- diff --git a/pom.xml b/pom.xml index 74c9b22..a9f7e92 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ under the License. org.apache.tamaya -tamaya-java7-api +tamaya-api ${project.version} provided @@ -47,7 +47,7 @@ under the License. org.apache.tamaya -tamaya-java7-core +tamaya-core ${project.version} provided
[38/50] [abbrv] incubator-tamaya-extensions git commit: [maven-release-plugin] prepare release tamaya-all-0.2-incubating
[maven-release-plugin] prepare release tamaya-all-0.2-incubating 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/ce4d80e5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/ce4d80e5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/ce4d80e5 Branch: refs/heads/master Commit: ce4d80e5e8e699db6d3f3888cb2e4d0ba51c6575 Parents: 9065c01 Author: anatoleAuthored: Wed Mar 16 16:20:07 2016 +0100 Committer: Oliver B. Fischer Committed: Tue Sep 27 00:18:31 2016 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/ce4d80e5/pom.xml -- diff --git a/pom.xml b/pom.xml index 21269ed..a019a94 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.tamaya.ext tamaya-extensions -0.2-incubating-SNAPSHOT +0.2-incubating tamaya-events
[48/50] [abbrv] incubator-tamaya-extensions git commit: ixed table rendering and setting of polling interval.
ixed table rendering and setting of polling interval. 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/8b9774ec Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/8b9774ec Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/8b9774ec Branch: refs/heads/master Commit: 8b9774ec3543576939f97f1753ccd6e1f860dfb7 Parents: 614596f Author: anatoleAuthored: Sun Apr 17 23:55:50 2016 +0200 Committer: Oliver B. Fischer Committed: Tue Sep 27 00:18:31 2016 +0200 -- .../tamaya/events/ConfigEventManager.java | 4 +- .../internal/DefaultConfigChangeObserver.java | 9 ++-- .../org/apache/tamaya/events/ui/EventView.java | 53 3 files changed, 49 insertions(+), 17 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/8b9774ec/src/main/java/org/apache/tamaya/events/ConfigEventManager.java -- diff --git a/src/main/java/org/apache/tamaya/events/ConfigEventManager.java b/src/main/java/org/apache/tamaya/events/ConfigEventManager.java index 9989fbb..f6bd3da 100644 --- a/src/main/java/org/apache/tamaya/events/ConfigEventManager.java +++ b/src/main/java/org/apache/tamaya/events/ConfigEventManager.java @@ -168,7 +168,7 @@ public final class ConfigEventManager { * * @return the check period in ms. */ -public long getChangeMonitoringPeriod(){ +public static long getChangeMonitoringPeriod(){ return SPI.getChangeMonitoringPeriod(); } @@ -179,7 +179,7 @@ public final class ConfigEventManager { * @see #enableChangeMonitoring(boolean) * @see #isChangeMonitoring() */ -public void setChangeMonitoringPeriod(long millis){ +public static void setChangeMonitoringPeriod(long millis){ SPI.setChangeMonitoringPeriod(millis); } http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/8b9774ec/src/main/java/org/apache/tamaya/events/internal/DefaultConfigChangeObserver.java -- diff --git a/src/main/java/org/apache/tamaya/events/internal/DefaultConfigChangeObserver.java b/src/main/java/org/apache/tamaya/events/internal/DefaultConfigChangeObserver.java index 5cd3f6c..f4457b2 100644 --- a/src/main/java/org/apache/tamaya/events/internal/DefaultConfigChangeObserver.java +++ b/src/main/java/org/apache/tamaya/events/internal/DefaultConfigChangeObserver.java @@ -36,7 +36,7 @@ public class DefaultConfigChangeObserver { private static final Logger LOG = Logger.getLogger(DefaultConfigChangeObserver.class.getName()); -private final Timer timer = new Timer("DefaultConfigChangeObserver", true); +private Timer timer = new Timer("DefaultConfigChangeObserver", true); private long checkPeriod = 2000L; @@ -52,9 +52,9 @@ public class DefaultConfigChangeObserver { timer.scheduleAtFixedRate(new TimerTask() { @Override public void run() { -if(running) { -checkConfigurationUpdate(); -} +if(running) { +checkConfigurationUpdate(); +} } }, START_DELAY, checkPeriod); } @@ -98,6 +98,7 @@ public class DefaultConfigChangeObserver { LOG.finest("Resetting check period to " + checkPeriod + " ms, reregistering timer."); this.checkPeriod = checkPeriod; timer.cancel(); +timer = new Timer("DefaultConfigChangeObserver", true); timer.scheduleAtFixedRate(new TimerTask() { @Override public void run() { http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/8b9774ec/src/main/java/org/apache/tamaya/events/ui/EventView.java -- diff --git a/src/main/java/org/apache/tamaya/events/ui/EventView.java b/src/main/java/org/apache/tamaya/events/ui/EventView.java index a69b04c..56e4b35 100644 --- a/src/main/java/org/apache/tamaya/events/ui/EventView.java +++ b/src/main/java/org/apache/tamaya/events/ui/EventView.java @@ -18,6 +18,7 @@ */ package org.apache.tamaya.events.ui; +import com.vaadin.data.Item; import com.vaadin.data.Property; import com.vaadin.navigator.View; import com.vaadin.navigator.ViewChangeListener; @@ -33,6 +34,7 @@ import org.apache.tamaya.ui.components.VerticalSpacedLayout; import org.apache.tamaya.ui.services.MessageProvider; import javax.annotation.Priority; +import java.util.Date; public class EventView extends VerticalSpacedLayout implements View { @@ -65,6 +67,8 @@ public class
[44/50] [abbrv] incubator-tamaya-extensions git commit: Modulularized UI module, added multi file based i18n, using config mechanisms.
Modulularized UI module, added multi file based i18n, using config mechanisms. 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/20a11ab7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/20a11ab7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/20a11ab7 Branch: refs/heads/master Commit: 20a11ab7237d755e5cdfd81ae2ad0a2d8628c243 Parents: eb79d07 Author: anatoleAuthored: Sat Apr 16 08:25:46 2016 +0200 Committer: Oliver B. Fischer Committed: Tue Sep 27 00:18:31 2016 +0200 -- .../org/apache/tamaya/events/ui/EventView.java | 134 +++ .../services/org.apache.tamaya.ui.ViewProvider | 19 +++ src/main/resources/ui/lang/tamaya.properties| 5 + .../tamaya/events/RandomPropertySource.java | 48 +++ .../org.apache.tamaya.spi.PropertySource| 19 +++ .../services/org.apache.tamaya.ui.ViewProvider | 19 +++ src/test/resources/config/application.yml | 13 ++ 7 files changed, 257 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/20a11ab7/src/main/java/org/apache/tamaya/events/ui/EventView.java -- diff --git a/src/main/java/org/apache/tamaya/events/ui/EventView.java b/src/main/java/org/apache/tamaya/events/ui/EventView.java new file mode 100644 index 000..a69b04c --- /dev/null +++ b/src/main/java/org/apache/tamaya/events/ui/EventView.java @@ -0,0 +1,134 @@ +/* + * 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.events.ui; + +import com.vaadin.data.Property; +import com.vaadin.navigator.View; +import com.vaadin.navigator.ViewChangeListener; +import com.vaadin.shared.ui.label.ContentMode; +import com.vaadin.ui.*; +import org.apache.tamaya.events.ConfigEvent; +import org.apache.tamaya.events.ConfigEventListener; +import org.apache.tamaya.events.ConfigEventManager; +import org.apache.tamaya.spi.ServiceContextManager; +import org.apache.tamaya.ui.UIConstants; +import org.apache.tamaya.ui.ViewProvider; +import org.apache.tamaya.ui.components.VerticalSpacedLayout; +import org.apache.tamaya.ui.services.MessageProvider; + +import javax.annotation.Priority; + + +public class EventView extends VerticalSpacedLayout implements View { + +@Priority(20) +public static final class Provider implements ViewProvider{ + +@Override +public ViewLifecycle getLifecycle() { +return ViewLifecycle.EAGER; +} + +@Override +public String getUrlPattern() { +return "/events"; +} + +@Override +public String getDisplayName() { +return "view.events.name"; +} + +@Override +public View createView(){ +return new EventView(); +} +} + +private CheckBox changeMonitorEnabled = new CheckBox(ServiceContextManager.getServiceContext() + .getService(MessageProvider.class).getMessage("view.events.button.enableMonitoring")); +private Button clearViewButton = new Button(ServiceContextManager.getServiceContext() + .getService(MessageProvider.class).getMessage("view.events.button.clearView")); +private Table eventsTable = new Table(ServiceContextManager.getServiceContext() + .getService(MessageProvider.class).getMessage("view.events.table.name")); + + +public EventView() { +Label caption = new Label(ServiceContextManager.getServiceContext() + .getService(MessageProvider.class).getMessage("view.events.name")); +Label description = new Label(ServiceContextManager.getServiceContext() + .getService(MessageProvider.class).getMessage("view.events.description"), +ContentMode.HTML); + +ConfigEventManager.addListener(new ConfigEventListener() { +@Override +public void
[31/50] [abbrv] incubator-tamaya-extensions git commit: [maven-release-plugin] prepare release 0.2-incubating
[maven-release-plugin] prepare release 0.2-incubating 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/67ca5e7f Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/67ca5e7f Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/67ca5e7f Branch: refs/heads/master Commit: 67ca5e7f4f0101e0c744d3a1283b0a580d326146 Parents: cfbcf27 Author: anatoleAuthored: Tue Mar 8 17:39:55 2016 +0100 Committer: Oliver B. Fischer Committed: Tue Sep 27 00:18:31 2016 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/67ca5e7f/pom.xml -- diff --git a/pom.xml b/pom.xml index 33d8659..f6759db 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.tamaya.ext tamaya-extensions -0.2-incubating-SNAPSHOT +0.2-incubating tamaya-events
[24/50] [abbrv] incubator-tamaya-extensions git commit: Fixed further issues from quality gates.
Fixed further issues from quality gates. 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/f566c8dc Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/f566c8dc Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/f566c8dc Branch: refs/heads/master Commit: f566c8dc0e619d9a2434062a5cf27e302988e6ba Parents: 6489414 Author: anatoleAuthored: Sun Jan 10 02:14:41 2016 +0100 Committer: Oliver B. Fischer Committed: Tue Sep 27 00:18:31 2016 +0200 -- src/main/java/org/apache/tamaya/events/ChangeType.java| 5 - .../java/org/apache/tamaya/events/ConfigEventManager.java | 2 +- .../org/apache/tamaya/events/ConfigurationChange.java | 4 ++-- .../apache/tamaya/events/ConfigurationChangeBuilder.java | 6 -- .../apache/tamaya/events/ConfigurationContextChange.java | 4 ++-- .../tamaya/events/ConfigurationContextChangeBuilder.java | 2 +- .../org/apache/tamaya/events/FrozenPropertySource.java| 4 ++-- .../org/apache/tamaya/events/PropertySourceChange.java| 6 +++--- .../apache/tamaya/events/PropertySourceChangeBuilder.java | 6 -- .../tamaya/events/folderobserver/FileChangeListener.java | 6 +++--- .../folderobserver/ObservingPropertySourceProvider.java | 4 ++-- .../events/internal/DefaultConfigChangeObserver.java | 6 +++--- .../events/internal/DefaultConfigEventManagerSpi.java | 10 +- .../org/apache/tamaya/events/spi/BaseConfigEvent.java | 6 +++--- .../tamaya/events/ChangeableGlobalPropertySource.java | 2 +- .../events/ChangeableThreadLocalPropertySource.java | 2 +- .../events/internal/DefaultConfigEventManagerSpiTest.java | 2 +- 17 files changed, 42 insertions(+), 35 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/f566c8dc/src/main/java/org/apache/tamaya/events/ChangeType.java -- diff --git a/src/main/java/org/apache/tamaya/events/ChangeType.java b/src/main/java/org/apache/tamaya/events/ChangeType.java index 4363579..2059017 100644 --- a/src/main/java/org/apache/tamaya/events/ChangeType.java +++ b/src/main/java/org/apache/tamaya/events/ChangeType.java @@ -19,10 +19,13 @@ package org.apache.tamaya.events; /** - * Created by Anatole on 20.02.2015. + * Enum describing the type of configuration change. */ public enum ChangeType { +/** Configuration hase been added. */ NEW, +/** Configuration hase been removed. */ DELETED, +/** Configuration hase been changed. */ UPDATED, } http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/f566c8dc/src/main/java/org/apache/tamaya/events/ConfigEventManager.java -- diff --git a/src/main/java/org/apache/tamaya/events/ConfigEventManager.java b/src/main/java/org/apache/tamaya/events/ConfigEventManager.java index f0bd0fa..6b206c8 100644 --- a/src/main/java/org/apache/tamaya/events/ConfigEventManager.java +++ b/src/main/java/org/apache/tamaya/events/ConfigEventManager.java @@ -166,7 +166,7 @@ public final class ConfigEventManager { /** * Sets the current monitoring period and restarts the monitor. You still have to enable the monitor if * it is currently not enabled. - * @param millis + * @param millis the monitoring period in ms. * @see #enableChangeMonitoring(boolean) * @see #isChangeMonitoring() */ http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/f566c8dc/src/main/java/org/apache/tamaya/events/ConfigurationChange.java -- diff --git a/src/main/java/org/apache/tamaya/events/ConfigurationChange.java b/src/main/java/org/apache/tamaya/events/ConfigurationChange.java index 0366556..c31cda2 100644 --- a/src/main/java/org/apache/tamaya/events/ConfigurationChange.java +++ b/src/main/java/org/apache/tamaya/events/ConfigurationChange.java @@ -39,13 +39,13 @@ public final class ConfigurationChange implements ConfigEvent, Se private static final long serialVersionUID = 1L; /** The base property provider/configuration. */ -private FrozenConfiguration configuration; +private final FrozenConfiguration configuration; /** The base version, usable for optimistic locking. */ private String version = UUID.randomUUID().toString(); /** The timestamp of the change set in millis from the epoch. */ private long timestamp = System.currentTimeMillis(); /** The recorded changes. */ -private Map changes = new HashMap<>(); +private final
[05/50] [abbrv] incubator-tamaya-extensions git commit: Reset head to previous master head version.
Reset head to previous master head version. 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/a5c7046b Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/a5c7046b Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/a5c7046b Branch: refs/heads/master Commit: a5c7046b5c2a254ad305d663761fff4d24b62141 Parents: ba01630 Author: anatoleAuthored: Tue Aug 4 22:42:56 2015 +0200 Committer: Oliver B. Fischer Committed: Tue Sep 27 00:18:31 2016 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/a5c7046b/pom.xml -- diff --git a/pom.xml b/pom.xml index 74c9b22..dc76200 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.tamaya.ext tamaya-extensions -0.2-incubating-SNAPSHOT +0.1-incubating-SNAPSHOT tamaya-events
[26/50] [abbrv] incubator-tamaya-extensions git commit: TAMAYA-134: Gitignore improvements and second batch of Javadoc fixes done by Philipp Ottlinger.
TAMAYA-134: Gitignore improvements and second batch of Javadoc fixes done by Philipp Ottlinger. 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/8e827054 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/8e827054 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/8e827054 Branch: refs/heads/master Commit: 8e827054c9e2082ab7010b5f9a7b427890ad787d Parents: 0760678 Author: anatoleAuthored: Tue Jan 19 01:11:27 2016 +0100 Committer: Oliver B. Fischer Committed: Tue Sep 27 00:18:31 2016 +0200 -- .../tamaya/events/ConfigEventManager.java | 17 - .../events/ConfigurationContextChange.java | 4 +- .../ConfigurationContextChangeBuilder.java | 19 ++--- .../events/PropertySourceChangeBuilder.java | 4 +- .../ObservingPropertySourceProvider.java| 77 .../events/spi/ConfigEventManagerSpi.java | 19 +++-- 6 files changed, 87 insertions(+), 53 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/8e827054/src/main/java/org/apache/tamaya/events/ConfigEventManager.java -- diff --git a/src/main/java/org/apache/tamaya/events/ConfigEventManager.java b/src/main/java/org/apache/tamaya/events/ConfigEventManager.java index 6b206c8..9989fbb 100644 --- a/src/main/java/org/apache/tamaya/events/ConfigEventManager.java +++ b/src/main/java/org/apache/tamaya/events/ConfigEventManager.java @@ -55,6 +55,7 @@ public final class ConfigEventManager { /** * Adds a Config listener that listens to all kind of {@link ConfigEvent}. + * @param the type of the event. * @param l the listener not null. * @param eventType the event type to which this listener listens to. */ @@ -82,7 +83,8 @@ public final class ConfigEventManager { /** * Removes a listener registered for the given event type. * - * @param l the listener not null. + * @param the type of the event. + * @param l the listener, not null. * @param eventType the event type to which this listener listens to. */ public static void removeListener(ConfigEventListener l, Class eventType) { @@ -106,6 +108,8 @@ public final class ConfigEventManager { /** * Access all registered ConfigEventListeners listening to a all kind of event types globally. + * + * @param the type of the event. * @return a list with the listeners found, never null. */ public static @@ -115,7 +119,8 @@ public final class ConfigEventManager { /** * Publishes a {@link ConfigurationChange} synchronously to all interested listeners. - * + * + * @param the type of the event. * @param event the event, not null. */ public static void fireEvent(ConfigEvent event) { @@ -125,6 +130,7 @@ public final class ConfigEventManager { /** * Publishes a {@link ConfigurationChange} asynchronously/multithreaded to all interested listeners. * + * @param the type of the event. * @param event the event, not null. */ public static void fireEventAsynch(ConfigEvent event) { @@ -133,10 +139,13 @@ public final class ConfigEventManager { /** * Start/Stop the change monitoring service, which will observe/reevaluate the current configuration regularly - * and triggers ConfigurationChange events is something changed. This is quite handy for publishing + * and trigger ConfigurationChange events if something changed. This is quite handy for publishing * configuration changes to whatever systems are interested in. Hereby the origin of a configuration change - * can be on this machine, or also remotedly. FOr handling corresponding {@link ConfigEventListener} have + * can be on this machine, or also remotely. For handling corresponding {@link ConfigEventListener} have * to be registered, e.g. listening on {@link org.apache.tamaya.events.ConfigurationChange} events. + * + * @param enable whether to enable or disable the change monitoring. + * * @see #isChangeMonitoring() * @see #getChangeMonitoringPeriod() */ http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/8e827054/src/main/java/org/apache/tamaya/events/ConfigurationContextChange.java -- diff --git a/src/main/java/org/apache/tamaya/events/ConfigurationContextChange.java b/src/main/java/org/apache/tamaya/events/ConfigurationContextChange.java index 8c9ceef..4e12d42 100644 ---
[32/50] [abbrv] incubator-tamaya-extensions git commit: [maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare for next development iteration 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/2a79257f Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/2a79257f Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/2a79257f Branch: refs/heads/master Commit: 2a79257fdfcfe11a05528ab0bdca8d36d2a30622 Parents: 67ca5e7 Author: anatoleAuthored: Tue Mar 8 17:40:05 2016 +0100 Committer: Oliver B. Fischer Committed: Tue Sep 27 00:18:31 2016 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/2a79257f/pom.xml -- diff --git a/pom.xml b/pom.xml index f6759db..8612499 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.tamaya.ext tamaya-extensions -0.2-incubating +0.3-incubating-SNAPSHOT tamaya-events
[28/50] [abbrv] incubator-tamaya-extensions git commit: TAMAYA-136: Adding PropertyValue for PropertySource SPI. All changes and test fixes in all modules/examples relevant for release.
TAMAYA-136: Adding PropertyValue for PropertySource SPI. All changes and test fixes in all modules/examples relevant for release. 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/b5145392 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/b5145392 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/b5145392 Branch: refs/heads/master Commit: b5145392970877442ee16653d4aeeb7ba984f4a1 Parents: 8e82705 Author: anatoleAuthored: Tue Feb 2 17:15:53 2016 +0100 Committer: Oliver B. Fischer Committed: Tue Sep 27 00:18:31 2016 +0200 -- .../org/apache/tamaya/events/FrozenPropertySource.java | 5 +++-- .../tamaya/events/PropertySourceChangeBuilder.java | 11 ++- .../apache/tamaya/events/FrozenPropertySourceTest.java | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/b5145392/src/main/java/org/apache/tamaya/events/FrozenPropertySource.java -- diff --git a/src/main/java/org/apache/tamaya/events/FrozenPropertySource.java b/src/main/java/org/apache/tamaya/events/FrozenPropertySource.java index a8167f2..81e6dca 100644 --- a/src/main/java/org/apache/tamaya/events/FrozenPropertySource.java +++ b/src/main/java/org/apache/tamaya/events/FrozenPropertySource.java @@ -19,6 +19,7 @@ package org.apache.tamaya.events; import org.apache.tamaya.spi.PropertySource; +import org.apache.tamaya.spi.PropertyValue; import java.io.Serializable; import java.util.Collections; @@ -81,8 +82,8 @@ public final class FrozenPropertySource implements PropertySource, Serializable } @Override -public String get(String key) { -return this.properties.get(key); +public PropertyValue get(String key) { +return PropertyValue.of(key, this.properties.get(key), getName()); } @Override http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/b5145392/src/main/java/org/apache/tamaya/events/PropertySourceChangeBuilder.java -- diff --git a/src/main/java/org/apache/tamaya/events/PropertySourceChangeBuilder.java b/src/main/java/org/apache/tamaya/events/PropertySourceChangeBuilder.java index cefa4f4..0858fdb 100644 --- a/src/main/java/org/apache/tamaya/events/PropertySourceChangeBuilder.java +++ b/src/main/java/org/apache/tamaya/events/PropertySourceChangeBuilder.java @@ -19,6 +19,7 @@ package org.apache.tamaya.events; import org.apache.tamaya.spi.PropertySource; +import org.apache.tamaya.spi.PropertyValue; import java.beans.PropertyChangeEvent; import java.util.ArrayList; @@ -95,19 +96,19 @@ public final class PropertySourceChangeBuilder { public static Collection compare(PropertySource map1, PropertySource map2) { List changes = new ArrayList<>(); for (Map.Entry en : map1.getProperties().entrySet()) { -String val = map2.get(en.getKey()); +PropertyValue val = map2.get(en.getKey()); if (val == null) { changes.add(new PropertyChangeEvent(map1, en.getKey(), null, en.getValue())); } else if (!val.equals(en.getValue())) { -changes.add(new PropertyChangeEvent(map1, en.getKey(), val, en.getValue())); +changes.add(new PropertyChangeEvent(map1, en.getKey(), val.getValue(), en.getValue())); } } for (Map.Entry en : map2.getProperties().entrySet()) { -String val = map1.get(en.getKey()); +PropertyValue val = map1.get(en.getKey()); if (val == null) { changes.add(new PropertyChangeEvent(map1, en.getKey(), en.getValue(), null)); } else if (!val.equals(en.getValue())) { -changes.add(new PropertyChangeEvent(map1, en.getKey(), en.getValue(), val)); +changes.add(new PropertyChangeEvent(map1, en.getKey(), en.getValue(), val.getValue())); } } return changes; @@ -170,7 +171,7 @@ public final class PropertySourceChangeBuilder { * @return the builder for chaining. */ public PropertySourceChangeBuilder remove(String key, String... otherKeys) { -String oldValue = this.source.get(key); +PropertyValue oldValue = this.source.get(key); if (oldValue == null) { this.delta.remove(key); } http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/b5145392/src/test/java/org/apache/tamaya/events/FrozenPropertySourceTest.java
[18/50] [abbrv] incubator-tamaya-extensions git commit: TAMAYA-126: Removed refs to Java 8.
TAMAYA-126: Removed refs 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/c87ace06 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/c87ace06 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/c87ace06 Branch: refs/heads/master Commit: c87ace06dff2067b69a60f8628c4bcc6d650dc18 Parents: 4b183ab Author: Anatole TreschAuthored: Fri Oct 30 10:22:36 2015 +0100 Committer: Oliver B. Fischer Committed: Tue Sep 27 00:18:31 2016 +0200 -- .../events/folderobserver/FileChangeListener.java | 5 ++--- .../ObservingPropertySourceProvider.java | 7 +++ .../tamaya/events/FrozenPropertySourceTest.java | 18 ++ .../apache/tamaya/events/ObservedConfigTest.java | 2 ++ 4 files changed, 21 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/c87ace06/src/main/java/org/apache/tamaya/events/folderobserver/FileChangeListener.java -- diff --git a/src/main/java/org/apache/tamaya/events/folderobserver/FileChangeListener.java b/src/main/java/org/apache/tamaya/events/folderobserver/FileChangeListener.java index b3767cc..dd64145 100644 --- a/src/main/java/org/apache/tamaya/events/folderobserver/FileChangeListener.java +++ b/src/main/java/org/apache/tamaya/events/folderobserver/FileChangeListener.java @@ -28,7 +28,6 @@ import java.nio.file.StandardWatchEventKinds; import java.nio.file.WatchEvent; import java.nio.file.WatchKey; import java.nio.file.WatchService; -import java.util.Objects; import java.util.logging.Level; import java.util.logging.Logger; @@ -59,7 +58,7 @@ class FileChangeListener implements Runnable { this.directory = directory; this.watchService = getWatchService(); -if (Objects.nonNull(watchService) && Objects.nonNull(directory)) { +if (watchService!=null && directory!=null) { try { directory.register(watchService, StandardWatchEventKinds.ENTRY_DELETE, @@ -80,7 +79,7 @@ class FileChangeListener implements Runnable { @Override public void run() { -if (Objects.isNull(watchService) || Objects.isNull(directory)) { +if (watchService!=null || directory!=null) { return; } while (running) { http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/c87ace06/src/main/java/org/apache/tamaya/events/folderobserver/ObservingPropertySourceProvider.java -- diff --git a/src/main/java/org/apache/tamaya/events/folderobserver/ObservingPropertySourceProvider.java b/src/main/java/org/apache/tamaya/events/folderobserver/ObservingPropertySourceProvider.java index f05c98c..9b88c0a 100644 --- a/src/main/java/org/apache/tamaya/events/folderobserver/ObservingPropertySourceProvider.java +++ b/src/main/java/org/apache/tamaya/events/folderobserver/ObservingPropertySourceProvider.java @@ -41,7 +41,6 @@ import java.util.Collection; import java.util.Collections; import java.util.LinkedList; import java.util.List; -import java.util.Objects; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.logging.Level; @@ -91,7 +90,7 @@ public class ObservingPropertySourceProvider implements PropertySourceProvider, if (directory == null) { directory = getDirectory(); } -if (Objects.nonNull(directory)) { +if (directory!=null){ synchronized (this.propertySources) { this.propertySources.addAll(readConfiguration(directory)); } @@ -171,14 +170,14 @@ public class ObservingPropertySourceProvider implements PropertySourceProvider, */ private Path getDirectory() { String absolutePath = System.getProperty("tamaya.configdir"); -if (Objects.nonNull(absolutePath)) { +if (null!=absolutePath) { Path path = Paths.get(absolutePath); if (Files.isDirectory(path)) { return path; } } URL resource = ObservingPropertySourceProvider.class.getResource("/META-INF/config/"); -if (Objects.nonNull(resource)) { +if (null!=resource) { try { return Paths.get(resource.toURI()); } catch (URISyntaxException e) { http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/c87ace06/src/test/java/org/apache/tamaya/events/FrozenPropertySourceTest.java -- diff
[27/50] [abbrv] incubator-tamaya-extensions git commit: Unified module name in poms.
Unified module name in poms. 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/07606788 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/07606788 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/07606788 Branch: refs/heads/master Commit: 07606788914867ca3fb3a6b538ac7bedc022f979 Parents: f566c8d Author: anatoleAuthored: Sat Jan 16 07:40:08 2016 +0100 Committer: Oliver B. Fischer Committed: Tue Sep 27 00:18:31 2016 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/07606788/pom.xml -- diff --git a/pom.xml b/pom.xml index 918f4ef..7ac7f28 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ under the License. tamaya-events -Apache Tamaya Event and dynamic Update Extensions +Apache Tamaya Modules - Event and dynamic Update Extensions bundle
[22/50] [abbrv] incubator-tamaya-extensions git commit: Added licence header and Javadoc.
Added licence header and Javadoc. 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/7e7d57cb Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/7e7d57cb Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/7e7d57cb Branch: refs/heads/master Commit: 7e7d57cbaeb424bf5579059d0532e2fdf11a6c09 Parents: 384b09e Author: anatoleAuthored: Wed Dec 16 08:42:41 2015 +0100 Committer: Oliver B. Fischer Committed: Tue Sep 27 00:18:31 2016 +0200 -- .../org/apache/tamaya/events/SimpleEvent.java | 23 ++-- 1 file changed, 21 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/7e7d57cb/src/test/java/org/apache/tamaya/events/SimpleEvent.java -- diff --git a/src/test/java/org/apache/tamaya/events/SimpleEvent.java b/src/test/java/org/apache/tamaya/events/SimpleEvent.java index 2245ec0..5017aa1 100644 --- a/src/test/java/org/apache/tamaya/events/SimpleEvent.java +++ b/src/test/java/org/apache/tamaya/events/SimpleEvent.java @@ -1,9 +1,28 @@ +/* + * 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.events; import org.apache.tamaya.events.spi.BaseConfigEvent; -import java.util.UUID; - +/** + * Simple test event for testing only. + */ public class SimpleEvent extends BaseConfigEvent { public SimpleEvent(String paylod) {
[07/50] [abbrv] incubator-tamaya-extensions git commit: Updated snapshot version.
Updated snapshot version. 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/12b1c494 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/12b1c494 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/12b1c494 Branch: refs/heads/master Commit: 12b1c494eb6481500b36ee444d46784fea863fa5 Parents: 37786b5 Author: anatoleAuthored: Fri Aug 28 18:12:04 2015 +0200 Committer: Oliver B. Fischer Committed: Tue Sep 27 00:18:31 2016 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/12b1c494/pom.xml -- diff --git a/pom.xml b/pom.xml index dc76200..74c9b22 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.tamaya.ext tamaya-extensions -0.1-incubating-SNAPSHOT +0.2-incubating-SNAPSHOT tamaya-events
[15/50] [abbrv] incubator-tamaya-extensions git commit: TAMAYA-123: Adding OSGI Support.
TAMAYA-123: Adding OSGI Support. 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/5a28c45b Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/5a28c45b Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/5a28c45b Branch: refs/heads/master Commit: 5a28c45b523abd8bc69e5875dc3699ed4978ac48 Parents: b57f1b5 Author: anatoleAuthored: Fri Oct 16 19:15:21 2015 +0200 Committer: Oliver B. Fischer Committed: Tue Sep 27 00:18:31 2016 +0200 -- pom.xml | 24 1 file changed, 24 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/5a28c45b/pom.xml -- diff --git a/pom.xml b/pom.xml index a9f7e92..0c846c9 100644 --- a/pom.xml +++ b/pom.xml @@ -28,6 +28,7 @@ under the License. tamaya-events Apache Tamaya Event and dynamic Update Extensions +bundle 1.7 @@ -62,5 +63,28 @@ under the License. + + + +org.apache.felix +maven-bundle-plugin +true + + + +org.apache.tamaya.events, +org.apache.tamaya.events.delta, +org.apache.tamaya.events.folderobserver, +org.apache.tamaya.events..spi + + +org.apache.tamaya.events.internal + + + + + + + \ No newline at end of file
[29/50] [abbrv] incubator-tamaya-extensions git commit: Fixed compile issues due to extended constructor for ConversionContext.
Fixed compile issues due to extended constructor for ConversionContext. 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/626e4247 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/626e4247 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/626e4247 Branch: refs/heads/master Commit: 626e4247352f5b41990b380586b6723e21319d0d Parents: b514539 Author: anatoleAuthored: Wed Feb 17 01:16:56 2016 +0100 Committer: Oliver B. Fischer Committed: Tue Sep 27 00:18:31 2016 +0200 -- src/main/java/org/apache/tamaya/events/FrozenConfiguration.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/626e4247/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java -- diff --git a/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java b/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java index 313f569..b874987 100644 --- a/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java +++ b/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java @@ -116,7 +116,8 @@ public final class FrozenConfiguration implements Configuration, Serializable { if (value != null) { List converters = ConfigurationProvider.getConfigurationContext() .getPropertyConverters(type); -ConversionContext context = new ConversionContext.Builder(this,key,type).build(); +ConversionContext context = new ConversionContext.Builder(this, +ConfigurationProvider.getConfigurationContext(), key,type).build(); for (PropertyConverter converter : converters) { try { T t = converter.convert(value, context);
[45/50] [abbrv] incubator-tamaya-extensions git commit: Added license headers.
Added license headers. 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/614596fb Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/614596fb Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/614596fb Branch: refs/heads/master Commit: 614596fb4d0d978536402827f0eb7477e1857fa4 Parents: 20a11ab Author: anatoleAuthored: Sat Apr 16 08:37:42 2016 +0200 Committer: Oliver B. Fischer Committed: Tue Sep 27 00:18:31 2016 +0200 -- src/main/resources/ui/lang/tamaya.properties | 19 +++ .../tamaya/events/RandomPropertySource.java | 18 ++ src/test/resources/config/application.yml| 18 ++ 3 files changed, 55 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/614596fb/src/main/resources/ui/lang/tamaya.properties -- diff --git a/src/main/resources/ui/lang/tamaya.properties b/src/main/resources/ui/lang/tamaya.properties index 37ca420..8f83a5c 100644 --- a/src/main/resources/ui/lang/tamaya.properties +++ b/src/main/resources/ui/lang/tamaya.properties @@ -1,3 +1,22 @@ +# +# 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. +# + view.events.name=Configuration Events view.events.table.name=Observed Events view.events.button.enableMonitoring=Change Monitor active http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/614596fb/src/test/java/org/apache/tamaya/events/RandomPropertySource.java -- diff --git a/src/test/java/org/apache/tamaya/events/RandomPropertySource.java b/src/test/java/org/apache/tamaya/events/RandomPropertySource.java index f32ead7..dead0d9 100644 --- a/src/test/java/org/apache/tamaya/events/RandomPropertySource.java +++ b/src/test/java/org/apache/tamaya/events/RandomPropertySource.java @@ -1,3 +1,21 @@ +/* + * 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.events; import org.apache.tamaya.spi.PropertySource; http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/614596fb/src/test/resources/config/application.yml -- diff --git a/src/test/resources/config/application.yml b/src/test/resources/config/application.yml index 9ec8d5b..00d6d43 100644 --- a/src/test/resources/config/application.yml +++ b/src/test/resources/config/application.yml @@ -1,3 +1,21 @@ +# +# 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
[34/50] [abbrv] incubator-tamaya-extensions git commit: [maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare for next development iteration 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/fa1d5c10 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/fa1d5c10 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/fa1d5c10 Branch: refs/heads/master Commit: fa1d5c10907d8a8261feaf9a2591fc3ddbf92adc Parents: 3956400 Author: anatoleAuthored: Tue Mar 8 20:39:16 2016 +0100 Committer: Oliver B. Fischer Committed: Tue Sep 27 00:18:31 2016 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/fa1d5c10/pom.xml -- diff --git a/pom.xml b/pom.xml index f6759db..8612499 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.tamaya.ext tamaya-extensions -0.2-incubating +0.3-incubating-SNAPSHOT tamaya-events
[42/50] [abbrv] incubator-tamaya-extensions git commit: Set new development version.
Set new development version. 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/bf89b48d Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/bf89b48d Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/bf89b48d Branch: refs/heads/master Commit: bf89b48de44636fd5c3889b196d2a396e604d92c Parents: 2cab890 Author: anatoleAuthored: Thu Apr 14 00:47:11 2016 +0200 Committer: Oliver B. Fischer Committed: Tue Sep 27 00:18:31 2016 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/bf89b48d/pom.xml -- diff --git a/pom.xml b/pom.xml index a019a94..74d3a4b 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.tamaya.ext tamaya-extensions -0.2-incubating +0.3-incubating-SNAPSHOT tamaya-events
[33/50] [abbrv] incubator-tamaya-extensions git commit: [maven-release-plugin] prepare release 0.2-incubating-rc1
[maven-release-plugin] prepare release 0.2-incubating-rc1 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/39564009 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/39564009 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/39564009 Branch: refs/heads/master Commit: 395640095f5ff2ada68c559e0b1691182dc1c40d Parents: 2a79257 Author: anatoleAuthored: Tue Mar 8 20:39:05 2016 +0100 Committer: Oliver B. Fischer Committed: Tue Sep 27 00:18:31 2016 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/39564009/pom.xml -- diff --git a/pom.xml b/pom.xml index 8612499..f6759db 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.tamaya.ext tamaya-extensions -0.3-incubating-SNAPSHOT +0.2-incubating tamaya-events
[02/50] [abbrv] incubator-tamaya-extensions git commit: Reset version, integrated docs into site.
Reset version, integrated docs into site. 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/d285054e Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/d285054e Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/d285054e Branch: refs/heads/master Commit: d285054ec0ec05fe3cbed83b3554914169ed20a7 Parents: cc65029 Author: anatoleAuthored: Wed Mar 16 21:54:18 2016 +0100 Committer: Oliver B. Fischer Committed: Tue Sep 27 00:18:31 2016 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d285054e/pom.xml -- diff --git a/pom.xml b/pom.xml index 74d3a4b..21269ed 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.tamaya.ext tamaya-extensions -0.3-incubating-SNAPSHOT +0.2-incubating-SNAPSHOT tamaya-events
[41/50] [abbrv] incubator-tamaya-extensions git commit: TAMAYA-148 Working on making OSGi support work in a testable fashion.
TAMAYA-148 Working on making OSGi support work in a testable fashion. 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/36e2bfd4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/36e2bfd4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/36e2bfd4 Branch: refs/heads/master Commit: 36e2bfd4d0af4ea448feb835b292b147983d41f9 Parents: bf89b48 Author: John D. AmentAuthored: Sun Apr 17 21:47:27 2016 -0400 Committer: Oliver B. Fischer Committed: Tue Sep 27 00:18:31 2016 +0200 -- .../apache/tamaya/events/ConfigEventListener.java | 1 - .../org.apache.tamaya.events.ConfigListener | 18 -- 2 files changed, 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/36e2bfd4/src/main/java/org/apache/tamaya/events/ConfigEventListener.java -- diff --git a/src/main/java/org/apache/tamaya/events/ConfigEventListener.java b/src/main/java/org/apache/tamaya/events/ConfigEventListener.java index de635f8..7fb32c8 100644 --- a/src/main/java/org/apache/tamaya/events/ConfigEventListener.java +++ b/src/main/java/org/apache/tamaya/events/ConfigEventListener.java @@ -21,7 +21,6 @@ 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/36e2bfd4/src/main/resources/META-INF/services/org.apache.tamaya.events.ConfigListener -- diff --git a/src/main/resources/META-INF/services/org.apache.tamaya.events.ConfigListener b/src/main/resources/META-INF/services/org.apache.tamaya.events.ConfigListener deleted file mode 100644 index f3199f2..000 --- a/src/main/resources/META-INF/services/org.apache.tamaya.events.ConfigListener +++ /dev/null @@ -1,18 +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. -#
[46/50] [abbrv] incubator-tamaya-extensions git commit: [maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare for next development iteration 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/cc650293 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/cc650293 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/cc650293 Branch: refs/heads/master Commit: cc650293ada6d27b0952ec50e1d522c1a1661a94 Parents: ce4d80e Author: anatoleAuthored: Wed Mar 16 16:20:17 2016 +0100 Committer: Oliver B. Fischer Committed: Tue Sep 27 00:18:31 2016 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/cc650293/pom.xml -- diff --git a/pom.xml b/pom.xml index a019a94..74d3a4b 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.tamaya.ext tamaya-extensions -0.2-incubating +0.3-incubating-SNAPSHOT tamaya-events
[35/50] [abbrv] incubator-tamaya-extensions git commit: Reset version for new release run.
Reset version for new release run. 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/330179f0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/330179f0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/330179f0 Branch: refs/heads/master Commit: 330179f0aa7e827568ccb56cd6b700c9f3623f25 Parents: fa1d5c1 Author: anatoleAuthored: Wed Mar 9 14:09:25 2016 +0100 Committer: Oliver B. Fischer Committed: Tue Sep 27 00:18:31 2016 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/330179f0/pom.xml -- diff --git a/pom.xml b/pom.xml index 8612499..33d8659 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.tamaya.ext tamaya-extensions -0.3-incubating-SNAPSHOT +0.2-incubating-SNAPSHOT tamaya-events
incubator-tamaya-extensions git commit: [TAMAYA-175] Added .gitignore.
Repository: incubator-tamaya-extensions Updated Branches: refs/heads/master 669277da6 -> 4900aa7fa [TAMAYA-175] Added .gitignore. 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/4900aa7f Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/4900aa7f Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/4900aa7f Branch: refs/heads/master Commit: 4900aa7fa0f09ce6e65d52a03dae014f026fe067 Parents: 669277d Author: Oliver B. FischerAuthored: Mon Oct 10 20:39:41 2016 +0200 Committer: Oliver B. Fischer Committed: Mon Oct 10 20:39:41 2016 +0200 -- .gitignore | 19 +++ 1 file changed, 19 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/4900aa7f/.gitignore -- diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..20c0163 --- /dev/null +++ b/.gitignore @@ -0,0 +1,19 @@ +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +dependency-reduced-pom.xml +release.properties +.idea +*.iml +*.log +*~ +.DS_Store +.project +.settings +.classpath +**/*.checkstyle +**/*.fbExcludeFilterFile + +
[34/50] [abbrv] incubator-tamaya-extensions git commit: TAMAYA-175 Moved the events module to the directory events after extracting it for the Tamaya main repository.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/89223dcd/events/src/test/java/org/apache/tamaya/events/delta/ConfigurationChangeTest.java -- diff --git a/events/src/test/java/org/apache/tamaya/events/delta/ConfigurationChangeTest.java b/events/src/test/java/org/apache/tamaya/events/delta/ConfigurationChangeTest.java new file mode 100644 index 000..b20ebef --- /dev/null +++ b/events/src/test/java/org/apache/tamaya/events/delta/ConfigurationChangeTest.java @@ -0,0 +1,163 @@ +/* + * 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.events.delta; + +import org.apache.tamaya.Configuration; +import org.apache.tamaya.ConfigurationProvider; +import org.apache.tamaya.events.ConfigurationChange; +import org.apache.tamaya.events.ConfigurationChangeBuilder; +import org.junit.Test; + +import java.util.Map; + +import static org.junit.Assert.*; + +/** + * Test class for {@link ConfigurationChange}. + */ +public class ConfigurationChangeTest { + +@Test +public void testEmptyChangeSet() throws Exception { +ConfigurationChange change = ConfigurationChange.emptyChangeSet(ConfigurationProvider.getConfiguration()); +assertNotNull(change); +assertTrue(change.isEmpty()); +} + +@Test +public void testGetConfiguration() throws Exception { +Configuration config = ConfigurationProvider.getConfiguration(); +ConfigurationChange change = ConfigurationChangeBuilder.of(config).build(); +assertNotNull(change); +assertTrue(change.getUpdatedSize()==0); +assertTrue(change.getAddedSize()==0); +assertTrue(change.getRemovedSize()==0); +assertTrue(change.getChanges().size()==0); +for (Map.Entryen : config.getProperties().entrySet()) { +if (!"[meta]frozenAt".equals(en.getKey())) { +if(en.getKey().contains("random.new")){ // dynamic generated value! +continue; +} +assertEquals("Error for " + en.getKey(), en.getValue(), change.getResource().get(en.getKey())); +} +} +} + +@Test +public void testGetVersion() throws Exception { +Configuration config = ConfigurationProvider.getConfiguration(); +ConfigurationChange change = ConfigurationChangeBuilder.of(config).build(); +assertNotNull(change.getVersion()); +change = ConfigurationChangeBuilder.of(config).setVersion("version2").build(); +assertNotNull(change.getVersion()); +assertEquals("version2", change.getVersion()); +} + +@Test +public void testGetTimestamp() throws Exception { +Configuration config = ConfigurationProvider.getConfiguration(); +ConfigurationChange change = ConfigurationChangeBuilder.of(config).build(); +assertTrue((System.currentTimeMillis() - change.getTimestamp()) <= 10L); +change = ConfigurationChangeBuilder.of(config).setTimestamp(10L).build(); +assertEquals(10L, change.getTimestamp()); +} + +@Test +public void testGetEvents() throws Exception { +Configuration config = ConfigurationProvider.getConfiguration(); +ConfigurationChange change = ConfigurationChangeBuilder.of(config).removeKey("key1", "key2").build(); +assertTrue(change.getChanges().size() == 2); +change = ConfigurationChangeBuilder.of(config).addChange("key1Added", "value1Added").build(); +assertTrue(change.getChanges().size() == 1); +} + +@Test +public void testGetRemovedSize() throws Exception { +Configuration config = ConfigurationProvider.getConfiguration(); +ConfigurationChange change = ConfigurationChangeBuilder.of(config).removeKey("java.version", "key2").build(); +assertTrue(change.getRemovedSize() == 2); +assertTrue(change.getAddedSize() == 0); +} + +@Test +public void testGetAddedSize() throws Exception { +Configuration config = ConfigurationProvider.getConfiguration(); +ConfigurationChange change = ConfigurationChangeBuilder.of(config).addChange("key1",
[32/50] [abbrv] incubator-tamaya-extensions git commit: TAMAYA-175 Moved the events module to the directory events after extracting it for the Tamaya main repository.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/89223dcd/src/test/java/org/apache/tamaya/events/ConfigEventManagerTest.java -- diff --git a/src/test/java/org/apache/tamaya/events/ConfigEventManagerTest.java b/src/test/java/org/apache/tamaya/events/ConfigEventManagerTest.java deleted file mode 100644 index b56407c..000 --- a/src/test/java/org/apache/tamaya/events/ConfigEventManagerTest.java +++ /dev/null @@ -1,66 +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 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.events; - -import org.junit.Test; - -import java.util.UUID; - -import static org.junit.Assert.*; - -/** - * Tests for {@link ConfigEventManager}. - */ -public class ConfigEventManagerTest { - -private Object testAddListenerValue; - -@Test -public void testAddRemoveListener() throws Exception { -ConfigEventListener testListener = new ConfigEventListener() { -@Override -public void onConfigEvent(ConfigEvent event) { -testAddListenerValue = event.getResource(); -} -}; -ConfigEventManager.addListener(testListener); -ConfigEventManager.fireEvent(new SimpleEvent("Event1")); -assertEquals(testAddListenerValue, "Event1"); -ConfigEventManager.removeListener(testListener); -ConfigEventManager.fireEvent(new SimpleEvent("Event2")); -assertEquals(testAddListenerValue, "Event1"); -} - -@Test -public void testFireEvent() throws Exception { -ConfigEventListener testListener = new ConfigEventListener() { -@Override -public void onConfigEvent(ConfigEvent event) { -testAddListenerValue = event.getResource(); -} -}; -ConfigEventManager.addListener(testListener); -ConfigEventManager.fireEvent(new SimpleEvent("Event1")); -assertEquals(testAddListenerValue, "Event1"); -ConfigEventManager.removeListener(testListener); -ConfigEventManager.fireEvent(new SimpleEvent("Event2")); -assertEquals(testAddListenerValue, "Event1"); -} - -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/89223dcd/src/test/java/org/apache/tamaya/events/FrozenPropertySourceTest.java -- diff --git a/src/test/java/org/apache/tamaya/events/FrozenPropertySourceTest.java b/src/test/java/org/apache/tamaya/events/FrozenPropertySourceTest.java deleted file mode 100644 index 1431228..000 --- a/src/test/java/org/apache/tamaya/events/FrozenPropertySourceTest.java +++ /dev/null @@ -1,106 +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 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.events; - -import org.apache.tamaya.core.propertysource.SystemPropertySource; -import org.apache.tamaya.spi.PropertySource; -import org.junit.Test; - -import java.util.Map; - -import static org.junit.Assert.*; - -/** - * Tests for {@link org.apache.tamaya.events.FrozenPropertySource}. - */ -public class FrozenPropertySourceTest { - -private static final PropertySource myPS = new SystemPropertySource(); - -@Test -public void testOf() throws Exception { -PropertySource ps = FrozenPropertySource.of(myPS); -assertNotNull(ps); -} - -@Test -public void testGetName() throws Exception
[35/50] [abbrv] incubator-tamaya-extensions git commit: TAMAYA-175 Moved the events module to the directory events after extracting it for the Tamaya main repository.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/89223dcd/events/src/main/java/org/apache/tamaya/events/delta/package-info.java -- diff --git a/events/src/main/java/org/apache/tamaya/events/delta/package-info.java b/events/src/main/java/org/apache/tamaya/events/delta/package-info.java new file mode 100644 index 000..2006717 --- /dev/null +++ b/events/src/main/java/org/apache/tamaya/events/delta/package-info.java @@ -0,0 +1,23 @@ +/* + * 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. + */ +/** + * This package contains artifacts to describe the changes (delta) of a + * Configuration or a PropertySource. + */ +package org.apache.tamaya.events.delta; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/89223dcd/events/src/main/java/org/apache/tamaya/events/folderobserver/FileChangeListener.java -- diff --git a/events/src/main/java/org/apache/tamaya/events/folderobserver/FileChangeListener.java b/events/src/main/java/org/apache/tamaya/events/folderobserver/FileChangeListener.java new file mode 100644 index 000..283719e --- /dev/null +++ b/events/src/main/java/org/apache/tamaya/events/folderobserver/FileChangeListener.java @@ -0,0 +1,144 @@ +/* + * 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.events.folderobserver; + +import org.apache.tamaya.ConfigException; + +import java.io.IOException; +import java.nio.file.FileSystem; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.nio.file.StandardWatchEventKinds; +import java.nio.file.WatchEvent; +import java.nio.file.WatchKey; +import java.nio.file.WatchService; +import java.util.logging.Level; +import java.util.logging.Logger; + + +/** + * Class that has the responsibility to watch the folder and then publish the changes to a + * {@link org.apache.tamaya.events.PropertySourceChange}. + * @see ObservingPropertySourceProvider + * This listener will wait to events and wait to one second to watch again. + * If new file was created or modified will commit from this file. + * If a file was removed then the listener will load using all files left. + * @author otaviojava + */ +class FileChangeListener implements Runnable { + +private static final Logger LOGGER = Logger.getLogger(FileChangeListener.class.getName()); + +private final WatchService watchService; + +private final FileChangeObserver observer; + +private final Path directory; + +private volatile boolean running = true; + +public FileChangeListener(Path directory, FileChangeObserver observer) { +this.observer = observer; +this.directory = directory; +this.watchService = getWatchService(); + +if (watchService!=null && directory!=null) { +try { +directory.register(watchService, +StandardWatchEventKinds.ENTRY_DELETE, +StandardWatchEventKinds.ENTRY_MODIFY, +StandardWatchEventKinds.ENTRY_CREATE); +} catch (IOException e) { +throw new FileChangeListenerException("An error happened when does try to registry to watch the folder", e); +} +} +} + +/** + * Stops the listener service from observing the target directory. + */ +
[33/50] [abbrv] incubator-tamaya-extensions git commit: TAMAYA-175 Moved the events module to the directory events after extracting it for the Tamaya main repository.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/89223dcd/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java -- diff --git a/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java b/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java deleted file mode 100644 index 304ddba..000 --- a/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java +++ /dev/null @@ -1,194 +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 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.events; - -import org.apache.tamaya.ConfigException; -import org.apache.tamaya.ConfigOperator; -import org.apache.tamaya.ConfigQuery; -import org.apache.tamaya.Configuration; -import org.apache.tamaya.ConfigurationProvider; -import org.apache.tamaya.TypeLiteral; -import org.apache.tamaya.functions.ConfigurationFunctions; -import org.apache.tamaya.spi.ConfigurationContext; -import org.apache.tamaya.spi.ConversionContext; -import org.apache.tamaya.spi.PropertyConverter; - -import java.io.Serializable; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.logging.Level; -import java.util.logging.Logger; - -/** - * /** - * Configuration implementation that stores all current values of a given (possibly dynamic, contextual and non server - * capable instance) and is fully serializable. Note that hereby only the scannable key/value pairs are considered. - */ -public final class FrozenConfiguration implements Configuration, Serializable { -private static final long serialVersionUID = -6373137316556444171L; -/** - * The properties frozen. - */ -private Mapproperties = new HashMap<>(); - -/** - * Constructor. - * - * @param config The base configuration. - */ -private FrozenConfiguration(Configuration config) { -this.properties.putAll(config.getProperties()); -this.properties.put("[meta]frozenAt", String.valueOf(System.currentTimeMillis())); -this.properties = Collections.unmodifiableMap(this.properties); -} - -/** - * Creates a new FrozenConfiguration instance based on a Configuration given. - * - * @param config the configuration to be frozen, not null. - * @return the frozen Configuration. - */ -public static FrozenConfiguration of(Configuration config) { -if (config instanceof FrozenConfiguration) { -return (FrozenConfiguration) config; -} -return new FrozenConfiguration(config); -} - -@Override -public String get(String key) { -return this.properties.get(key); -} - -@Override -public String getOrDefault(String key, String defaultValue) { -String val = get(key); -if(val==null){ -return defaultValue; -} -return val; -} - -@Override -public T getOrDefault(String key, Class type, T defaultValue) { -T val = get(key, type); -if(val==null){ -return defaultValue; -} -return val; -} - -@Override -public T get(String key, Class type) { -return (T) get(key, TypeLiteral.of(type)); -} - -/** - * Accesses the current String value for the given key and tries to convert it - * using the {@link org.apache.tamaya.spi.PropertyConverter} instances provided by the current - * {@link org.apache.tamaya.spi.ConfigurationContext}. - * - * @param key the property's absolute, or relative path, e.g. @code - * a/b/c/d.myProperty}. - * @param type The target type required, not null. - * @param the value type - * @return the converted value, never null. - */ -@Override -public T get(String key, TypeLiteral type) { -String value = get(key); -if (value != null) { -List converters = ConfigurationProvider.getConfigurationContext() -.getPropertyConverters(type); -ConversionContext context = new ConversionContext.Builder(this, -
[07/50] [abbrv] incubator-tamaya-extensions git commit: TAMAYA-134: Gitignore improvements and second batch of Javadoc fixes done by Philipp Ottlinger.
TAMAYA-134: Gitignore improvements and second batch of Javadoc fixes done by Philipp Ottlinger. 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/245defb2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/245defb2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/245defb2 Branch: refs/heads/master Commit: 245defb26bad2f11551a35218aecbd7419019f7a Parents: e0cd657 Author: anatoleAuthored: Tue Jan 19 01:11:27 2016 +0100 Committer: Oliver B. Fischer Committed: Fri Sep 30 21:29:37 2016 +0200 -- .../tamaya/events/ConfigEventManager.java | 17 - .../events/ConfigurationContextChange.java | 4 +- .../ConfigurationContextChangeBuilder.java | 19 ++--- .../events/PropertySourceChangeBuilder.java | 4 +- .../ObservingPropertySourceProvider.java| 77 .../events/spi/ConfigEventManagerSpi.java | 19 +++-- 6 files changed, 87 insertions(+), 53 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/245defb2/src/main/java/org/apache/tamaya/events/ConfigEventManager.java -- diff --git a/src/main/java/org/apache/tamaya/events/ConfigEventManager.java b/src/main/java/org/apache/tamaya/events/ConfigEventManager.java index 6b206c8..9989fbb 100644 --- a/src/main/java/org/apache/tamaya/events/ConfigEventManager.java +++ b/src/main/java/org/apache/tamaya/events/ConfigEventManager.java @@ -55,6 +55,7 @@ public final class ConfigEventManager { /** * Adds a Config listener that listens to all kind of {@link ConfigEvent}. + * @param the type of the event. * @param l the listener not null. * @param eventType the event type to which this listener listens to. */ @@ -82,7 +83,8 @@ public final class ConfigEventManager { /** * Removes a listener registered for the given event type. * - * @param l the listener not null. + * @param the type of the event. + * @param l the listener, not null. * @param eventType the event type to which this listener listens to. */ public static void removeListener(ConfigEventListener l, Class eventType) { @@ -106,6 +108,8 @@ public final class ConfigEventManager { /** * Access all registered ConfigEventListeners listening to a all kind of event types globally. + * + * @param the type of the event. * @return a list with the listeners found, never null. */ public static @@ -115,7 +119,8 @@ public final class ConfigEventManager { /** * Publishes a {@link ConfigurationChange} synchronously to all interested listeners. - * + * + * @param the type of the event. * @param event the event, not null. */ public static void fireEvent(ConfigEvent event) { @@ -125,6 +130,7 @@ public final class ConfigEventManager { /** * Publishes a {@link ConfigurationChange} asynchronously/multithreaded to all interested listeners. * + * @param the type of the event. * @param event the event, not null. */ public static void fireEventAsynch(ConfigEvent event) { @@ -133,10 +139,13 @@ public final class ConfigEventManager { /** * Start/Stop the change monitoring service, which will observe/reevaluate the current configuration regularly - * and triggers ConfigurationChange events is something changed. This is quite handy for publishing + * and trigger ConfigurationChange events if something changed. This is quite handy for publishing * configuration changes to whatever systems are interested in. Hereby the origin of a configuration change - * can be on this machine, or also remotedly. FOr handling corresponding {@link ConfigEventListener} have + * can be on this machine, or also remotely. For handling corresponding {@link ConfigEventListener} have * to be registered, e.g. listening on {@link org.apache.tamaya.events.ConfigurationChange} events. + * + * @param enable whether to enable or disable the change monitoring. + * * @see #isChangeMonitoring() * @see #getChangeMonitoringPeriod() */ http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/245defb2/src/main/java/org/apache/tamaya/events/ConfigurationContextChange.java -- diff --git a/src/main/java/org/apache/tamaya/events/ConfigurationContextChange.java b/src/main/java/org/apache/tamaya/events/ConfigurationContextChange.java index 8c9ceef..4e12d42 100644 ---
[42/50] [abbrv] incubator-tamaya-extensions git commit: [maven-release-plugin] prepare release 0.2-incubating
[maven-release-plugin] prepare release 0.2-incubating 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/8483171e Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/8483171e Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/8483171e Branch: refs/heads/master Commit: 8483171e0d7fe838cba5e08e4690cc4ec1b32c7c Parents: 11f5d50 Author: anatoleAuthored: Tue Mar 8 17:39:55 2016 +0100 Committer: Oliver B. Fischer Committed: Fri Sep 30 21:29:37 2016 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/8483171e/pom.xml -- diff --git a/pom.xml b/pom.xml index 6222349..a59a968 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.tamaya.ext tamaya-extensions -0.2-incubating-SNAPSHOT +0.2-incubating tamaya-filter
[50/50] [abbrv] incubator-tamaya-extensions git commit: [maven-release-plugin] prepare release vote02-tamaya-0.2-incubating
[maven-release-plugin] prepare release vote02-tamaya-0.2-incubating 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/03ee6891 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/03ee6891 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/03ee6891 Branch: refs/heads/master Commit: 03ee6891d24ccd030bc429611c204682face2ccb Parents: 3d80290 Author: anatoleAuthored: Tue Apr 5 18:56:54 2016 +0200 Committer: Oliver B. Fischer Committed: Fri Sep 30 21:29:37 2016 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/03ee6891/pom.xml -- diff --git a/pom.xml b/pom.xml index 6222349..a59a968 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.tamaya.ext tamaya-extensions -0.2-incubating-SNAPSHOT +0.2-incubating tamaya-filter
[38/50] [abbrv] incubator-tamaya-extensions git commit: Added tests for filter module. Checked in missing files.
Added tests for filter module. Checked in missing files. 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/3fffcb09 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/3fffcb09 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/3fffcb09 Branch: refs/heads/master Commit: 3fffcb09793fc059160117b04ae35d482a6abd1a Parents: 3cb7f8d Author: anatoleAuthored: Thu Feb 11 20:20:13 2016 +0100 Committer: Oliver B. Fischer Committed: Fri Sep 30 21:29:37 2016 +0200 -- .../tamaya/filter/DefaultMetadataFilter.java| 42 --- .../filter/internal/DefaultMetadataFilter.java | 43 +++ .../tamaya/filter/ConfigurationFilterTest.java | 41 ++ .../tamaya/filter/ProgrammableFilterTest.java | 56 .../tamaya/filter/RegexPropertyFilterTest.java | 19 +++ 5 files changed, 159 insertions(+), 42 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/3fffcb09/src/main/java/org/apache/tamaya/filter/DefaultMetadataFilter.java -- diff --git a/src/main/java/org/apache/tamaya/filter/DefaultMetadataFilter.java b/src/main/java/org/apache/tamaya/filter/DefaultMetadataFilter.java deleted file mode 100644 index 389d9fa..000 --- a/src/main/java/org/apache/tamaya/filter/DefaultMetadataFilter.java +++ /dev/null @@ -1,42 +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 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.filter; - -import org.apache.tamaya.spi.FilterContext; -import org.apache.tamaya.spi.PropertyFilter; - -/** - * Default property filter that hides metadta entries starting with an '_', similar ti {@code etcd}. - */ -public final class DefaultMetadataFilter implements PropertyFilter{ -@Override -public String filterProperty(String valueToBeFiltered, FilterContext context) { -if(context.isSinglePropertyScoped()){ -// When accessing keys explicitly, do not hide anything. -return valueToBeFiltered; -} -if(ConfigurationFilter.THREADED_METADATA_FILTERED.get()) { -if (context.getKey().startsWith("_")) { -// Hide metadata entries. -return null; -} -} -return valueToBeFiltered; -} -} http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/3fffcb09/src/main/java/org/apache/tamaya/filter/internal/DefaultMetadataFilter.java -- diff --git a/src/main/java/org/apache/tamaya/filter/internal/DefaultMetadataFilter.java b/src/main/java/org/apache/tamaya/filter/internal/DefaultMetadataFilter.java new file mode 100644 index 000..1119cba --- /dev/null +++ b/src/main/java/org/apache/tamaya/filter/internal/DefaultMetadataFilter.java @@ -0,0 +1,43 @@ +/* + * 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.filter.internal; + +import org.apache.tamaya.filter.ConfigurationFilter; +import org.apache.tamaya.spi.FilterContext; +import org.apache.tamaya.spi.PropertyFilter; + +/** + * Default property
[41/50] [abbrv] incubator-tamaya-extensions git commit: Removed all dependencies to Hamcrest versions < 2.0.0.0
Removed all dependencies to Hamcrest versions < 2.0.0.0 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/11f5d507 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/11f5d507 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/11f5d507 Branch: refs/heads/master Commit: 11f5d50798797c971a43c73eb8f54432f4d4af79 Parents: 98980d0 Author: Oliver B. FischerAuthored: Fri Mar 4 04:39:46 2016 +0100 Committer: Oliver B. Fischer Committed: Fri Sep 30 21:29:37 2016 +0200 -- pom.xml | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/11f5d507/pom.xml -- diff --git a/pom.xml b/pom.xml index 2480950..6222349 100644 --- a/pom.xml +++ b/pom.xml @@ -48,6 +48,10 @@ under the License. provided +org.hamcrest +java-hamcrest + + junit junit @@ -74,4 +78,4 @@ under the License. - \ No newline at end of file +
[05/50] [abbrv] incubator-tamaya-extensions git commit: Fixed further issues from quality gates.
Fixed further issues from quality gates. 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/fefbeca7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/fefbeca7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/fefbeca7 Branch: refs/heads/master Commit: fefbeca7f3263e622d6f90dc87faf247c107c42b Parents: 4d6c713 Author: anatoleAuthored: Sun Jan 10 02:14:41 2016 +0100 Committer: Oliver B. Fischer Committed: Fri Sep 30 21:29:37 2016 +0200 -- src/main/java/org/apache/tamaya/events/ChangeType.java| 5 - .../java/org/apache/tamaya/events/ConfigEventManager.java | 2 +- .../org/apache/tamaya/events/ConfigurationChange.java | 4 ++-- .../apache/tamaya/events/ConfigurationChangeBuilder.java | 6 -- .../apache/tamaya/events/ConfigurationContextChange.java | 4 ++-- .../tamaya/events/ConfigurationContextChangeBuilder.java | 2 +- .../org/apache/tamaya/events/FrozenPropertySource.java| 4 ++-- .../org/apache/tamaya/events/PropertySourceChange.java| 6 +++--- .../apache/tamaya/events/PropertySourceChangeBuilder.java | 6 -- .../tamaya/events/folderobserver/FileChangeListener.java | 6 +++--- .../folderobserver/ObservingPropertySourceProvider.java | 4 ++-- .../events/internal/DefaultConfigChangeObserver.java | 6 +++--- .../events/internal/DefaultConfigEventManagerSpi.java | 10 +- .../org/apache/tamaya/events/spi/BaseConfigEvent.java | 6 +++--- .../tamaya/events/ChangeableGlobalPropertySource.java | 2 +- .../events/ChangeableThreadLocalPropertySource.java | 2 +- .../events/internal/DefaultConfigEventManagerSpiTest.java | 2 +- 17 files changed, 42 insertions(+), 35 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/fefbeca7/src/main/java/org/apache/tamaya/events/ChangeType.java -- diff --git a/src/main/java/org/apache/tamaya/events/ChangeType.java b/src/main/java/org/apache/tamaya/events/ChangeType.java index 4363579..2059017 100644 --- a/src/main/java/org/apache/tamaya/events/ChangeType.java +++ b/src/main/java/org/apache/tamaya/events/ChangeType.java @@ -19,10 +19,13 @@ package org.apache.tamaya.events; /** - * Created by Anatole on 20.02.2015. + * Enum describing the type of configuration change. */ public enum ChangeType { +/** Configuration hase been added. */ NEW, +/** Configuration hase been removed. */ DELETED, +/** Configuration hase been changed. */ UPDATED, } http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/fefbeca7/src/main/java/org/apache/tamaya/events/ConfigEventManager.java -- diff --git a/src/main/java/org/apache/tamaya/events/ConfigEventManager.java b/src/main/java/org/apache/tamaya/events/ConfigEventManager.java index f0bd0fa..6b206c8 100644 --- a/src/main/java/org/apache/tamaya/events/ConfigEventManager.java +++ b/src/main/java/org/apache/tamaya/events/ConfigEventManager.java @@ -166,7 +166,7 @@ public final class ConfigEventManager { /** * Sets the current monitoring period and restarts the monitor. You still have to enable the monitor if * it is currently not enabled. - * @param millis + * @param millis the monitoring period in ms. * @see #enableChangeMonitoring(boolean) * @see #isChangeMonitoring() */ http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/fefbeca7/src/main/java/org/apache/tamaya/events/ConfigurationChange.java -- diff --git a/src/main/java/org/apache/tamaya/events/ConfigurationChange.java b/src/main/java/org/apache/tamaya/events/ConfigurationChange.java index 0366556..c31cda2 100644 --- a/src/main/java/org/apache/tamaya/events/ConfigurationChange.java +++ b/src/main/java/org/apache/tamaya/events/ConfigurationChange.java @@ -39,13 +39,13 @@ public final class ConfigurationChange implements ConfigEvent, Se private static final long serialVersionUID = 1L; /** The base property provider/configuration. */ -private FrozenConfiguration configuration; +private final FrozenConfiguration configuration; /** The base version, usable for optimistic locking. */ private String version = UUID.randomUUID().toString(); /** The timestamp of the change set in millis from the epoch. */ private long timestamp = System.currentTimeMillis(); /** The recorded changes. */ -private Map changes = new HashMap<>(); +private final
[25/50] [abbrv] incubator-tamaya-extensions git commit: Added license headers.
Added license headers. 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/032322bd Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/032322bd Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/032322bd Branch: refs/heads/master Commit: 032322bdf76c0cac82adb110983fb6fd62cc5bd0 Parents: c7828a4 Author: anatoleAuthored: Sat Apr 16 08:37:42 2016 +0200 Committer: Oliver B. Fischer Committed: Fri Sep 30 21:29:37 2016 +0200 -- src/main/resources/ui/lang/tamaya.properties | 19 +++ .../tamaya/events/RandomPropertySource.java | 18 ++ src/test/resources/config/application.yml| 18 ++ 3 files changed, 55 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/032322bd/src/main/resources/ui/lang/tamaya.properties -- diff --git a/src/main/resources/ui/lang/tamaya.properties b/src/main/resources/ui/lang/tamaya.properties index 37ca420..8f83a5c 100644 --- a/src/main/resources/ui/lang/tamaya.properties +++ b/src/main/resources/ui/lang/tamaya.properties @@ -1,3 +1,22 @@ +# +# 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. +# + view.events.name=Configuration Events view.events.table.name=Observed Events view.events.button.enableMonitoring=Change Monitor active http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/032322bd/src/test/java/org/apache/tamaya/events/RandomPropertySource.java -- diff --git a/src/test/java/org/apache/tamaya/events/RandomPropertySource.java b/src/test/java/org/apache/tamaya/events/RandomPropertySource.java index f32ead7..dead0d9 100644 --- a/src/test/java/org/apache/tamaya/events/RandomPropertySource.java +++ b/src/test/java/org/apache/tamaya/events/RandomPropertySource.java @@ -1,3 +1,21 @@ +/* + * 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.events; import org.apache.tamaya.spi.PropertySource; http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/032322bd/src/test/resources/config/application.yml -- diff --git a/src/test/resources/config/application.yml b/src/test/resources/config/application.yml index 9ec8d5b..00d6d43 100644 --- a/src/test/resources/config/application.yml +++ b/src/test/resources/config/application.yml @@ -1,3 +1,21 @@ +# +# 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
[43/50] [abbrv] incubator-tamaya-extensions git commit: [maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare for next development iteration 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/ee432435 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/ee432435 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/ee432435 Branch: refs/heads/master Commit: ee43243571416c8f6d402758bb795b7cff5645c5 Parents: 8483171 Author: anatoleAuthored: Tue Mar 8 17:40:05 2016 +0100 Committer: Oliver B. Fischer Committed: Fri Sep 30 21:29:37 2016 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/ee432435/pom.xml -- diff --git a/pom.xml b/pom.xml index a59a968..d9d4854 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.tamaya.ext tamaya-extensions -0.2-incubating +0.3-incubating-SNAPSHOT tamaya-filter
[28/50] [abbrv] incubator-tamaya-extensions git commit: Implemented UI improvements and bugfixes. Fixed some impl details.
Implemented UI improvements and bugfixes. Fixed some impl details. 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/81b05eb0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/81b05eb0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/81b05eb0 Branch: refs/heads/master Commit: 81b05eb0c793e700cfbd3f0cc7213cab317d5081 Parents: df14719 Author: anatoleAuthored: Sat Jun 25 01:21:16 2016 +0200 Committer: Oliver B. Fischer Committed: Fri Sep 30 21:29:37 2016 +0200 -- src/main/java/org/apache/tamaya/events/ui/EventView.java | 9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/81b05eb0/src/main/java/org/apache/tamaya/events/ui/EventView.java -- diff --git a/src/main/java/org/apache/tamaya/events/ui/EventView.java b/src/main/java/org/apache/tamaya/events/ui/EventView.java index bee6e7b..2c4dead 100644 --- a/src/main/java/org/apache/tamaya/events/ui/EventView.java +++ b/src/main/java/org/apache/tamaya/events/ui/EventView.java @@ -59,17 +59,22 @@ public class EventView extends VerticalSpacedLayout implements View { } @Override +public String getName() { +return "view.events.name"; +} + +@Override public String getUrlPattern() { return "/events"; } @Override public String getDisplayName() { -return "view.events.name"; +return getName(); } @Override -public View createView(){ +public View createView(Object... params){ return new EventView(); } }
[46/50] [abbrv] incubator-tamaya-extensions git commit: [maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare for next development iteration 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/a23ed993 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/a23ed993 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/a23ed993 Branch: refs/heads/master Commit: a23ed993ecaa42be9ac4f70ec29b8af2aabc3a1a Parents: 566982c Author: anatoleAuthored: Wed Mar 16 16:20:17 2016 +0100 Committer: Oliver B. Fischer Committed: Fri Sep 30 21:29:37 2016 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/a23ed993/pom.xml -- diff --git a/pom.xml b/pom.xml index a59a968..d9d4854 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.tamaya.ext tamaya-extensions -0.2-incubating +0.3-incubating-SNAPSHOT tamaya-filter
[06/50] [abbrv] incubator-tamaya-extensions git commit: Unified module name in poms.
Unified module name in poms. 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/e0cd6576 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/e0cd6576 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/e0cd6576 Branch: refs/heads/master Commit: e0cd6576c85086b3c788932ba75301b95ad5d559 Parents: fefbeca Author: anatoleAuthored: Sat Jan 16 07:40:08 2016 +0100 Committer: Oliver B. Fischer Committed: Fri Sep 30 21:29:37 2016 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/e0cd6576/pom.xml -- diff --git a/pom.xml b/pom.xml index f5b384b..9d2f59d 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ under the License. tamaya-events -Apache Tamaya Event and dynamic Update Extensions +Apache Tamaya Modules - Event and dynamic Update Extensions bundle
[47/50] [abbrv] incubator-tamaya-extensions git commit: Reset version for new release run.
Reset version for new release run. 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/3d48e37c Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/3d48e37c Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/3d48e37c Branch: refs/heads/master Commit: 3d48e37c2b8d17001b8d00050172f68022e1551f Parents: 75827f2 Author: anatoleAuthored: Wed Mar 9 14:09:25 2016 +0100 Committer: Oliver B. Fischer Committed: Fri Sep 30 21:29:37 2016 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/3d48e37c/pom.xml -- diff --git a/pom.xml b/pom.xml index d9d4854..6222349 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.tamaya.ext tamaya-extensions -0.3-incubating-SNAPSHOT +0.2-incubating-SNAPSHOT tamaya-filter
[27/50] [abbrv] incubator-tamaya-extensions git commit: TAMAYA-150 Added UI module and related functionality.
TAMAYA-150 Added UI module and related functionality. 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/df14719d Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/df14719d Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/df14719d Branch: refs/heads/master Commit: df14719d0b4489edabf5ff6d15cc8f8d03388fbb Parents: 6ca5def Author: anatoleAuthored: Tue Apr 19 13:52:19 2016 +0200 Committer: Oliver B. Fischer Committed: Fri Sep 30 21:29:37 2016 +0200 -- .../java/org/apache/tamaya/events/ui/EventView.java | 15 +-- .../tamaya/events/delta/ConfigurationChangeTest.java | 8 +++- 2 files changed, 20 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/df14719d/src/main/java/org/apache/tamaya/events/ui/EventView.java -- diff --git a/src/main/java/org/apache/tamaya/events/ui/EventView.java b/src/main/java/org/apache/tamaya/events/ui/EventView.java index 56e4b35..bee6e7b 100644 --- a/src/main/java/org/apache/tamaya/events/ui/EventView.java +++ b/src/main/java/org/apache/tamaya/events/ui/EventView.java @@ -23,7 +23,13 @@ import com.vaadin.data.Property; import com.vaadin.navigator.View; import com.vaadin.navigator.ViewChangeListener; import com.vaadin.shared.ui.label.ContentMode; -import com.vaadin.ui.*; +import com.vaadin.ui.Button; +import com.vaadin.ui.CheckBox; +import com.vaadin.ui.HorizontalLayout; +import com.vaadin.ui.Label; +import com.vaadin.ui.Notification; +import com.vaadin.ui.Table; +import com.vaadin.ui.TextField; import org.apache.tamaya.events.ConfigEvent; import org.apache.tamaya.events.ConfigEventListener; import org.apache.tamaya.events.ConfigEventManager; @@ -36,9 +42,14 @@ import org.apache.tamaya.ui.services.MessageProvider; import javax.annotation.Priority; import java.util.Date; - +/** + * Tamaya View for observing the current event stream. + */ public class EventView extends VerticalSpacedLayout implements View { +/** + * Provider used to register the view. + */ @Priority(20) public static final class Provider implements ViewProvider{ http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/df14719d/src/test/java/org/apache/tamaya/events/delta/ConfigurationChangeTest.java -- diff --git a/src/test/java/org/apache/tamaya/events/delta/ConfigurationChangeTest.java b/src/test/java/org/apache/tamaya/events/delta/ConfigurationChangeTest.java index 95269e2..b20ebef 100644 --- a/src/test/java/org/apache/tamaya/events/delta/ConfigurationChangeTest.java +++ b/src/test/java/org/apache/tamaya/events/delta/ConfigurationChangeTest.java @@ -45,9 +45,15 @@ public class ConfigurationChangeTest { Configuration config = ConfigurationProvider.getConfiguration(); ConfigurationChange change = ConfigurationChangeBuilder.of(config).build(); assertNotNull(change); -assertTrue(change.isEmpty()); +assertTrue(change.getUpdatedSize()==0); +assertTrue(change.getAddedSize()==0); +assertTrue(change.getRemovedSize()==0); +assertTrue(change.getChanges().size()==0); for (Map.Entry en : config.getProperties().entrySet()) { if (!"[meta]frozenAt".equals(en.getKey())) { +if(en.getKey().contains("random.new")){ // dynamic generated value! +continue; +} assertEquals("Error for " + en.getKey(), en.getValue(), change.getResource().get(en.getKey())); } }
[09/50] [abbrv] incubator-tamaya-extensions git commit: Fixed compile issues due to extended constructor for ConversionContext.
Fixed compile issues due to extended constructor for ConversionContext. 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/8ebc3c1a Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/8ebc3c1a Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/8ebc3c1a Branch: refs/heads/master Commit: 8ebc3c1a1ec705e716aeb77c837f51a105a7b355 Parents: 2e22951 Author: anatoleAuthored: Wed Feb 17 01:16:56 2016 +0100 Committer: Oliver B. Fischer Committed: Fri Sep 30 21:29:37 2016 +0200 -- src/main/java/org/apache/tamaya/events/FrozenConfiguration.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/8ebc3c1a/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java -- diff --git a/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java b/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java index 313f569..b874987 100644 --- a/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java +++ b/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java @@ -116,7 +116,8 @@ public final class FrozenConfiguration implements Configuration, Serializable { if (value != null) { List converters = ConfigurationProvider.getConfigurationContext() .getPropertyConverters(type); -ConversionContext context = new ConversionContext.Builder(this,key,type).build(); +ConversionContext context = new ConversionContext.Builder(this, +ConfigurationProvider.getConfigurationContext(), key,type).build(); for (PropertyConverter converter : converters) { try { T t = converter.convert(value, context);
[31/50] [abbrv] incubator-tamaya-extensions git commit: TAMAYA-172: Fixed invalid comparison of PropertyValue with String.
TAMAYA-172: Fixed invalid comparison of PropertyValue with String. 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/9bf98feb Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/9bf98feb Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/9bf98feb Branch: refs/heads/master Commit: 9bf98feb72ea54e154e6614d6972fe1f8185a6f4 Parents: 6710cec Author: anatoleAuthored: Sun Sep 11 22:16:07 2016 +0200 Committer: Oliver B. Fischer Committed: Fri Sep 30 21:29:37 2016 +0200 -- .../java/org/apache/tamaya/events/PropertySourceChangeBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/9bf98feb/src/main/java/org/apache/tamaya/events/PropertySourceChangeBuilder.java -- diff --git a/src/main/java/org/apache/tamaya/events/PropertySourceChangeBuilder.java b/src/main/java/org/apache/tamaya/events/PropertySourceChangeBuilder.java index fa2cf5e..b7a4483 100644 --- a/src/main/java/org/apache/tamaya/events/PropertySourceChangeBuilder.java +++ b/src/main/java/org/apache/tamaya/events/PropertySourceChangeBuilder.java @@ -99,7 +99,7 @@ public final class PropertySourceChangeBuilder { PropertyValue val = map2.get(en.getKey()); if (val == null) { changes.add(new PropertyChangeEvent(map1, en.getKey(), null, en.getValue())); -} else if (!val.equals(en.getValue())) { +} else if (!val.getValue().equals(en.getValue())) { changes.add(new PropertyChangeEvent(map1, en.getKey(), val.getValue(), en.getValue())); } }
[16/50] [abbrv] incubator-tamaya-extensions git commit: Added Configuration.getConfigurationContext().
Added Configuration.getConfigurationContext(). 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/0a9aeae6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/0a9aeae6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/0a9aeae6 Branch: refs/heads/master Commit: 0a9aeae664e531917413043292ae4cf2647aecea Parents: e5bbbde Author: anatoleAuthored: Mon Mar 14 00:39:53 2016 +0100 Committer: Oliver B. Fischer Committed: Fri Sep 30 21:29:37 2016 +0200 -- .../java/org/apache/tamaya/events/FrozenConfiguration.java| 7 +++ src/test/java/org/apache/tamaya/events/TestConfigView.java| 6 ++ 2 files changed, 13 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/0a9aeae6/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java -- diff --git a/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java b/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java index b874987..304ddba 100644 --- a/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java +++ b/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java @@ -24,6 +24,8 @@ import org.apache.tamaya.ConfigQuery; import org.apache.tamaya.Configuration; import org.apache.tamaya.ConfigurationProvider; import org.apache.tamaya.TypeLiteral; +import org.apache.tamaya.functions.ConfigurationFunctions; +import org.apache.tamaya.spi.ConfigurationContext; import org.apache.tamaya.spi.ConversionContext; import org.apache.tamaya.spi.PropertyConverter; @@ -162,6 +164,11 @@ public final class FrozenConfiguration implements Configuration, Serializable { } @Override +public ConfigurationContext getContext() { +return ConfigurationFunctions.emptyConfigurationContext(); +} + +@Override public boolean equals(Object o) { if (this == o) { return true; http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/0a9aeae6/src/test/java/org/apache/tamaya/events/TestConfigView.java -- diff --git a/src/test/java/org/apache/tamaya/events/TestConfigView.java b/src/test/java/org/apache/tamaya/events/TestConfigView.java index 4f2227a..8e5b397 100644 --- a/src/test/java/org/apache/tamaya/events/TestConfigView.java +++ b/src/test/java/org/apache/tamaya/events/TestConfigView.java @@ -24,6 +24,7 @@ import org.apache.tamaya.ConfigQuery; import org.apache.tamaya.Configuration; import org.apache.tamaya.ConfigurationProvider; import org.apache.tamaya.TypeLiteral; +import org.apache.tamaya.spi.ConfigurationContext; import org.apache.tamaya.spi.ConversionContext; import org.apache.tamaya.spi.PropertyConverter; @@ -73,6 +74,11 @@ public class TestConfigView implements ConfigOperator{ } @Override +public ConfigurationContext getContext() { +return config.getContext(); +} + +@Override public String get(String key) { return getProperties().get(key); }
[24/50] [abbrv] incubator-tamaya-extensions git commit: Modulularized UI module, added multi file based i18n, using config mechanisms.
Modulularized UI module, added multi file based i18n, using config mechanisms. 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/c7828a4b Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/c7828a4b Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/c7828a4b Branch: refs/heads/master Commit: c7828a4b0c75d77f5d4830ec436aecf45424a1ee Parents: f3d3288 Author: anatoleAuthored: Sat Apr 16 08:25:46 2016 +0200 Committer: Oliver B. Fischer Committed: Fri Sep 30 21:29:37 2016 +0200 -- .../org/apache/tamaya/events/ui/EventView.java | 134 +++ .../services/org.apache.tamaya.ui.ViewProvider | 19 +++ src/main/resources/ui/lang/tamaya.properties| 5 + .../tamaya/events/RandomPropertySource.java | 48 +++ .../org.apache.tamaya.spi.PropertySource| 19 +++ .../services/org.apache.tamaya.ui.ViewProvider | 19 +++ src/test/resources/config/application.yml | 13 ++ 7 files changed, 257 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/c7828a4b/src/main/java/org/apache/tamaya/events/ui/EventView.java -- diff --git a/src/main/java/org/apache/tamaya/events/ui/EventView.java b/src/main/java/org/apache/tamaya/events/ui/EventView.java new file mode 100644 index 000..a69b04c --- /dev/null +++ b/src/main/java/org/apache/tamaya/events/ui/EventView.java @@ -0,0 +1,134 @@ +/* + * 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.events.ui; + +import com.vaadin.data.Property; +import com.vaadin.navigator.View; +import com.vaadin.navigator.ViewChangeListener; +import com.vaadin.shared.ui.label.ContentMode; +import com.vaadin.ui.*; +import org.apache.tamaya.events.ConfigEvent; +import org.apache.tamaya.events.ConfigEventListener; +import org.apache.tamaya.events.ConfigEventManager; +import org.apache.tamaya.spi.ServiceContextManager; +import org.apache.tamaya.ui.UIConstants; +import org.apache.tamaya.ui.ViewProvider; +import org.apache.tamaya.ui.components.VerticalSpacedLayout; +import org.apache.tamaya.ui.services.MessageProvider; + +import javax.annotation.Priority; + + +public class EventView extends VerticalSpacedLayout implements View { + +@Priority(20) +public static final class Provider implements ViewProvider{ + +@Override +public ViewLifecycle getLifecycle() { +return ViewLifecycle.EAGER; +} + +@Override +public String getUrlPattern() { +return "/events"; +} + +@Override +public String getDisplayName() { +return "view.events.name"; +} + +@Override +public View createView(){ +return new EventView(); +} +} + +private CheckBox changeMonitorEnabled = new CheckBox(ServiceContextManager.getServiceContext() + .getService(MessageProvider.class).getMessage("view.events.button.enableMonitoring")); +private Button clearViewButton = new Button(ServiceContextManager.getServiceContext() + .getService(MessageProvider.class).getMessage("view.events.button.clearView")); +private Table eventsTable = new Table(ServiceContextManager.getServiceContext() + .getService(MessageProvider.class).getMessage("view.events.table.name")); + + +public EventView() { +Label caption = new Label(ServiceContextManager.getServiceContext() + .getService(MessageProvider.class).getMessage("view.events.name")); +Label description = new Label(ServiceContextManager.getServiceContext() + .getService(MessageProvider.class).getMessage("view.events.description"), +ContentMode.HTML); + +ConfigEventManager.addListener(new ConfigEventListener() { +@Override +public void
[02/50] [abbrv] incubator-tamaya-extensions git commit: Removed unused imports.
Removed unused imports. 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/65fdcd28 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/65fdcd28 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/65fdcd28 Branch: refs/heads/master Commit: 65fdcd2880e57c019909dca3a090709e626e3579 Parents: ccf489f Author: anatoleAuthored: Wed Dec 16 08:45:14 2015 +0100 Committer: Oliver B. Fischer Committed: Fri Sep 30 21:29:37 2016 +0200 -- src/main/java/org/apache/tamaya/events/ConfigEvent.java | 3 --- .../apache/tamaya/events/folderobserver/FileChangeListener.java | 3 +-- .../events/folderobserver/ObservingPropertySourceProvider.java | 4 +--- .../tamaya/events/internal/DefaultConfigChangeObserver.java | 5 - .../apache/tamaya/events/internal/LoggingConfigListener.java| 1 - .../org/apache/tamaya/events/spi/ConfigEventManagerSpi.java | 1 - 6 files changed, 6 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/65fdcd28/src/main/java/org/apache/tamaya/events/ConfigEvent.java -- diff --git a/src/main/java/org/apache/tamaya/events/ConfigEvent.java b/src/main/java/org/apache/tamaya/events/ConfigEvent.java index b56145e..5a713d7 100644 --- a/src/main/java/org/apache/tamaya/events/ConfigEvent.java +++ b/src/main/java/org/apache/tamaya/events/ConfigEvent.java @@ -18,9 +18,6 @@ */ package org.apache.tamaya.events; -import java.beans.PropertyChangeEvent; -import java.util.Collection; - /** * Event that contains a set current changes that were applied or could be applied. http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/65fdcd28/src/main/java/org/apache/tamaya/events/folderobserver/FileChangeListener.java -- diff --git a/src/main/java/org/apache/tamaya/events/folderobserver/FileChangeListener.java b/src/main/java/org/apache/tamaya/events/folderobserver/FileChangeListener.java index af51063..3427ce8 100644 --- a/src/main/java/org/apache/tamaya/events/folderobserver/FileChangeListener.java +++ b/src/main/java/org/apache/tamaya/events/folderobserver/FileChangeListener.java @@ -19,7 +19,6 @@ package org.apache.tamaya.events.folderobserver; import org.apache.tamaya.ConfigException; -import org.apache.tamaya.events.PropertySourceChange; import java.io.IOException; import java.nio.file.FileSystem; @@ -35,7 +34,7 @@ import java.util.logging.Logger; /** * Class that has the responsibility to watch the folder and then publish the changes to a - * {@link PropertySourceChange}. + * {@link org.apache.tamaya.events.PropertySourceChange}. * @see ObservingPropertySourceProvider * This listener will wait to events and wait to one second to watch again. * If new file was created or modified will commit from this file. http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/65fdcd28/src/main/java/org/apache/tamaya/events/folderobserver/ObservingPropertySourceProvider.java -- diff --git a/src/main/java/org/apache/tamaya/events/folderobserver/ObservingPropertySourceProvider.java b/src/main/java/org/apache/tamaya/events/folderobserver/ObservingPropertySourceProvider.java index 14692f4..8387504 100644 --- a/src/main/java/org/apache/tamaya/events/folderobserver/ObservingPropertySourceProvider.java +++ b/src/main/java/org/apache/tamaya/events/folderobserver/ObservingPropertySourceProvider.java @@ -19,9 +19,7 @@ package org.apache.tamaya.events.folderobserver; import org.apache.tamaya.ConfigException; -import org.apache.tamaya.ConfigurationProvider; import org.apache.tamaya.events.ConfigEventManager; -import org.apache.tamaya.events.PropertySourceChange; import org.apache.tamaya.events.ConfigurationContextChange; import org.apache.tamaya.events.ConfigurationContextChangeBuilder; import org.apache.tamaya.format.ConfigurationData; @@ -52,7 +50,7 @@ import java.util.logging.Logger; * This implementation run in a folder taking up all file compatible with the given * ConfigurationFormats. When a file is added, deleted or modified the PropertySourceProvider * will adapt the changes automatically and trigger according - * {@link PropertySourceChange} events. + * {@link org.apache.tamaya.events.PropertySourceChange} events. * The default folder is META-INF/config, but you can change using the absolute path in * "-Dtamaya.configdir" parameter. */
[04/50] [abbrv] incubator-tamaya-extensions git commit: Removed useless comments.
Removed useless comments. 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/4d6c7134 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/4d6c7134 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/4d6c7134 Branch: refs/heads/master Commit: 4d6c7134355290d09c3de1d996c4dbb5e0461b77 Parents: f71dc11 Author: anatoleAuthored: Sun Dec 20 11:53:30 2015 +0100 Committer: Oliver B. Fischer Committed: Fri Sep 30 21:29:37 2016 +0200 -- src/main/java/org/apache/tamaya/events/ConfigurationChange.java | 4 1 file changed, 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/4d6c7134/src/main/java/org/apache/tamaya/events/ConfigurationChange.java -- diff --git a/src/main/java/org/apache/tamaya/events/ConfigurationChange.java b/src/main/java/org/apache/tamaya/events/ConfigurationChange.java index a291084..0366556 100644 --- a/src/main/java/org/apache/tamaya/events/ConfigurationChange.java +++ b/src/main/java/org/apache/tamaya/events/ConfigurationChange.java @@ -126,7 +126,6 @@ public final class ConfigurationChange implements ConfigEvent, Se } } return removedCount; -//return (int) this.changes.values().stream().filter((e) -> e.getNewValue() == null).count(); } /** @@ -142,8 +141,6 @@ public final class ConfigurationChange implements ConfigEvent, Se } } return addedCount; -//return (int) this.changes.values().stream().filter((e) -> e.getOldValue() == null && -//e.getNewValue() != null).count(); } /** @@ -158,7 +155,6 @@ public final class ConfigurationChange implements ConfigEvent, Se } } return updatedCount; -//return (int) this.changes.values().stream().filter((e) -> e.getOldValue()!=null && e.getNewValue()!=null).count(); }
[23/50] [abbrv] incubator-tamaya-extensions git commit: Fixed UI module, adding modularity. Added initial version for the vents module.
Fixed UI module, adding modularity. Added initial version for the vents module. 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/f3d32886 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/f3d32886 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/f3d32886 Branch: refs/heads/master Commit: f3d3288621598c622defb8ab33bf09cf7f9ff056 Parents: 3833438 Author: anatoleAuthored: Sat Apr 16 08:21:36 2016 +0200 Committer: Oliver B. Fischer Committed: Fri Sep 30 21:29:37 2016 +0200 -- pom.xml | 14 -- .../ObservingPropertySourceProvider.java | 3 ++- 2 files changed, 14 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/f3d32886/pom.xml -- diff --git a/pom.xml b/pom.xml index d43379c..7294789 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,6 @@ under the License. org.apache.tamaya tamaya-api ${project.version} -provided org.apache.tamaya.ext @@ -48,10 +47,21 @@ under the License. ${project.version} +org.apache.tamaya.ext +tamaya-spisupport +${project.version} + + org.apache.tamaya tamaya-core ${project.version} -provided +runtime + + +org.apache.tamaya.ext +tamaya-ui +${project.version} +true http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/f3d32886/src/main/java/org/apache/tamaya/events/folderobserver/ObservingPropertySourceProvider.java -- diff --git a/src/main/java/org/apache/tamaya/events/folderobserver/ObservingPropertySourceProvider.java b/src/main/java/org/apache/tamaya/events/folderobserver/ObservingPropertySourceProvider.java index 347576f..feddd70 100644 --- a/src/main/java/org/apache/tamaya/events/folderobserver/ObservingPropertySourceProvider.java +++ b/src/main/java/org/apache/tamaya/events/folderobserver/ObservingPropertySourceProvider.java @@ -40,12 +40,12 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.apache.tamaya.ConfigException; -import org.apache.tamaya.core.propertysource.BasePropertySource; import org.apache.tamaya.events.ConfigEventManager; import org.apache.tamaya.events.ConfigurationContextChange; import org.apache.tamaya.events.ConfigurationContextChangeBuilder; import org.apache.tamaya.spi.PropertySource; import org.apache.tamaya.spi.PropertySourceProvider; +import org.apache.tamaya.spisupport.BasePropertySource; /** * This implementation runs in a folder taking up all files compatible with the given @@ -118,6 +118,7 @@ public class ObservingPropertySourceProvider implements PropertySourceProvider, protected Collection getPropertySources(final Path file) { return Arrays.asList(new PropertySource[]{new BasePropertySource() { private final Map props = readProperties(file); + @Override public Map getProperties() { return props;
[37/50] [abbrv] incubator-tamaya-extensions git commit: TAMAYA-136: Adding PropertyValue for PropertySource SPI. All changes and test fixes in all modules/examples relevant for release.
TAMAYA-136: Adding PropertyValue for PropertySource SPI. All changes and test fixes in all modules/examples relevant for release. 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/3cb7f8de Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/3cb7f8de Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/3cb7f8de Branch: refs/heads/master Commit: 3cb7f8de5bd875ae38dd5dedd3bf591bbce2de19 Parents: 89223dc Author: anatoleAuthored: Tue Feb 2 17:15:53 2016 +0100 Committer: Oliver B. Fischer Committed: Fri Sep 30 21:29:37 2016 +0200 -- pom.xml | 77 + .../tamaya/filter/ConfigurationFilter.java | 112 +++ .../tamaya/filter/DefaultMetadataFilter.java| 42 +++ .../tamaya/filter/ProgrammableFilter.java | 111 ++ .../tamaya/filter/RegexPropertyFilter.java | 56 ++ .../org.apache.tamaya.spi.PropertyFilter| 20 6 files changed, 418 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/3cb7f8de/pom.xml -- diff --git a/pom.xml b/pom.xml new file mode 100644 index 000..2480950 --- /dev/null +++ b/pom.xml @@ -0,0 +1,77 @@ + + +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> +4.0.0 + + +org.apache.tamaya.ext +tamaya-extensions +0.2-incubating-SNAPSHOT + + +tamaya-filter +Apache Tamaya Modules - Adaptive Configuration Filtering +bundle + + +1.7 + + + + +org.apache.tamaya +tamaya-api +${project.version} +provided + + +org.apache.tamaya +tamaya-core +${project.version} +provided + + +junit +junit + + + + + + +org.apache.felix +maven-bundle-plugin +true + + + +org.apache.tamaya.filter, + + + + + + + + + + + + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/3cb7f8de/src/main/java/org/apache/tamaya/filter/ConfigurationFilter.java -- diff --git a/src/main/java/org/apache/tamaya/filter/ConfigurationFilter.java b/src/main/java/org/apache/tamaya/filter/ConfigurationFilter.java new file mode 100644 index 000..99ab27f --- /dev/null +++ b/src/main/java/org/apache/tamaya/filter/ConfigurationFilter.java @@ -0,0 +1,112 @@ +/* + * 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.filter; + +import org.apache.tamaya.spi.FilterContext; +import org.apache.tamaya.spi.PropertyFilter; + + +/** + * Hereby + * + * Single filters are applied only when values are explicitly accessed. This is useful, e.g. for + * filtering passwords into clear text variants. Nevertheless metadata keys hidden on map level must be + * accessible (=not filtered) when accessed as single values. + * Map filters are applied when values are filtered as part of a full properties access. + * Often filtering in these cases is more commonly applied, e.g. you dont want to show up all kind of metadata. + * + * For both variants individual filter rules can be applied here. All filters configured are managed on a + * thread-local level, so this class is typically used
[08/50] [abbrv] incubator-tamaya-extensions git commit: TAMAYA-136: Adding PropertyValue for PropertySource SPI. All changes and test fixes in all modules/examples relevant for release.
TAMAYA-136: Adding PropertyValue for PropertySource SPI. All changes and test fixes in all modules/examples relevant for release. 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/2e229513 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/2e229513 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/2e229513 Branch: refs/heads/master Commit: 2e229513e335c6c3a59a42b7093413081cacaaf2 Parents: 245defb Author: anatoleAuthored: Tue Feb 2 17:15:53 2016 +0100 Committer: Oliver B. Fischer Committed: Fri Sep 30 21:29:37 2016 +0200 -- .../org/apache/tamaya/events/FrozenPropertySource.java | 5 +++-- .../tamaya/events/PropertySourceChangeBuilder.java | 11 ++- .../apache/tamaya/events/FrozenPropertySourceTest.java | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/2e229513/src/main/java/org/apache/tamaya/events/FrozenPropertySource.java -- diff --git a/src/main/java/org/apache/tamaya/events/FrozenPropertySource.java b/src/main/java/org/apache/tamaya/events/FrozenPropertySource.java index a8167f2..81e6dca 100644 --- a/src/main/java/org/apache/tamaya/events/FrozenPropertySource.java +++ b/src/main/java/org/apache/tamaya/events/FrozenPropertySource.java @@ -19,6 +19,7 @@ package org.apache.tamaya.events; import org.apache.tamaya.spi.PropertySource; +import org.apache.tamaya.spi.PropertyValue; import java.io.Serializable; import java.util.Collections; @@ -81,8 +82,8 @@ public final class FrozenPropertySource implements PropertySource, Serializable } @Override -public String get(String key) { -return this.properties.get(key); +public PropertyValue get(String key) { +return PropertyValue.of(key, this.properties.get(key), getName()); } @Override http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/2e229513/src/main/java/org/apache/tamaya/events/PropertySourceChangeBuilder.java -- diff --git a/src/main/java/org/apache/tamaya/events/PropertySourceChangeBuilder.java b/src/main/java/org/apache/tamaya/events/PropertySourceChangeBuilder.java index cefa4f4..0858fdb 100644 --- a/src/main/java/org/apache/tamaya/events/PropertySourceChangeBuilder.java +++ b/src/main/java/org/apache/tamaya/events/PropertySourceChangeBuilder.java @@ -19,6 +19,7 @@ package org.apache.tamaya.events; import org.apache.tamaya.spi.PropertySource; +import org.apache.tamaya.spi.PropertyValue; import java.beans.PropertyChangeEvent; import java.util.ArrayList; @@ -95,19 +96,19 @@ public final class PropertySourceChangeBuilder { public static Collection compare(PropertySource map1, PropertySource map2) { List changes = new ArrayList<>(); for (Map.Entry en : map1.getProperties().entrySet()) { -String val = map2.get(en.getKey()); +PropertyValue val = map2.get(en.getKey()); if (val == null) { changes.add(new PropertyChangeEvent(map1, en.getKey(), null, en.getValue())); } else if (!val.equals(en.getValue())) { -changes.add(new PropertyChangeEvent(map1, en.getKey(), val, en.getValue())); +changes.add(new PropertyChangeEvent(map1, en.getKey(), val.getValue(), en.getValue())); } } for (Map.Entry en : map2.getProperties().entrySet()) { -String val = map1.get(en.getKey()); +PropertyValue val = map1.get(en.getKey()); if (val == null) { changes.add(new PropertyChangeEvent(map1, en.getKey(), en.getValue(), null)); } else if (!val.equals(en.getValue())) { -changes.add(new PropertyChangeEvent(map1, en.getKey(), en.getValue(), val)); +changes.add(new PropertyChangeEvent(map1, en.getKey(), en.getValue(), val.getValue())); } } return changes; @@ -170,7 +171,7 @@ public final class PropertySourceChangeBuilder { * @return the builder for chaining. */ public PropertySourceChangeBuilder remove(String key, String... otherKeys) { -String oldValue = this.source.get(key); +PropertyValue oldValue = this.source.get(key); if (oldValue == null) { this.delta.remove(key); } http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/2e229513/src/test/java/org/apache/tamaya/events/FrozenPropertySourceTest.java
[39/50] [abbrv] incubator-tamaya-extensions git commit: Added ConfigurationFilter tests and fixes.
Added ConfigurationFilter tests and fixes. 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/98980d03 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/98980d03 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/98980d03 Branch: refs/heads/master Commit: 98980d032ae27882eb3c8d507d29ab30c33f79b3 Parents: 1aefa98 Author: anatoleAuthored: Sat Feb 13 01:21:40 2016 +0100 Committer: Oliver B. Fischer Committed: Fri Sep 30 21:29:37 2016 +0200 -- .../tamaya/filter/ConfigurationFilter.java | 4 +- .../tamaya/filter/ProgrammableFilter.java | 9 ++- .../org.apache.tamaya.spi.PropertyFilter| 3 +- .../tamaya/filter/ConfigurationFilterTest.java | 85 +--- 4 files changed, 85 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/98980d03/src/main/java/org/apache/tamaya/filter/ConfigurationFilter.java -- diff --git a/src/main/java/org/apache/tamaya/filter/ConfigurationFilter.java b/src/main/java/org/apache/tamaya/filter/ConfigurationFilter.java index b5bb45e..b33ff27 100644 --- a/src/main/java/org/apache/tamaya/filter/ConfigurationFilter.java +++ b/src/main/java/org/apache/tamaya/filter/ConfigurationFilter.java @@ -108,11 +108,11 @@ public final class ConfigurationFilter implements PropertyFilter{ @Override public String filterProperty(String valueToBeFiltered, FilterContext context) { if(!context.isSinglePropertyScoped()){ -for(PropertyFilter pred: THREADED_MAP_FILTERS.get().getFilters()){ +for(PropertyFilter pred: THREADED_SINGLE_FILTERS.get().getFilters()){ valueToBeFiltered = pred.filterProperty(valueToBeFiltered, context); } }else{ -for(PropertyFilter pred: THREADED_SINGLE_FILTERS.get().getFilters()){ +for(PropertyFilter pred: THREADED_MAP_FILTERS.get().getFilters()){ valueToBeFiltered = pred.filterProperty(valueToBeFiltered, context); } } http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/98980d03/src/main/java/org/apache/tamaya/filter/ProgrammableFilter.java -- diff --git a/src/main/java/org/apache/tamaya/filter/ProgrammableFilter.java b/src/main/java/org/apache/tamaya/filter/ProgrammableFilter.java index 18a7e08..ec6040c 100644 --- a/src/main/java/org/apache/tamaya/filter/ProgrammableFilter.java +++ b/src/main/java/org/apache/tamaya/filter/ProgrammableFilter.java @@ -61,6 +61,14 @@ public final class ProgrammableFilter implements PropertyFilter{ } /** + * Removes a filter. + * @param filter the filter to be removed, not null. + */ +public void removeFilter(PropertyFilter filter) { +filters.remove(filter); +} + +/** * Clears all filters. */ public void clearFilters(){ @@ -107,5 +115,4 @@ public final class ProgrammableFilter implements PropertyFilter{ '}'; } - } http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/98980d03/src/main/resources/META-INF/services/org.apache.tamaya.spi.PropertyFilter -- diff --git a/src/main/resources/META-INF/services/org.apache.tamaya.spi.PropertyFilter b/src/main/resources/META-INF/services/org.apache.tamaya.spi.PropertyFilter index 630c222..806b833 100644 --- a/src/main/resources/META-INF/services/org.apache.tamaya.spi.PropertyFilter +++ b/src/main/resources/META-INF/services/org.apache.tamaya.spi.PropertyFilter @@ -16,5 +16,4 @@ # specific language governing permissions and limitations # under the License. # -org.apache.tamaya.filter.ConfigurationFilter -org.apache.tamaya.filter.DefaultMetadataFilter \ No newline at end of file +org.apache.tamaya.filter.ConfigurationFilter \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/98980d03/src/test/java/org/apache/tamaya/filter/ConfigurationFilterTest.java -- diff --git a/src/test/java/org/apache/tamaya/filter/ConfigurationFilterTest.java b/src/test/java/org/apache/tamaya/filter/ConfigurationFilterTest.java index bbfe72d..9d0da1f 100644 --- a/src/test/java/org/apache/tamaya/filter/ConfigurationFilterTest.java +++ b/src/test/java/org/apache/tamaya/filter/ConfigurationFilterTest.java @@ -18,6 +18,10 @@ */ package org.apache.tamaya.filter; +import org.apache.tamaya.Configuration; +import
[44/50] [abbrv] incubator-tamaya-extensions git commit: [maven-release-plugin] prepare release 0.2-incubating-rc1
[maven-release-plugin] prepare release 0.2-incubating-rc1 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/6a6b4a0b Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/6a6b4a0b Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/6a6b4a0b Branch: refs/heads/master Commit: 6a6b4a0bedeaba8f5f9062db23dc574ddd08fe90 Parents: ee43243 Author: anatoleAuthored: Tue Mar 8 20:39:05 2016 +0100 Committer: Oliver B. Fischer Committed: Fri Sep 30 21:29:37 2016 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/6a6b4a0b/pom.xml -- diff --git a/pom.xml b/pom.xml index d9d4854..a59a968 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.tamaya.ext tamaya-extensions -0.3-incubating-SNAPSHOT +0.2-incubating tamaya-filter
[17/50] [abbrv] incubator-tamaya-extensions git commit: Added dep to functions module for EMPTY instances.
Added dep to functions module for EMPTY instances. 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/8fb49b77 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/8fb49b77 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/8fb49b77 Branch: refs/heads/master Commit: 8fb49b77ddbebfcb5d04e6ec6ea5b9e775418205 Parents: 0a9aeae Author: anatoleAuthored: Mon Mar 14 00:41:46 2016 +0100 Committer: Oliver B. Fischer Committed: Fri Sep 30 21:29:37 2016 +0200 -- pom.xml | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/8fb49b77/pom.xml -- diff --git a/pom.xml b/pom.xml index 4bd0ee4..0535316 100644 --- a/pom.xml +++ b/pom.xml @@ -42,11 +42,11 @@ under the License. ${project.version} provided - - - - - + +org.apache.tamaya.ext +tamaya-functions +${project.version} + org.apache.tamaya tamaya-core
[49/50] [abbrv] incubator-tamaya-extensions git commit: Fixed quality issues.
Fixed quality 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/09c1ad98 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/09c1ad98 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/09c1ad98 Branch: refs/heads/master Commit: 09c1ad988041045c624772612a96c9891a7344c3 Parents: 537d61f Author: anatoleAuthored: Sat Apr 30 20:44:03 2016 +0200 Committer: Oliver B. Fischer Committed: Fri Sep 30 21:29:37 2016 +0200 -- src/main/java/org/apache/tamaya/filter/ConfigurationFilter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/09c1ad98/src/main/java/org/apache/tamaya/filter/ConfigurationFilter.java -- diff --git a/src/main/java/org/apache/tamaya/filter/ConfigurationFilter.java b/src/main/java/org/apache/tamaya/filter/ConfigurationFilter.java index b33ff27..c2739a1 100644 --- a/src/main/java/org/apache/tamaya/filter/ConfigurationFilter.java +++ b/src/main/java/org/apache/tamaya/filter/ConfigurationFilter.java @@ -107,7 +107,7 @@ public final class ConfigurationFilter implements PropertyFilter{ @Override public String filterProperty(String valueToBeFiltered, FilterContext context) { -if(!context.isSinglePropertyScoped()){ +if(context.isSinglePropertyScoped()){ for(PropertyFilter pred: THREADED_SINGLE_FILTERS.get().getFilters()){ valueToBeFiltered = pred.filterProperty(valueToBeFiltered, context); }
[45/50] [abbrv] incubator-tamaya-extensions git commit: [maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare for next development iteration 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/75827f2c Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/75827f2c Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/75827f2c Branch: refs/heads/master Commit: 75827f2c7c9b2e66eb98cbcd45012566ad6ef4c8 Parents: 6a6b4a0 Author: anatoleAuthored: Tue Mar 8 20:39:16 2016 +0100 Committer: Oliver B. Fischer Committed: Fri Sep 30 21:29:37 2016 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/75827f2c/pom.xml -- diff --git a/pom.xml b/pom.xml index a59a968..d9d4854 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.tamaya.ext tamaya-extensions -0.2-incubating +0.3-incubating-SNAPSHOT tamaya-filter
[26/50] [abbrv] incubator-tamaya-extensions git commit: ixed table rendering and setting of polling interval.
ixed table rendering and setting of polling interval. 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/6ca5def8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/6ca5def8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/6ca5def8 Branch: refs/heads/master Commit: 6ca5def80fe586081bf9297dfbeb8b68fa27f710 Parents: 032322b Author: anatoleAuthored: Sun Apr 17 23:55:50 2016 +0200 Committer: Oliver B. Fischer Committed: Fri Sep 30 21:29:37 2016 +0200 -- .../tamaya/events/ConfigEventManager.java | 4 +- .../internal/DefaultConfigChangeObserver.java | 9 ++-- .../org/apache/tamaya/events/ui/EventView.java | 53 3 files changed, 49 insertions(+), 17 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/6ca5def8/src/main/java/org/apache/tamaya/events/ConfigEventManager.java -- diff --git a/src/main/java/org/apache/tamaya/events/ConfigEventManager.java b/src/main/java/org/apache/tamaya/events/ConfigEventManager.java index 9989fbb..f6bd3da 100644 --- a/src/main/java/org/apache/tamaya/events/ConfigEventManager.java +++ b/src/main/java/org/apache/tamaya/events/ConfigEventManager.java @@ -168,7 +168,7 @@ public final class ConfigEventManager { * * @return the check period in ms. */ -public long getChangeMonitoringPeriod(){ +public static long getChangeMonitoringPeriod(){ return SPI.getChangeMonitoringPeriod(); } @@ -179,7 +179,7 @@ public final class ConfigEventManager { * @see #enableChangeMonitoring(boolean) * @see #isChangeMonitoring() */ -public void setChangeMonitoringPeriod(long millis){ +public static void setChangeMonitoringPeriod(long millis){ SPI.setChangeMonitoringPeriod(millis); } http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/6ca5def8/src/main/java/org/apache/tamaya/events/internal/DefaultConfigChangeObserver.java -- diff --git a/src/main/java/org/apache/tamaya/events/internal/DefaultConfigChangeObserver.java b/src/main/java/org/apache/tamaya/events/internal/DefaultConfigChangeObserver.java index 5cd3f6c..f4457b2 100644 --- a/src/main/java/org/apache/tamaya/events/internal/DefaultConfigChangeObserver.java +++ b/src/main/java/org/apache/tamaya/events/internal/DefaultConfigChangeObserver.java @@ -36,7 +36,7 @@ public class DefaultConfigChangeObserver { private static final Logger LOG = Logger.getLogger(DefaultConfigChangeObserver.class.getName()); -private final Timer timer = new Timer("DefaultConfigChangeObserver", true); +private Timer timer = new Timer("DefaultConfigChangeObserver", true); private long checkPeriod = 2000L; @@ -52,9 +52,9 @@ public class DefaultConfigChangeObserver { timer.scheduleAtFixedRate(new TimerTask() { @Override public void run() { -if(running) { -checkConfigurationUpdate(); -} +if(running) { +checkConfigurationUpdate(); +} } }, START_DELAY, checkPeriod); } @@ -98,6 +98,7 @@ public class DefaultConfigChangeObserver { LOG.finest("Resetting check period to " + checkPeriod + " ms, reregistering timer."); this.checkPeriod = checkPeriod; timer.cancel(); +timer = new Timer("DefaultConfigChangeObserver", true); timer.scheduleAtFixedRate(new TimerTask() { @Override public void run() { http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/6ca5def8/src/main/java/org/apache/tamaya/events/ui/EventView.java -- diff --git a/src/main/java/org/apache/tamaya/events/ui/EventView.java b/src/main/java/org/apache/tamaya/events/ui/EventView.java index a69b04c..56e4b35 100644 --- a/src/main/java/org/apache/tamaya/events/ui/EventView.java +++ b/src/main/java/org/apache/tamaya/events/ui/EventView.java @@ -18,6 +18,7 @@ */ package org.apache.tamaya.events.ui; +import com.vaadin.data.Item; import com.vaadin.data.Property; import com.vaadin.navigator.View; import com.vaadin.navigator.ViewChangeListener; @@ -33,6 +34,7 @@ import org.apache.tamaya.ui.components.VerticalSpacedLayout; import org.apache.tamaya.ui.services.MessageProvider; import javax.annotation.Priority; +import java.util.Date; public class EventView extends VerticalSpacedLayout implements View { @@ -65,6 +67,8 @@ public class
[20/50] [abbrv] incubator-tamaya-extensions git commit: Set new development version.
Set new development version. 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/082c36a9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/082c36a9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/082c36a9 Branch: refs/heads/master Commit: 082c36a9a2d3577f70a619403e71c3683a3bdbda Parents: a15bd0e Author: anatoleAuthored: Thu Apr 14 00:47:11 2016 +0200 Committer: Oliver B. Fischer Committed: Fri Sep 30 21:29:37 2016 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/082c36a9/pom.xml -- diff --git a/pom.xml b/pom.xml index 4f3a981..d43379c 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.tamaya.ext tamaya-extensions -0.2-incubating +0.3-incubating-SNAPSHOT tamaya-events
[13/50] [abbrv] incubator-tamaya-extensions git commit: [maven-release-plugin] prepare release 0.2-incubating-rc1
[maven-release-plugin] prepare release 0.2-incubating-rc1 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/14b9e6ea Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/14b9e6ea Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/14b9e6ea Branch: refs/heads/master Commit: 14b9e6ea916a439d1ce519f8db2a0c6df9056337 Parents: a519ddd Author: anatoleAuthored: Tue Mar 8 20:39:05 2016 +0100 Committer: Oliver B. Fischer Committed: Fri Sep 30 21:29:37 2016 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/14b9e6ea/pom.xml -- diff --git a/pom.xml b/pom.xml index e843ec8..0fece2a 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.tamaya.ext tamaya-extensions -0.3-incubating-SNAPSHOT +0.2-incubating tamaya-events
[48/50] [abbrv] incubator-tamaya-extensions git commit: Reset version, integrated docs into site.
Reset version, integrated docs into site. 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/3d802909 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/3d802909 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/3d802909 Branch: refs/heads/master Commit: 3d80290955acd68082c6e9e6091eefb99bb5303b Parents: a23ed99 Author: anatoleAuthored: Wed Mar 16 21:54:18 2016 +0100 Committer: Oliver B. Fischer Committed: Fri Sep 30 21:29:37 2016 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/3d802909/pom.xml -- diff --git a/pom.xml b/pom.xml index d9d4854..6222349 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.tamaya.ext tamaya-extensions -0.3-incubating-SNAPSHOT +0.2-incubating-SNAPSHOT tamaya-filter
[40/50] [abbrv] incubator-tamaya-extensions git commit: Synched with head.
Synched with head. 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/b16020f4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/b16020f4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/b16020f4 Branch: refs/heads/master Commit: b16020f4a0bae22110f34e2b25f11c994b9c1e6a Parents: 3fffcb0 Author: anatoleAuthored: Thu Feb 11 20:31:24 2016 +0100 Committer: Oliver B. Fischer Committed: Fri Sep 30 21:29:37 2016 +0200 -- .../apache/tamaya/filter/ConfigurationFilter.java| 15 --- .../org/apache/tamaya/filter/ProgrammableFilter.java | 6 +++--- .../apache/tamaya/filter/RegexPropertyFilter.java| 2 +- .../filter/internal/DefaultMetadataFilter.java | 2 +- 4 files changed, 17 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/b16020f4/src/main/java/org/apache/tamaya/filter/ConfigurationFilter.java -- diff --git a/src/main/java/org/apache/tamaya/filter/ConfigurationFilter.java b/src/main/java/org/apache/tamaya/filter/ConfigurationFilter.java index 99ab27f..30ba3e2 100644 --- a/src/main/java/org/apache/tamaya/filter/ConfigurationFilter.java +++ b/src/main/java/org/apache/tamaya/filter/ConfigurationFilter.java @@ -62,12 +62,21 @@ public final class ConfigurationFilter implements PropertyFilter{ }; /** + * Flag if metadata entries (starting with an '_') are filtered out on when accessing multiple properties, default + * is {@code true}. + * @return true, if metadata entries (starting with an '_') are to be filtered. + */ +public static boolean isMetadataFiltered(){ +return THREADED_METADATA_FILTERED.get(); +} + +/** * Seactivates metadata filtering also on global map access for this thread. * @see #clearFilters() - * @param active true,to enable metadata filtering (default). + * @param filtered true,to enable metadata filtering (default). */ -public static void setMetadataFilter(boolean active){ -THREADED_METADATA_FILTERED.set(active); +public static void setMetadataFiltered(boolean filtered){ +THREADED_METADATA_FILTERED.set(filtered); } /** http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/b16020f4/src/main/java/org/apache/tamaya/filter/ProgrammableFilter.java -- diff --git a/src/main/java/org/apache/tamaya/filter/ProgrammableFilter.java b/src/main/java/org/apache/tamaya/filter/ProgrammableFilter.java index 8589faa..18a7e08 100644 --- a/src/main/java/org/apache/tamaya/filter/ProgrammableFilter.java +++ b/src/main/java/org/apache/tamaya/filter/ProgrammableFilter.java @@ -80,8 +80,8 @@ public final class ProgrammableFilter implements PropertyFilter{ * @param filters the filters to be applied. */ public void setFilters(Collection filters) { -filters.clear(); -filters.addAll(filters); +this.filters.clear(); +this.filters.addAll(filters); } /** @@ -102,7 +102,7 @@ public final class ProgrammableFilter implements PropertyFilter{ @Override public String toString() { -return "FilterConfig{" + +return "ProgrammableFilter{" + "filters=" + filters + '}'; } http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/b16020f4/src/main/java/org/apache/tamaya/filter/RegexPropertyFilter.java -- diff --git a/src/main/java/org/apache/tamaya/filter/RegexPropertyFilter.java b/src/main/java/org/apache/tamaya/filter/RegexPropertyFilter.java index 616f2cf..1ed43ba 100644 --- a/src/main/java/org/apache/tamaya/filter/RegexPropertyFilter.java +++ b/src/main/java/org/apache/tamaya/filter/RegexPropertyFilter.java @@ -48,7 +48,7 @@ public final class RegexPropertyFilter implements PropertyFilter{ @Override public String toString() { -return "RegexPredicate{" + +return "RegexPropertyFilter{" + "expression='" + expression + '\'' + '}'; } http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/b16020f4/src/main/java/org/apache/tamaya/filter/internal/DefaultMetadataFilter.java -- diff --git a/src/main/java/org/apache/tamaya/filter/internal/DefaultMetadataFilter.java b/src/main/java/org/apache/tamaya/filter/internal/DefaultMetadataFilter.java index 1119cba..95e9d25 100644 ---
[18/50] [abbrv] incubator-tamaya-extensions git commit: [maven-release-plugin] prepare release tamaya-all-0.2-incubating
[maven-release-plugin] prepare release tamaya-all-0.2-incubating 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/64c43de4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/64c43de4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/64c43de4 Branch: refs/heads/master Commit: 64c43de418bdbc802aeff04b82376202da4ed98c Parents: 8fb49b7 Author: anatoleAuthored: Wed Mar 16 16:20:07 2016 +0100 Committer: Oliver B. Fischer Committed: Fri Sep 30 21:29:37 2016 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/64c43de4/pom.xml -- diff --git a/pom.xml b/pom.xml index 0535316..4f3a981 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.tamaya.ext tamaya-extensions -0.2-incubating-SNAPSHOT +0.2-incubating tamaya-events
[30/50] [abbrv] incubator-tamaya-extensions git commit: TAMAYA-154: LHF: fix javadoc while stduying findbugs warning
TAMAYA-154: LHF: fix javadoc while stduying findbugs warning 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/6710cec0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/6710cec0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/6710cec0 Branch: refs/heads/master Commit: 6710cec0a8584df7afdb42eff8110cbe5672bf3c Parents: 07d3602 Author: Phil OttlingerAuthored: Wed Aug 31 20:41:23 2016 +0200 Committer: Oliver B. Fischer Committed: Fri Sep 30 21:29:37 2016 +0200 -- .../java/org/apache/tamaya/events/PropertySourceChangeBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/6710cec0/src/main/java/org/apache/tamaya/events/PropertySourceChangeBuilder.java -- diff --git a/src/main/java/org/apache/tamaya/events/PropertySourceChangeBuilder.java b/src/main/java/org/apache/tamaya/events/PropertySourceChangeBuilder.java index 0858fdb..fa2cf5e 100644 --- a/src/main/java/org/apache/tamaya/events/PropertySourceChangeBuilder.java +++ b/src/main/java/org/apache/tamaya/events/PropertySourceChangeBuilder.java @@ -87,7 +87,7 @@ public final class PropertySourceChangeBuilder { /** * Compares the two property config/configurations and creates a collection current all changes - * that must be appied to render {@code map1} into {@code map2}. + * that must be applied to render {@code map1} into {@code map2}. * * @param map1 the source map, not null. * @param map2 the target map, not null.
[15/50] [abbrv] incubator-tamaya-extensions git commit: Reset version for new release run.
Reset version for new release run. 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/e5bbbde3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/e5bbbde3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/e5bbbde3 Branch: refs/heads/master Commit: e5bbbde3939f9fcd2adcd89f5a5adaf47066a111 Parents: b42c4ad Author: anatoleAuthored: Wed Mar 9 14:09:25 2016 +0100 Committer: Oliver B. Fischer Committed: Fri Sep 30 21:29:37 2016 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/e5bbbde3/pom.xml -- diff --git a/pom.xml b/pom.xml index e843ec8..4bd0ee4 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.tamaya.ext tamaya-extensions -0.3-incubating-SNAPSHOT +0.2-incubating-SNAPSHOT tamaya-events
[11/50] [abbrv] incubator-tamaya-extensions git commit: [maven-release-plugin] prepare release 0.2-incubating
[maven-release-plugin] prepare release 0.2-incubating 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/dd25aa8b Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/dd25aa8b Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/dd25aa8b Branch: refs/heads/master Commit: dd25aa8b122b6954f5630ff16338646e76b906bb Parents: 41e9cf3 Author: anatoleAuthored: Tue Mar 8 17:39:55 2016 +0100 Committer: Oliver B. Fischer Committed: Fri Sep 30 21:29:37 2016 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/dd25aa8b/pom.xml -- diff --git a/pom.xml b/pom.xml index 4bd0ee4..0fece2a 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.tamaya.ext tamaya-extensions -0.2-incubating-SNAPSHOT +0.2-incubating tamaya-events
[21/50] [abbrv] incubator-tamaya-extensions git commit: Reset version, integrated docs into site.
Reset version, integrated docs into site. 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/c5a7508c Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/c5a7508c Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/c5a7508c Branch: refs/heads/master Commit: c5a7508c6527f41bba93520b9ec9e3eca911ed88 Parents: 4299859 Author: anatoleAuthored: Wed Mar 16 21:54:18 2016 +0100 Committer: Oliver B. Fischer Committed: Fri Sep 30 21:29:37 2016 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/c5a7508c/pom.xml -- diff --git a/pom.xml b/pom.xml index d43379c..0535316 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.tamaya.ext tamaya-extensions -0.3-incubating-SNAPSHOT +0.2-incubating-SNAPSHOT tamaya-events
[14/50] [abbrv] incubator-tamaya-extensions git commit: [maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare for next development iteration 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/b42c4ad1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/b42c4ad1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/b42c4ad1 Branch: refs/heads/master Commit: b42c4ad1d0e39343967e481f33b86b909f85a0c3 Parents: 14b9e6e Author: anatoleAuthored: Tue Mar 8 20:39:16 2016 +0100 Committer: Oliver B. Fischer Committed: Fri Sep 30 21:29:37 2016 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/b42c4ad1/pom.xml -- diff --git a/pom.xml b/pom.xml index 0fece2a..e843ec8 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.tamaya.ext tamaya-extensions -0.2-incubating +0.3-incubating-SNAPSHOT tamaya-events