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

2017-03-11 Thread Apache Jenkins Server 
See

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

2017-03-11 Thread Apache Jenkins Server 
See

incubator-tamaya-extensions git commit: [TAMAYA-244] Removed possible causes for NullPointerExceptions.

2017-03-11 Thread plexus 
Repository: incubator-tamaya-extensions
Updated Branches:
  refs/heads/master feaa76538 -> 78415bc9b


[TAMAYA-244] Removed possible causes for NullPointerExceptions.


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

Branch: refs/heads/master
Commit: 78415bc9bcd1aa3574282e6570a6fa1f0e130988
Parents: feaa765
Author: Oliver B. Fischer 
Authored: Sun Mar 12 00:41:31 2017 +0100
Committer: Oliver B. Fischer 
Committed: Sun Mar 12 00:41:31 2017 +0100

--
 .../tamaya/functions/CombinedConfiguration.java | 27 ++--
 .../functions/CombinedConfigurationTest.java|  7 +
 2 files changed, 26 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/78415bc9/modules/functions/src/main/java/org/apache/tamaya/functions/CombinedConfiguration.java
--
diff --git 
a/modules/functions/src/main/java/org/apache/tamaya/functions/CombinedConfiguration.java
 
b/modules/functions/src/main/java/org/apache/tamaya/functions/CombinedConfiguration.java
index a268736..234e03c 100644
--- 
a/modules/functions/src/main/java/org/apache/tamaya/functions/CombinedConfiguration.java
+++ 
b/modules/functions/src/main/java/org/apache/tamaya/functions/CombinedConfiguration.java
@@ -24,9 +24,7 @@ import org.apache.tamaya.Configuration;
 import org.apache.tamaya.TypeLiteral;
 import org.apache.tamaya.spi.ConfigurationContext;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Combines a set of child configurations to a new one, by overriding the 
