You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by po...@apache.org on 2016/10/17 18:56:02 UTC
[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 Ottlinger <po...@apache.org>
Authored: Mon Oct 17 20:54:51 2016 +0200
Committer: Phil Ottlinger <po...@apache.org>
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
</plugin>
</plugins>
</build>
--
--
</project>