date:20170305

See 

--
[...truncated 990.65 KB...]
[INFO] Exclude: **/bootstrap-*
[INFO] Exclude: **/js/jquery-*
[INFO] Exclude: **/*.json
[INFO] Exclude: **/*.md
[INFO] Exclude: **/*.md.vm
[INFO] Exclude: src/site/asciidoc/temp-properties-files-for-site/attributes.adoc
[INFO] Exclude: readme/**
[INFO] 9 resources included (use -debug for more details)
[INFO] Rat check: Summary over all files. Unapproved: 0, unknown: 0, generated: 
0, approved: 9 licenses.
[WARNING] Failed to getClass for org.apache.maven.plugins.source.SourceJarMojo
[INFO] 
[INFO] <<< maven-source-plugin:3.0.1:jar (source-jar) < generate-sources @ 
tamaya-management_alpha <<<
[INFO] 
[INFO] --- maven-source-plugin:3.0.1:jar (source-jar) @ tamaya-management_alpha 
---
[INFO] Building jar: 

[INFO] 
[INFO] --- maven-failsafe-plugin:2.19.1:integration-test (default) @ 
tamaya-management_alpha ---
[INFO] Skipping execution of surefire because it has already been run for this 
configuration
[JENKINS] Recording test results[INFO] 
[INFO] --- maven-failsafe-plugin:2.19.1:verify (default) @ 
tamaya-management_alpha ---

[JENKINS] Recording test results[INFO] 
[INFO] --- maven-install-plugin:2.5.2:install (default-install) @ 
tamaya-management_alpha ---
[INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/1/org/apache/tamaya/ext/tamaya-management_alpha/0.3-incubating-SNAPSHOT/tamaya-management_alpha-0.3-incubating-SNAPSHOT.jar
[INFO] Installing 
 to 
/home/jenkins/jenkins-slave/maven-repositories/1/org/apache/tamaya/ext/tamaya-management_alpha/0.3-incubating-SNAPSHOT/tamaya-management_alpha-0.3-incubating-SNAPSHOT.pom
[INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/1/org/apache/tamaya/ext/tamaya-management_alpha/0.3-incubating-SNAPSHOT/tamaya-management_alpha-0.3-incubating-SNAPSHOT-features.xml
[INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/1/org/apache/tamaya/ext/tamaya-management_alpha/0.3-incubating-SNAPSHOT/tamaya-management_alpha-0.3-incubating-SNAPSHOT-javadoc.jar
[INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/1/org/apache/tamaya/ext/tamaya-management_alpha/0.3-incubating-SNAPSHOT/tamaya-management_alpha-0.3-incubating-SNAPSHOT-sources.jar
[INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/1/org/apache/tamaya/ext/tamaya-management_alpha/0.3-incubating-SNAPSHOT/tamaya-management_alpha-0.3-incubating-SNAPSHOT-features.xml

[INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/1/org/apache/tamaya/ext/tamaya-management_alpha/0.3-incubating-SNAPSHOT/tamaya-management_alpha-0.3-incubating-SNAPSHOT-javadoc.jar
[INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/1/org/apache/tamaya/ext/tamaya-management_alpha/0.3-incubating-SNAPSHOT/tamaya-management_alpha-0.3-incubating-SNAPSHOT-sources.jar
[INFO] 
[INFO] --- maven-deploy-plugin:2.8.2:deploy (default-deploy) @ 
tamaya-management_alpha ---
[INFO] Downloading: 
https://repository.apache.org/content/repositories/snapshots/org/apache/tamaya/ext/tamaya-management_alpha/0.3-incubating-SNAPSHOT/maven-metadata.xml
[INFO] Downloaded: 
https://repository.apache.org/content/repositories/snapshots/org/apache/tamaya/ext/tamaya-management_alpha/0.3-incubating-SNAPSHOT/maven-metadata.xml
 (2 KB at 2.7 KB/sec)
[INFO] Uploading: 
https://repository.apache.org/content/repositories/snapshots/org/apache/tamaya/ext/tamaya-management_alpha/0.3-incubating-SNAPSHOT/tamaya-management_alpha-0.3-incubating-20170306.000128-12.jar
[INFO] Uploaded: 
https://repository.apache.org/content/repositories/snapshots/org/apache/tamaya/ext/tamaya-management_alpha/0.3-incubating-SNAPSHOT/tamaya-management_alpha-0.3-incubating-20170306.000128-12.jar
 (12 KB at 12.9 KB/sec)
[INFO] Uploading:

Build failed in Jenkins: Tamaya-Sandbox-Master » Apache Tamaya Modules - Metamodel #437

2017-03-05 Thread Apache Jenkins Server

See 


--
[INFO] 
[INFO] 
[INFO] Building Apache Tamaya Modules - Metamodel 0.3-incubating-SNAPSHOT
[INFO] 
[INFO] 
[INFO] --- maven-clean-plugin:3.0.0:clean (default-clean) @ 
tamaya-metamodel_alpha ---
[INFO] Deleting 

[INFO] 
[INFO] --- maven-enforcer-plugin:1.4.1:enforce (enforce-versions) @ 
tamaya-metamodel_alpha ---
[INFO] 
[INFO] --- apache-rat-plugin:0.12:check (default) @ tamaya-metamodel_alpha ---
[INFO] Enabled default license matchers.
[INFO] Will parse SCM ignores for exclusions...
[INFO] Finished adding exclusions from SCM ignore files.
[INFO] 61 implicit excludes (use -debug for more details).
[INFO] Exclude: **/*banner.txt
[INFO] Exclude: banner.txt
[INFO] Exclude: .git
[INFO] Exclude: derby.log
[INFO] Exclude: **/bootstrap-*
[INFO] Exclude: **/js/jquery-*
[INFO] Exclude: **/*.json
[INFO] Exclude: **/*.md
[INFO] Exclude: **/*.md.vm
[INFO] Exclude: src/site/asciidoc/temp-properties-files-for-site/attributes.adoc
[INFO] Exclude: readme/**
[INFO] 46 resources included (use -debug for more details)
[INFO] Rat check: Summary over all files. Unapproved: 0, unknown: 0, generated: 
0, approved: 46 licenses.
[INFO] 
[INFO] --- maven-remote-resources-plugin:1.5:process (process-resource-bundles) 
@ tamaya-metamodel_alpha ---
[INFO] 
[INFO] --- karaf-maven-plugin:4.0.5:features-generate-descriptor (generate) @ 
tamaya-metamodel_alpha ---
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/tamaya/ext/tamaya-metamodel_alpha/0.3-incubating-SNAPSHOT/maven-metadata.xml
[INFO] Downloaded: 
http://repository.apache.org/snapshots/org/apache/tamaya/ext/tamaya-metamodel_alpha/0.3-incubating-SNAPSHOT/maven-metadata.xml
 (2 KB at 4.0 KB/sec)
[INFO] Generating feature descriptor file 

[INFO] ...done!
[INFO] 
[INFO] --- maven-resources-plugin:2.7:resources (default-resources) @ 
tamaya-metamodel_alpha ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 4 resources
[INFO] Copying 3 resources
[INFO] 
[INFO] --- maven-compiler-plugin:3.5.1:compile (default-compile) @ 
tamaya-metamodel_alpha ---
[INFO] Changes detected - recompiling the module!
[INFO] Compiling 36 source files to 

[INFO] 
:
 Some input files use unchecked or unsafe operations.
[INFO] 
:
 Recompile with -Xlint:unchecked for details.
[INFO] -
[WARNING] COMPILATION WARNING : 
[INFO] -
[WARNING] 
:[66,20]
 isConfigurationContextSettable() in 
org.apache.tamaya.spi.ConfigurationProviderSpi has been deprecated
[WARNING] 
:[61,17]
 setConfigurationContext(org.apache.tamaya.spi.ConfigurationContext) in 
org.apache.tamaya.spi.ConfigurationProviderSpi has been deprecated
[WARNING] 
:[82,33]
 getConfigurationContext() in org.apache.tamaya.spi.ConfigurationProviderSpi 
has been deprecated
[INFO] 3 warnings 
[INFO] -
[INFO] -
[ERROR] COMPILATION ERROR : 
[INFO] -
[ERROR] 
:[131,26]
 getProperties() in

Build failed in Jenkins: Tamaya-Sandbox-Master #436

2017-03-05 Thread Apache Jenkins Server

See 


Changes:

[anatole] TAMAYA-252: Unified PropertyValue API and usage, also separating key,

[anatole] TAMAYA-252: Unified PropertyValue builder API.

--
[...truncated 14.54 KB...]
[INFO] --- karaf-maven-plugin:4.0.5:features-generate-descriptor (generate) @ 
tamaya-sandbox ---
[INFO] Generating feature descriptor file 

[INFO] ...done!
[INFO] 
[INFO] --- bnd-maven-plugin:3.3.0:bnd-process (default) @ tamaya-sandbox ---
[INFO] skip project with packaging=pom
[INFO] 
[INFO] --- maven-site-plugin:3.4:attach-descriptor (attach-descriptor) @ 
tamaya-sandbox ---
[INFO] 
[INFO] --- maven-javadoc-plugin:2.10.4:jar (attach-javadocs) @ tamaya-sandbox 
---
[INFO] Not executing Javadoc as the project is not a Java classpath-capable 
package
[INFO] 
[INFO] >>> maven-source-plugin:3.0.1:jar (source-jar) > generate-sources @ 
tamaya-sandbox >>>
[INFO] 
[INFO] --- maven-enforcer-plugin:1.4.1:enforce (enforce-versions) @ 
tamaya-sandbox ---
[INFO] 
[INFO] --- apache-rat-plugin:0.12:check (default) @ tamaya-sandbox ---
[INFO] Enabled default license matchers.
[INFO] Will parse SCM ignores for exclusions...
[INFO] Parsing exclusions from 

[INFO] Finished adding exclusions from SCM ignore files.
[INFO] 89 implicit excludes (use -debug for more details).
[INFO] Exclude: **/*banner.txt
[INFO] Exclude: banner.txt
[INFO] Exclude: .git
[INFO] Exclude: derby.log
[INFO] Exclude: **/bootstrap-*
[INFO] Exclude: **/js/jquery-*
[INFO] Exclude: **/*.json
[INFO] Exclude: **/*.md
[INFO] Exclude: **/*.md.vm
[INFO] Exclude: src/site/asciidoc/temp-properties-files-for-site/attributes.adoc
[INFO] Exclude: readme/**
[INFO] 1 resources included (use -debug for more details)
[INFO] Rat check: Summary over all files. Unapproved: 0, unknown: 0, generated: 
0, approved: 1 licenses.
[WARNING] Failed to getClass for org.apache.maven.plugins.source.SourceJarMojo
[INFO] 
[INFO] <<< maven-source-plugin:3.0.1:jar (source-jar) < generate-sources @ 
tamaya-sandbox <<<
[INFO] 
[INFO] --- maven-source-plugin:3.0.1:jar (source-jar) @ tamaya-sandbox ---
[INFO] 
[INFO] --- maven-failsafe-plugin:2.19.1:integration-test (default) @ 
tamaya-sandbox ---
[INFO] No tests to run.
[INFO] Skipping execution of surefire because it has already been run for this 
configuration
[JENKINS] Recording test results[INFO] 
[INFO] --- maven-failsafe-plugin:2.19.1:verify (default) @ tamaya-sandbox ---

[JENKINS] Recording test results[INFO] 
[INFO] --- maven-install-plugin:2.5.2:install (default-install) @ 
tamaya-sandbox ---
[INFO] Installing 
 to 
/home/jenkins/jenkins-slave/maven-repositories/1/org/apache/tamaya/ext/tamaya-sandbox/0.3-incubating-SNAPSHOT/tamaya-sandbox-0.3-incubating-SNAPSHOT.pom
[INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/1/org/apache/tamaya/ext/tamaya-sandbox/0.3-incubating-SNAPSHOT/tamaya-sandbox-0.3-incubating-SNAPSHOT-features.xml

[INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/1/org/apache/tamaya/ext/tamaya-sandbox/0.3-incubating-SNAPSHOT/tamaya-sandbox-0.3-incubating-SNAPSHOT-features.xml
[INFO] 
[INFO] --- maven-deploy-plugin:2.8.2:deploy (default-deploy) @ tamaya-sandbox 
---
[INFO] Downloading: 
https://repository.apache.org/content/repositories/snapshots/org/apache/tamaya/ext/tamaya-sandbox/0.3-incubating-SNAPSHOT/maven-metadata.xml
[INFO] Downloaded: 
https://repository.apache.org/content/repositories/snapshots/org/apache/tamaya/ext/tamaya-sandbox/0.3-incubating-SNAPSHOT/maven-metadata.xml
 (860 B at 0.7 KB/sec)
[INFO] Uploading: 
https://repository.apache.org/content/repositories/snapshots/org/apache/tamaya/ext/tamaya-sandbox/0.3-incubating-SNAPSHOT/tamaya-sandbox-0.3-incubating-20170305.233643-331.pom
[INFO] Uploaded: 
https://repository.apache.org/content/repositories/snapshots/org/apache/tamaya/ext/tamaya-sandbox/0.3-incubating-SNAPSHOT/tamaya-sandbox-0.3-incubating-20170305.233643-331.pom
 (38 KB at 35.7 KB/sec)
[INFO] Downloading: 
https://repository.apache.org/content/repositories/snapshots/org/apache/tamaya/ext/tamaya-sandbox/maven-metadata.xml
[INFO] Downloaded: 
https://repository.apache.org/content/repositories/snapshots/org/apache/tamaya/ext/tamaya-sandbox/maven-metadata.xml
 (304 B at 0.5 KB/sec)
[INFO] Uploading: 
https://repository.apache.org/content/repositories/snapshots/org/apache/tamaya/ext/tamaya-sandbox/0.3-incubating-SNAPSHOT/maven-metadata.xml
[INFO] Uploaded:

Build failed in Jenkins: Tamaya-Sandbox-Master » Apache Tamaya Modules - Hazelcast PropertySource #436

2017-03-05 Thread Apache Jenkins Server

See 


--
[INFO] 
[INFO] 
[INFO] Building Apache Tamaya Modules - Hazelcast PropertySource 
0.3-incubating-SNAPSHOT
[INFO] 
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/tamaya/tamaya-core/0.3-incubating-SNAPSHOT/maven-metadata.xml
[INFO] Downloaded: 
http://repository.apache.org/snapshots/org/apache/tamaya/tamaya-core/0.3-incubating-SNAPSHOT/maven-metadata.xml
 (2 KB at 4.0 KB/sec)
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/tamaya/tamaya-core/0.3-incubating-SNAPSHOT/tamaya-core-0.3-incubating-20170305.001431-420.pom
[INFO] Downloaded: 
http://repository.apache.org/snapshots/org/apache/tamaya/tamaya-core/0.3-incubating-SNAPSHOT/tamaya-core-0.3-incubating-20170305.001431-420.pom
 (3 KB at 8.0 KB/sec)
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/tamaya/tamaya-code/0.3-incubating-SNAPSHOT/maven-metadata.xml
[INFO] Downloaded: 
http://repository.apache.org/snapshots/org/apache/tamaya/tamaya-code/0.3-incubating-SNAPSHOT/maven-metadata.xml
 (853 B at 2.3 KB/sec)
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/tamaya/tamaya-code/0.3-incubating-SNAPSHOT/tamaya-code-0.3-incubating-20170305.001340-423.pom
[INFO] Downloaded: 
http://repository.apache.org/snapshots/org/apache/tamaya/tamaya-code/0.3-incubating-SNAPSHOT/tamaya-code-0.3-incubating-20170305.001340-423.pom
 (2 KB at 3.9 KB/sec)
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/tamaya/tamaya-all/0.3-incubating-SNAPSHOT/maven-metadata.xml
[INFO] Downloaded: 
http://repository.apache.org/snapshots/org/apache/tamaya/tamaya-all/0.3-incubating-SNAPSHOT/maven-metadata.xml
 (852 B at 2.3 KB/sec)
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/tamaya/tamaya-all/0.3-incubating-SNAPSHOT/tamaya-all-0.3-incubating-20170305.001313-425.pom
[INFO] Downloaded: 
http://repository.apache.org/snapshots/org/apache/tamaya/tamaya-all/0.3-incubating-SNAPSHOT/tamaya-all-0.3-incubating-20170305.001313-425.pom
 (36 KB at 76.1 KB/sec)
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/tamaya/tamaya-api/0.3-incubating-SNAPSHOT/maven-metadata.xml
[INFO] Downloaded: 
http://repository.apache.org/snapshots/org/apache/tamaya/tamaya-api/0.3-incubating-SNAPSHOT/maven-metadata.xml
 (2 KB at 3.9 KB/sec)
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/tamaya/tamaya-api/0.3-incubating-SNAPSHOT/tamaya-api-0.3-incubating-20170305.001359-423.pom
[INFO] Downloaded: 
http://repository.apache.org/snapshots/org/apache/tamaya/tamaya-api/0.3-incubating-SNAPSHOT/tamaya-api-0.3-incubating-20170305.001359-423.pom
 (2 KB at 5.0 KB/sec)
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/tamaya/ext/tamaya-functions/0.3-incubating-SNAPSHOT/maven-metadata.xml
[INFO] Downloaded: 
http://repository.apache.org/snapshots/org/apache/tamaya/ext/tamaya-functions/0.3-incubating-SNAPSHOT/maven-metadata.xml
 (2 KB at 3.9 KB/sec)
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/tamaya/ext/tamaya-functions/0.3-incubating-SNAPSHOT/tamaya-functions-0.3-incubating-20170305.003526-386.pom
[INFO] Downloaded: 
http://repository.apache.org/snapshots/org/apache/tamaya/ext/tamaya-functions/0.3-incubating-SNAPSHOT/tamaya-functions-0.3-incubating-20170305.003526-386.pom
 (3 KB at 6.5 KB/sec)
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/tamaya/ext/tamaya-extensions/0.3-incubating-SNAPSHOT/maven-metadata.xml
[INFO] Downloaded: 
http://repository.apache.org/snapshots/org/apache/tamaya/ext/tamaya-extensions/0.3-incubating-SNAPSHOT/maven-metadata.xml
 (863 B at 2.3 KB/sec)
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/tamaya/ext/tamaya-extensions/0.3-incubating-SNAPSHOT/tamaya-extensions-0.3-incubating-20170305.233405-392.pom
[INFO] Downloaded: 
http://repository.apache.org/snapshots/org/apache/tamaya/ext/tamaya-extensions/0.3-incubating-SNAPSHOT/tamaya-extensions-0.3-incubating-20170305.233405-392.pom
 (2 KB at 5.3 KB/sec)
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/tamaya/ext/tamaya-extensions-all/0.3-incubating-SNAPSHOT/maven-metadata.xml
[INFO] Downloaded: 
http://repository.apache.org/snapshots/org/apache/tamaya/ext/tamaya-extensions-all/0.3-incubating-SNAPSHOT/maven-metadata.xml
 (867 B at 2.3 KB/sec)
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/tamaya/ext/tamaya-extensions-all/0.3-incubating-SNAPSHOT/tamaya-extensions-all-0.3-incubating-20170305.233352-223.pom
[INFO] Downloaded:

Build failed in Jenkins: Tamaya-Extensions-Master #484

2017-03-05 Thread Apache Jenkins Server

See 


Changes:

[anatole] TAMAYA-253: Added replacement policy for raw evaluation.

[anatole] TAMAYA-252: Unified PropertyValue API and usage, also separating key,

[anatole] TAMAYA-238: Removed explicit versions.

[anatole] TAMAYA-252: Unified PropertyValue builder API.

--
[...truncated 149.02 KB...]
[INFO] --- maven-remote-resources-plugin:1.5:process (process-resource-bundles) 
@ tamaya-resources ---
[DEBUG] Initializing Velocity, Calling init()...
[DEBUG] ***
[DEBUG] Starting Apache Velocity v1.7 (compiled: 2010-11-19 12:14:37)
[DEBUG] RuntimeInstance initializing.
[DEBUG] Default Properties File: 
org/apache/velocity/runtime/defaults/velocity.properties
[DEBUG] Default ResourceManager initializing. (class 
org.apache.velocity.runtime.resource.ResourceManagerImpl)
[DEBUG] ResourceLoader instantiated: 
org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
[DEBUG] ResourceCache: initialized (class 
org.apache.velocity.runtime.resource.ResourceCacheImpl) with class 
java.util.Collections$SynchronizedMap cache map.
[DEBUG] Default ResourceManager initialization complete.
[DEBUG] Loaded System Directive: org.apache.velocity.runtime.directive.Stop
[DEBUG] Loaded System Directive: org.apache.velocity.runtime.directive.Define
[DEBUG] Loaded System Directive: org.apache.velocity.runtime.directive.Break
[DEBUG] Loaded System Directive: org.apache.velocity.runtime.directive.Evaluate
[DEBUG] Loaded System Directive: org.apache.velocity.runtime.directive.Literal
[DEBUG] Loaded System Directive: org.apache.velocity.runtime.directive.Macro
[DEBUG] Loaded System Directive: org.apache.velocity.runtime.directive.Parse
[DEBUG] Loaded System Directive: org.apache.velocity.runtime.directive.Include
[DEBUG] Loaded System Directive: org.apache.velocity.runtime.directive.Foreach
[DEBUG] Velocimacro : initialization starting.
[DEBUG] Velocimacro : "velocimacro.library" is not set.  Trying default 
library: VM_global_library.vm
[DEBUG] Velocimacro : Default library not found.
[DEBUG] Velocimacro : allowInline = true : VMs can be defined inline in 
templates
[DEBUG] Velocimacro : allowInlineToOverride = false : VMs defined inline may 
NOT replace previous VM definitions
[DEBUG] Velocimacro : allowInlineLocal = false : VMs defined inline will be 
global in scope if allowed.
[DEBUG] Velocimacro : autoload off : VM system will not automatically reload 
global library macros
[DEBUG] Velocimacro : Velocimacro : initialization complete.
[DEBUG] RuntimeInstance successfully initialized.
[DEBUG] Supplemental data models won't be loaded.  No models specified.
[DEBUG] Building project for 
org.apache.tamaya:tamaya-api:jar:0.3-incubating-SNAPSHOT:compile
[DEBUG] Adding project with groupId [org.apache.tamaya]
[DEBUG] Building project for 
org.apache.geronimo.specs:geronimo-annotation_1.2_spec:jar:1.0-alpha-1:compile
[DEBUG] Adding project with groupId [org.apache.geronimo.specs]
[INFO] 
[INFO] --- karaf-maven-plugin:4.0.5:features-generate-descriptor (generate) @ 
tamaya-resources ---
[DEBUG] Dependency collection stats: {ConflictMarker.analyzeTime=0, 
ConflictMarker.markTime=0, ConflictMarker.nodeCount=4, 
ConflictIdSorter.graphTime=0, ConflictIdSorter.topsortTime=0, 
ConflictIdSorter.conflictIdCount=3, ConflictIdSorter.conflictIdCycleCount=0, 
ConflictResolver.totalTime=0, ConflictResolver.conflictItemCount=4, 
DefaultDependencyCollector.collectTime=2, 
DefaultDependencyCollector.transformTime=0}
[INFO] Generating feature descriptor file 

[DEBUG] Resolving artifact 
org.apache.tamaya:tamaya-api:jar:0.3-incubating-SNAPSHOT from 
[activate-asf-snapshots 
(https://repository.apache.org/content/repositories/snapshots/, default, 
releases+snapshots), maven-central (https://repo1.maven.org/maven2, default, 
releases), Nexus (http://repository.apache.org/snapshots, default, snapshots), 
central (https://repo.maven.apache.org/maven2, default, releases)]
[DEBUG] Resolved artifact 
org.apache.tamaya:tamaya-api:jar:0.3-incubating-SNAPSHOT to 
/home/jenkins/jenkins-slave/maven-repositories/1/org/apache/tamaya/tamaya-api/0.3-incubating-SNAPSHOT/tamaya-api-0.3-incubating-SNAPSHOT.jar
 from activate-asf-snapshots 
(https://repository.apache.org/content/repositories/snapshots/, default, 
releases+snapshots)
[DEBUG] Resolving artifact 
org.apache.geronimo.specs:geronimo-annotation_1.2_spec:jar:1.0-alpha-1 from 
[activate-asf-snapshots 
(https://repository.apache.org/content/repositories/snapshots/, default, 
releases+snapshots), maven-central (https://repo1.maven.org/maven2, default, 
releases), Nexus (http://repository.apache.org/snapshots, default, snapshots), 
central (https://repo.maven.apache.org/maven2, default, releases)]
[DEBUG]

[4/6] incubator-tamaya git commit: TAMAYA-252: Clarified PropertyValue API.

2017-03-05 Thread anatole

TAMAYA-252: Clarified PropertyValue API.


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

Branch: refs/heads/master
Commit: 8c0081b9a8f6123f080bdd4c4b33dc0c62fde451
Parents: b59c1ae
Author: anatole 
Authored: Fri Mar 3 22:27:02 2017 +0100
Committer: anatole 
Committed: Mon Mar 6 00:29:34 2017 +0100

--
 .../org/apache/tamaya/spi/PropertyValue.java| 60 +
 .../apache/tamaya/spi/PropertyValueBuilder.java | 70 +---
 2 files changed, 108 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/8c0081b9/code/api/src/main/java/org/apache/tamaya/spi/PropertyValue.java
--
diff --git a/code/api/src/main/java/org/apache/tamaya/spi/PropertyValue.java 
b/code/api/src/main/java/org/apache/tamaya/spi/PropertyValue.java
index 30afeab..0332b85 100644
--- a/code/api/src/main/java/org/apache/tamaya/spi/PropertyValue.java
+++ b/code/api/src/main/java/org/apache/tamaya/spi/PropertyValue.java
@@ -18,6 +18,7 @@
  */
 package org.apache.tamaya.spi;
 
