You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by jo...@apache.org on 2014/12/28 16:12:36 UTC

[3/4] incubator-tamaya git commit: Restored the 0.1 code base to compiling order.

Restored the 0.1 code base to compiling order.


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

Branch: refs/heads/0.1-prototype
Commit: dbca17909bcec2ac63aa05e4f1e6277fc0644863
Parents: 3575b8b
Author: John D. Ament <jo...@apache.org>
Authored: Sun Dec 28 09:21:12 2014 -0500
Committer: John D. Ament <jo...@apache.org>
Committed: Sun Dec 28 09:21:12 2014 -0500

----------------------------------------------------------------------
 .../java/org/apache/tamaya/Configuration.java   |  6 ++--
 .../tamaya/core/ConfigurationFunctions.java     | 33 +++++++++-----------
 .../config/FallbackSimpleConfigProvider.java    | 18 +++++++++++
 .../internal/config/FileChangeListener.java     | 18 +++++++++++
 .../internal/config/FileChangeObserver.java     | 18 +++++++++++
 .../core/internal/config/FileConfiguration.java | 18 +++++++++++
 .../tamaya/core/internal/config/FileReader.java | 18 +++++++++++
 .../config/FilesPropertiesConfigProvider.java   | 18 +++++++++++
 .../core/internal/inject/InjectionUtils.java    | 18 +++++++++++
 .../core/properties/MappedPropertySource.java   | 18 +++++++++++
 .../properties/ValueFilteredPropertySource.java | 18 +++++++++++
 .../FilesPropertiesConfigProviderTest.java      | 18 +++++++++++
 .../apache/tamaya/ucs/UC1ReadProperties.java    |  2 +-
 pom.xml                                         |  7 +++--
 14 files changed, 203 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/dbca1790/api/src/main/java/org/apache/tamaya/Configuration.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/tamaya/Configuration.java b/api/src/main/java/org/apache/tamaya/Configuration.java
index fa61447..73eb41a 100644
--- a/api/src/main/java/org/apache/tamaya/Configuration.java
+++ b/api/src/main/java/org/apache/tamaya/Configuration.java
@@ -43,7 +43,7 @@ import java.util.function.UnaryOperator;
  * simplifying the development current this interface, e.g. for being backed up by systems and stores that are not part current
  * this library at all.
  */
