[1/5] incubator-tamaya-sandbox git commit: TAMAYA-260 - Fix how the default field name is generated.

[johndament]

Repository: incubator-tamaya-sandbox
Updated Branches:
  refs/heads/master 6e5b58376 -> 96593c764


TAMAYA-260 - Fix how the default field name is generated.


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

Branch: refs/heads/master
Commit: 4200f87619aa4ef6019aef34cce34dc3099ad28d
Parents: 4a9c22f
Author: John D. Ament 
Authored: Wed Sep 20 23:23:32 2017 -0400
Committer: John Ament 
Committed: Tue Oct 3 13:40:43 2017 -0400

--
 .../microprofile/cdi/MicroprofileConfigurationProducer.java   | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/4200f876/microprofile/src/main/java/org/apache/tamaya/microprofile/cdi/MicroprofileConfigurationProducer.java
--
diff --git 
a/microprofile/src/main/java/org/apache/tamaya/microprofile/cdi/MicroprofileConfigurationProducer.java
 
b/microprofile/src/main/java/org/apache/tamaya/microprofile/cdi/MicroprofileConfigurationProducer.java
index a6d8c96..15f8c91 100644
--- 
a/microprofile/src/main/java/org/apache/tamaya/microprofile/cdi/MicroprofileConfigurationProducer.java
+++ 
b/microprofile/src/main/java/org/apache/tamaya/microprofile/cdi/MicroprofileConfigurationProducer.java
@@ -30,6 +30,8 @@ import 
org.eclipse.microprofile.config.spi.ConfigProviderResolver;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.spi.AnnotatedField;
+import javax.enterprise.inject.spi.AnnotatedType;
 import javax.enterprise.inject.spi.InjectionPoint;
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.ParameterizedType;
@@ -72,8 +74,9 @@ public class MicroprofileConfigurationProducer {
 }
 
 static String getDefaultKey(InjectionPoint injectionPoint) {
-String memberName = injectionPoint.getMember().getName();
-return memberName;
+AnnotatedField field = (AnnotatedField)injectionPoint.getAnnotated();
+AnnotatedType declaringType = field.getDeclaringType();
+return declaringType.getJavaClass().getCanonicalName() + "." + 
field.getJavaMember().getName();
 }
 
 static ConversionContext createConversionContext(String key, 
InjectionPoint injectionPoint) {

[3/5] incubator-tamaya-sandbox git commit: TAMAYA-260 - Removing code copied in from MicroProfile Config 1.1

[johndament]

TAMAYA-260 - Removing code copied in from MicroProfile Config 1.1


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

Branch: refs/heads/master
Commit: b9841fc5b1ce9f25a5fd9c92394bbdd890816cf8
Parents: 6e5b583
Author: John D. Ament 
Authored: Wed Sep 20 23:03:49 2017 -0400
Committer: John Ament 
Committed: Tue Oct 3 13:40:43 2017 -0400

--
 .../AutoDiscoveredConfigSourceTest.java |  66 -
 .../imported/CDIPlainInjectionTest.java | 261 ---
 .../imported/CdiOptionalInjectionTest.java  |  69 -
 .../imported/ConfigProviderTest.java| 122 -
 .../microprofile/imported/ConverterTest.java| 233 -
 .../imported/CustomConfigSourceTest.java|  40 ---
 .../imported/OptionalValuesBean.java|  62 -
 .../imported/broken/ConfigOwner.java|  39 ---
 .../imported/broken/CustomConverterBean.java|  46 
 .../CustomConfigSourceProvider.java |  53 
 .../configsources/CustomDbConfigSource.java |  69 -
 .../configsources/SampleYamlConfigSource.java   |  58 -
 .../microprofile/imported/converters/Duck.java  |  36 ---
 .../imported/converters/DuckConverter.java  |  33 ---
 .../microprofile/imported/converters/Pizza.java |  42 ---
 .../imported/converters/PizzaConverter.java |  34 ---
 .../imported/matchers/AdditionalMatchers.java   |  61 -
 ...eclipse.microprofile.config.spi.ConfigSource |  19 --
 ...microprofile.config.spi.ConfigSourceProvider |  18 --
 ...rg.eclipse.microprofile.config.spi.Converter |  18 --
 20 files changed, 1379 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/b9841fc5/microprofile/src/test/java/org/apache/tamaya/microprofile/imported/AutoDiscoveredConfigSourceTest.java
--
diff --git 
a/microprofile/src/test/java/org/apache/tamaya/microprofile/imported/AutoDiscoveredConfigSourceTest.java
 
b/microprofile/src/test/java/org/apache/tamaya/microprofile/imported/AutoDiscoveredConfigSourceTest.java
deleted file mode 100644
index 57cbc5d..000
--- 
a/microprofile/src/test/java/org/apache/tamaya/microprofile/imported/AutoDiscoveredConfigSourceTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- 
***
- * Copyright (c) 2016-2017 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * Licensed 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.microprofile.imported;
-
-import org.apache.tamaya.microprofile.imported.converters.Pizza;
-import org.eclipse.microprofile.config.Config;
-import org.eclipse.microprofile.config.spi.ConfigProviderResolver;
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.util.logging.Logger;
-
-/**
- * Verify the method addDiscoveredSources() on ConfigBuilder.
- *
- * @author mailto:emiji...@uk.ibm.com;>Emily Jiang
- * @author mailto:strub...@apache.org;>Mark Struberg
- */
-public class AutoDiscoveredConfigSourceTest {
-
-@Test
-public void testAutoDiscoveredConfigureSources() {
-Config config = 
ConfigProviderResolver.instance().getBuilder().addDefaultSources().addDiscoveredSources().build();
-
Assert.assertEquals(config.getValue("tck.config.test.customDbConfig.key1", 
String.class), "valueFromDb1");
-}
-
-@Test
-public void testAutoDiscoveredConverterManuallyAdded() {
-   
-Config config = 
ConfigProviderResolver.instance().getBuilder().addDefaultSources().addDiscoveredSources().addDiscoveredConverters().build();
-Pizza dVaule = config.getValue("tck.config.test.customDbConfig.key3", 
Pizza.class);
-Assert.assertEquals(dVaule.getSize(), "big");
-Assert.assertEquals(dVaule.getFlavor(), 

[2/5] incubator-tamaya-sandbox git commit: TAMAYA-260 - Beginning alignment to the MicroProfile Config 1.1 spec.

[johndament]

TAMAYA-260 - Beginning alignment to the MicroProfile Config 1.1 spec.

- Change the default property name for injection.
- Do something with classloader setting (but ignore the field for now)
- Clean up pom file.


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

Branch: refs/heads/master
Commit: 4a9c22f60e3e6e93c537eab215d00831f8c41f9e
Parents: b9841fc
Author: John D. Ament 
Authored: Wed Sep 20 23:06:14 2017 -0400
Committer: John Ament 
Committed: Tue Oct 3 13:40:43 2017 -0400

--
 microprofile/pom.xml| 58 +++-
 .../microprofile/MicroprofileConfigBuilder.java |  7 ++-
 .../cdi/MicroprofileConfigurationProducer.java  | 20 ++-
 3 files changed, 18 insertions(+), 67 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/4a9c22f6/microprofile/pom.xml
--
diff --git a/microprofile/pom.xml b/microprofile/pom.xml
index 37bbb2b..9273e4f 100644
--- a/microprofile/pom.xml
+++ b/microprofile/pom.xml
@@ -33,17 +33,16 @@ under the License.
 
 1.8
 1.8
-1.0
+1.1
 
1.0
 1.0
 2.2.6
-6.0.53
 0.4-incubating-SNAPSHOT
 1.1.13.Final
 
2.0.0.Beta5
-2.0
-3.0.0.Final
-2.2.7.Final
+2.0
+3.0.1.Final
+3.0.1.Final
 1.1.0
 4.7.1
 
@@ -84,44 +83,20 @@ under the License.
 
 org.eclipse.microprofile.config
 microprofile-config-api
-1.0
+${microprofile.config.version}
 
 
 javax.enterprise
 cdi-api
-1.2
-provided
-
-
-org.apache.geronimo.specs
-geronimo-jcdi_1.1_spec
-${geronimo-jcdi-1.1-spec.version}
+${cdi-api.version}
 provided
 
 
 org.jboss.weld.se
-weld-se
+weld-se-shaded
 ${weld.version}
 test
 
-
-org.apache.deltaspike.cdictrl
-deltaspike-cdictrl-weld
-${deltaspike.version}
-test
-
-
-org.apache.deltaspike.modules
-deltaspike-test-control-module-api
-${deltaspike.version}
-test
-
-
-org.apache.deltaspike.modules
-deltaspike-test-control-module-impl
-${deltaspike.version}
-test
-
 
 
 org.jboss.arquillian.testng
@@ -142,12 +117,6 @@ under the License.
 test
 pom
 
-
-org.apache.openejb
-openejb-core
-${openejb.version}
-provided
-
 
 
 
@@ -160,13 +129,7 @@ under the License.
 
 org.eclipse.microprofile.config
 microprofile-config-tck
-1.0
-test
-
-
-org.jboss.weld.se
-weld-se-shaded
-${weld-shaded.version}
+${microprofile.config.version}
 test
 
 
@@ -175,11 +138,6 @@ under the License.
 ${arquillian-weld-embedded.version}
 test
 
-
-javax.enterprise
-cdi-api
-${cdi2-api.version}
-
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/4a9c22f6/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileConfigBuilder.java
--
diff --git 
a/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileConfigBuilder.java
 
b/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileConfigBuilder.java
index 7947e63..896311c 100644
--- 
a/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileConfigBuilder.java
+++ 
b/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileConfigBuilder.java
@@ -39,6 +39,7 @@ import java.util.Objects;
 final class MicroprofileConfigBuilder implements ConfigBuilder{
 
 private ConfigurationContextBuilder contextBuilder;
+private ClassLoader classLoader;
 
 

[5/5] incubator-tamaya-sandbox git commit: TAMAYA-260 Cleaning up how TCK runs.

[johndament]

TAMAYA-260 Cleaning up how TCK runs.


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

Branch: refs/heads/master
Commit: 96593c764871af6b2317bade9745b45a8efedd08
Parents: 3aad356
Author: John Ament 
Authored: Tue Oct 3 13:56:51 2017 -0400
Committer: John Ament 
Committed: Tue Oct 3 13:56:51 2017 -0400

--
 .../apache/tamaya/microprofile/TamayaConfiguration.java  |  5 -
 .../cdi/MicroprofileConfigurationProducer.java   | 11 +++
 .../tamaya/microprofile/converter/ProviderConverter.java |  3 +--
 3 files changed, 8 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/96593c76/microprofile/src/main/java/org/apache/tamaya/microprofile/TamayaConfiguration.java
--
diff --git 
a/microprofile/src/main/java/org/apache/tamaya/microprofile/TamayaConfiguration.java
 
b/microprofile/src/main/java/org/apache/tamaya/microprofile/TamayaConfiguration.java
index 7b5a73c..0f27821 100644
--- 
a/microprofile/src/main/java/org/apache/tamaya/microprofile/TamayaConfiguration.java
+++ 
b/microprofile/src/main/java/org/apache/tamaya/microprofile/TamayaConfiguration.java
@@ -72,11 +72,6 @@ public class TamayaConfiguration implements Configuration{
 }
 
 @Override
-public  T getFromValue(String value, TypeLiteral targetType) {
-return ConfigurationProvider.getConfiguration().getFromValue(value, 
targetType);
-}
-
-@Override
 public Map getProperties() {
 return null;
 }

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/96593c76/microprofile/src/main/java/org/apache/tamaya/microprofile/cdi/MicroprofileConfigurationProducer.java
--
diff --git 
a/microprofile/src/main/java/org/apache/tamaya/microprofile/cdi/MicroprofileConfigurationProducer.java
 
b/microprofile/src/main/java/org/apache/tamaya/microprofile/cdi/MicroprofileConfigurationProducer.java
index 15f8c91..8445407 100644
--- 
a/microprofile/src/main/java/org/apache/tamaya/microprofile/cdi/MicroprofileConfigurationProducer.java
+++ 
b/microprofile/src/main/java/org/apache/tamaya/microprofile/cdi/MicroprofileConfigurationProducer.java
@@ -33,6 +33,7 @@ import javax.enterprise.inject.Produces;
 import javax.enterprise.inject.spi.AnnotatedField;
 import javax.enterprise.inject.spi.AnnotatedType;
 import javax.enterprise.inject.spi.InjectionPoint;
+import javax.inject.Provider;
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
@@ -84,15 +85,17 @@ public class MicroprofileConfigurationProducer {
 Configuration config = ConfigurationProvider.getConfiguration();
 ConversionContext.Builder builder = new 
ConversionContext.Builder(config,
 ConfigurationProvider.getConfiguration().getContext(), key, 
TypeLiteral.of(targetType));
-if (injectionPoint.getMember() instanceof AnnotatedElement) {
-builder.setAnnotatedElement((AnnotatedElement) 
injectionPoint.getMember());
-}
 if(targetType instanceof ParameterizedType){
 ParameterizedType pt = (ParameterizedType)targetType;
 if(pt.getRawType().equals(Provider.class)) {
-
builder.setTargetType(TypeLiteral.of(pt.getActualTypeArguments()[0]));
+builder = new ConversionContext.Builder(config,
+ConfigurationProvider.getConfiguration().getContext(), 
key,
+TypeLiteral.of(pt.getActualTypeArguments()[0]));
 }
 }
+if (injectionPoint.getMember() instanceof AnnotatedElement) {
+builder.setAnnotatedElement((AnnotatedElement) 
injectionPoint.getMember());
+}
 return builder.build();
 }
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/96593c76/microprofile/src/main/java/org/apache/tamaya/microprofile/converter/ProviderConverter.java
--
diff --git 
a/microprofile/src/main/java/org/apache/tamaya/microprofile/converter/ProviderConverter.java
 
b/microprofile/src/main/java/org/apache/tamaya/microprofile/converter/ProviderConverter.java
index 1983e3d..b8b5068 100644
--- 
a/microprofile/src/main/java/org/apache/tamaya/microprofile/converter/ProviderConverter.java
+++ 

[4/5] incubator-tamaya-sandbox git commit: TAMAYA-260 - Improve how parameterized types are handled.

[johndament]

TAMAYA-260 - Improve how parameterized types are handled.


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

Branch: refs/heads/master
Commit: 3aad3568d532798a60a1636a5d54bcb264cdf309
Parents: 4200f87
Author: John D. Ament 
Authored: Wed Sep 20 23:35:59 2017 -0400
Committer: John Ament 
Committed: Tue Oct 3 13:49:30 2017 -0400

--
 .../cdi/MicroprofileCDIExtension.java   | 45 ++--
 tamaya-sandbox.iml  | 12 --
 2 files changed, 23 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/3aad3568/microprofile/src/main/java/org/apache/tamaya/microprofile/cdi/MicroprofileCDIExtension.java
--
diff --git 
a/microprofile/src/main/java/org/apache/tamaya/microprofile/cdi/MicroprofileCDIExtension.java
 
b/microprofile/src/main/java/org/apache/tamaya/microprofile/cdi/MicroprofileCDIExtension.java
index 550b9e0..0e30b78 100644
--- 
a/microprofile/src/main/java/org/apache/tamaya/microprofile/cdi/MicroprofileCDIExtension.java
+++ 
b/microprofile/src/main/java/org/apache/tamaya/microprofile/cdi/MicroprofileCDIExtension.java
@@ -20,13 +20,18 @@ import 
org.eclipse.microprofile.config.inject.ConfigProperty;
 
 import javax.enterprise.event.Observes;
 import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.spi.*;
+import javax.enterprise.inject.spi.AfterBeanDiscovery;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.Extension;
+import javax.enterprise.inject.spi.InjectionPoint;
+import javax.enterprise.inject.spi.ProcessBean;
+import javax.enterprise.inject.spi.ProcessProducerMethod;
 import javax.inject.Provider;
-import java.lang.reflect.Field;
-import java.lang.reflect.Member;
-import java.lang.reflect.Method;
+import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
-import java.util.*;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.logging.Logger;
 
 
@@ -63,25 +68,12 @@ public class MicroprofileCDIExtension implements Extension {
 boolean configured = false;
 for (InjectionPoint injectionPoint : ips) {
 if 
(injectionPoint.getAnnotated().isAnnotationPresent(ConfigProperty.class)) {
-System.err.println("Configured: " + injectionPoint);
+LOG.fine("Configuring: " + injectionPoint);
 final ConfigProperty annotation = 
injectionPoint.getAnnotated().getAnnotation(ConfigProperty.class);
 String key = 
!annotation.name().isEmpty()?annotation.name():MicroprofileConfigurationProducer.getDefaultKey(injectionPoint);
-Member member = injectionPoint.getMember();
-if(member instanceof Field) {
-Field f = (Field)member;
-if(!Instance.class.equals(f.getType()) &&
-!Provider.class.equals(f.getType())){
-types.add(f.getType());
-}
-}else if(member instanceof Method){
-Method m = (Method)member;
-if(!Instance.class.equals(m.getParameterTypes()[0]) &&
-!Provider.class.equals(m.getParameterTypes()[0])){
-types.add(m.getParameterTypes()[0]);
-}
-}else{
-continue;
-}
+Type originalType = injectionPoint.getType();
+Type convertedType = unwrapType(originalType);
+types.add(convertedType);
 configured = true;
 LOG.finest(() -> "Enabling Tamaya Microprofile Configuration 
on bean: " + configuredType.getName());
 configuredType.addConfiguredMember(injectionPoint, key);
@@ -105,5 +97,14 @@ public class MicroprofileCDIExtension implements Extension {
 }
 }
 
+private Type unwrapType(Type type) {
+if(type instanceof ParameterizedType) {
+Type rawType = ((ParameterizedType) type).getRawType();
+if(rawType == Provider.class || rawType == Instance.class) {
+return ((ParameterizedType) type).getActualTypeArguments()[0];
+}
+}
+return type;
+}
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/3aad3568/tamaya-sandbox.iml

[2/2] incubator-tamaya-sandbox git commit: TAMAYA-260 - Improve how parameterized types are handled.

[johndament]

TAMAYA-260 - Improve how parameterized types are handled.


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

Branch: refs/heads/TAMAYA-260-mp-11
Commit: 794def9cf62f03b569820d92676202bd11167e08
Parents: acf2b6f
Author: John D. Ament 
Authored: Wed Sep 20 23:35:59 2017 -0400
Committer: John D. Ament 
Committed: Wed Sep 20 23:35:59 2017 -0400

--
 .../cdi/MicroprofileCDIExtension.java   | 39 +---
 1 file changed, 25 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/794def9c/microprofile/src/main/java/org/apache/tamaya/microprofile/cdi/MicroprofileCDIExtension.java
--
diff --git 
a/microprofile/src/main/java/org/apache/tamaya/microprofile/cdi/MicroprofileCDIExtension.java
 
b/microprofile/src/main/java/org/apache/tamaya/microprofile/cdi/MicroprofileCDIExtension.java
index 7a819fc..0e30b78 100644
--- 
a/microprofile/src/main/java/org/apache/tamaya/microprofile/cdi/MicroprofileCDIExtension.java
+++ 
b/microprofile/src/main/java/org/apache/tamaya/microprofile/cdi/MicroprofileCDIExtension.java
@@ -19,12 +19,19 @@ package org.apache.tamaya.microprofile.cdi;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 
 import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.*;
-import java.lang.reflect.Field;
-import java.lang.reflect.Member;
-import java.lang.reflect.Method;
+import javax.enterprise.inject.Instance;
+import javax.enterprise.inject.spi.AfterBeanDiscovery;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.Extension;
+import javax.enterprise.inject.spi.InjectionPoint;
+import javax.enterprise.inject.spi.ProcessBean;
+import javax.enterprise.inject.spi.ProcessProducerMethod;
+import javax.inject.Provider;
+import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
-import java.util.*;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.logging.Logger;
 
 
@@ -61,17 +68,12 @@ public class MicroprofileCDIExtension implements Extension {
 boolean configured = false;
 for (InjectionPoint injectionPoint : ips) {
 if 
(injectionPoint.getAnnotated().isAnnotationPresent(ConfigProperty.class)) {
-System.err.println("Configured: " + injectionPoint);
+LOG.fine("Configuring: " + injectionPoint);
 final ConfigProperty annotation = 
injectionPoint.getAnnotated().getAnnotation(ConfigProperty.class);
 String key = 
!annotation.name().isEmpty()?annotation.name():MicroprofileConfigurationProducer.getDefaultKey(injectionPoint);
-Member member = injectionPoint.getMember();
-if(member instanceof Field) {
-types.add(((Field) member).getType());
-}else if(member instanceof Method){
-types.add(((Method) member).getParameterTypes()[0]);
-}else{
-continue;
-}
+Type originalType = injectionPoint.getType();
+Type convertedType = unwrapType(originalType);
+types.add(convertedType);
 configured = true;
 LOG.finest(() -> "Enabling Tamaya Microprofile Configuration 
on bean: " + configuredType.getName());
 configuredType.addConfiguredMember(injectionPoint, key);
@@ -95,5 +97,14 @@ public class MicroprofileCDIExtension implements Extension {
 }
 }
 
+private Type unwrapType(Type type) {
+if(type instanceof ParameterizedType) {
+Type rawType = ((ParameterizedType) type).getRawType();
+if(rawType == Provider.class || rawType == Instance.class) {
+return ((ParameterizedType) type).getActualTypeArguments()[0];
+}
+}
+return type;
+}
 
 }

[1/2] incubator-tamaya-sandbox git commit: TAMAYA-260 - Fix how the default field name is generated.

[johndament]

Repository: incubator-tamaya-sandbox
Updated Branches:
  refs/heads/TAMAYA-260-mp-11 73839b317 -> 794def9cf


TAMAYA-260 - Fix how the default field name is generated.


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

Branch: refs/heads/TAMAYA-260-mp-11
Commit: acf2b6f85218c70d8bc2fc22bbc16b20de2a0558
Parents: 73839b3
Author: John D. Ament 
Authored: Wed Sep 20 23:23:32 2017 -0400
Committer: John D. Ament 
Committed: Wed Sep 20 23:23:32 2017 -0400

--
 .../microprofile/cdi/MicroprofileConfigurationProducer.java   | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/acf2b6f8/microprofile/src/main/java/org/apache/tamaya/microprofile/cdi/MicroprofileConfigurationProducer.java
--
diff --git 
a/microprofile/src/main/java/org/apache/tamaya/microprofile/cdi/MicroprofileConfigurationProducer.java
 
b/microprofile/src/main/java/org/apache/tamaya/microprofile/cdi/MicroprofileConfigurationProducer.java
index 758a87f..a459f77 100644
--- 
a/microprofile/src/main/java/org/apache/tamaya/microprofile/cdi/MicroprofileConfigurationProducer.java
+++ 
b/microprofile/src/main/java/org/apache/tamaya/microprofile/cdi/MicroprofileConfigurationProducer.java
@@ -30,6 +30,8 @@ import 
org.eclipse.microprofile.config.spi.ConfigProviderResolver;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.spi.AnnotatedField;
+import javax.enterprise.inject.spi.AnnotatedType;
 import javax.enterprise.inject.spi.InjectionPoint;
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Type;
@@ -71,8 +73,9 @@ public class MicroprofileConfigurationProducer {
 }
 
 static String getDefaultKey(InjectionPoint injectionPoint) {
-String memberName = injectionPoint.getMember().getName();
-return memberName;
+AnnotatedField field = (AnnotatedField)injectionPoint.getAnnotated();
+AnnotatedType declaringType = field.getDeclaringType();
+return declaringType.getJavaClass().getCanonicalName() + "." + 
field.getJavaMember().getName();
 }
 
 static ConversionContext createConversionContext(String key, 
InjectionPoint injectionPoint) {

[2/2] incubator-tamaya-sandbox git commit: TAMAYA-260 - Beginning alignment to the MicroProfile Config 1.1 spec.

[johndament]

TAMAYA-260 - Beginning alignment to the MicroProfile Config 1.1 spec.

- Change the default property name for injection.
- Do something with classloader setting (but ignore the field for now)
- Clean up pom file.


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

Branch: refs/heads/TAMAYA-260-mp-11
Commit: 73839b31765f3115ad79b055d94ab7b41c5e0aa1
Parents: 20f5400
Author: John D. Ament 
Authored: Wed Sep 20 23:06:14 2017 -0400
Committer: John D. Ament 
Committed: Wed Sep 20 23:06:14 2017 -0400

--
 microprofile/pom.xml| 58 +++-
 .../microprofile/MicroprofileConfigBuilder.java |  7 ++-
 .../cdi/MicroprofileConfigurationProducer.java  | 20 ++-
 3 files changed, 18 insertions(+), 67 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/73839b31/microprofile/pom.xml
--
diff --git a/microprofile/pom.xml b/microprofile/pom.xml
index 37bbb2b..9273e4f 100644
--- a/microprofile/pom.xml
+++ b/microprofile/pom.xml
@@ -33,17 +33,16 @@ under the License.
 
 1.8
 1.8
-1.0
+1.1
 
1.0
 1.0
 2.2.6
-6.0.53
 0.4-incubating-SNAPSHOT
 1.1.13.Final
 
2.0.0.Beta5
-2.0
-3.0.0.Final
-2.2.7.Final
+2.0
+3.0.1.Final
+3.0.1.Final
 1.1.0
 4.7.1
 
@@ -84,44 +83,20 @@ under the License.
 
 org.eclipse.microprofile.config
 microprofile-config-api
-1.0
+${microprofile.config.version}
 
 
 javax.enterprise
 cdi-api
-1.2
-provided
-
-
-org.apache.geronimo.specs
-geronimo-jcdi_1.1_spec
-${geronimo-jcdi-1.1-spec.version}
+${cdi-api.version}
 provided
 
 
 org.jboss.weld.se
-weld-se
+weld-se-shaded
 ${weld.version}
 test
 
-
-org.apache.deltaspike.cdictrl
-deltaspike-cdictrl-weld
-${deltaspike.version}
-test
-
-
-org.apache.deltaspike.modules
-deltaspike-test-control-module-api
-${deltaspike.version}
-test
-
-
-org.apache.deltaspike.modules
-deltaspike-test-control-module-impl
-${deltaspike.version}
-test
-
 
 
 org.jboss.arquillian.testng
@@ -142,12 +117,6 @@ under the License.
 test
 pom
 
-
-org.apache.openejb
-openejb-core
-${openejb.version}
-provided
-
 
 
 
@@ -160,13 +129,7 @@ under the License.
 
 org.eclipse.microprofile.config
 microprofile-config-tck
-1.0
-test
-
-
-org.jboss.weld.se
-weld-se-shaded
-${weld-shaded.version}
+${microprofile.config.version}
 test
 
 
@@ -175,11 +138,6 @@ under the License.
 ${arquillian-weld-embedded.version}
 test
 
-
-javax.enterprise
-cdi-api
-${cdi2-api.version}
-
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/73839b31/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileConfigBuilder.java
--
diff --git 
a/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileConfigBuilder.java
 
b/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileConfigBuilder.java
index 7947e63..896311c 100644
--- 
a/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileConfigBuilder.java
+++ 
b/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileConfigBuilder.java
@@ -39,6 +39,7 @@ import java.util.Objects;
 final class MicroprofileConfigBuilder implements ConfigBuilder{
 
 private ConfigurationContextBuilder contextBuilder;
+private ClassLoader classLoader;

[1/2] incubator-tamaya-sandbox git commit: TAMAYA-260 - Removing code copied in from MicroProfile Config 1.1

[johndament]

Repository: incubator-tamaya-sandbox
Updated Branches:
  refs/heads/TAMAYA-260-mp-11 [created] 73839b317


TAMAYA-260 - Removing code copied in from MicroProfile Config 1.1


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

Branch: refs/heads/TAMAYA-260-mp-11
Commit: 20f540066cf64ad97fa374139b9d8f7e99b962a0
Parents: 99ce49e
Author: John D. Ament 
Authored: Wed Sep 20 23:03:49 2017 -0400
Committer: John D. Ament 
Committed: Wed Sep 20 23:03:49 2017 -0400

--
 .../AutoDiscoveredConfigSourceTest.java |  66 -
 .../imported/CDIPlainInjectionTest.java | 261 ---
 .../imported/CdiOptionalInjectionTest.java  |  69 -
 .../imported/ConfigProviderTest.java| 122 -
 .../microprofile/imported/ConverterTest.java| 233 -
 .../imported/CustomConfigSourceTest.java|  40 ---
 .../imported/OptionalValuesBean.java|  62 -
 .../imported/broken/ConfigOwner.java|  39 ---
 .../imported/broken/CustomConverterBean.java|  46 
 .../CustomConfigSourceProvider.java |  53 
 .../configsources/CustomDbConfigSource.java |  69 -
 .../configsources/SampleYamlConfigSource.java   |  58 -
 .../microprofile/imported/converters/Duck.java  |  36 ---
 .../imported/converters/DuckConverter.java  |  33 ---
 .../microprofile/imported/converters/Pizza.java |  42 ---
 .../imported/converters/PizzaConverter.java |  34 ---
 .../imported/matchers/AdditionalMatchers.java   |  61 -
 ...eclipse.microprofile.config.spi.ConfigSource |  19 --
 ...microprofile.config.spi.ConfigSourceProvider |  18 --
 ...rg.eclipse.microprofile.config.spi.Converter |  18 --
 20 files changed, 1379 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/20f54006/microprofile/src/test/java/org/apache/tamaya/microprofile/imported/AutoDiscoveredConfigSourceTest.java
--
diff --git 
a/microprofile/src/test/java/org/apache/tamaya/microprofile/imported/AutoDiscoveredConfigSourceTest.java
 
b/microprofile/src/test/java/org/apache/tamaya/microprofile/imported/AutoDiscoveredConfigSourceTest.java
deleted file mode 100644
index 57cbc5d..000
--- 
a/microprofile/src/test/java/org/apache/tamaya/microprofile/imported/AutoDiscoveredConfigSourceTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- 
***
- * Copyright (c) 2016-2017 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * Licensed 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.microprofile.imported;
-
-import org.apache.tamaya.microprofile.imported.converters.Pizza;
-import org.eclipse.microprofile.config.Config;
-import org.eclipse.microprofile.config.spi.ConfigProviderResolver;
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.util.logging.Logger;
-
-/**
- * Verify the method addDiscoveredSources() on ConfigBuilder.
- *
- * @author mailto:emiji...@uk.ibm.com;>Emily Jiang
- * @author mailto:strub...@apache.org;>Mark Struberg
- */
-public class AutoDiscoveredConfigSourceTest {
-
-@Test
-public void testAutoDiscoveredConfigureSources() {
-Config config = 
ConfigProviderResolver.instance().getBuilder().addDefaultSources().addDiscoveredSources().build();
-
Assert.assertEquals(config.getValue("tck.config.test.customDbConfig.key1", 
String.class), "valueFromDb1");
-}
-
-@Test
-public void testAutoDiscoveredConverterManuallyAdded() {
-   
-Config config = 
ConfigProviderResolver.instance().getBuilder().addDefaultSources().addDiscoveredSources().addDiscoveredConverters().build();
-Pizza dVaule = config.getValue("tck.config.test.customDbConfig.key3", 

incubator-tamaya git commit: TAMAYA-304 - If no services came back, use the class's class loader to discover services.

[johndament]

Repository: incubator-tamaya
Updated Branches:
  refs/heads/java8 6010c606c -> 54f6b1c87


TAMAYA-304 - If no services came back, use the class's class loader to discover 
services.


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

Branch: refs/heads/java8
Commit: 54f6b1c87c5ae50dc5604ca51d4a58d5a93830dc
Parents: 6010c60
Author: John D. Ament 
Authored: Wed Sep 20 23:01:16 2017 -0400
Committer: John D. Ament 
Committed: Wed Sep 20 23:01:16 2017 -0400

--
 .../org/apache/tamaya/core/internal/DefaultServiceContext.java | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/54f6b1c8/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultServiceContext.java
--
diff --git 
a/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultServiceContext.java
 
b/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultServiceContext.java
index b4a059c..7146ccf 100644
--- 
a/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultServiceContext.java
+++ 
b/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultServiceContext.java
@@ -20,7 +20,6 @@ package org.apache.tamaya.core.internal;
 
 import org.apache.tamaya.ConfigException;
 import org.apache.tamaya.spi.ServiceContext;
-import org.osgi.service.component.annotations.Component;
 
 import javax.annotation.Priority;
 import java.io.IOException;
@@ -96,6 +95,11 @@ public final class DefaultServiceContext implements 
ServiceContext {
 for (T t : ServiceLoader.load(serviceType)) {
 services.add(t);
 }
+if(services.isEmpty()) {
+for (T t : ServiceLoader.load(serviceType, 
serviceType.getClassLoader())) {
+services.add(t);
+}
+}
 Collections.sort(services, 
PriorityServiceComparator.getInstance());
 services = Collections.unmodifiableList(services);
 } catch (ServiceConfigurationError e) {

[incubator-tamaya-sandbox] Git Push Summary

[johndament]

Repository: incubator-tamaya-sandbox
Updated Branches:
  refs/heads/mp-config-support [deleted] 6f41fd3b1

incubator-tamaya-sandbox git commit: Adding profile for Weld3 to run tests with. Removed o.e.mp code to instead pull in artifact

[johndament]

Repository: incubator-tamaya-sandbox
Updated Branches:
  refs/heads/mp-config-support [created] 6f41fd3b1


Adding profile for Weld3 to run tests with.  Removed o.e.mp code to instead 
pull in artifact


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

Branch: refs/heads/mp-config-support
Commit: 6f41fd3b17f3883ccc1a4bc3a5199a263f7e8d12
Parents: 22cdc84
Author: John D. Ament 
Authored: Wed Aug 9 06:31:44 2017 -0400
Committer: John D. Ament 
Committed: Wed Aug 9 06:31:44 2017 -0400

--
 microprofile/pom.xml| 108 
 .../microprofile/MicroprofileConfigBuilder.java |  12 ++
 .../org/eclipse/microprofile/config/Config.java | 126 --
 .../microprofile/config/ConfigProvider.java | 102 
 .../config/inject/ConfigProperty.java   | 112 -
 .../config/inject/package-info.java |  40 -
 .../microprofile/config/package-info.java   |  75 -
 .../microprofile/config/spi/ConfigBuilder.java  |  83 --
 .../config/spi/ConfigProviderResolver.java  | 164 ---
 .../microprofile/config/spi/ConfigSource.java   | 107 
 .../config/spi/ConfigSourceProvider.java|  58 ---
 .../microprofile/config/spi/Converter.java  |  77 -
 .../microprofile/config/spi/package-info.java   |  30 
 13 files changed, 87 insertions(+), 1007 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/6f41fd3b/microprofile/pom.xml
--
diff --git a/microprofile/pom.xml b/microprofile/pom.xml
index 1b5d808..4d65714 100644
--- a/microprofile/pom.xml
+++ b/microprofile/pom.xml
@@ -36,26 +36,12 @@ under the License.
 1.0
 
1.0
 1.0
+1.1.13.Final
+
2.0.0.Beta5
+2.0
+3.0.0.Final
 
 
-
-
-
-org.apache.maven.plugins
-maven-compiler-plugin
-
-true
-${maven.compile.optimize}
-${maven.compile.sourceLevel}
-${maven.compile.targetLevel}
-${project.build.sourceEncoding}
-
${maven.compile.deprecation}
-
-
-
-
-
-
 
 
 junit
@@ -85,24 +71,80 @@ under the License.
 ${project.parent.version}
 
 
-org.apache.geronimo.specs
-geronimo-atinject_1.0_spec
-${geronimo-atinject-1.0-spec.version}
-provided
-true
+org.eclipse.microprofile.config
+microprofile-config-api
+${microprofile.version}
 
 
-org.apache.geronimo.specs
-geronimo-jcdi_1.1_spec
-${geronimo-jcdi-1.1-spec.version}
-provided
-true
+org.eclipse.microprofile.config
+microprofile-config-tck
+${microprofile.version}
+test
+
+
+org.jboss.arquillian.testng
+arquillian-testng-container
+${arquillian.version}
+test
+
+
+org.testng
+testng
+6.9.9
+test
 
-
-
-
-
-
 
 
+
+
+
+org.apache.maven.plugins
+maven-surefire-plugin
+2.20
+
+
org.eclipse.microprofile.config:microprofile-config-tck
+
+
+
+org.apache.maven.plugins
+maven-compiler-plugin
+
+true
+${maven.compile.optimize}
+${maven.compile.sourceLevel}
+${maven.compile.targetLevel}
+${project.build.sourceEncoding}
+
${maven.compile.deprecation}
+
+
+
+
+
+
+
+Weld3
+
+true
+
+
+
+org.jboss.weld.se
+weld-se-shaded
+${weld.version}
+test
+
+
+org.jboss.arquillian.container
+arquillian-weld-embedded
+

incubator-tamaya-extensions git commit: Disable findbugs.

[johndament]

Repository: incubator-tamaya-extensions
Updated Branches:
  refs/heads/master 57e349d31 -> 9d346676a


Disable findbugs.


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

Branch: refs/heads/master
Commit: 9d346676ae6b81430a108e131f997076e2439eb5
Parents: 57e349d
Author: John D. Ament 
Authored: Sat Nov 5 11:04:15 2016 -0400
Committer: John D. Ament 
Committed: Sat Nov 5 11:04:15 2016 -0400

--
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/9d346676/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 9f1ee30..a0df5d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -405,7 +405,7 @@ under the License.
 maven-toolchains-plugin
 ${toolchains.plugin}
 
-
+
 
 org.asciidoctor
 asciidoctor-maven-plugin

incubator-tamaya-extensions git commit: Turn off doclint, for JDK 8.

[johndament]

Repository: incubator-tamaya-extensions
Updated Branches:
  refs/heads/master 48f54a6a5 -> 57e349d31


Turn off doclint, for JDK 8.


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

Branch: refs/heads/master
Commit: 57e349d31b4058ed29d2601006a18040391decfd
Parents: 48f54a6
Author: John D. Ament 
Authored: Sat Nov 5 11:02:02 2016 -0400
Committer: John D. Ament 
Committed: Sat Nov 5 11:02:02 2016 -0400

--
 pom.xml | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/57e349d3/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 009ae39..9f1ee30 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,6 +48,7 @@ under the License.
 
 
 
+-Xdoclint:none
 2.5
 false
 1.7

incubator-tamaya git commit: Don't print out all variables.

[johndament]

Repository: incubator-tamaya
Updated Branches:
  refs/heads/master 747bae159 -> aac361a30


Don't print out all variables.


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

Branch: refs/heads/master
Commit: aac361a3097f5d98efa2826a274c01b65d406c05
Parents: 747bae1
Author: John D. Ament 
Authored: Sun Oct 23 10:06:08 2016 -0400
Committer: John D. Ament 
Committed: Sun Oct 23 10:06:08 2016 -0400

--
 .../src/test/java/org/apache/tamaya/ConfigurationTest.java| 1 -
 .../test/java/org/apache/tamaya/core/ConfigurationTest.java   | 7 ---
 2 files changed, 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/aac361a3/code/api/src/test/java/org/apache/tamaya/ConfigurationTest.java
--
diff --git a/code/api/src/test/java/org/apache/tamaya/ConfigurationTest.java 
b/code/api/src/test/java/org/apache/tamaya/ConfigurationTest.java
index 0c33cd9..ecbb75c 100644
--- a/code/api/src/test/java/org/apache/tamaya/ConfigurationTest.java
+++ b/code/api/src/test/java/org/apache/tamaya/ConfigurationTest.java
@@ -60,5 +60,4 @@ public class ConfigurationTest {
 
assertEquals(Double.MAX_VALUE,ConfigurationProvider.getConfiguration().get("double",
 Double.class), 0.0d);
 }
 
-
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/aac361a3/code/core/src/test/java/org/apache/tamaya/core/ConfigurationTest.java
--
diff --git 
a/code/core/src/test/java/org/apache/tamaya/core/ConfigurationTest.java 
b/code/core/src/test/java/org/apache/tamaya/core/ConfigurationTest.java
index 98bb29c..ff2b011 100644
--- a/code/core/src/test/java/org/apache/tamaya/core/ConfigurationTest.java
+++ b/code/core/src/test/java/org/apache/tamaya/core/ConfigurationTest.java
@@ -56,12 +56,5 @@ public class ConfigurationTest {
 System.out.println("name3: " + current().get("name3"));
 System.out.println("name4: " + current().get("name4"));
 System.out.println("name5: " + current().get("name5"));
-
-System.out.println("ALL :");
-Set> entries = 
current().getProperties().entrySet();
-for (Map.Entry entry : entries) {
-System.out.println("   " + entry.getKey()+" = " + 
entry.getValue());
-}
 }
-
 }

svn commit: r16322 - /dev/incubator/tamaya/

[johndament]

Author: johndament
Date: Sun Oct  2 13:20:44 2016
New Revision: 16322

Log:
Reseting Tamaya.

Removed:
dev/incubator/tamaya/

incubator-tamaya-site git commit: Adding gitignore.

[johndament]

Repository: incubator-tamaya-site
Updated Branches:
  refs/heads/asf-site [created] 24861b65a


Adding gitignore.


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

Branch: refs/heads/asf-site
Commit: 24861b65ac8c58f148d5b8d82448513ad0b8e0cc
Parents: 
Author: John D. Ament 
Authored: Wed Sep 21 09:58:10 2016 -0700
Committer: John D. Ament 
Committed: Wed Sep 21 09:58:10 2016 -0700

--
 .gitignore | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/24861b65/.gitignore
--
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..e69de29

incubator-tamaya git commit: Removed cross module reference for CDI testing.

[johndament]

Repository: incubator-tamaya
Updated Branches:
  refs/heads/master 1be2053bf -> cf7e9c343


Removed cross module reference for CDI testing.


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

Branch: refs/heads/master
Commit: cf7e9c343380c3609f0e461a23390fb5316cb459
Parents: 1be2053
Author: John D. Ament 
Authored: Sun Aug 28 19:05:24 2016 -0400
Committer: John D. Ament 
Committed: Sun Aug 28 19:05:24 2016 -0400

--
 .../META-INF/services/javax.enterprise.inject.spi.Extension | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/cf7e9c34/modules/integration/cdi/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
--
diff --git 
a/modules/integration/cdi/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
 
b/modules/integration/cdi/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
index 4543268..e82118a 100644
--- 
a/modules/integration/cdi/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
+++ 
b/modules/integration/cdi/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
@@ -16,5 +16,4 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-org.apache.tamaya.integration.cdi.TamayaCDIIntegration
 org.apache.tamaya.integration.cdi.ConfigurationExtension
\ No newline at end of file

incubator-tamaya git commit: TAMAYA-148 Removed existing tests, to be replaced by pax-exam. Added a karaf integration layer to generate an aggregate features.xml

[johndament]

Repository: incubator-tamaya
Updated Branches:
  refs/heads/master 4050e8176 -> 80aa20b6b


TAMAYA-148 Removed existing tests, to be replaced by pax-exam.  Added a karaf 
integration layer to generate an aggregate features.xml


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

Branch: refs/heads/master
Commit: 80aa20b6ba6f45e61f5acf0bbd807b13aca5e4fd
Parents: 4050e81
Author: John D. Ament 
Authored: Sat Apr 30 07:30:14 2016 -0400
Committer: John D. Ament 
Committed: Sat Apr 30 07:30:14 2016 -0400

--
 modules/classloader-support/pom.xml |   2 +-
 modules/injection-api/pom.xml   |   1 +
 modules/integration/camel/pom.xml   |   2 +-
 modules/integration/karaf/pom.xml   | 274 +++
 modules/integration/osgi/pom.xml|  69 +
 .../integration/osgi/OSGIConfigRootMapper.java  |   1 -
 .../osgi/OSGIEnhancedConfiguration.java |   3 -
 .../integration/osgi/TamayaConfigAdminImpl.java |  64 +++--
 .../osgi/TamayaConfigurationImpl.java   |   4 +-
 .../integration/osgi/test/HelloService.java |  35 ---
 .../osgi/test/TestConfigIntegration.java| 257 -
 modules/integration/pom.xml |   1 +
 12 files changed, 317 insertions(+), 396 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/80aa20b6/modules/classloader-support/pom.xml
--
diff --git a/modules/classloader-support/pom.xml 
b/modules/classloader-support/pom.xml
index 1d27df4..adea1d3 100644
--- a/modules/classloader-support/pom.xml
+++ b/modules/classloader-support/pom.xml
@@ -1,4 +1,4 @@
-
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+
+tamaya-integration
+org.apache.tamaya.ext
+0.3-incubating-SNAPSHOT
+
+4.0.0
+Apache Tamaya Integration - Karaf Features
+tamaya-karaf
+
+
+org.apache.tamaya
+tamaya-api
+features
+xml
+${project.version}
+
+
+
+org.apache.tamaya
+tamaya-core
+features
+xml
+${project.version}
+
+
+
+org.apache.tamaya.ext
+tamaya-builder
+features
+xml
+${project.version}
+
+
+
+org.apache.tamaya.ext
+tamaya-classloader-support
+features
+xml
+${project.version}
+
+
+
+org.apache.tamaya.ext
+tamaya-collections
+features
+xml
+${project.version}
+
+
+
+org.apache.tamaya.ext
+tamaya-events
+features
+xml
+${project.version}
+
+
+
+org.apache.tamaya.ext
+tamaya-filter
+features
+xml
+${project.version}
+
+
+
+org.apache.tamaya.ext
+tamaya-formats
+features
+xml
+${project.version}
+
+
+
+org.apache.tamaya.ext
+tamaya-functions
+features
+xml
+${project.version}
+
+
+
+org.apache.tamaya.ext
+tamaya-injection
+features
+xml
+${project.version}
+
+
+
+org.apache.tamaya.ext
+tamaya-injection-api
+features
+xml
+${project.version}
+
+
+
+org.apache.tamaya.ext
+tamaya-json
+features
+xml
+${project.version}
+
+
+
+org.apache.tamaya.ext
+tamaya-management
+features
+xml
+${project.version}
+
+
+
+org.apache.tamaya.ext
+tamaya-model
+features
+xml
+${project.version}
+
+
+
+org.apache.tamaya.ext
+tamaya-mutable-config
+features
+xml
+${project.version}
+
+
+
+org.apache.tamaya.ext
+tamaya-optional
+features
+xml
+   

[1/2] incubator-tamaya git commit: TAMAYA-149 Use varargs for the main method to allow it to be used in the example.

[johndament]

Repository: incubator-tamaya
Updated Branches:
  refs/heads/master 1c8b45b18 -> 143f4d211


TAMAYA-149 Use varargs for the main method to allow it to be used in the 
example.


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

Branch: refs/heads/master
Commit: 386f09abedea0047234cb9ee3ddf8d97e2334dbf
Parents: 1c8b45b
Author: John D. Ament 
Authored: Tue Apr 19 20:40:57 2016 -0400
Committer: John D. Ament 
Committed: Tue Apr 19 20:40:57 2016 -0400

--
 .../src/main/java/org/apache/tamaya/server/ConfigServiceApp.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/386f09ab/modules/server/src/main/java/org/apache/tamaya/server/ConfigServiceApp.java
--
diff --git 
a/modules/server/src/main/java/org/apache/tamaya/server/ConfigServiceApp.java 
b/modules/server/src/main/java/org/apache/tamaya/server/ConfigServiceApp.java
index 880c4f5..c8a2810 100644
--- 
a/modules/server/src/main/java/org/apache/tamaya/server/ConfigServiceApp.java
+++ 
b/modules/server/src/main/java/org/apache/tamaya/server/ConfigServiceApp.java
@@ -56,7 +56,7 @@ public class ConfigServiceApp {
 }
 }
 
-public static void main(String[] args) throws Exception {
+public static void main(String... args) throws Exception {
 Configuration config = ConfigurationProvider.getConfiguration();
 String contextPath = config.getOrDefault("tamaya.server.contextPath", 
"/");
 String appBase = ".";

incubator-tamaya git commit: Ignore generated file from rat checks.

[johndament]

Repository: incubator-tamaya
Updated Branches:
  refs/heads/master 61ddb3238 -> ec457f272


Ignore generated file from rat checks.


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

Branch: refs/heads/master
Commit: ec457f2721cd9b07c87b3d579c66ace785aa7a3e
Parents: 61ddb32
Author: John D. Ament 
Authored: Sun Apr 17 22:58:05 2016 -0400
Committer: John D. Ament 
Committed: Sun Apr 17 22:58:05 2016 -0400

--
 pom.xml | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ec457f27/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 58532fc..a026f1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -687,6 +687,7 @@ under the License.
 **/*.json
 **/*.md
 **/*.md.vm
+
src/site/asciidoc/temp-properties-files-for-site/attributes.adoc
 
 
 src/**/*

incubator-tamaya git commit: TAMAYA-148 Working on making OSGi support work in a testable fashion.

[johndament]

Repository: incubator-tamaya
Updated Branches:
  refs/heads/master c9d84a6a1 -> 61ddb3238


TAMAYA-148 Working on making OSGi support work in a testable fashion.


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

Branch: refs/heads/master
Commit: 61ddb3238e8e5f210d6e93cef32df0d0b5fb4200
Parents: c9d84a6
Author: John D. Ament 
Authored: Sun Apr 17 21:47:27 2016 -0400
Committer: John D. Ament 
Committed: Sun Apr 17 21:47:27 2016 -0400

--
 .../tamaya/events/ConfigEventListener.java  |   1 -
 .../org.apache.tamaya.events.ConfigListener |  18 --
 modules/injection-api/pom.xml   |   3 +-
 .../tamaya/integration/osgi/HelloService.java   |  27 --
 .../integration/osgi/HelloServiceImpl.java  |  36 ---
 .../integration/osgi/TestConfigIntegration.java | 272 ---
 .../integration/osgi/test/HelloService.java |  35 +++
 .../osgi/test/TestConfigIntegration.java| 257 ++
 .../osgi/src/test/resources/arquillian.xml  |   2 +-
 .../osgi/src/test/resources/felix.properties|   2 +-
 10 files changed, 296 insertions(+), 357 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/61ddb323/modules/events/src/main/java/org/apache/tamaya/events/ConfigEventListener.java
--
diff --git 
a/modules/events/src/main/java/org/apache/tamaya/events/ConfigEventListener.java
 
b/modules/events/src/main/java/org/apache/tamaya/events/ConfigEventListener.java
index de635f8..7fb32c8 100644
--- 
a/modules/events/src/main/java/org/apache/tamaya/events/ConfigEventListener.java
+++ 
b/modules/events/src/main/java/org/apache/tamaya/events/ConfigEventListener.java
@@ -21,7 +21,6 @@ package org.apache.tamaya.events;
 /**
  * Interface to be implemented for listening on changes on {@link 
org.apache.tamaya.Configuration} instances.
  */
-//@FunctionalInterface
 public interface ConfigEventListener {
 /**
  * Called if an event occurred.

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/61ddb323/modules/events/src/main/resources/META-INF/services/org.apache.tamaya.events.ConfigListener
--
diff --git 
a/modules/events/src/main/resources/META-INF/services/org.apache.tamaya.events.ConfigListener
 
b/modules/events/src/main/resources/META-INF/services/org.apache.tamaya.events.ConfigListener
deleted file mode 100644
index f3199f2..000
--- 
a/modules/events/src/main/resources/META-INF/services/org.apache.tamaya.events.ConfigListener
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy current the License at
-#
-#http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/61ddb323/modules/injection-api/pom.xml
--
diff --git a/modules/injection-api/pom.xml b/modules/injection-api/pom.xml
index 9b2d580..a2122ad 100644
--- a/modules/injection-api/pom.xml
+++ b/modules/injection-api/pom.xml
@@ -66,7 +66,8 @@ under the License.
 
 
 
-org.apache.tamaya.inject.api
+org.apache.tamaya.inject.api,
+org.apache.tamaya.inject.spi
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/61ddb323/modules/integration/osgi/src/test/java/org/apache/tamaya/integration/osgi/HelloService.java
--
diff --git 
a/modules/integration/osgi/src/test/java/org/apache/tamaya/integration/osgi/HelloService.java
 
b/modules/integration/osgi/src/test/java/org/apache/tamaya/integration/osgi/HelloService.java
deleted 

incubator-tamaya git commit: Fixed compilation error.

[johndament]

Repository: incubator-tamaya
Updated Branches:
  refs/heads/master 7ad4c36ee -> c805b1deb


Fixed compilation error.


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

Branch: refs/heads/master
Commit: c805b1deb3b77e801323f174c5dbca754c430883
Parents: 7ad4c36
Author: John D. Ament 
Authored: Sat Feb 27 18:54:17 2016 -0500
Committer: John D. Ament 
Committed: Sat Feb 27 18:54:17 2016 -0500

--
 .../api/src/main/java/org/apache/tamaya/spi/ConversionContext.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/c805b1de/code/api/src/main/java/org/apache/tamaya/spi/ConversionContext.java
--
diff --git 
a/code/api/src/main/java/org/apache/tamaya/spi/ConversionContext.java 
b/code/api/src/main/java/org/apache/tamaya/spi/ConversionContext.java
index 436c9f1..5b4835a 100644
--- a/code/api/src/main/java/org/apache/tamaya/spi/ConversionContext.java
+++ b/code/api/src/main/java/org/apache/tamaya/spi/ConversionContext.java
@@ -174,7 +174,7 @@ public class ConversionContext {
 public Builder(Configuration configuration, ConfigurationContext 
configurationContext, String key, TypeLiteral targetType){
 this.key = key;
 this.configuration = configuration;
-this.configurationContext = context;
+this.configurationContext = configurationContext;
 this.targetType = Objects.requireNonNull(targetType);
 }
 

[3/3] incubator-tamaya git commit: Minor typo in config resource.

[johndament]

Minor typo in config resource.


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

Branch: refs/heads/master
Commit: c8ff387e2a8b2db172afcdcc24bee7fa031691e3
Parents: 675e377
Author: John D. Ament 
Authored: Sun Feb 14 15:15:42 2016 -0500
Committer: John D. Ament 
Committed: Sun Feb 14 15:15:42 2016 -0500

--
 .../main/java/org/apache/tamaya/server/ConfigurationResource.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/c8ff387e/modules/server/src/main/java/org/apache/tamaya/server/ConfigurationResource.java
--
diff --git 
a/modules/server/src/main/java/org/apache/tamaya/server/ConfigurationResource.java
 
b/modules/server/src/main/java/org/apache/tamaya/server/ConfigurationResource.java
index 593a119..0a279fb 100644
--- 
a/modules/server/src/main/java/org/apache/tamaya/server/ConfigurationResource.java
+++ 
b/modules/server/src/main/java/org/apache/tamaya/server/ConfigurationResource.java
@@ -45,7 +45,7 @@ import org.apache.tamaya.ConfigurationProvider;
 import org.apache.tamaya.functions.ConfigurationFunctions;
 
 /**
- * Configuration resource with a etcd compatible REST API
+ * Configuration resource with an etcd compatible REST API
  * (excluding the blocking API calls).
  */
 @Path("/")

[1/3] incubator-tamaya git commit: TAMAYA-142 etcd module - export proper package name and depend on httpclient's OSGi version.

[johndament]

Repository: incubator-tamaya
Updated Branches:
  refs/heads/master 0148fda48 -> c8ff387e2


TAMAYA-142 etcd module - export proper package name and depend on httpclient's 
OSGi version.


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

Branch: refs/heads/master
Commit: 675e377b38e05fbaafebb3e8deb4c8ceb2c4efcb
Parents: 0adb68e
Author: John D. Ament 
Authored: Sun Feb 14 15:14:29 2016 -0500
Committer: John D. Ament 
Committed: Sun Feb 14 15:14:44 2016 -0500

--
 modules/integration/etcd/pom.xml | 8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/675e377b/modules/integration/etcd/pom.xml
--
diff --git a/modules/integration/etcd/pom.xml b/modules/integration/etcd/pom.xml
index c4bf750..d1d35d3 100644
--- a/modules/integration/etcd/pom.xml
+++ b/modules/integration/etcd/pom.xml
@@ -30,10 +30,6 @@ under the License.
 Apache Tamaya Integration - etcd
 bundle
 
-
-2.16.0
-
-
 
 
 
@@ -55,7 +51,7 @@ under the License.
 
 
 
-org.apache.tamaya.integration.camel
+org.apache.tamaya.etcd
 
 
 
@@ -92,7 +88,7 @@ under the License.
 
 
 org.apache.httpcomponents
-httpclient
+httpclient-osgi
 4.5.1
 
 

[1/2] incubator-tamaya git commit: TAMAYA-134 Patch from Philipp Ottlinger to fix a number of javadocs.

[johndament]

Repository: incubator-tamaya
Updated Branches:
  refs/heads/master 9fd1cee1f -> 5701c27e7


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/5701c27e/modules/optional/src/main/java/org/apache/tamaya/optional/OptionalConfiguration.java
--
diff --git 
a/modules/optional/src/main/java/org/apache/tamaya/optional/OptionalConfiguration.java
 
b/modules/optional/src/main/java/org/apache/tamaya/optional/OptionalConfiguration.java
index 8cc5d4f..4868bc1 100644
--- 
a/modules/optional/src/main/java/org/apache/tamaya/optional/OptionalConfiguration.java
+++ 
b/modules/optional/src/main/java/org/apache/tamaya/optional/OptionalConfiguration.java
@@ -19,12 +19,12 @@
 package org.apache.tamaya.optional;
 
 
-import org.apache.tamaya.ConfigurationProvider;
-
 import java.util.Objects;
 
+import org.apache.tamaya.ConfigurationProvider;
+
 /**
- * Simplified configuration API, that can be used by code that only want 
Tamaya to optionally enhance its configuration
+ * Simplified configuration API, that can be used by code that only wants 
Tamaya to optionally enhance its configuration
  * mechanism, but by default uses its own configuration by default.
  */
 public final class OptionalConfiguration {
@@ -48,7 +48,7 @@ public final class OptionalConfiguration {
 try {
 Class.forName(TAMAYA_CONFIGURATION);
 return true;
-} catch (Exception e) {
+} catch (final Exception e) {
 return false;
 }
 }
@@ -58,6 +58,7 @@ public final class OptionalConfiguration {
  * In all other cases {@code null} is returned.
  */
 public static final ValueProvider DEFAULT_PROVIDER = new ValueProvider() {
+@SuppressWarnings("unchecked")
 @Override
 public  T get(String key, Class type) {
 if (String.class == type) {
@@ -93,7 +94,8 @@ public final class OptionalConfiguration {
 
 /**
  * Creates a new instance.
- * @param policy the policy how a value should be evaluated depending ig 
Tamaya is availalbe or not.
+ *
+ * @param policy   the policy how a value should be evaluated depending if 
Tamaya is available or not.
  * @param provider the non Tamaya-based provider to be used to evaluate 
values.
  */
 private OptionalConfiguration(EvaluationPolicy policy, ValueProvider 
provider) {
@@ -104,6 +106,8 @@ public final class OptionalConfiguration {
 /**
  * Returns an instance of OptionalConfiguration, which uses the given 
provider and policy for evaluating the values.
  *
+ * @param policy   the policy how a value should be evaluated depending if 
Tamaya is available or not.
+ * @param provider the non Tamaya-based provider to be used to evaluate 
values.
  * @return a default OptionalConfiguration instance, never null.
  */
 public static OptionalConfiguration of(EvaluationPolicy policy, 
ValueProvider provider) {
@@ -114,6 +118,7 @@ public final class OptionalConfiguration {
  * Returns a default instance, which uses a default provider returning 
values from system properties and environment
  * only.
  *
+ * @param policy the policy how a value should be evaluated depending if 
Tamaya is available or not.
  * @return a default OptionalConfiguration instance, never null.
  */
 public static OptionalConfiguration of(EvaluationPolicy policy) {
@@ -133,13 +138,13 @@ public final class OptionalConfiguration {
 /**
  * Access a String value.
  *
- * @param key the key, not null.
+ * @param key  the key, not null.
  * @param defaultValue the default value, returned if no such key is found 
in the configuration.
  * @return the value found, or null.
  */
 public String getOrDefault(String key, String defaultValue) {
-String value = get(key, String.class);
-if(value==null){
+final String value = get(key, String.class);
+if (value == null) {
 return defaultValue;
 }
 return value;
@@ -155,8 +160,8 @@ public final class OptionalConfiguration {
  * @return the value, or null.
  */
 public  T get(String key, Class type) {
-T value = provider.get(key, type);
-T tamayaValue = getTamaya(key, type);
+final T value = provider.get(key, type);
+final T tamayaValue = getTamaya(key, type);
 switch (policy) {
 case OTHER_OVERRIDES_TAMAYA:
 return value != null ? value : tamayaValue;
@@ -178,15 +183,15 @@ public final class OptionalConfiguration {
 /**
  * Access a String value.
  *
- * @param key the key, not null.
- * @param type the target type, not null.
- * @param   the type param.
+ * @param key  the key, not null.
+ * @param type the target type, not null.
+ * @param   the type param.
  * @param defaultValue the default value, 

svn commit: r978083 - /websites/production/tamaya/content/

[johndament]

Author: johndament
Date: Tue Jan 19 19:49:20 2016
New Revision: 978083

Log:
Publishing svnmucc operation to tamaya site by johndament

Added:
websites/production/tamaya/content/
  - copied from r978082, websites/staging/tamaya/trunk/content/

svn commit: r978082 - /websites/production/tamaya/content/

[johndament]

Author: johndament
Date: Tue Jan 19 19:44:59 2016
New Revision: 978082

Log:
Publishing svnmucc operation to tamaya site by johndament

Added:
websites/production/tamaya/content/
  - copied from r978081, websites/staging/tamaya/trunk/content/

svn commit: r977880 - /websites/production/tamaya/content/

[johndament]

Author: johndament
Date: Sun Jan 17 01:05:40 2016
New Revision: 977880

Log:
Publishing svnmucc operation to tamaya site by johndament

Added:
websites/production/tamaya/content/
  - copied from r977879, websites/staging/tamaya/trunk/content/

incubator-tamaya git commit: Fixed up pom files to refer to new module name. Commented non-working block.

[johndament]

Repository: incubator-tamaya
Updated Branches:
  refs/heads/master bdb291870 -> ee35fed6e


Fixed up pom files to refer to new module name.  Commented non-working block.


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

Branch: refs/heads/master
Commit: ee35fed6e85c0bb2b16be69aeca64e4fbf413776
Parents: bdb2918
Author: John D. Ament 
Authored: Sat Jan 16 19:35:26 2016 -0500
Committer: John D. Ament 
Committed: Sat Jan 16 19:35:26 2016 -0500

--
 code/api/pom.xml|  2 +-
 code/core/pom.xml   |  2 +-
 .../etcd/internal/EtcdConfigChangeRequest.java  | 24 ++--
 .../mutableconfig/ConfigChangeRequest.java  |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ee35fed6/code/api/pom.xml
--
diff --git a/code/api/pom.xml b/code/api/pom.xml
index 3709c41..6f77b19 100644
--- a/code/api/pom.xml
+++ b/code/api/pom.xml
@@ -21,7 +21,7 @@ under the License.
 
 
 org.apache.tamaya
-code
+tamaya-code
 0.2-incubating-SNAPSHOT
 ../pom.xml
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ee35fed6/code/core/pom.xml
--
diff --git a/code/core/pom.xml b/code/core/pom.xml
index 3088bd6..4a496db 100644
--- a/code/core/pom.xml
+++ b/code/core/pom.xml
@@ -21,7 +21,7 @@ under the License.
 
 
 org.apache.tamaya
-code
+tamaya-code
 0.2-incubating-SNAPSHOT
 ../pom.xml
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ee35fed6/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/internal/EtcdConfigChangeRequest.java
--
diff --git 
a/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/internal/EtcdConfigChangeRequest.java
 
b/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/internal/EtcdConfigChangeRequest.java
index 27757ad..f3c7813 100644
--- 
a/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/internal/EtcdConfigChangeRequest.java
+++ 
b/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/internal/EtcdConfigChangeRequest.java
@@ -60,18 +60,18 @@ class EtcdConfigChangeRequest extends 
AbstractConfigChangeRequest{
 checkClosed();
 for(EtcdAccessor accessor: EtcdBackends.getEtcdBackends()){
 try{
-for(String k:getRemoved()){
-Map res = accessor.delete(k);
-if(res.get("_ERROR")!=null){
-LOG.info("Failed to remove key from etcd: " + k);
-}
-}
-for(Map.Entry en:getProperties().entrySet()){
-Map res = accessor.set(en.getKey(), 
en.getValue());
-if(res.get("_ERROR")!=null){
-LOG.info("Failed key from etcd: " + en.getKey()  + "=" 
+ en.getValue());
-}
-}
+//for(String k:getRemoved()){
+//Map res = accessor.delete(k);
+//if(res.get("_ERROR")!=null){
+//LOG.info("Failed to remove key from etcd: " + k);
+//}
+//}
+//for(Map.Entry en:getProperties().entrySet()){
+//Map res = accessor.set(en.getKey(), 
en.getValue());
+//if(res.get("_ERROR")!=null){
+//LOG.info("Failed key from etcd: " + en.getKey()  + 
"=" + en.getValue());
+//}
+//}
 } catch(Exception e){
 LOG.log(Level.FINE, "etcd access failed on " + 
accessor.getUrl() + ", trying next...", e);
 }

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ee35fed6/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ConfigChangeRequest.java
--
diff --git 
a/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ConfigChangeRequest.java
 
b/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ConfigChangeRequest.java
index 97bc614..d1cec76 100644
--- 

svn commit: r10247 - /dev/incubator/tamaya/

[johndament]

Author: johndament
Date: Fri Aug 21 10:17:34 2015
New Revision: 10247

Log:
Added tamaya.

Added:
dev/incubator/tamaya/

svn commit: r960774 - /websites/production/tamaya/content/

[johndament]

Author: johndament
Date: Tue Aug  4 15:12:14 2015
New Revision: 960774

Log:
Publishing svnmucc operation to tamaya site by johndament

Added:
websites/production/tamaya/content/
  - copied from r960773, websites/staging/tamaya/trunk/content/

svn commit: r960773 - in /websites/staging/tamaya/trunk/content: ./ quickstart.html

[johndament]

Author: johndament
Date: Tue Aug  4 15:11:01 2015
New Revision: 960773

Log:
Rolled back to r944139

Modified:
websites/staging/tamaya/trunk/content/   (props changed)
websites/staging/tamaya/trunk/content/quickstart.html

Propchange: websites/staging/tamaya/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Aug  4 15:11:01 2015
@@ -1 +1 @@
-1667382
+1667381

Modified: websites/staging/tamaya/trunk/content/quickstart.html
==
--- websites/staging/tamaya/trunk/content/quickstart.html (original)
+++ websites/staging/tamaya/trunk/content/quickstart.html Tue Aug  4 15:11:01 
2015
@@ -154,21 +154,6 @@ a emResolver/em singleton:/p
 /pre/div
 
 
-pCurrently the following resolvers are available:/p
-ul
-liemconf/em cross-reference to another configuration entry./li
-liemurl/em referencing a resource addressable by an URL./li
-liemfile/em referencing a file, replacing the expression with the file's 
text value./li
-liemresource/em referencing a classpath resource, replacing the 
expression with the resource's text value./li
-/ul
-pA concrete example of a referencing entry would be:/p
-div class=codehilitepremyKey=My span class=cp${/spanspan 
class=nconf/spanspan class=p:/spanspan class=na/spanspan 
class=o./spanspan class=nb/spanspan class=o./spanspan 
class=nc/spanspan class=o./spanspan class=notherKey/spanspan 
class=cp}/span entry.
-/pre/div
-
-
-pEvaluation supports multiple evaluation steps, e.g. needed for evaluating 
of values that are expressions themselves
-(and so on). In case of circular dependencies evaluation will stop after a 
configurable amount of evaluation
-cycles done./p
 h2 id=ant-styled-path-resolution-of-resourcesAnt-styled Path Resolution of 
Resources/h2
 div class=codehiliteprespan class=ntlt;dependencygt;/span
   span class=ntlt;artifactIdgt;/spanorg.apache.tamaya.extspan 
class=ntlt;/idgt;/span
@@ -223,6 +208,15 @@ corresponding configuration:/p
 
 span class=nMyTypeTemplate/span span class=ntype/span span 
class=p=/span span class=nConfigurationInjector/spanspan 
class=p./spanspan class=ncreateTemplate/spanspan 
class=p(/spanspan class=nMyTypeTemplate/spanspan 
class=p./spanspan class=nclass/spanspan class=p);/span
 /pre/div
+
+
+pCurrently the following resolvers are available:/p
+ul
+liemconf/em cross-reference to another configuration entry./li
+liemurl/em referencing a resource addressable by an URL./li
+liemfile/em referencing a file, replacing the expression with the file's 
text value./li
+liemresource/em referencing a classpath resource, replacing the 
expression with the resource's text value./li
+/ul
   /div
   /div
 

svn commit: r960588 - /websites/production/tamaya/content/

[johndament]

Author: johndament
Date: Mon Aug  3 02:28:11 2015
New Revision: 960588

Log:
Publishing svnmucc operation to tamaya site by johndament

Added:
websites/production/tamaya/content/
  - copied from r960587, websites/staging/tamaya/trunk/content/

svn commit: r1693847 - /incubator/tamaya/site/trunk/content/source.mdtext

[johndament]

Author: johndament
Date: Mon Aug  3 02:14:43 2015
New Revision: 1693847

URL: http://svn.apache.org/r1693847
Log:
Updated sources file.

Modified:
incubator/tamaya/site/trunk/content/source.mdtext

Modified: incubator/tamaya/site/trunk/content/source.mdtext
URL: 
http://svn.apache.org/viewvc/incubator/tamaya/site/trunk/content/source.mdtext?rev=1693847r1=1693846r2=1693847view=diff
==
--- incubator/tamaya/site/trunk/content/source.mdtext (original)
+++ incubator/tamaya/site/trunk/content/source.mdtext Mon Aug  3 02:14:43 2015
@@ -25,9 +25,16 @@ Alternatively there is also a GitHub rea
 
 * [https://github.com/apache/incubator-tamaya] [3]
 
+Building The Source
+
+We use maven to build the source code.  Since we have both Java 7 and Java 8 
compliant modules, we require both JDKs
+to be installed on the client machine.  To dthis, we use [Maven Toolchains] 
[5] to link to both JDKs.  Your toolchains.xml
+should have references to both 1.7 and 1.8 in it.
+
 If you like to contribute to this project please also refer also to our 
[Contributors section] [4].
 
   [1]: http://git-wip-us.apache.org/repos/asf/incubator-tamaya.git
   [2]: https://git-wip-us.apache.org/repos/asf/incubator-tamaya.git
   [3]: https://github.com/apache/incubator-tamaya.git
-  [4]: ./contributors.html 
+  [4]: ./contributors.html
+  [5]: https://maven.apache.org/guides/mini/guide-using-toolchains.html

svn commit: r1693850 - /incubator/tamaya/site/trunk/content/source.mdtext

[johndament]

Author: johndament
Date: Mon Aug  3 02:20:58 2015
New Revision: 1693850

URL: http://svn.apache.org/r1693850
Log:
Better headings.

Modified:
incubator/tamaya/site/trunk/content/source.mdtext

Modified: incubator/tamaya/site/trunk/content/source.mdtext
URL: 
http://svn.apache.org/viewvc/incubator/tamaya/site/trunk/content/source.mdtext?rev=1693850r1=1693849r2=1693850view=diff
==
--- incubator/tamaya/site/trunk/content/source.mdtext (original)
+++ incubator/tamaya/site/trunk/content/source.mdtext Mon Aug  3 02:20:58 2015
@@ -16,12 +16,14 @@ Notice:Licensed to the Apache Softwa
specific language governing permissions and limitations
under the License.
 
-# The current source code can be found at:
+# Source Code
+
+The current source code can be found at:
 
 * [http://git-wip-us.apache.org/repos/asf/incubator-tamaya.git (read-only)][1]
 * [https://git-wip-us.apache.org/repos/asf/incubator-tamaya.git] [2]
 
-# Alternatively there is also a GitHub read-only mirror at:
+Alternatively there is also a GitHub read-only mirror at:
 
 * [https://github.com/apache/incubator-tamaya] [3]
 
@@ -31,6 +33,8 @@ We use maven to build the source code.
 to be installed on the client machine.  To dthis, we use [Maven Toolchains] 
[5] to link to both JDKs.  Your toolchains.xml
 should have references to both 1.7 and 1.8 in it.
 
+# Contributions
+
 If you like to contribute to this project please also refer also to our 
[Contributors section] [4].
 
   [1]: http://git-wip-us.apache.org/repos/asf/incubator-tamaya.git

svn commit: r1693849 - /incubator/tamaya/site/trunk/content/source.mdtext

[johndament]

Author: johndament
Date: Mon Aug  3 02:19:51 2015
New Revision: 1693849

URL: http://svn.apache.org/r1693849
Log:
Some headings.

Modified:
incubator/tamaya/site/trunk/content/source.mdtext

Modified: incubator/tamaya/site/trunk/content/source.mdtext
URL: 
http://svn.apache.org/viewvc/incubator/tamaya/site/trunk/content/source.mdtext?rev=1693849r1=1693848r2=1693849view=diff
==
--- incubator/tamaya/site/trunk/content/source.mdtext (original)
+++ incubator/tamaya/site/trunk/content/source.mdtext Mon Aug  3 02:19:51 2015
@@ -16,16 +16,16 @@ Notice:Licensed to the Apache Softwa
specific language governing permissions and limitations
under the License.
 
-The current source code can be found at:
+# The current source code can be found at:
 
 * [http://git-wip-us.apache.org/repos/asf/incubator-tamaya.git (read-only)][1]
 * [https://git-wip-us.apache.org/repos/asf/incubator-tamaya.git] [2]
 
-Alternatively there is also a GitHub read-only mirror at:
+# Alternatively there is also a GitHub read-only mirror at:
 
 * [https://github.com/apache/incubator-tamaya] [3]
 
-Building The Source
+# Building The Source
 
 We use maven to build the source code.  Since we have both Java 7 and Java 8 
compliant modules, we require both JDKs
 to be installed on the client machine.  To dthis, we use [Maven Toolchains] 
[5] to link to both JDKs.  Your toolchains.xml

incubator-tamaya git commit: Added release configuration.

[johndament]

Repository: incubator-tamaya
Updated Branches:
  refs/heads/master 1f5e98a5d - df1f26e4e


Added release configuration.


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

Branch: refs/heads/master
Commit: df1f26e4e1dcfe002cbfc9e9a2872253da6b14cf
Parents: 1f5e98a
Author: John D. Ament johndam...@apache.org
Authored: Sun Aug 2 22:55:53 2015 -0400
Committer: John D. Ament johndam...@apache.org
Committed: Sun Aug 2 22:55:53 2015 -0400

--
 pom.xml | 13 +
 1 file changed, 13 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/df1f26e4/pom.xml
--
diff --git a/pom.xml b/pom.xml
index f8cafe8..68dd71c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -584,7 +584,20 @@ under the License.
 /execution
 /executions
 /plugin
+!-- we need to tweak the maven-release-plugin for GIT --
+plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-release-plugin/artifactId
+version2.5.1/version
+configuration
+pushChangesfalse/pushChanges
+localCheckouttrue/localCheckout
+autoVersionSubmodulestrue/autoVersionSubmodules
 
+releaseProfilesrelease/releaseProfiles
+preparationGoalsclean install/preparationGoals
+/configuration
+/plugin
 /plugins
 /build
 

incubator-tamaya git commit: Minor pom fixes to clean up contents and reduce duplicated content.

[johndament]

Repository: incubator-tamaya
Updated Branches:
  refs/heads/master 56556638d - 1f5e98a5d


Minor pom fixes to clean up contents and reduce duplicated content.


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

Branch: refs/heads/master
Commit: 1f5e98a5da8034a59260975936b936c2cceedd98
Parents: 5655663
Author: John D. Ament johndam...@apache.org
Authored: Sat Aug 1 21:32:22 2015 -0400
Committer: John D. Ament johndam...@apache.org
Committed: Sat Aug 1 21:32:22 2015 -0400

--
 docs/pom.xml| 27 -
 docs/src/main/asciidoc/releaseguide/readme.md   |  2 +-
 examples/1-minimal-example/pom.xml  | 12 --
 .../2-simple-propertysource-example/pom.xml | 12 --
 examples/3-resources-example/pom.xml| 12 --
 examples/4-resolver-example/pom.xml | 12 --
 examples/5-injection-example/pom.xml| 12 --
 examples/6-fileobserver-example/pom.xml | 12 --
 examples/7-builder-example/pom.xml  | 12 --
 examples/pom.xml| 12 --
 java7/api/pom.xml   | 12 --
 java7/core/pom.xml  | 12 --
 java7/pom.xml   | 12 --
 java8/api/pom.xml   | 12 --
 java8/core/pom.xml  | 41 
 modules/builder/pom.xml | 12 --
 modules/events/pom.xml  | 12 --
 modules/formats/pom.xml | 12 --
 modules/injection/pom.xml   | 12 --
 modules/json/pom.xml| 12 --
 modules/pom.xml | 12 --
 modules/resolver/pom.xml| 12 --
 modules/resources/pom.xml   | 12 --
 pom.xml | 32 +--
 sandbox/environment/pom.xml | 12 --
 sandbox/functions/pom.xml   | 12 --
 sandbox/integration/cdi/pom.xml | 12 --
 sandbox/integration/commons/pom.xml | 12 --
 sandbox/jodatime/pom.xml| 12 --
 sandbox/management/pom.xml  | 12 --
 sandbox/metamodels/pom.xml  | 12 --
 sandbox/metamodels/simple/pom.xml   | 12 --
 sandbox/model/pom.xml   | 12 --
 sandbox/pom.xml | 12 --
 sandbox/remote/pom.xml  | 17 
 sandbox/sysprops/pom.xml| 12 --
 36 files changed, 2 insertions(+), 489 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/1f5e98a5/docs/pom.xml
--
diff --git a/docs/pom.xml b/docs/pom.xml
index c416146..d774ebd 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -47,19 +47,6 @@ under the License.
 /exclusions
 /dependency
 /dependencies
-
-scm
-connection
-scm:git://git.apache.org/incubator-tamaya.git
-/connection
-developerConnection
-scm:git://git.apache.org/incubator-tamaya.git
-/developerConnection
-url
-https://git-wip-us.apache.org/repos/asf?p=incubator-tamaya.git
-/url
-/scm
-
 build
 plugins
 plugin
@@ -133,18 +120,4 @@ under the License.
 /plugins
 /build
 
-repositories
-repository
-idrubygems-proxy-releases/id
-nameRubyGems.org Proxy (Releases)/name
-urlhttp://rubygems-proxy.torquebox.org/releases/url
-releases
-enabledtrue/enabled
-/releases
-snapshots
-enabledfalse/enabled
-/snapshots
-/repository
-/repositories
-
 /project

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/1f5e98a5/docs/src/main/asciidoc/releaseguide/readme.md
--
diff --git a/docs/src/main/asciidoc/releaseguide/readme.md 
b/docs/src/main/asciidoc/releaseguide/readme.md
index 5132596..5932935 100644
--- a/docs/src/main/asciidoc/releaseguide/readme.md
+++ b/docs/src/main/asciidoc/releaseguide/readme.md
@@ -1,3 +1,3 @@
-# Release Guide ofApache Tamaya (incubating)
+# Release Guide of Apache Tamaya (incubating)
 
 This directory contains the release guide of Apache Tamaya 

incubator-tamaya git commit: TAMAYA-52 Reset version back. Removed toolchain for now to avoid local env setup issues.

[johndament]

Repository: incubator-tamaya
Updated Branches:
  refs/heads/master 585167aa8 - 6d15f753d


TAMAYA-52 Reset version back.  Removed toolchain for now to avoid local env 
setup issues.


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

Branch: refs/heads/master
Commit: 6d15f753d5a4fefa9c4ae1d4a4e1b26d2dc0b723
Parents: 585167a
Author: John D. Ament johndam...@apache.org
Authored: Wed Jan 7 21:34:26 2015 -0500
Committer: John D. Ament johndam...@apache.org
Committed: Wed Jan 7 21:34:26 2015 -0500

--
 docs/pom.xml  |  2 +-
 java7/api/pom.xml |  2 +-
 java7/pom.xml | 27 +--
 java8/api/pom.xml |  2 +-
 java8/core/pom.xml|  2 +-
 java8/pom.xml |  2 +-
 modules/formats/pom.xml   |  2 +-
 modules/json/pom.xml  |  2 +-
 modules/pom.xml   |  2 +-
 modules/resolver/pom.xml  |  2 +-
 modules/resources/pom.xml |  2 +-
 pom.xml   |  2 +-
 12 files changed, 12 insertions(+), 37 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/6d15f753/docs/pom.xml
--
diff --git a/docs/pom.xml b/docs/pom.xml
index d3646fd..5a7f955 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -23,7 +23,7 @@ under the License.
 parent
 groupIdorg.apache.tamaya/groupId
 artifactIdtamaya-all/artifactId
-version0.2-incubating-SNAPSHOT/version
+version0.1-incubating-SNAPSHOT/version
 relativePath../relativePath
 /parent
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/6d15f753/java7/api/pom.xml
--
diff --git a/java7/api/pom.xml b/java7/api/pom.xml
index 3dbfa4c..cb34185 100644
--- a/java7/api/pom.xml
+++ b/java7/api/pom.xml
@@ -23,7 +23,7 @@ under the License.
 parent
 groupIdorg.apache.tamaya/groupId
 artifactIdtamaya-java7/artifactId
-version0.2-SNAPSHOT/version
+version0.1-incubating-SNAPSHOT/version
 relativePath../pom.xml/relativePath
 /parent
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/6d15f753/java7/pom.xml
--
diff --git a/java7/pom.xml b/java7/pom.xml
index df137c2..2bf889f 100644
--- a/java7/pom.xml
+++ b/java7/pom.xml
@@ -23,7 +23,7 @@ under the License.
 parent
 groupIdorg.apache.tamaya/groupId
 artifactIdtamaya-all/artifactId
-version0.2-SNAPSHOT/version
+version0.1-incubating-SNAPSHOT/version
 relativePath../pom.xml/relativePath
 /parent
 
@@ -40,29 +40,4 @@ under the License.
 modulecore/module
 --
 /modules
-
-build
-plugins
-plugin
-!-- use java7 to compile the modules in this tree --
-groupIdorg.apache.maven.plugins/groupId
-artifactIdmaven-toolchains-plugin/artifactId
-version1.1/version
-executions
-execution
-goals
-goaltoolchain/goal
-/goals
-/execution
-/executions
-configuration
-toolchains
-jdk
-version[1.7,)/version
-/jdk
-/toolchains
-/configuration
-/plugin
-/plugins
-/build
 /project

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/6d15f753/java8/api/pom.xml
--
diff --git a/java8/api/pom.xml b/java8/api/pom.xml
index 6f40b45..0ee64d9 100644
--- a/java8/api/pom.xml
+++ b/java8/api/pom.xml
@@ -23,7 +23,7 @@ under the License.
 parent
 groupIdorg.apache.tamaya/groupId
 artifactIdtamaya-java8/artifactId
-version0.2-incubating-SNAPSHOT/version
+version0.1-incubating-SNAPSHOT/version
 relativePath../pom.xml/relativePath
 /parent
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/6d15f753/java8/core/pom.xml
--
diff --git a/java8/core/pom.xml b/java8/core/pom.xml
index 7949c3c..b0ac449 100644
--- a/java8/core/pom.xml
+++ b/java8/core/pom.xml
@@ -23,7 +23,7 @@ under the License.
 parent
 groupIdorg.apache.tamaya/groupId
 artifactIdtamaya-java8/artifactId
-version0.2-incubating-SNAPSHOT/version
+

incubator-tamaya git commit: TAMAYA-42 Minor javadoc clarification. Removed unused field. Removed code duplication from char converter.

[johndament]

Repository: incubator-tamaya
Updated Branches:
  refs/heads/master ea651771f - f15ed8d5c


TAMAYA-42 Minor javadoc clarification.  Removed unused field.  Removed code 
duplication from char converter.


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

Branch: refs/heads/master
Commit: f15ed8d5cda0a7f3e13baea36dc49fba42b00783
Parents: ea65177
Author: John D. Ament johndam...@apache.org
Authored: Mon Jan 5 21:06:53 2015 -0500
Committer: John D. Ament johndam...@apache.org
Committed: Mon Jan 5 21:06:53 2015 -0500

--
 .../java/org/apache/tamaya/spi/ConfigurationContext.java| 2 +-
 .../tamaya/core/internal/DefaultConfigurationContext.java   | 2 --
 .../tamaya/core/internal/PropertyConverterManager.java  | 9 ++---
 3 files changed, 7 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f15ed8d5/api/src/main/java/org/apache/tamaya/spi/ConfigurationContext.java
--
diff --git a/api/src/main/java/org/apache/tamaya/spi/ConfigurationContext.java 
b/api/src/main/java/org/apache/tamaya/spi/ConfigurationContext.java
index 27bc52e..efad465 100644
--- a/api/src/main/java/org/apache/tamaya/spi/ConfigurationContext.java
+++ b/api/src/main/java/org/apache/tamaya/spi/ConfigurationContext.java
@@ -47,7 +47,7 @@ public interface ConfigurationContext {
  * PropertySources are loaded when this method is called the first time, 
which basically is
  * when the first time configuration is accessed.
  *
- * @return sorted list of registered PropertySources
+ * @return a sorted list of registered PropertySources.  The returned list 
need not be modifiable
  */
 ListPropertySource getPropertySources();
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f15ed8d5/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContext.java
--
diff --git 
a/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContext.java
 
b/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContext.java
index a2705ef..b367d25 100644
--- 
a/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContext.java
+++ 
b/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContext.java
@@ -40,8 +40,6 @@ import java.util.logging.Logger;
  * Default Implementation of a simple ConfigurationContext.
  */
 public class DefaultConfigurationContext implements ConfigurationContext {
-
-private static final Logger LOG = 
Logger.getLogger(DefaultConfigurationContext.class.getName());
 /**
  * Cubcomponent handling {@link org.apache.tamaya.spi.PropertyConverter} 
instances.
  */

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f15ed8d5/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java
--
diff --git 
a/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java
 
b/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java
index 86c8ebe..5c7ae02 100644
--- 
a/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java
+++ 
b/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java
@@ -52,7 +52,7 @@ public class PropertyConverterManager {
 private MapClass?, ListPropertyConverter? converters = new 
ConcurrentHashMap();
 /** The lock used. */
 private StampedLock lock = new StampedLock();
-
+private static final String CHAR_NULL_ERROR = Cannot convert null 
property;
 /**
  * Constructor.
  */
@@ -60,12 +60,15 @@ public class PropertyConverterManager {
 initDefaultConverters();
 }
 
+private static final PropertyConverterCharacter CHAR_CONVERTER =
+(s) - Objects.requireNonNull(s,CHAR_NULL_ERROR).charAt(0);
+
 /**
  * Registers the default converters provided out of the box.
  */
 protected void initDefaultConverters() {
 // Add default converters
-register(char.class, (s) - s != null ? s.charAt(0) : null);
+register(char.class, CHAR_CONVERTER);
 register(byte.class, Byte::parseByte);
 register(short.class, Short::parseShort);
 register(int.class, Integer::parseInt);
@@ -74,7 +77,7 @@ public class PropertyConverterManager {
 register(float.class, Float::parseFloat); //X TODO not good enough as 
this is Locale dependent!
 register(double.class, 

[2/4] incubator-tamaya git commit: TAMAYA-19: Separated config from property source.

[johndament]

TAMAYA-19:  Separated config from property source.


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

Branch: refs/heads/0.1-prototype
Commit: 3575b8ba926981ca861bdeb6fe19c66a4d150bc2
Parents: 7f64653
Author: anatole anat...@apache.org
Authored: Sat Dec 27 02:10:31 2014 +0100
Committer: John D. Ament johndam...@apache.org
Committed: Sun Dec 28 08:58:00 2014 -0500

--
 .../java/org/apache/tamaya/DynamicValue.java| 153 ++-
 .../org/apache/tamaya/PropertyMapSupplier.java  |  37 +
 .../tamaya/spi/ConfigurationFactorySpi.java |  60 
 3 files changed, 211 insertions(+), 39 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/3575b8ba/dormant/api/src/main/java/org/apache/tamaya/DynamicValue.java
--
diff --git a/dormant/api/src/main/java/org/apache/tamaya/DynamicValue.java 
b/dormant/api/src/main/java/org/apache/tamaya/DynamicValue.java
index 150586f..b8e0cf5 100644
--- a/dormant/api/src/main/java/org/apache/tamaya/DynamicValue.java
+++ b/dormant/api/src/main/java/org/apache/tamaya/DynamicValue.java
@@ -32,13 +32,14 @@ import java.util.function.Supplier;
 import java.util.logging.Logger;
 
 /**
- * A accessor for a single configured value. This can be used to support 
values that may be reinjected, reconfigured or
- * final.
- * h3Implementation Requirements/h3
- * Instances of this class must be
+ * A accessor for a single configured value. This can be used to support 
values that may change during runtime, reconfigured or
+ * final. Hereby external code (could be Tamaya configuration listners or 
client code), can set a new value. Depending on the
+ * {@link org.apache.tamaya.DynamicValue.UpdatePolicy} the new value is 
immedeately active or it requires an active commit
+ * by client code. Similarly an instance also can ignore all later changes to 
the value.
+ * h3Implementation Details/h3
+ * This class is
  * ul
- * liSerializable/li
- * liImmutable/li
+ * liSerializable, when also the item stored is serializable/li
  * liThread safe/li
  * /ul
  */
@@ -50,8 +51,8 @@ public final class DynamicValueT implements Serializable{
 enum UpdatePolicy{
 /** New values are applied immedately and registered listeners are 
informed about the change. */
 IMMEDIATE,
-/** New values or not applied, but stored in the newValue property. 
Explcit call to #update
- of #updateAndGet are required to accept the change and inform the 
listeners about the change.
+/** New values or not applied, but stored in the newValue property. 
Explcit call to #commit
+ of #commitAndGet are required to accept the change and inform the 
listeners about the change.
  */
 EXPLCIT,
 /**
@@ -65,17 +66,19 @@ public final class DynamicValueT implements Serializable{
 }
 
 
+/** The property name of the entry. */
+private String propertyName;
 /**
- * Converts this value to an {@link java.util.Optional} instance.
- * @return an {@link java.util.Optional} instance, never null.
+ * Policy that defines how new values are applied, be default it is 
applied initially once, but never updated anymore.
  */
 private UpdatePolicy updatePolicy = UpdatePolicy.NEVER;
+/** The current value, never null. */
 private transient OptionalT value;
-private transient PropertyChangeEvent newValue;
+/** The new value, or null. */
+private transient OptionalT newValue;
+/** List of listeners that listen for changes. */
 private transient WeakListConsumerPropertyChangeEvent listeners;
 
-public static final DynamicValue EMPTY = new DynamicValue(null);
-
 /**
  * Returns an empty {@code Optional} instance.  No value is present for 
this
  * Optional.
@@ -88,25 +91,45 @@ public final class DynamicValueT implements Serializable{
  * @param T Type of the non-existent value
  * @return an empty {@code Optional}
  */
-public static T DynamicValueT empty() {
-DynamicValue v = (DynamicValueT) EMPTY;
+public static T DynamicValueT empty(String propertyName) {
+DynamicValue v = new DynamicValueT(propertyName, null);
 return v;
 }
 
-private DynamicValue(OptionalT item){
+/**
+ * Constructor.
+ * @param propertyName the name of the value in the format {@code 
configName:propertyName}./config
+ * @param item the initial value.
+ */
+private DynamicValue(String propertyName, OptionalT item){
+this.propertyName = 

incubator-tamaya git commit: Get Tamaya back to the compiling state.

[johndament]

Repository: incubator-tamaya
Updated Branches:
  refs/heads/master 95b54ec56 - 702156cd9


Get Tamaya back to the compiling state.


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

Branch: refs/heads/master
Commit: 702156cd98fd32571b529888954c091f89292360
Parents: 95b54ec
Author: John D. Ament johndam...@apache.org
Authored: Fri Dec 26 10:57:15 2014 -0500
Committer: John D. Ament johndam...@apache.org
Committed: Fri Dec 26 10:57:15 2014 -0500

--
 modules/integration/cdi/pom.xml|  4 +-
 modules/integration/pom.xml| 24 +-
 modules/integration/se/pom.xml | 71 
 modules/metamodels/environment/pom.xml | 73 +
 modules/pom.xml|  2 +-
 pom.xml|  6 ++-
 6 files changed, 173 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/702156cd/modules/integration/cdi/pom.xml
--
diff --git a/modules/integration/cdi/pom.xml b/modules/integration/cdi/pom.xml
index 8a8450b..1909bcc 100644
--- a/modules/integration/cdi/pom.xml
+++ b/modules/integration/cdi/pom.xml
@@ -21,8 +21,8 @@ under the License.
 modelVersion4.0.0/modelVersion
 
 parent
-artifactIdtamaya-ext-all/artifactId
-groupIdorg.apache.tamaya.ext/groupId
+groupIdorg.apache.tamaya.integration/groupId
+artifactIdtamaya-integration-all/artifactId
 version0.1-SNAPSHOT/version
 relativePath../relativePath
 /parent

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/702156cd/modules/integration/pom.xml
--
diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml
index 95f2b07..33deee1 100644
--- a/modules/integration/pom.xml
+++ b/modules/integration/pom.xml
@@ -1,4 +1,22 @@
 ?xml version=1.0 encoding=UTF-8?
+!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+License); you may not use this file except in compliance
+with the License.  You may obtain a copy current the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+--
 project xmlns=http://maven.apache.org/POM/4.0.0;
  xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
  xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;
@@ -8,11 +26,13 @@
 version0.1-SNAPSHOT/version
 relativePath../relativePath
 /parent
+packagingpom/packaging
 modelVersion4.0.0/modelVersion
-
-artifactIdorg.apache.tamaya.metamodels.environment/artifactId
+groupIdorg.apache.tamaya.integration/groupId
+artifactIdtamaya-integration-all/artifactId
 
 modules
+modulemanaged/module
 modulecdi/module
 modulese/module
 /modules

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/702156cd/modules/integration/se/pom.xml
--
diff --git a/modules/integration/se/pom.xml b/modules/integration/se/pom.xml
new file mode 100644
index 000..9958368
--- /dev/null
+++ b/modules/integration/se/pom.xml
@@ -0,0 +1,71 @@
+!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+License); you may not use this file except in compliance
+with the License.  You may obtain a copy current the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+--
+project 

svn commit: r1642433 - /incubator/tamaya/site/trunk/index.html

[johndament]

Author: johndament
Date: Sat Nov 29 14:17:27 2014
New Revision: 1642433

URL: http://svn.apache.org/r1642433
Log:
Added temporary landing page.

Added:
incubator/tamaya/site/trunk/index.html

Added: incubator/tamaya/site/trunk/index.html
URL: 
http://svn.apache.org/viewvc/incubator/tamaya/site/trunk/index.html?rev=1642433view=auto
==
--- incubator/tamaya/site/trunk/index.html (added)
+++ incubator/tamaya/site/trunk/index.html Sat Nov 29 14:17:27 2014
@@ -0,0 +1,3 @@
+htmlheadtitle/title
+body/body
+/html