+import java.io.Serializable;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -29,18 +30,21 @@ import java.util.Objects;
  * it is possible to create a PropertyValue with a null value. Nevertheless in 
all cases the provider source (typically
  * the name of the PropertySource) must be set.
  */
-public final class PropertyValue {
+public final class PropertyValue implements Serializable{
+private static final long serialVersionUID = 1L;
 /** The requested key. */
 private String key;
+/** The value. */
+private String value;
 /** Additional metadata provided by the provider. */
-private Map configEntries = new HashMap<>();
+private Map metaEntries = new HashMap<>();
 
 PropertyValue(PropertyValueBuilder builder){
 this.key = builder.key;
-if(builder.contextData!=null) {
-this.configEntries.putAll(builder.contextData);
+this.value = Objects.requireNonNull(builder.value);
+if(builder.metaEntries !=null) {
+this.metaEntries.putAll(builder.metaEntries);
 }
-this.configEntries.put(key, Objects.requireNonNull(builder.value));
 }
 
 /**
@@ -51,8 +55,8 @@ public final class PropertyValue {
  */
 private PropertyValue(String key, String value, String source){
 this.key = Objects.requireNonNull(key, "key is required.");
-this.configEntries.put(key, value);
-this.configEntries.put("_"+key+".source", 
Objects.requireNonNull(source, "source is required."));
+this.value = Objects.requireNonNull(value);
+this.metaEntries.put("_"+key+".source", Objects.requireNonNull(source, 
"source is required."));
 }
 
 /**
@@ -69,7 +73,7 @@ public final class PropertyValue {
  * {@link PropertySource#get(String)}.
  */
 public String getValue() {
-return configEntries.get(key);
+return this.value;
 }
 
 /**
@@ -77,8 +81,8 @@ public final class PropertyValue {
  * is also used for subsequent processing, like value filtering.
  * @return the property value entry map.
  */
-public Map getConfigEntries() {
-return Collections.unmodifiableMap(configEntries);
+public Map getMetaEntries() {
+return Collections.unmodifiableMap(metaEntries);
 }
 
 /**
@@ -111,7 +115,39 @@ public final class PropertyValue {
  * @param key the key, not null.
  * @return the value found, or null.
  */
-public String get(String key) {
-return this.configEntries.get(key);
+public String getMetaEntry(String key) {
+return this.metaEntries.get(key);
+}
+
+/**
+ * Creates a new builder instance based on this item.
+ * @return a new builder, never null.
+ */
+public PropertyValueBuilder toBuilder() {
+return new PropertyValueBuilder(this.getKey(), this.getValue(), 
this.metaEntries);
+}
+
+@Override
+public boolean equals(Object o) {
+if (this == o) return true;
+if (!(o instanceof PropertyValue)) return false;
+PropertyValue that = (PropertyValue) o;
+return Objects.equals(getKey(), that.getKey()) &&
+Objects.equals(getValue(), that.getValue()) &&
+Objects.equals(getMetaEntries(), that.getMetaEntries());
+}
+
+@Override
+public int hashCode() {
+return Objects.hash(getKey(),

[1/6] incubator-tamaya git commit: TAMAYA-252: Unified PropertyValue builder API.

2017-03-05 Thread anatole

Repository: incubator-tamaya
Updated Branches:
  refs/heads/master b59c1ae26 -> 8ad767b48


TAMAYA-252: Unified PropertyValue builder API.


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

Branch: refs/heads/master
Commit: 8ad767b484f2e9bb6247b14ca53c8395b773ebe0
Parents: b2dddeb
Author: anatole 
Authored: Mon Mar 6 00:28:58 2017 +0100
Committer: anatole 
Committed: Mon Mar 6 00:29:34 2017 +0100

--
 .../org/apache/tamaya/spi/FilterContext.java|  47 ---
 .../apache/tamaya/spi/FilterContextTest.java|  71 +--
 .../core/internal/DefaultConfiguration.java |   2 +-
 .../tamaya/core/internal/PropertyFiltering.java | 123 ---
 .../core/internal/PropertySourceComparator.java |   4 +-
 .../core/testdata/TestPropertyFilter.java   |   2 +-
 .../testdata/TestRemovingPropertyFilter.java|   4 +-
 7 files changed, 152 insertions(+), 101 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/8ad767b4/code/api/src/main/java/org/apache/tamaya/spi/FilterContext.java
--
diff --git a/code/api/src/main/java/org/apache/tamaya/spi/FilterContext.java 
b/code/api/src/main/java/org/apache/tamaya/spi/FilterContext.java
index d5c7850..e3f4465 100644
--- a/code/api/src/main/java/org/apache/tamaya/spi/FilterContext.java
+++ b/code/api/src/main/java/org/apache/tamaya/spi/FilterContext.java
@@ -18,6 +18,8 @@
  */
 package org.apache.tamaya.spi;
 
+import org.apache.tamaya.Configuration;
+
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -30,7 +32,9 @@ import java.util.Objects;
  */
 public class FilterContext {
 /** The key. */
-private final String key;
+private final PropertyValue value;
+/** tHE CURRENT CONTEXT. */
+private final ConfigurationContext context;
 @Experimental
 private Map configEntries = new HashMap();
 @Experimental
@@ -38,35 +42,50 @@ public class FilterContext {
 
 
 /**
- * Creates a new FilterContext.
- * @param key the key under evaluation, not null.
+ * Creates a new FilterContext, for filtering of a multi value access
+ * using {@link Configuration#getProperties()}.
+ * @param value the value under evaluation, not null.
  * @param configEntries the raw configuration data available in the 
current evaluation context, not null.
+ * @param context the current context, not null.
  */
-public FilterContext(String key, Map configEntries) {
+public FilterContext(PropertyValue value, Map 
configEntries, ConfigurationContext context) {
 this.singlePropertyScoped = false;
-this.key = Objects.requireNonNull(key);
+this.value = Objects.requireNonNull(value);
+this.context = Objects.requireNonNull(context);
 this.configEntries.putAll(configEntries);
 this.configEntries = Collections.unmodifiableMap(this.configEntries);
 }
 
-public FilterContext(String key, PropertyValue value) {
+/**
+ * Creates a new FilterContext, for filtering of a single value access
+ * using {@link Configuration#getProperties()}.
+ * @param value the value under evaluation, not null.
+ * @param context the current context, not null.
+ */
+public FilterContext(PropertyValue value, ConfigurationContext context) {
 this.singlePropertyScoped = true;
-this.key = Objects.requireNonNull(key);
-if(value!=null) {
-this.configEntries.put(value.getKey(), value);
-}
+this.context = Objects.requireNonNull(context);
+this.value = Objects.requireNonNull(value);
 this.configEntries = Collections.unmodifiableMap(this.configEntries);
 }
 
 /**
- * Get the key accessed. This information is very useful to evaluate 
additional metadata needed to determine/
+ * Get the current context.
+ * @return the current context, not null.
+ */
+public ConfigurationContext getContext(){
+return context;
+}
+
+/**
+ * Get the property value under evaluation. This information is very 
useful to evaluate additional metadata needed to determine/
  * control further aspects of the conversion.
  *
  * @return the key. This may be null in case where a default value has to 
be converted and no unique underlying
  * key/value configuration is present.
  */
-public String getKey() {
-return key;
+public PropertyValue

[3/6] incubator-tamaya git commit: TAMAYA-252: Unified PropertyValue API and usage, also separating key, value, source and other meta-data and defining a clear builder policy.

2017-03-05 Thread anatole

TAMAYA-252: Unified PropertyValue API and usage, also separating key, value, 
source and other meta-data and defining a clear builder policy.


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

Branch: refs/heads/master
Commit: ae4ebe1d34a03f7f6e3dd97859533eec879bc639
Parents: 855342a
Author: anatole 
Authored: Sun Mar 5 21:27:29 2017 +0100
Committer: anatole 
Committed: Mon Mar 6 00:29:34 2017 +0100

--
 .../org/apache/tamaya/spi/FilterContext.java|  20 ++-
 .../org/apache/tamaya/spi/PropertyFilter.java   |   4 +-
 .../org/apache/tamaya/spi/PropertySource.java   |  51 ++-
 .../org/apache/tamaya/spi/PropertyValue.java|  77 +-
 .../apache/tamaya/spi/PropertyValueBuilder.java |  90 
 .../spi/PropertyValueCombinationPolicy.java |   7 +-
 .../apache/tamaya/spi/FilterContextTest.java|  29 ++--
 .../tamaya/spi/PropertyValueBuilderTest.java| 129 +---
 .../apache/tamaya/spi/PropertyValueTest.java| 146 ++-
 .../core/internal/DefaultConfiguration.java |  86 +--
 .../tamaya/core/internal/PropertyFiltering.java |  33 ++---
 .../core/internal/PropertySourceComparator.java |  88 +--
 .../core/internal/WrappedPropertySource.java|   2 +-
 .../core/propertysource/BasePropertySource.java |  14 +-
 .../core/propertysource/CLIPropertySource.java  |  16 +-
 .../EnvironmentPropertySource.java  |  29 ++--
 .../JavaConfigurationPropertySource.java|   7 +-
 .../propertysource/SimplePropertySource.java|  39 ++---
 .../propertysource/SystemPropertySource.java|  19 +--
 .../core/ConfigurationContextBuilderTest.java   |  27 ++--
 .../apache/tamaya/core/TestPropertySource.java  |   7 +-
 .../DefaultConfigurationContextBuilderTest.java |  19 ++-
 .../DefaultConfigurationContextTest.java|   2 +-
 .../ConverterTestsPropertySource.java   |   7 +-
 .../propertysource/BasePropertySourceTest.java  |  25 ++--
 .../propertysource/CLIPropertySourceTest.java   |  18 +--
 .../EnvironmentPropertySourceTest.java  |   9 +-
 .../PropertiesFilePropertySourceTest.java   |   6 +-
 .../SimplePropertySourceTest.java   |   5 +-
 .../SystemPropertySourceTest.java   |  28 ++--
 .../provider/JavaConfigurationProviderTest.java |   2 +-
 .../testdata/TestPropertyDefaultSource.java |   9 +-
 .../core/testdata/TestPropertyFilter.java   |   7 +-
 .../testdata/TestPropertySourceProvider.java|  13 +-
 .../testdata/TestRemovingPropertyFilter.java|   7 +-
 .../SimplePropertySource.java   |   9 +-
 36 files changed, 711 insertions(+), 375 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ae4ebe1d/code/api/src/main/java/org/apache/tamaya/spi/FilterContext.java
--
diff --git a/code/api/src/main/java/org/apache/tamaya/spi/FilterContext.java 
b/code/api/src/main/java/org/apache/tamaya/spi/FilterContext.java
index 3c675c8..d5c7850 100644
--- a/code/api/src/main/java/org/apache/tamaya/spi/FilterContext.java
+++ b/code/api/src/main/java/org/apache/tamaya/spi/FilterContext.java
@@ -32,7 +32,7 @@ public class FilterContext {
 /** The key. */
 private final String key;
 @Experimental
-private Map configEntries = new HashMap();
+private Map configEntries = new HashMap();
 @Experimental
 private boolean singlePropertyScoped;
 
@@ -40,16 +40,24 @@ public class FilterContext {
 /**
  * Creates a new FilterContext.
  * @param key the key under evaluation, not null.
- * @param singlePropertyScope true, if the filtering is done only for one 
single property accessed explcitily.
  * @param configEntries the raw configuration data available in the 
current evaluation context, not null.
  */
-public FilterContext(String key, Map configEntries, boolean 
singlePropertyScope) {
-this.singlePropertyScoped = singlePropertyScope;
+public FilterContext(String key, Map configEntries) {
+this.singlePropertyScoped = false;
 this.key = Objects.requireNonNull(key);
 this.configEntries.putAll(configEntries);
 this.configEntries = Collections.unmodifiableMap(this.configEntries);
 }
 
+public FilterContext(String key, PropertyValue value) {
+this.singlePropertyScoped = true;
+this.key = Objects.requireNonNull(key);
+if(value!=null) {
+

[2/6] incubator-tamaya git commit: TAMAYA-252: Unified PropertyValue API and usage, also separating key, value, source and other meta-data and defining a clear builder policy.

2017-03-05 Thread anatole

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ae4ebe1d/code/core/src/test/java/org/apache/tamaya/core/internal/converters/ConverterTestsPropertySource.java
--
diff --git 
a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/ConverterTestsPropertySource.java
 
b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/ConverterTestsPropertySource.java
index 121e331..d09ed8d 100644
--- 
a/code/core/src/test/java/org/apache/tamaya/core/internal/converters/ConverterTestsPropertySource.java
+++ 
b/code/core/src/test/java/org/apache/tamaya/core/internal/converters/ConverterTestsPropertySource.java
@@ -30,6 +30,11 @@ import java.util.Map;
 public class ConverterTestsPropertySource implements PropertySource{
 
 @Override
+public int getOrdinal() {
+return 0;
+}
+
+@Override
 public String getName(){
 return "ConverterTestsPropertySource";
 }
@@ -238,7 +243,7 @@ public class ConverterTestsPropertySource implements 
PropertySource{
 }
 
 @Override
-public Map getProperties() {
+public Map getProperties() {
 return Collections.emptyMap();
 }
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ae4ebe1d/code/core/src/test/java/org/apache/tamaya/core/propertysource/BasePropertySourceTest.java
--
diff --git 
a/code/core/src/test/java/org/apache/tamaya/core/propertysource/BasePropertySourceTest.java
 
b/code/core/src/test/java/org/apache/tamaya/core/propertysource/BasePropertySourceTest.java
index 37cc86a..9c2fc60 100644
--- 
a/code/core/src/test/java/org/apache/tamaya/core/propertysource/BasePropertySourceTest.java
+++ 
b/code/core/src/test/java/org/apache/tamaya/core/propertysource/BasePropertySourceTest.java
@@ -21,13 +21,10 @@ package org.apache.tamaya.core.propertysource;
 import org.apache.tamaya.core.internal.PropertySourceComparator;
 import org.apache.tamaya.spi.PropertySource;
 import org.apache.tamaya.spi.PropertyValue;
-import org.apache.tamaya.spi.PropertyValueBuilder;
 import org.junit.Assert;
 import org.junit.Test;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 
 public class BasePropertySourceTest {
 
@@ -47,7 +44,7 @@ public class BasePropertySourceTest {
 }
 
 @Override
-public Map getProperties() {
+public Map getProperties() {
 return Collections.emptyMap();
 }
 };
@@ -61,7 +58,7 @@ public class BasePropertySourceTest {
 
 @Test
 public void testGet() {
-Assert.assertEquals("1000", new 
OverriddenOrdinalPropertySource().get(PropertySource.TAMAYA_ORDINAL).get(PropertySource.TAMAYA_ORDINAL));
+Assert.assertEquals(1000, new 
OverriddenOrdinalPropertySource().getOrdinal());
 }
 
 private static class OverriddenOrdinalPropertySource extends 
BasePropertySource {
@@ -76,10 +73,10 @@ public class BasePropertySourceTest {
 }
 
 @Override
-public Map getProperties() {
-Map map = new HashMap<>(1);
-map.put(PropertySource.TAMAYA_ORDINAL, "1000");
-return map;
+public Map getProperties() {
+Map result = new HashMap<>(1);
+result.put(PropertySource.TAMAYA_ORDINAL, 
PropertyValue.of(PropertySource.TAMAYA_ORDINAL, "1000", getName()));
+return result;
 }
 }
 
@@ -95,10 +92,10 @@ public class BasePropertySourceTest {
 }
 
 @Override
-public Map getProperties() {
-Map map = new HashMap<>(1);
-map.put(PropertySource.TAMAYA_ORDINAL, "invalid");
-return map;
+public Map getProperties() {
+Map result = new HashMap<>(1);
+result.put(PropertySource.TAMAYA_ORDINAL, 
PropertyValue.of(PropertySource.TAMAYA_ORDINAL, "invalid", getName()));
+return result;
 }
 }
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ae4ebe1d/code/core/src/test/java/org/apache/tamaya/core/propertysource/CLIPropertySourceTest.java
--
diff --git 
a/code/core/src/test/java/org/apache/tamaya/core/propertysource/CLIPropertySourceTest.java
 
b/code/core/src/test/java/org/apache/tamaya/core/propertysource/CLIPropertySourceTest.java
index dde63e5..20126f3 100644
--- 
a/code/core/src/test/java/org/apache/tamaya/core/propertysource/CLIPropertySourceTest.java
+++ 
b/code/core/src/test/java/org/apache/tamaya/core/propertysource/CLIPropertySourceTest.java
@@ -34,25 +34,25 @@ public class

[2/5] incubator-tamaya-extensions git commit: TAMAYA-252: Unified PropertyValue API and usage, also separating key, value, source and other meta-data and defining a clear builder policy.

2017-03-05 Thread anatole

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/9f915b25/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/ExpressionResolutionFilter.java
--
diff --git 
a/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/ExpressionResolutionFilter.java
 
b/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/ExpressionResolutionFilter.java
index bd90083..2f2de62 100644
--- 
a/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/ExpressionResolutionFilter.java
+++ 
b/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/ExpressionResolutionFilter.java
@@ -22,6 +22,7 @@ import org.apache.tamaya.ConfigException;
 import org.apache.tamaya.resolver.spi.ExpressionEvaluator;
 import org.apache.tamaya.spi.FilterContext;
 import org.apache.tamaya.spi.PropertyFilter;
+import org.apache.tamaya.spi.PropertyValue;
 import org.apache.tamaya.spi.ServiceContextManager;
 
 import javax.annotation.Priority;
@@ -84,9 +85,13 @@ public class ExpressionResolutionFilter implements 
PropertyFilter {
  * @return the resolved value, or the input in case where no expression 
was detected.
  */
 @Override
-public String filterProperty(String valueToBeFiltered, FilterContext 
context){
+public PropertyValue filterProperty(PropertyValue valueToBeFiltered, 
FilterContext context){
 LOG.finest("Resolving " + valueToBeFiltered + "(key=" + 
context.getKey() + ")");
-return evaluator().evaluateExpression(context.getKey(), 
valueToBeFiltered, true);
+String newVal = evaluator().evaluateExpression(context.getKey(), 
valueToBeFiltered.getValue(), true);
+if(newVal!=null){
+return valueToBeFiltered.toBuilder().setValue(newVal).build();
+}
+return null;
 }
 
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/9f915b25/modules/resolver/src/test/java/org/apache/tamaya/resolver/MyTestPropertySource.java
--
diff --git 
a/modules/resolver/src/test/java/org/apache/tamaya/resolver/MyTestPropertySource.java
 
b/modules/resolver/src/test/java/org/apache/tamaya/resolver/MyTestPropertySource.java
index 1c26f31..eee7fa4 100644
--- 
a/modules/resolver/src/test/java/org/apache/tamaya/resolver/MyTestPropertySource.java
+++ 
b/modules/resolver/src/test/java/org/apache/tamaya/resolver/MyTestPropertySource.java
@@ -76,6 +76,11 @@ public class MyTestPropertySource implements PropertySource{
 }
 
 @Override
+public int getOrdinal() {
+return 0;
+}
+
+@Override
 public String getName() {
 return "test";
 }
@@ -86,8 +91,12 @@ public class MyTestPropertySource implements PropertySource{
 }
 
 @Override
-public Map getProperties() {
-return properties;
+public Map getProperties() {
+Map res = new HashMap<>();
+for(Map.Entry en:properties.entrySet()){
+res.put(en.getKey(), PropertyValue.of(en.getKey(), en.getValue(), 
"test"));
+}
+return res;
 }
 
 @Override

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/9f915b25/modules/resources/src/main/java/org/apache/tamaya/resource/AbstractPathPropertySourceProvider.java
--
diff --git 
a/modules/resources/src/main/java/org/apache/tamaya/resource/AbstractPathPropertySourceProvider.java
 
b/modules/resources/src/main/java/org/apache/tamaya/resource/AbstractPathPropertySourceProvider.java
index 6a6398a..760e688 100644
--- 
a/modules/resources/src/main/java/org/apache/tamaya/resource/AbstractPathPropertySourceProvider.java
+++ 
b/modules/resources/src/main/java/org/apache/tamaya/resource/AbstractPathPropertySourceProvider.java
@@ -126,7 +126,7 @@ public abstract class AbstractPathPropertySourceProvider 
implements PropertySour
 /** The property source's name. */
 private final String name;
 /** The properties. */
-private final Map properties = new HashMap<>();
+private final Map properties = new HashMap<>();
 
 /**
  * Constructor for a simple properties configuration.
@@ -134,9 +134,10 @@ public abstract class AbstractPathPropertySourceProvider 
implements PropertySour
  * @param props the properties, not null
  */
 public PropertiesBasedPropertySource(String name, Properties props) {
-this.name = name;
+this.name = Objects.requireNonNull(name);
 for (Entry en : props.entrySet()) {
-this.properties.put(en.getKey().toString(), 
String.valueOf(en.getValue()));
+this.properties.put(en.getKey().toString(),
+

[5/6] incubator-tamaya git commit: TAMAYA-238: Removed explicit versions.

2017-03-05 Thread anatole

TAMAYA-238: Removed explicit versions.


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

Branch: refs/heads/master
Commit: b2dddeb864d16f65c48a151103a96f3eccfa1502
Parents: ae4ebe1
Author: anatole 
Authored: Sun Mar 5 21:34:54 2017 +0100
Committer: anatole 
Committed: Mon Mar 6 00:29:34 2017 +0100

--
 code/api/bnd.bnd  | 3 +--
 code/core/bnd.bnd | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b2dddeb8/code/api/bnd.bnd
--
diff --git a/code/api/bnd.bnd b/code/api/bnd.bnd
index 4f29bfe..7ca7687 100644
--- a/code/api/bnd.bnd
+++ b/code/api/bnd.bnd
@@ -1,5 +1,4 @@
 Export-Package: \
org.apache.tamaya,\
org.apache.tamaya.spi
-Bundle-SymbolicName: org.apache.tamaya
-Bundle-Version: 0.3-INCUBATING-SNAPSHOT
\ No newline at end of file
+Bundle-SymbolicName: org.apache.tamaya
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b2dddeb8/code/core/bnd.bnd
--
diff --git a/code/core/bnd.bnd b/code/core/bnd.bnd
index 5d14d8c..7aa4182 100644
--- a/code/core/bnd.bnd
+++ b/code/core/bnd.bnd
@@ -8,5 +8,4 @@ Import-Package: \
org.osgi.framework,\
javax.annotation
 Bundle-Activator: org.apache.tamaya.core.OSGIActivator
-Bundle-SymbolicName: org.apache.tamaya.core
-Bundle-Version: 0.3-INCUBATING-SNAPSHOT
\ No newline at end of file
+Bundle-SymbolicName: org.apache.tamaya.core
\ No newline at end of file

[1/2] incubator-tamaya-site git commit: TAMAYA-253: Added replacement policy for raw evaluation.

2017-03-05 Thread anatole

Repository: incubator-tamaya-site
Updated Branches:
  refs/heads/master 69e489603 -> a449f485a


TAMAYA-253: Added replacement policy for raw evaluation.


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

Branch: refs/heads/master
Commit: b400321110504fc33807071d429731c77878201f
Parents: 69e4896
Author: anatole 
Authored: Sun Mar 5 21:24:25 2017 +0100
Committer: anatole 
Committed: Sun Mar 5 21:24:25 2017 +0100

--
 content/documentation/api.adoc  | 36 ++--
 content/documentation/core.adoc | 58 +++-
 content/documentation/extensions/mod_jndi.adoc  |  3 +
 .../extensions/mod_spi-support.adoc |  6 ++
 4 files changed, 82 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/b4003211/content/documentation/api.adoc
--
diff --git a/content/documentation/api.adoc b/content/documentation/api.adoc
index 9761a5f..ffd8850 100644
--- a/content/documentation/api.adoc
+++ b/content/documentation/api.adoc
@@ -33,7 +33,9 @@ The API provides the artifacts as described in the 
link:../highleveldesign.html[
  +PropertySource+
  *** provides String based property access for single key/value pairs in 
_raw_ format (meaning no postprocessing
  is applied yet).
- *** can _optionally_ provide access to a +Map+, providing 
all its properties at once.
+ *** can _optionally_ provide access to a +Iterable+, 
providing all its properties at once.
+ *** defines the default ordinal to be used for establishing the order of 
significance among all
+ auto-discovered property sources.
   ** _PropertySourceProvider:_ allows to automatically register multiple 
property sources, e.g. all config files found in
  a file system folder..
   ** +ConfigurationProviderSpi+ defines the interface to be implemented by the 
delegating bean that is implementing the
@@ -293,12 +295,11 @@ identified to be necessary:
 [source,java]
 
 public interface PropertySource{
-  // This feature is under discussion
-  // int getOrdinal();
+  int getOrdinal();
   String getName();
-  String get(String key);
+  PropertyValue get(String key);
   boolean isScannable();
-  Map getProperties();
+  Iterable getProperties();
 }
 
 
@@ -312,13 +313,14 @@ Hereby
   properties. If a +PropertySource+ is defined as non scannable accesses to
   +getProperties()+ may not return all key/value pairs that would be available 
when accessed directly using the
   +String get(String)+ method. The fact if a +PropertySource+ is _scannable_ 
can be determined by calling +isScannable()+.
-* TODO Feature is in question: +getOrdinal()+ defines the ordinal of the 
+PropertySource+. Property sources are managed in an ordered chain, where
-  property sources with higher ordinals override the ones with lower ordinals. 
If ordinal are the same, the natural
-  ordering of the fulloy qualified class names of the property source 
implementations are used. The reason for
-  not using +@Priority+ annotations is that property sources can define 
dynamically their ordinals, e.g. based on
-  a property contained with the configuration itself.
-* Finally +getName()+ returns a (unique) name that identifies the 
+PropertySource+ within the current
-  +ConfigurationContext+.
+* +int getOrdinal()+ defines the ordinal of the +PropertySource+. Property 
sources are managed in an ordered chain, where
+  property sources with higher ordinals override ones with lower ordinals. If 
the ordinal of two property sources is
+  the same, the natural ordering of the fully qualified class names of the 
property source implementations is used.
+  The reason for not using +@Priority+ annotations is that property sources 
can define dynamically their ordinals,
+  e.g. based on a property contained with the configuration itself.
+  Implementations of this API may provide additional functionality to adapt 
the default ordinal of auto-discovered
+  property sources.
+* Finally +getName()+ returns a (unique) name that identifies the 
+PropertySource+ within its containing +ConfigurationContext+.
 
 This interface can be implemented by any kind of logic. It could be a simple 
in memory map, a distributed configuration
 provided by a data grid, a database, the JNDI tree or other resources. Or it 
can be a combination

[5/5] incubator-tamaya-extensions git commit: TAMAYA-252: Unified PropertyValue builder API.

2017-03-05 Thread anatole

TAMAYA-252: Unified PropertyValue builder API.


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/01ba7463
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/01ba7463
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/01ba7463

Branch: refs/heads/master
Commit: 01ba7463ea705d9f8725bd594aeac6af648df16c
Parents: 0e16f4e
Author: anatole 
Authored: Mon Mar 6 00:28:58 2017 +0100
Committer: anatole 
Committed: Mon Mar 6 00:28:58 2017 +0100

--
 .../tamaya/events/RandomPropertySource.java |   2 +-
 .../apache/tamaya/events/TestConfigView.java|   2 +-
 .../filter/internal/DefaultMetadataFilter.java  |   2 +-
 .../tamaya/filter/ConfigurationFilterTest.java  |  10 +-
 .../tamaya/filter/ProgrammableFilterTest.java   |  76 ++-
 .../integration/cdi/EnvironmentsTest.java   |   2 +-
 .../internal/ExpressionResolutionFilter.java|   4 +-
 .../tamaya/spisupport/DefaultConfiguration.java |   2 +-
 .../spisupport/PropertyFilterManager.java   | 131 ---
 .../tamaya/spisupport/PropertyFiltering.java| 110 
 .../spisupport/PropertySourceComparator.java|   4 +-
 .../tamaya/spisupport/RegexPropertyFilter.java  |   4 +-
 .../spisupport/RegexPropertyFilterTest.java |  30 +++--
 13 files changed, 125 insertions(+), 254 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/01ba7463/modules/events/src/test/java/org/apache/tamaya/events/RandomPropertySource.java
--
diff --git 
a/modules/events/src/test/java/org/apache/tamaya/events/RandomPropertySource.java
 
b/modules/events/src/test/java/org/apache/tamaya/events/RandomPropertySource.java
index 041056b..746c5f3 100644
--- 
a/modules/events/src/test/java/org/apache/tamaya/events/RandomPropertySource.java
+++ 
b/modules/events/src/test/java/org/apache/tamaya/events/RandomPropertySource.java
@@ -53,7 +53,7 @@ public class RandomPropertySource implements PropertySource{
 @Override
 public Map getProperties() {
 synchronized(data) {
-data.put("random.new", new PropertyValueBuilder("random.new", 
String.valueOf(Math.random()), getName())
+data.put("random.new", PropertyValue.builder("random.new", 
String.valueOf(Math.random()), getName())
 .addMetaEntry("_random.new.timestamp", 
String.valueOf(System.currentTimeMillis())).build());
 return new HashMap<>(data);
 }

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/01ba7463/modules/events/src/test/java/org/apache/tamaya/events/TestConfigView.java
--
diff --git 
a/modules/events/src/test/java/org/apache/tamaya/events/TestConfigView.java 
b/modules/events/src/test/java/org/apache/tamaya/events/TestConfigView.java
index 8e5b397..0713298 100644
--- a/modules/events/src/test/java/org/apache/tamaya/events/TestConfigView.java
+++ b/modules/events/src/test/java/org/apache/tamaya/events/TestConfigView.java
@@ -60,7 +60,7 @@ public class TestConfigView implements ConfigOperator{
 }
 return result;
 //return config.getProperties().entrySet().stream().filter(e 
-> e.getKey().startsWith("test")).collect(
-//Collectors.toMap(en -> en.getKey(), en -> 
en.getValue()));
+//Collectors.toMap(en -> en.getKey(), en -> 
en.getProperty()));
 }
 
 @Override

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/01ba7463/modules/filter/src/main/java/org/apache/tamaya/filter/internal/DefaultMetadataFilter.java
--
diff --git 
a/modules/filter/src/main/java/org/apache/tamaya/filter/internal/DefaultMetadataFilter.java
 
b/modules/filter/src/main/java/org/apache/tamaya/filter/internal/DefaultMetadataFilter.java
index 5694a9d..e9554a2 100644
--- 
a/modules/filter/src/main/java/org/apache/tamaya/filter/internal/DefaultMetadataFilter.java
+++ 
b/modules/filter/src/main/java/org/apache/tamaya/filter/internal/DefaultMetadataFilter.java
@@ -34,7 +34,7 @@ public final class DefaultMetadataFilter implements 
PropertyFilter{
 return valueToBeFiltered;
 }
 if(ConfigurationFilter.isMetadataFiltered()) {
-if (context.getKey().startsWith("_")) {
+if (context.getProperty().getKey().startsWith("_")) {
 // Hide metadata entries.
 return null;
 }

[2/2] incubator-tamaya-sandbox git commit: TAMAYA-252: Unified PropertyValue builder API.

2017-03-05 Thread anatole

TAMAYA-252: Unified PropertyValue builder API.


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

Branch: refs/heads/master
Commit: 99e6850022c7ce14f44e325f72edee573e7dcc65
Parents: 80d6ec2
Author: anatole 
Authored: Mon Mar 6 00:28:58 2017 +0100
Committer: anatole 
Committed: Mon Mar 6 00:28:58 2017 +0100

--
 .../apache/tamaya/consul/ConsulPropertySource.java   |  4 ++--
 .../tamaya/metamodel/ext/FilteredPropertySource.java | 12 ++--
 .../usagetracker/internal/DefaultConfigUsage.java| 15 ---
 .../usagetracker/internal/UsageTrackerFilter.java|  4 ++--
 .../tamaya/usagetracker/spi/ConfigUsageSpi.java  |  8 +---
 5 files changed, 23 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/99e68500/consul/src/main/java/org/apache/tamaya/consul/ConsulPropertySource.java
--
diff --git 
a/consul/src/main/java/org/apache/tamaya/consul/ConsulPropertySource.java 
b/consul/src/main/java/org/apache/tamaya/consul/ConsulPropertySource.java
index d65ce35..026a926 100644
--- a/consul/src/main/java/org/apache/tamaya/consul/ConsulPropertySource.java
+++ b/consul/src/main/java/org/apache/tamaya/consul/ConsulPropertySource.java
@@ -147,7 +147,7 @@ implements MutablePropertySource{
 props.put(reqKey+".modifyIndex", 
String.valueOf(value.getModifyIndex()));
 props.put(reqKey+".lockIndex", 
String.valueOf(value.getLockIndex()));
 props.put(reqKey+".flags", 
String.valueOf(value.getFlags()));
-return new PropertyValueBuilder(key, 
value.getValue().get(), getName()).setMetaEntries(props).build();
+return PropertyValue.builder(key, value.getValue().get(), 
getName()).setMetaEntries(props).build();
 }
 } catch(Exception e){
 LOG.log(Level.FINE, "etcd access failed on " + hostAndPort + 
", trying next...", e);
@@ -162,7 +162,7 @@ implements MutablePropertySource{
 //try{
 //Consul consul = 
Consul.builder().withHostAndPort(hostAndPort).build();
 //KeyValueClient kvClient = consul.keyValueClient();
-//Optional valueOpt = kvClient.getValue(reqKey);
+//Optional valueOpt = kvClient.getProperty(reqKey);
 //try{
 //Map props = kvClient.getProperties("");
 //if(!props.containsKey("_ERROR")) {

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/99e68500/metamodel/src/main/java/org/apache/tamaya/metamodel/ext/FilteredPropertySource.java
--
diff --git 
a/metamodel/src/main/java/org/apache/tamaya/metamodel/ext/FilteredPropertySource.java
 
b/metamodel/src/main/java/org/apache/tamaya/metamodel/ext/FilteredPropertySource.java
index f82e676..43d1836 100644
--- 
a/metamodel/src/main/java/org/apache/tamaya/metamodel/ext/FilteredPropertySource.java
+++ 
b/metamodel/src/main/java/org/apache/tamaya/metamodel/ext/FilteredPropertySource.java
@@ -18,11 +18,9 @@
  */
 package org.apache.tamaya.metamodel.ext;
 
-import org.apache.tamaya.spi.FilterContext;
-import org.apache.tamaya.spi.PropertyFilter;
-import org.apache.tamaya.spi.PropertySource;
-import org.apache.tamaya.spi.PropertyValue;
+import org.apache.tamaya.spi.*;
 import org.apache.tamaya.spisupport.BasePropertySource;
+import org.apache.tamaya.spisupport.DefaultConfigurationContextBuilder;
 import org.apache.tamaya.spisupport.PropertySourceComparator;
 
 import java.util.ArrayList;
@@ -41,6 +39,8 @@ public final class FilteredPropertySource extends 
BasePropertySource {
 
 private PropertySource wrapped;
 private List filters = new ArrayList<>();
+private ConfigurationContext dummyContext = new 
DefaultConfigurationContextBuilder()
+.addPropertySources(this).build();
 
 /**
  * Constructor used privately. Use {@link #of(PropertySource)} for making 
a {@link PropertySource} filterable.
@@ -84,7 +84,7 @@ public final class FilteredPropertySource extends 
BasePropertySource {
 if(filters!=null){
 PropertyValue filteredValue = value;
 for(PropertyFilter pf:filters){
-filteredValue = pf.filterProperty(filteredValue, new 
FilterContext(key, value));
+filteredValue = pf.filterProperty(filteredValue, new

[4/5] incubator-tamaya-extensions git commit: TAMAYA-238: Removed explicit versions.

2017-03-05 Thread anatole

TAMAYA-238: Removed explicit versions.


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/0e16f4e4
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/0e16f4e4
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/0e16f4e4

Branch: refs/heads/master
Commit: 0e16f4e4ba06cc7dd41a004101ad64870067922f
Parents: 9f915b2
Author: anatole 
Authored: Sun Mar 5 21:34:54 2017 +0100
Committer: anatole 
Committed: Sun Mar 5 21:34:54 2017 +0100

--
 modules/formats/base/bnd.bnd| 3 +--
 modules/formats/json/bnd.bnd| 3 +--
 modules/formats/yaml/bnd.bnd| 3 +--
 modules/functions/bnd.bnd   | 3 +--
 modules/injection/injection-api/bnd.bnd | 5 +++--
 modules/injection/standalone/bnd.bnd| 3 +--
 modules/jndi/bnd.bnd| 6 +-
 modules/mutable-config/bnd.bnd  | 3 +--
 modules/optional/bnd.bnd| 3 +--
 modules/resolver/bnd.bnd| 3 +--
 modules/resources/bnd.bnd   | 3 +--
 modules/spi-support/bnd.bnd | 3 +--
 modules/spring/bnd.bnd  | 3 +--
 13 files changed, 19 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/0e16f4e4/modules/formats/base/bnd.bnd
--
diff --git a/modules/formats/base/bnd.bnd b/modules/formats/base/bnd.bnd
index 0d351d1..610181a 100644
--- a/modules/formats/base/bnd.bnd
+++ b/modules/formats/base/bnd.bnd
@@ -1,5 +1,4 @@
 Export-Package: \
org.apache.tamaya.format,\
org.apache.tamaya.format.formats
-Bundle-SymbolicName: org.apache.tamaya.formats
-Bundle-Version: 0.3-INCUBATING-SNAPSHOT
\ No newline at end of file
+Bundle-SymbolicName: org.apache.tamaya.formats
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/0e16f4e4/modules/formats/json/bnd.bnd
--
diff --git a/modules/formats/json/bnd.bnd b/modules/formats/json/bnd.bnd
index 62cd3f9..c4251d1 100644
--- a/modules/formats/json/bnd.bnd
+++ b/modules/formats/json/bnd.bnd
@@ -1,4 +1,3 @@
 Export-Package: \
org.apache.tamaya.json
-Bundle-SymbolicName: org.apache.tamaya.formats.json
-Bundle-Version: 0.3-INCUBATING-SNAPSHOT
\ No newline at end of file
+Bundle-SymbolicName: org.apache.tamaya.formats.json
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/0e16f4e4/modules/formats/yaml/bnd.bnd
--
diff --git a/modules/formats/yaml/bnd.bnd b/modules/formats/yaml/bnd.bnd
index fc92b02..01ab527 100644
--- a/modules/formats/yaml/bnd.bnd
+++ b/modules/formats/yaml/bnd.bnd
@@ -1,4 +1,3 @@
 Export-Package: \
org.apache.tamaya.yaml
-Bundle-SymbolicName: org.apache.tamaya.formats.yaml
-Bundle-Version: 0.3-INCUBATING-SNAPSHOT
\ No newline at end of file
+Bundle-SymbolicName: org.apache.tamaya.formats.yaml
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/0e16f4e4/modules/functions/bnd.bnd
--
diff --git a/modules/functions/bnd.bnd b/modules/functions/bnd.bnd
index 62bda5d..b12cfd4 100644
--- a/modules/functions/bnd.bnd
+++ b/modules/functions/bnd.bnd
@@ -1,4 +1,3 @@
 Export-Package: \
org.apache.tamaya.functions
-Bundle-SymbolicName: org.apache.tamaya.functions
-Bundle-Version: 0.3-INCUBATING-SNAPSHOT
\ No newline at end of file
+Bundle-SymbolicName: org.apache.tamaya.functions
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/0e16f4e4/modules/injection/injection-api/bnd.bnd
--
diff --git a/modules/injection/injection-api/bnd.bnd 
b/modules/injection/injection-api/bnd.bnd
index ea781a8..3516930 100644
--- a/modules/injection/injection-api/bnd.bnd
+++ b/modules/injection/injection-api/bnd.bnd
@@ -2,5 +2,6 @@ Export-Package: \
org.apache.tamaya.inject.api,\
org.apache.tamaya.inject.spi
 Bundle-SymbolicName: org.apache.tamaya.inject.api
-Import-Package: org.apache.tamaya;version="[0.3,1)",\
- org.apache.tamaya.inject.api,org.apache.tamaya.spi;version="[0.3,1)"
\ No newline at end of file
+Import-Package: org.apache.tamaya,\
+org.apache.tamaya.inject.api,\
+org.apache.tamaya.spi
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/0e16f4e4/modules/injection/standalone/bnd.bnd

[2/2] incubator-tamaya-site git commit: TAMAYA-252: Unified PropertyValue builder API.

2017-03-05 Thread anatole

TAMAYA-252: Unified PropertyValue builder API.


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

Branch: refs/heads/master
Commit: a449f485a057e7ef05c911f0333463dec40b8e60
Parents: b400321
Author: anatole 
Authored: Mon Mar 6 00:28:58 2017 +0100
Committer: anatole 
Committed: Mon Mar 6 00:28:58 2017 +0100

--
 content/documentation/api.adoc | 99 ++---
 1 file changed, 91 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/a449f485/content/documentation/api.adoc
--
diff --git a/content/documentation/api.adoc b/content/documentation/api.adoc
index ffd8850..9e133fe 100644
--- a/content/documentation/api.adoc
+++ b/content/documentation/api.adoc
@@ -31,9 +31,10 @@ The API provides the artifacts as described in the 
link:../highleveldesign.html[
  the configuration data provided is managed locally, remotedely. There is 
even no
  requirement that the configuration data is always fully available. 
Summarizing a
  +PropertySource+
- *** provides String based property access for single key/value pairs in 
_raw_ format (meaning no postprocessing
- is applied yet).
- *** can _optionally_ provide access to a +Iterable+, 
providing all its properties at once.
+ *** provides property access for single key/value pairs in _raw_ format 
(meaning no postprocessing
+ is applied yet). A single property hereby is modelled as 
+PropertyValue+, which also includes
+ its source and additional arbitrary metadata entries.
+ *** can _optionally_ provide access to a +Map+, 
providing all its properties at once.
  *** defines the default ordinal to be used for establishing the order of 
significance among all
  auto-discovered property sources.
   ** _PropertySourceProvider:_ allows to automatically register multiple 
property sources, e.g. all config files found in
@@ -278,6 +279,88 @@ The class +ConfigException+ models the base *runtime* 
exception used by the conf
 [[SPI]]
 == SPI
 
+[[PropertyValue]]
+=== PropertyValue, PropertyValueBuilder
+
+On the API properties are represented as Strings only, whereas in the SPI 
value are represented as +ProeprtyValue+,
+which contain
+
+* the property's _key_ (String)
+* the property's _value_ (String)
+* the property's _source_ (String, typically equals to the property source's 
name)
+* any additional meta-data represented as _Map_
+
+This helps to kepp all value relevant data together in one place and also 
allows to choose any kind of
+representation for meta-data entries. The +PropertyValue+ itself is a final 
and _serializable_ data container,
+which also has a powerful builder API (e.g. for using within filters):
+
+[source,java]
+
+public final class PropertyValue implements Serializable{
+[...]
+
+public static PropertyValue of(String key, String value, String source);
+
+public String getKey();
+public String getSource();
+public String getValue();
+public Map getMetaEntries();
+public String getMetaEntry(String key);
+public PropertyValueBuilder toBuilder();
+
+public static PropertyValueBuilder builder(String key, String source);
+public static PropertyValueBuilder builder(String key, String value, 
String source);
+
+/**
+ * Maps a map of {@code Map} to a {@code 
Map}.
+ * @param config the String based map, not null.
+ * @param source the source name, not null.
+ * @return the corresponding value based map.
+ */
+public static Map map(Map config, 
String source);
+
+/**
+ * Maps a map of {@code Map} to a {@code 
Map}.
+ * @param config the String based map, not null.
+ * @param source the source name, not null.
+ * @param metaData additional metadata, not null.
+ * @return the corresponding value based map.
+ */
+public static Map map(Map config, 
String source,
+Map metaData);
+}
+
+
+When writing your own datasource you can easily create your own 
+PropertyValues+:
+
+[source,java]

[3/5] incubator-tamaya-extensions git commit: TAMAYA-252: Unified PropertyValue API and usage, also separating key, value, source and other meta-data and defining a clear builder policy.

2017-03-05 Thread anatole

TAMAYA-252: Unified PropertyValue API and usage, also separating key, value, 
source and other meta-data and defining a clear builder policy.


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/9f915b25
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/9f915b25
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/9f915b25

Branch: refs/heads/master
Commit: 9f915b254b91731f2e9fa1eefe8f459f727f6a7c
Parents: ed22695
Author: anatole 
Authored: Sun Mar 5 21:29:02 2017 +0100
Committer: anatole 
Committed: Sun Mar 5 21:29:02 2017 +0100

--
 .../events/FilePropertySourceProvider.java  |  7 +-
 .../tamaya/events/FrozenPropertySource.java | 17 +++-
 .../events/PropertySourceChangeBuilder.java | 18 ++---
 .../events/ChangeableGlobalPropertySource.java  |  3 +-
 .../ChangeableThreadLocalPropertySource.java|  3 +-
 .../tamaya/events/FrozenPropertySourceTest.java |  5 +-
 .../tamaya/events/RandomPropertySource.java | 15 ++--
 .../ObservingPropertySourceProvider.java| 12 +--
 .../tamaya/filter/ConfigurationFilter.java  |  3 +-
 .../org/apache/tamaya/filter/FilterContext.java |  3 +-
 .../filter/internal/DefaultMetadataFilter.java  |  3 +-
 .../tamaya/filter/ConfigurationFilterTest.java  | 21 ++---
 .../tamaya/filter/ProgrammableFilterTest.java   | 81 +++-
 .../MappedConfigurationDataPropertySource.java  |  8 +-
 ...ppedConfigurationDataPropertySourceTest.java | 16 ++--
 .../apache/tamaya/json/JSONPropertySource.java  | 17 ++--
 .../org/apache/tamaya/json/JSONVisitor.java |  1 +
 .../tamaya/yaml/JSONPropertySourceTest.java |  2 +-
 .../apache/tamaya/yaml/YAMLPropertySource.java  | 17 ++--
 .../functions/ConfigWrappingPropertySource.java |  9 ++-
 .../functions/EnrichedPropertySource.java   | 30 +---
 .../functions/FilteredPropertySource.java   | 17 ++--
 .../tamaya/functions/MappedPropertySource.java  | 23 +++---
 .../functions/PropertySourceFunctions.java  |  7 +-
 .../functions/ValueMappedPropertySource.java| 15 ++--
 .../functions/ConfigurationFunctionsTest.java   | 20 +
 .../cdi/cfg/ProvidedPropertySource.java | 12 +--
 .../integration/cdi/cfg/TestPropertySource.java | 10 ++-
 .../tamaya/inject/TestPropertySource.java   | 13 +++-
 .../internal/DefaultDynamicValueTest.java   | 46 ++-
 .../apache/tamaya/jndi/JNDIPropertySource.java  | 20 -
 .../org.apache.tamaya.spi.PropertySource| 19 +
 .../tamaya/jndi/JNDIPropertySourceTest.java |  3 +-
 .../MutablePropertiesPropertySource.java| 19 +
 .../MutableXmlPropertiesPropertySource.java | 20 ++---
 .../internal/ExpressionResolutionFilter.java|  9 ++-
 .../tamaya/resolver/MyTestPropertySource.java   | 13 +++-
 .../AbstractPathPropertySourceProvider.java | 16 ++--
 .../AbstractPathPropertySourceProviderTest.java |  3 +-
 .../PathBasedPropertySourceProvider.java| 26 ---
 .../tamaya/spisupport/BasePropertySource.java   | 13 +---
 .../tamaya/spisupport/CLIPropertySource.java| 13 +++-
 .../tamaya/spisupport/DefaultConfiguration.java | 80 +++
 .../spisupport/EnvironmentPropertySource.java   | 11 ++-
 .../tamaya/spisupport/MapPropertySource.java| 14 +++-
 .../spisupport/PropertyFilterManager.java   | 16 ++--
 .../tamaya/spisupport/PropertyFiltering.java| 17 ++--
 .../spisupport/PropertySourceComparator.java| 52 ++---
 .../tamaya/spisupport/RegexPropertyFilter.java  |  3 +-
 .../tamaya/spisupport/SimplePropertySource.java | 39 --
 .../tamaya/spisupport/SystemPropertySource.java | 22 +++---
 .../spisupport/BasePropertySourceTest.java  | 25 +++---
 .../spisupport/CLIPropertySourceTest.java   | 18 ++---
 .../DefaultConfigurationContextTest.java| 10 +--
 .../EnvironmentPropertySourceTest.java  |  9 ++-
 .../PropertiesFilePropertySourceTest.java   |  6 +-
 .../spisupport/RegexPropertyFilterTest.java | 26 ---
 .../spisupport/SimplePropertySourceTest.java|  9 ++-
 .../spisupport/SystemPropertySourceTest.java| 24 +++---
 .../spisupport/TestPropertyDefaultSource.java   |  9 ++-
 60 files changed, 569 insertions(+), 449 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/9f915b25/examples/04-events-example/src/main/java/org/apache/tamaya/ext/examples/events/FilePropertySourceProvider.java
--
diff --git 
a/examples/04-events-example/src/main/java/org/apache/tamaya/ext/examples/events/FilePropertySourceProvider.java

[1/5] incubator-tamaya-extensions git commit: TAMAYA-253: Added replacement policy for raw evaluation.

2017-03-05 Thread anatole

Repository: incubator-tamaya-extensions
Updated Branches:
  refs/heads/master abb34d651 -> 01ba7463e


TAMAYA-253: Added replacement policy for raw evaluation.


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/ed226955
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/ed226955
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/ed226955

Branch: refs/heads/master
Commit: ed2269552a61141ca36cb0b6cc2295d6e51444b3
Parents: abb34d6
Author: anatole 
Authored: Sun Mar 5 21:24:25 2017 +0100
Committer: anatole 
Committed: Sun Mar 5 21:24:25 2017 +0100

--
 .../tamaya/spisupport/ConfigValueEvaluator.java | 48 ++
 .../spisupport/DefaultConfigValueEvaluator.java | 70 
 2 files changed, 118 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/ed226955/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/ConfigValueEvaluator.java
--
diff --git 
a/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/ConfigValueEvaluator.java
 
b/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/ConfigValueEvaluator.java
new file mode 100644
index 000..92fd614
--- /dev/null
+++ 
b/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/ConfigValueEvaluator.java
@@ -0,0 +1,48 @@
+/*
+ * 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.spisupport;
+
+import org.apache.tamaya.spi.ConfigurationContext;
+import org.apache.tamaya.spi.PropertyValue;
+
+import java.util.Map;
+
+
+/**
+ * Component SPI which encapsulates the evaluation of a single or full 
rawvalue
+ * for a {@link ConfigurationContext}.
+ */
+public interface ConfigValueEvaluator {
+
+/**
+ * Evaluates single value using a {@link ConfigurationContext}.
+ * @param key the config key, not null.
+ * @param context the context, not null.
+ * @return the value, or null.
+ */
+PropertyValue evaluteRawValue(String key, ConfigurationContext context);
+
+/**
+ * Evaluates all property values from a {@link ConfigurationContext}.
+ * @param context the context, not null.
+ * @return the value, or null.
+ */
+Map evaluateRawValues(ConfigurationContext context);
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/ed226955/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/DefaultConfigValueEvaluator.java
--
diff --git 
a/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/DefaultConfigValueEvaluator.java
 
b/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/DefaultConfigValueEvaluator.java
new file mode 100644
index 000..cdfcfdc
--- /dev/null
+++ 
b/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/DefaultConfigValueEvaluator.java
@@ -0,0 +1,70 @@
+/*
+ * 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.spisupport;
+
+import org.apache.tamaya.spi.ConfigurationContext;
+import

[1/2] incubator-tamaya-sandbox git commit: TAMAYA-252: Unified PropertyValue API and usage, also separating key, value, source and other meta-data and defining a clear builder policy.

2017-03-05 Thread anatole

Repository: incubator-tamaya-sandbox
Updated Branches:
  refs/heads/master 57e984010 -> 99e685002


TAMAYA-252: Unified PropertyValue API and usage, also separating key, value, 
source and other meta-data and defining a clear builder policy.


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

Branch: refs/heads/master
Commit: 80d6ec20ca5a7773efde56c509a0d25e3d49d091
Parents: 57e9840
Author: anatole 
Authored: Sun Mar 5 21:29:39 2017 +0100
Committer: anatole 
Committed: Sun Mar 5 21:29:39 2017 +0100

--
 .../commons/CommonsConfigPropertySource.java|  12 +--
 .../tamaya/consul/ConsulPropertySource.java |   4 +-
 .../tamaya/consul/ConsulPropertySourceTest.java |   7 +-
 .../apache/tamaya/consul/ConsulWriteTest.java   |   3 +-
 .../apache/tamaya/etcd/EtcdPropertySource.java  | 102 +--
 .../tamaya/etcd/EtcdPropertySourceTest.java |   7 +-
 .../hazelcast/HazelcastPropertySource.java  |  15 +--
 .../tamaya/metamodel/EnabledPropertySource.java |   3 +-
 .../metamodel/ext/FilteredPropertySource.java   |  32 +++---
 .../ext/RefreshablePropertySource.java  |   3 +-
 .../propertysources/PropertySourceBuilder.java  |   5 +-
 .../tamaya/remote/BaseRemotePropertySource.java |   6 +-
 .../apache/tamaya/usagetracker/UsageStat.java   |  12 ++-
 .../internal/DefaultConfigUsage.java|   5 +-
 .../internal/UsageTrackerFilter.java|   3 +-
 .../tamaya/usagetracker/spi/ConfigUsageSpi.java |   3 +-
 16 files changed, 139 insertions(+), 83 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/80d6ec20/apache-commons/src/main/java/org/apache/tamaya/commons/CommonsConfigPropertySource.java
--
diff --git 
a/apache-commons/src/main/java/org/apache/tamaya/commons/CommonsConfigPropertySource.java
 
b/apache-commons/src/main/java/org/apache/tamaya/commons/CommonsConfigPropertySource.java
index 8e8ea2f..2383e68 100644
--- 
a/apache-commons/src/main/java/org/apache/tamaya/commons/CommonsConfigPropertySource.java
+++ 
b/apache-commons/src/main/java/org/apache/tamaya/commons/CommonsConfigPropertySource.java
@@ -22,10 +22,7 @@ import org.apache.commons.configuration.Configuration;
 import org.apache.tamaya.spi.PropertySource;
 import org.apache.tamaya.spi.PropertyValue;
 
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 
 /**
  * PropertySource that wraps {@link 
org.apache.commons.configuration.Configuration}.
@@ -52,6 +49,7 @@ public class CommonsConfigPropertySource implements 
PropertySource {
 }
 }
 
+@Override
 public int getOrdinal() {
 return ordinal;
 }
@@ -68,12 +66,12 @@ public class CommonsConfigPropertySource implements 
PropertySource {
 }
 
 @Override
-public Map getProperties() {
-Map config = new HashMap<>();
+public Map getProperties() {
+Map config = new HashMap<>();
 Iterator keyIter = commonsConfig.getKeys();
 while (keyIter.hasNext()) {
 String key = keyIter.next();
-config.put(key, commonsConfig.getString(key));
+config.put(key, PropertyValue.of(key, 
commonsConfig.getString(key), getName()));
 }
 return config;
 }

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/80d6ec20/consul/src/main/java/org/apache/tamaya/consul/ConsulPropertySource.java
--
diff --git 
a/consul/src/main/java/org/apache/tamaya/consul/ConsulPropertySource.java 
b/consul/src/main/java/org/apache/tamaya/consul/ConsulPropertySource.java
index 7c0b017..d65ce35 100644
--- a/consul/src/main/java/org/apache/tamaya/consul/ConsulPropertySource.java
+++ b/consul/src/main/java/org/apache/tamaya/consul/ConsulPropertySource.java
@@ -147,7 +147,7 @@ implements MutablePropertySource{
 props.put(reqKey+".modifyIndex", 
String.valueOf(value.getModifyIndex()));
 props.put(reqKey+".lockIndex", 
String.valueOf(value.getLockIndex()));
 props.put(reqKey+".flags", 
String.valueOf(value.getFlags()));
-return new PropertyValueBuilder(key, 
value.getValue().get(), getName()).setContextData(props).build();
+return new PropertyValueBuilder(key, 
value.getValue().get(),

Jenkins build is still unstable: Tamaya-Sandbox-Master #435

2017-03-05 Thread Apache Jenkins Server

See

Jenkins build is still unstable: Tamaya-Sandbox-Master » Apache Tamaya :: OSGi Integration :: ConfigAdmin #435

2017-03-05 Thread Apache Jenkins Server

See

Jenkins build is unstable: Tamaya-Sandbox-Master #438

Jenkins build is back to normal : Tamaya-Sandbox-Master » Apache Tamaya Modules - Metamodel #438

Jenkins build is still unstable: Tamaya-Sandbox-Master » Apache Tamaya :: OSGi Integration :: ConfigAdmin #438

Jenkins build is back to normal : Tamaya-Extensions-Master #485

Jenkins build is back to normal : Tamaya-Sandbox-Master » Apache Tamaya Modules - Hazelcast PropertySource #437

Jenkins build is unstable: Tamaya-Sandbox-Master » Apache Tamaya :: OSGi Integration :: ConfigAdmin #437

Build failed in Jenkins: Tamaya-Sandbox-Master #437

Build failed in Jenkins: Tamaya-Sandbox-Master » Apache Tamaya Modules - Metamodel #437

Build failed in Jenkins: Tamaya-Sandbox-Master #436

Build failed in Jenkins: Tamaya-Sandbox-Master » Apache Tamaya Modules - Hazelcast PropertySource #436

Build failed in Jenkins: Tamaya-Extensions-Master #484

[4/6] incubator-tamaya git commit: TAMAYA-252: Clarified PropertyValue API.

[1/6] incubator-tamaya git commit: TAMAYA-252: Unified PropertyValue builder API.

[3/6] incubator-tamaya git commit: TAMAYA-252: Unified PropertyValue API and usage, also separating key, value, source and other meta-data and defining a clear builder policy.

[2/6] incubator-tamaya git commit: TAMAYA-252: Unified PropertyValue API and usage, also separating key, value, source and other meta-data and defining a clear builder policy.

[2/5] incubator-tamaya-extensions git commit: TAMAYA-252: Unified PropertyValue API and usage, also separating key, value, source and other meta-data and defining a clear builder policy.

[5/6] incubator-tamaya git commit: TAMAYA-238: Removed explicit versions.

[1/2] incubator-tamaya-site git commit: TAMAYA-253: Added replacement policy for raw evaluation.

[5/5] incubator-tamaya-extensions git commit: TAMAYA-252: Unified PropertyValue builder API.

[2/2] incubator-tamaya-sandbox git commit: TAMAYA-252: Unified PropertyValue builder API.

[4/5] incubator-tamaya-extensions git commit: TAMAYA-238: Removed explicit versions.

[2/2] incubator-tamaya-site git commit: TAMAYA-252: Unified PropertyValue builder API.

[3/5] incubator-tamaya-extensions git commit: TAMAYA-252: Unified PropertyValue API and usage, also separating key, value, source and other meta-data and defining a clear builder policy.

[1/5] incubator-tamaya-extensions git commit: TAMAYA-253: Added replacement policy for raw evaluation.

[1/2] incubator-tamaya-sandbox git commit: TAMAYA-252: Unified PropertyValue API and usage, also separating key, value, source and other meta-data and defining a clear builder policy.

Jenkins build is still unstable: Tamaya-Sandbox-Master #435

Jenkins build is still unstable: Tamaya-Sandbox-Master » Apache Tamaya :: OSGi Integration :: ConfigAdmin #435

27 matches

Site Navigation

Mail list logo

Footer information