-public interface Configuration extends PropertyMapSupplier {
+public interface Configuration extends PropertyMapSupplier,PropertySource {
 
     /**
      * An empty and immutable Configuration instance.
@@ -264,7 +264,7 @@ public interface Configuration extends PropertyMapSupplier {
      *                 combining configurations.
      * @return the new adjusted configuration, never {@code null}.
      */
-    default Configuration with(UnaryOperator<Configuration> operator){
+    default PropertySource with(UnaryOperator<PropertySource> operator){
         return operator.apply(this);
     }
 
@@ -275,7 +275,7 @@ public interface Configuration extends PropertyMapSupplier {
      * @param query the query, never {@code null}.
      * @return the result
      */
-    default <T> T query(Function<Configuration,T> query){
+    default <T> T query(Function<PropertySource,T> query){
         return query.apply(this);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/dbca1790/core/src/main/java/org/apache/tamaya/core/ConfigurationFunctions.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/ConfigurationFunctions.java b/core/src/main/java/org/apache/tamaya/core/ConfigurationFunctions.java
index b1c2522..1ddc301 100644
--- a/core/src/main/java/org/apache/tamaya/core/ConfigurationFunctions.java
+++ b/core/src/main/java/org/apache/tamaya/core/ConfigurationFunctions.java
@@ -19,6 +19,7 @@
 package org.apache.tamaya.core;
 
 import org.apache.tamaya.Configuration;
+import org.apache.tamaya.PropertySource;
 import org.apache.tamaya.core.properties.PropertySourceBuilder;
 
 import java.util.*;
@@ -45,7 +46,7 @@ public final class ConfigurationFunctions {
      * @param areaKey the area key, not null
      * @return the area configuration, with the areaKey stripped away.
      */
-    public static UnaryOperator<Configuration> selectArea(String areaKey) {
+    public static UnaryOperator<PropertySource> selectArea(String areaKey) {
         return selectArea(areaKey, true);
     }
 
@@ -57,7 +58,7 @@ public final class ConfigurationFunctions {
      * @param stripKeys if set to true, the area key is stripped away fromMap the resulting key.
      * @return the area configuration, with the areaKey stripped away.
      */
-    public static UnaryOperator<Configuration> selectArea(String areaKey, boolean stripKeys) {
+    public static UnaryOperator<PropertySource> selectArea(String areaKey, boolean stripKeys) {
         return config -> {
             Map<String, String> area = new HashMap<>();
             area.putAll(
@@ -90,7 +91,7 @@ public final class ConfigurationFunctions {
      *
      * @return s set with all areas, never {@code null}.
      */
-    public static Function<Configuration,Set<String>> getAreas() {
+    public static Function<PropertySource,Set<String>> getAreas() {
         return config -> {
             final Set<String> areas = new HashSet<>();
             config.getProperties().keySet().forEach(s -> {
@@ -113,7 +114,7 @@ public final class ConfigurationFunctions {
      *
      * @return s set with all transitive areas, never {@code null}.
      */
-    public static Function<Configuration,Set<String>> getTransitiveAreas() {
+    public static Function<PropertySource,Set<String>> getTransitiveAreas() {
         return config -> {
             final Set<String> transitiveAreas = new HashSet<>();
             config.query(getAreas()).forEach(s -> {
@@ -141,10 +142,9 @@ public final class ConfigurationFunctions {
      * @param predicate A predicate to deternine, which areas should be returned, not {@code null}.
      * @return s set with all areas, never {@code null}.
      */
-    public static Function<Configuration,Set<String>> getAreas(final Predicate<String> predicate) {
-        return config -> {
-            return config.query(getAreas()).stream().filter(predicate).collect(Collectors.toCollection(TreeSet::new));
-        };
+    public static Function<PropertySource,Set<String>> getAreas(final Predicate<String> predicate) {
+        return config -> config.query(getAreas()).stream().filter(predicate)
+                .collect(Collectors.toCollection(TreeSet::new));
     }
 
     /**
@@ -156,10 +156,9 @@ public final class ConfigurationFunctions {
      * @param predicate A predicate to deternine, which areas should be returned, not {@code null}.
      * @return s set with all transitive areas, never {@code null}.
      */
-    public static Function<Configuration,Set<String>> getTransitiveAreas(Predicate<String> predicate) {
-        return config -> {
-            return config.query(getTransitiveAreas()).stream().filter(predicate).collect(Collectors.toCollection(TreeSet::new));
-        };
+    public static Function<PropertySource,Set<String>> getTransitiveAreas(Predicate<String> predicate) {
+        return config -> config.query(getTransitiveAreas()).stream().filter(predicate)
+                .collect(Collectors.toCollection(TreeSet::new));
     }
 
     /**
@@ -169,10 +168,8 @@ public final class ConfigurationFunctions {
      * @param areaKey the configuration area (sub)path.
      * @return {@code true}, if such a node exists.
      */
-    public static Function<Configuration,Boolean> containsArea(String areaKey) {
-        return config -> {
-            return config.query(getAreas()).contains(areaKey);
-        };
+    public static Function<PropertySource,Boolean> containsArea(String areaKey) {
+        return config -> config.query(getAreas()).contains(areaKey);
     }
 
     /**
@@ -183,7 +180,7 @@ public final class ConfigurationFunctions {
      * @param areaKey the area key, not null
      * @return the area configuration, with the areaKey stripped away.
      */
-    public static UnaryOperator<Configuration> selectAreaRecursive(String areaKey) {
+    public static UnaryOperator<PropertySource> selectAreaRecursive(String areaKey) {
         return selectAreaRecursive(areaKey, true);
     }
 
@@ -195,7 +192,7 @@ public final class ConfigurationFunctions {
      * @param stripKeys if set to true, the area key is stripped away fromMap the resulting key.
      * @return the area configuration, with the areaKey stripped away.
      */
-    public static UnaryOperator<Configuration> selectAreaRecursive(String areaKey, boolean stripKeys) {
+    public static UnaryOperator<PropertySource> selectAreaRecursive(String areaKey, boolean stripKeys) {
         return config -> {
             Map<String, String> area = new HashMap<>();
             String lookupKey = areaKey + '.';

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/dbca1790/core/src/main/java/org/apache/tamaya/core/internal/config/FallbackSimpleConfigProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/config/FallbackSimpleConfigProvider.java b/core/src/main/java/org/apache/tamaya/core/internal/config/FallbackSimpleConfigProvider.java
index 7bcfb77..047a570 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/config/FallbackSimpleConfigProvider.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/config/FallbackSimpleConfigProvider.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.tamaya.core.internal.config;
 
 import org.apache.tamaya.Configuration;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/dbca1790/core/src/main/java/org/apache/tamaya/core/internal/config/FileChangeListener.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/config/FileChangeListener.java b/core/src/main/java/org/apache/tamaya/core/internal/config/FileChangeListener.java
index afd1199..44d1dee 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/config/FileChangeListener.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/config/FileChangeListener.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.tamaya.core.internal.config;
 
 import static java.nio.file.StandardWatchEventKinds.ENTRY_CREATE;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/dbca1790/core/src/main/java/org/apache/tamaya/core/internal/config/FileChangeObserver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/config/FileChangeObserver.java b/core/src/main/java/org/apache/tamaya/core/internal/config/FileChangeObserver.java
index a7d4ba9..1f73f56 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/config/FileChangeObserver.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/config/FileChangeObserver.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.tamaya.core.internal.config;
 
 import java.util.Map;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/dbca1790/core/src/main/java/org/apache/tamaya/core/internal/config/FileConfiguration.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/config/FileConfiguration.java b/core/src/main/java/org/apache/tamaya/core/internal/config/FileConfiguration.java
index 4f76180..6d9b25d 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/config/FileConfiguration.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/config/FileConfiguration.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.tamaya.core.internal.config;
 
 import java.util.Map;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/dbca1790/core/src/main/java/org/apache/tamaya/core/internal/config/FileReader.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/config/FileReader.java b/core/src/main/java/org/apache/tamaya/core/internal/config/FileReader.java
index 287ccc4..b8995a0 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/config/FileReader.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/config/FileReader.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.tamaya.core.internal.config;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/dbca1790/core/src/main/java/org/apache/tamaya/core/internal/config/FilesPropertiesConfigProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/config/FilesPropertiesConfigProvider.java b/core/src/main/java/org/apache/tamaya/core/internal/config/FilesPropertiesConfigProvider.java
index c2cf7fa..ded2d75 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/config/FilesPropertiesConfigProvider.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/config/FilesPropertiesConfigProvider.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.tamaya.core.internal.config;
 
 import java.net.URISyntaxException;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/dbca1790/core/src/main/java/org/apache/tamaya/core/internal/inject/InjectionUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/inject/InjectionUtils.java b/core/src/main/java/org/apache/tamaya/core/internal/inject/InjectionUtils.java
index d80ee80..7b581f4 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/inject/InjectionUtils.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/inject/InjectionUtils.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.tamaya.core.internal.inject;
 
 import java.lang.reflect.AnnotatedElement;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/dbca1790/core/src/main/java/org/apache/tamaya/core/properties/MappedPropertySource.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/properties/MappedPropertySource.java b/core/src/main/java/org/apache/tamaya/core/properties/MappedPropertySource.java
index 160d6c4..e349cd2 100644
--- a/core/src/main/java/org/apache/tamaya/core/properties/MappedPropertySource.java
+++ b/core/src/main/java/org/apache/tamaya/core/properties/MappedPropertySource.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.tamaya.core.properties;
 
 import java.util.HashMap;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/dbca1790/core/src/main/java/org/apache/tamaya/core/properties/ValueFilteredPropertySource.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/properties/ValueFilteredPropertySource.java b/core/src/main/java/org/apache/tamaya/core/properties/ValueFilteredPropertySource.java
index db17d21..8fe0f07 100644
--- a/core/src/main/java/org/apache/tamaya/core/properties/ValueFilteredPropertySource.java
+++ b/core/src/main/java/org/apache/tamaya/core/properties/ValueFilteredPropertySource.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.tamaya.core.properties;
 
 import org.apache.tamaya.PropertySource;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/dbca1790/core/src/test/java/org/apache/tamaya/core/internal/config/FilesPropertiesConfigProviderTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/tamaya/core/internal/config/FilesPropertiesConfigProviderTest.java b/core/src/test/java/org/apache/tamaya/core/internal/config/FilesPropertiesConfigProviderTest.java
index 5aeeec5..376c07d 100644
--- a/core/src/test/java/org/apache/tamaya/core/internal/config/FilesPropertiesConfigProviderTest.java
+++ b/core/src/test/java/org/apache/tamaya/core/internal/config/FilesPropertiesConfigProviderTest.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.tamaya.core.internal.config;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/dbca1790/core/src/test/java/org/apache/tamaya/ucs/UC1ReadProperties.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/tamaya/ucs/UC1ReadProperties.java b/core/src/test/java/org/apache/tamaya/ucs/UC1ReadProperties.java
index e7f2049..b3df38b 100644
--- a/core/src/test/java/org/apache/tamaya/ucs/UC1ReadProperties.java
+++ b/core/src/test/java/org/apache/tamaya/ucs/UC1ReadProperties.java
@@ -69,7 +69,7 @@ public class UC1ReadProperties {
 //        long longNum = config.getLong("num.Long").orElse(288900L);
 
         // or more simpler use area function
-        Configuration areaConfig2 = config.with(ConfigurationFunctions.selectArea("num"));
+        PropertySource areaConfig2 = config.with(ConfigurationFunctions.selectArea("num"));
         System.out.println(areaConfig2);
 
         // iterator over an area, using streams only

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/dbca1790/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 329d20a..e32856d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -217,9 +217,10 @@ under the License.
                     <version>${rat.version}</version>
                     <configuration>
                         <excludes>
-                            <exclude>**/target</exclude>
-                            <exclude>*.iml</exclude>
+                            <exclude>**/target/*</exclude>
+                            <exclude>**/*.iml</exclude>
                             <exclude>**/.idea/**</exclude>
+                            <exclude>**/*.adoc</exclude>
                         </excludes>
                     </configuration>
                     <executions>
@@ -585,7 +586,7 @@ under the License.
         <module>buildtools</module>
         <module>api</module>
         <module>core</module>
-        <module>modules</module>
+        <!--<module>modules</module>-->
     </modules>
 
 </project>