first entries with result from
@@ -35,8 +33,12 @@ import java.util.Map;
 class CombinedConfiguration implements Configuration{
 /** The name of the new configuration. */
 private final String name;
-/** The configuration's in evaluation order. Instances with higher indices 
override results with lower ones. */
-private final Configuration[] configurations;
+
+/**
+ * The configuration's in evaluation order. Instances with higher indices
+ * override results with lower ones.
+ */
+private final ArrayList configurations = new ArrayList<>();
 
 /**
  * Creates a combined configuration instance.
@@ -45,7 +47,16 @@ class CombinedConfiguration implements Configuration{
  */
 public CombinedConfiguration(String configName, Configuration... configs) {
 this.name = configName;
-this.configurations = configs == null ? new Configuration[0] : 
configs.clone();
+
+if (null != configs) {
+for (Configuration config : configs) {
+if (config == null) {
+continue;
+}
+
+configurations.add(config);
+}
+}
 }
 
 @Override
@@ -133,14 +144,14 @@ class CombinedConfiguration implements Configuration{
 @Override
 public ConfigurationContext getContext() {
 // TODO thjink on combining the participating contexts...
-return configurations[0].getContext();
+return configurations.get(0).getContext();
 }
 
 @Override
 public String toString() {
 return "CombinedConfiguration{" +
 "name='" + name + '\'' +
-", configurations=" + Arrays.toString(configurations) +
+", configurations=" + configurations +
 '}';
 }
 }

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/78415bc9/modules/functions/src/test/java/org/apache/tamaya/functions/CombinedConfigurationTest.java
--
diff --git 
a/modules/functions/src/test/java/org/apache/tamaya/functions/CombinedConfigurationTest.java
 
b/modules/functions/src/test/java/org/apache/tamaya/functions/CombinedConfigurationTest.java
index 585e1f7..e56c0cc 100644
--- 
a/modules/functions/src/test/java/org/apache/tamaya/functions/CombinedConfigurationTest.java
+++ 
b/modules/functions/src/test/java/org/apache/tamaya/functions/CombinedConfigurationTest.java
@@ -78,6 +78,13 @@ public class CombinedConfigurationTest {
 }
 
 @Test
+public void createCombinedConfigurationWithNullNullAsSingleConfiguration() 
{
+CombinedConfiguration cc = new CombinedConfiguration("abc", null, 
null);
+
+assertThat(cc.get("nil")).isNull();
+}
+
+@Test
 public void requestedEntryIsntInAnyConfigration() throws Exception {
 
 CombinedConfiguration

incubator-tamaya-extensions git commit: [TAMAYA-244] Added missing license header to CombinedConfigurationTest.java.

2017-03-11 Thread plexus 
Repository: incubator-tamaya-extensions
Updated Branches:
  refs/heads/master 2ab6ceedd -> feaa76538


[TAMAYA-244] Added missing license header to CombinedConfigurationTest.java.


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

Branch: refs/heads/master
Commit: feaa765386954c80ff1a819c0854d6891e348852
Parents: 2ab6cee
Author: Oliver B. Fischer 
Authored: Sun Mar 12 00:31:57 2017 +0100
Committer: Oliver B. Fischer 
Committed: Sun Mar 12 00:31:57 2017 +0100

--
 .../functions/CombinedConfigurationTest.java  | 18 ++
 1 file changed, 18 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/feaa7653/modules/functions/src/test/java/org/apache/tamaya/functions/CombinedConfigurationTest.java
--
diff --git 
a/modules/functions/src/test/java/org/apache/tamaya/functions/CombinedConfigurationTest.java
 
b/modules/functions/src/test/java/org/apache/tamaya/functions/CombinedConfigurationTest.java
index 1e17d7d..585e1f7 100644
--- 
a/modules/functions/src/test/java/org/apache/tamaya/functions/CombinedConfigurationTest.java
+++ 
b/modules/functions/src/test/java/org/apache/tamaya/functions/CombinedConfigurationTest.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.functions;
 
 import org.apache.tamaya.ConfigOperator;

incubator-tamaya-extensions git commit: [TAMAYA-244] Added the first tests and made some small improvements to the CombinedConfiguration.

2017-03-11 Thread plexus 
Repository: incubator-tamaya-extensions
Updated Branches:
  refs/heads/master fe572c185 -> 2ab6ceedd


[TAMAYA-244] Added the first tests and made some small improvements to the 
CombinedConfiguration.


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

Branch: refs/heads/master
Commit: 2ab6ceeddbe1e3d41a10feba89e23adb6d8ef366
Parents: fe572c1
Author: Oliver B. Fischer 
Authored: Sun Mar 12 00:28:10 2017 +0100
Committer: Oliver B. Fischer 
Committed: Sun Mar 12 00:29:06 2017 +0100

--
 modules/functions/pom.xml   |   5 +
 .../tamaya/functions/CombinedConfiguration.java |   4 +-
 .../functions/CombinedConfigurationTest.java| 117 +++
 3 files changed, 124 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/2ab6ceed/modules/functions/pom.xml
--
diff --git a/modules/functions/pom.xml b/modules/functions/pom.xml
index 3bd96cc..0289465 100644
--- a/modules/functions/pom.xml
+++ b/modules/functions/pom.xml
@@ -56,6 +56,11 @@ under the License.
 
 
 
+org.assertj
+assertj-core
+
+
+
 org.hamcrest
 java-hamcrest
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/2ab6ceed/modules/functions/src/main/java/org/apache/tamaya/functions/CombinedConfiguration.java
--
diff --git 
a/modules/functions/src/main/java/org/apache/tamaya/functions/CombinedConfiguration.java
 
b/modules/functions/src/main/java/org/apache/tamaya/functions/CombinedConfiguration.java
index 8a479e9..a268736 100644
--- 
a/modules/functions/src/main/java/org/apache/tamaya/functions/CombinedConfiguration.java
+++ 
b/modules/functions/src/main/java/org/apache/tamaya/functions/CombinedConfiguration.java
@@ -43,9 +43,9 @@ class CombinedConfiguration implements Configuration{
  * @param configName the name of the new config.
  * @param configs the configurations hereby instances with higher indices 
override results with lower ones.
  */
-public CombinedConfiguration(String configName, Configuration... configs){
+public CombinedConfiguration(String configName, Configuration... configs) {
 this.name = configName;
-this.configurations =configs.clone();
+this.configurations = configs == null ? new Configuration[0] : 
configs.clone();
 }
 
 @Override

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/2ab6ceed/modules/functions/src/test/java/org/apache/tamaya/functions/CombinedConfigurationTest.java
--
diff --git 
a/modules/functions/src/test/java/org/apache/tamaya/functions/CombinedConfigurationTest.java
 
b/modules/functions/src/test/java/org/apache/tamaya/functions/CombinedConfigurationTest.java
new file mode 100644
index 000..1e17d7d
--- /dev/null
+++ 
b/modules/functions/src/test/java/org/apache/tamaya/functions/CombinedConfigurationTest.java
@@ -0,0 +1,117 @@
+package org.apache.tamaya.functions;
+
+import org.apache.tamaya.ConfigOperator;
+import org.apache.tamaya.ConfigQuery;
+import org.apache.tamaya.Configuration;
+import org.apache.tamaya.TypeLiteral;
+import org.apache.tamaya.spi.ConfigurationContext;
+import org.apache.tamaya.spi.ConfigurationContextBuilder;
+import org.apache.tamaya.spisupport.DefaultConfiguration;
+import org.apache.tamaya.spisupport.DefaultConfigurationContext;
+import org.apache.tamaya.spisupport.DefaultConfigurationContextBuilder;
+import org.apache.tamaya.spisupport.SimplePropertySource;
+import org.junit.Test;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.TreeMap;
+
+import static java.util.Collections.singletonMap;
+import static org.assertj.core.api.Assertions.assertThat;
+
+
+public class CombinedConfigurationTest {
+private Configuration configWithA1;
+private Configuration configWithA2;
+private Configuration configWithB;
+private Configuration configWithC;
+private Configuration configWithoutEntries;
+
+{
+SimplePropertySource sourceWithKeyA1 = new SimplePropertySource("A", 
singletonMap("a", "a1"));
+SimplePropertySource sourceWithKeyA2 = new SimplePropertySource("A", 
singletonMap("a", "a2"));
+SimplePropertySource sourceWithKeyB = new SimplePropertySource("B", 
singletonMap("b", "b"));
+

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

2017-03-11 Thread Apache Jenkins Server 
See

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

2017-03-11 Thread Apache Jenkins Server 
See

incubator-tamaya-extensions git commit: TAMAYA-238: Added explicit bundle names.

2017-03-11 Thread anatole 
Repository: incubator-tamaya-extensions
Updated Branches:
  refs/heads/master 01ba7463e -> fe572c185


TAMAYA-238: Added explicit bundle names.


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

Branch: refs/heads/master
Commit: fe572c185baa831796a8626fed4eebc3416135ff
Parents: 01ba746
Author: anatole 
Authored: Sat Mar 11 23:36:54 2017 +0100
Committer: anatole 
Committed: Sat Mar 11 23:36:54 2017 +0100

--
 modules/events/bnd.bnd  | 3 ++-
 modules/features/bnd.bnd| 3 ++-
 modules/filter/bnd.bnd  | 3 ++-
 modules/injection/cdi-ee/bnd.bnd| 3 +++
 modules/injection/injection-api/bnd.bnd | 4 ++--
 5 files changed, 11 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/fe572c18/modules/events/bnd.bnd
--
diff --git a/modules/events/bnd.bnd b/modules/events/bnd.bnd
index 95aebbc..21036e3 100644
--- a/modules/events/bnd.bnd
+++ b/modules/events/bnd.bnd
@@ -1,3 +1,4 @@
 Export-Package: \
org.apache.tamaya.events,\
-   org.apache.tamaya.events.spi
\ No newline at end of file
+   org.apache.tamaya.events.spi
+Bundle-SymbolicName: org.apache.tamaya.events
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/fe572c18/modules/features/bnd.bnd
--
diff --git a/modules/features/bnd.bnd b/modules/features/bnd.bnd
index e0d0b58..708dedd 100644
--- a/modules/features/bnd.bnd
+++ b/modules/features/bnd.bnd
@@ -1,2 +1,3 @@
 Export-Package: \
-   org.apache.tamaya.features
\ No newline at end of file
+   org.apache.tamaya.features
+Bundle-SymbolicName: org.apache.tamaya.features
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/fe572c18/modules/filter/bnd.bnd
--
diff --git a/modules/filter/bnd.bnd b/modules/filter/bnd.bnd
index 4e2f0f8..b0a3aa3 100644
--- a/modules/filter/bnd.bnd
+++ b/modules/filter/bnd.bnd
@@ -1,2 +1,3 @@
 Export-Package: \
-   org.apache.tamaya.filter
\ No newline at end of file
+   org.apache.tamaya.filter
+Bundle-SymbolicName: org.apache.tamaya.filter
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/fe572c18/modules/injection/cdi-ee/bnd.bnd
--
diff --git a/modules/injection/cdi-ee/bnd.bnd b/modules/injection/cdi-ee/bnd.bnd
new file mode 100644
index 000..a97720d
--- /dev/null
+++ b/modules/injection/cdi-ee/bnd.bnd
@@ -0,0 +1,3 @@
+Export-Package: \
+   org.apache.tamaya.inject
+Bundle-SymbolicName: org.apache.tamaya.inject-ee
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/fe572c18/modules/injection/injection-api/bnd.bnd
--
diff --git a/modules/injection/injection-api/bnd.bnd 
b/modules/injection/injection-api/bnd.bnd
index 3516930..f34b1f9 100644
--- a/modules/injection/injection-api/bnd.bnd
+++ b/modules/injection/injection-api/bnd.bnd
@@ -1,7 +1,7 @@
 Export-Package: \
org.apache.tamaya.inject.api,\
org.apache.tamaya.inject.spi
-Bundle-SymbolicName: org.apache.tamaya.inject.api
 Import-Package: org.apache.tamaya,\
 org.apache.tamaya.inject.api,\
-org.apache.tamaya.spi
\ No newline at end of file
+org.apache.tamaya.spi
+Bundle-SymbolicName: org.apache.tamaya.inject.api
\ No newline at end of file

incubator-tamaya-site git commit: TAMAYA-256: Fixed Java version, tests and added documentation for Vertx support.

2017-03-11 Thread anatole 
Repository: incubator-tamaya-site
Updated Branches:
  refs/heads/master 5a66c777e -> 8f1fa3a86


TAMAYA-256: Fixed Java version, tests and added documentation for Vertx support.


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

Branch: refs/heads/master
Commit: 8f1fa3a86e2979ccc3424905b3714f8d4763cece
Parents: 5a66c77
Author: anatole 
Authored: Sat Mar 11 00:04:29 2017 +0100
Committer: anatole 
Committed: Sat Mar 11 23:37:22 2017 +0100

--
 content/documentation/extensions.adoc   |   1 +
 content/documentation/extensions/mod_vertx.adoc | 189 +++
 2 files changed, 190 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/8f1fa3a8/content/documentation/extensions.adoc
--
diff --git a/content/documentation/extensions.adoc 
b/content/documentation/extensions.adoc
index 0c643f1..b8e082a 100644
--- a/content/documentation/extensions.adoc
+++ b/content/documentation/extensions.adoc
@@ -64,4 +64,5 @@ NOTE: All extensions currently run on Java 7 as well as on 
Java 8.
 |+org.apache.tamaya.ext:tamaya-ui+  |Provides a web UI for a VM 
running Tamaya.|link:extensions/mod_ui.html[Documentation]
 |+org.apache.tamaya.ext:tamaya-usagetracker+ |Allows tracking of configuration 
usage.  |link:extensions/mod_usagetracker.html[Documentation]
 |+org.apache.tamaya.ext:tamaya-validation+  |Provides an XML API for 
validating configuration. 
|link:extensions/mod_validation.html[Documentation]
+|+org.apache.tamaya.ext:tamaya-vertx-alpha+ |Provides Vertx integration.   
|link:extensions/mod_vertx.html[Documentation]
 |===

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/8f1fa3a8/content/documentation/extensions/mod_vertx.adoc
--
diff --git a/content/documentation/extensions/mod_vertx.adoc 
b/content/documentation/extensions/mod_vertx.adoc
new file mode 100644
index 000..4bb93d5
--- /dev/null
+++ b/content/documentation/extensions/mod_vertx.adoc
@@ -0,0 +1,189 @@
+:jbake-type: page
+:jbake-status: published
+
+= Apache Tamaya -- Extension: Integration for Vertx
+
+toc::[]
+
+
+[[JNDI]]
+== Integration with Vertx (Extension Module)
+Tamaya _JNDI_ is an extension module. Refer to the 
link:../extensions.html[extensions documentation] for further details.
+
+=== What functionality this module provides ?
+
+Tamaya _Vertx_ provides configuration services that can be used in a Vertx 
environment:
+
+* +AbstractConfiguredVerticle+ defines a subclass extending 
+AbstractVerticle+, which allows you to
+  use Tamaya Injection API.
+* Additionally you deply a +ConfigVerticle+, which registers services to 
access configuration
+  using asynchronous event bus.
+
+
+=== Compatibility
+
+The module requires Java 8, so it will not run on Java 7.
+
+
+=== Installation
+
+To use Tamaya's _Vertx_ support you only must add the corresponding dependency 
to
+your module:
+
+[source, xml]
+---
+
+  org.apache.tamaya.ext
+  tamaya-vertx-alpha
+  {tamaya_version}
+
+---
+
+
+=== The Functionality Provided
+
+NOTE: This module is in alpha state. Please give feedback via our JIRA, so we 
can improve it.
+
+
+ Extending AbstractConfiguredVerticle
+
+Main artifact is the +AbstractConfiguredVerticle+ class, which implements a
+base verticle class for Vertx:
+
+[source, java]
+---
+public abstract class AbstractConfiguredVerticle extends AbstractVerticle{
+
+private Configuration configuration;
+
+public AbstractConfiguredVerticle() {
+configure();
+}
+
+public Configuration getConfiguration(){
+if(this.configuration==null){
+  this.configuration = ConfigurationProvider.getConfiguration();
+}
+return this.configuration;
+}
+
+public void setConfiguration(Configuration configuration){
+this.configuration = configuration;
+configure();
+}
+
+protected void configure(){
+ConfigurationInjection.getConfigurationInjector().configure(this, 
getConfiguration());
+}
+
+protected final String getConfigProperty(String key);
+protected final String getConfigPropertyOrDefault(String key, String 
defaultValue);
+protected final  T getConfigProperty(String key, Class type);
+protected final  T

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

2017-03-11 Thread Apache Jenkins Server 
See