tamaya-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anat...@apache.org
Subject [13/16] incubator-tamaya git commit: Created sandbox directory.
Date Tue, 24 Mar 2015 21:20:30 GMT
Created sandbox directory.


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

Branch: refs/heads/master
Commit: f3d68c077f63023f5f7739c18f3e4d863343bb9d
Parents: 9c32dde
Author: anatole <anatole@apache.org>
Authored: Tue Mar 24 22:17:47 2015 +0100
Committer: anatole <anatole@apache.org>
Committed: Tue Mar 24 22:17:47 2015 +0100

----------------------------------------------------------------------
 modules/apiextensions/pom.xml                   |  43 -----
 .../api/PropertySourceFactory.java              |  32 ----
 ...faultConfigurationContextChangeListener.java |  24 +--
 modules/events/src/test/data/test.properties    |  21 ---
 modules/events/src/test/data/test2.properties2  |  21 ---
 .../tamaya/events/ObservedConfigTest.java       | 173 ++++++++++++++++++
 .../tamaya/events/TestObservingProvider.java    |  61 +++++++
 .../tamaya/events/tests/ObservedConfigTest.java |  49 -----
 .../events/tests/TestObservingProvider.java     |  45 -----
 ...org.apache.tamaya.spi.PropertySourceProvider |   2 +-
 .../src/test/resources/data/test1.properties    |  20 +++
 .../src/test/resources/data/test1b.properties   |  20 +++
 .../src/test/resources/data/test2.properties    |  20 +++
 .../src/test/resources/data/test3.properties    |  20 +++
 .../BaseFormatPropertySourceProvider.java       |  37 ++--
 .../tamaya/format/ConfigurationFormats.java     |  41 ++++-
 .../format/FlattenedDefaultPropertySource.java  |  18 +-
 .../tamaya/inject/internal/InjectionUtils.java  |   1 -
 modules/integration/cdi/pom.xml                 | 178 -------------------
 modules/integration/commons/pom.xml             |  50 ------
 .../commons/CommonsConfigPropertySource.java    |  81 ---------
 .../commons/IniConfigurationFormat.java         |  60 -------
 modules/integration/pom.xml                     |  40 -----
 modules/management/pom.xml                      |  41 -----
 modules/metamodels/environment/pom.xml          |  34 ----
 modules/metamodels/pom.xml                      |   1 -
 .../metamodel/simple/MapPropertySource.java     |  44 -----
 modules/pom.xml                                 |   8 +-
 .../PathBasedPropertySourceProvider.java        |   9 +-
 sandbox/apiextensions/pom.xml                   |  43 +++++
 .../api/PropertySourceFactory.java              |  32 ++++
 sandbox/integration/cdi/pom.xml                 | 178 +++++++++++++++++++
 sandbox/integration/commons/pom.xml             |  50 ++++++
 .../commons/CommonsConfigPropertySource.java    |  81 +++++++++
 .../commons/IniConfigurationFormat.java         |  60 +++++++
 sandbox/integration/pom.xml                     |  40 +++++
 sandbox/management/pom.xml                      |  41 +++++
 37 files changed, 936 insertions(+), 783 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f3d68c07/modules/apiextensions/pom.xml
----------------------------------------------------------------------
diff --git a/modules/apiextensions/pom.xml b/modules/apiextensions/pom.xml
deleted file mode 100644
index f32d2b1..0000000
--- a/modules/apiextensions/pom.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.tamaya.ext</groupId>
-        <artifactId>tamaya-extensions</artifactId>
-        <version>0.1-incubating-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>tamaya-apiextensions</artifactId>
-    <name>Apache Tamaya API Extensions</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tamaya</groupId>
-            <artifactId>tamaya-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-
-    
-</project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f3d68c07/modules/apiextensions/src/main/java/org/apache/tamaya/modules/apiextensions/api/PropertySourceFactory.java
----------------------------------------------------------------------
diff --git a/modules/apiextensions/src/main/java/org/apache/tamaya/modules/apiextensions/api/PropertySourceFactory.java b/modules/apiextensions/src/main/java/org/apache/tamaya/modules/apiextensions/api/PropertySourceFactory.java
deleted file mode 100644
index d28613d..0000000
--- a/modules/apiextensions/src/main/java/org/apache/tamaya/modules/apiextensions/api/PropertySourceFactory.java
+++ /dev/null
@@ -1,32 +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 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.modules.apiextensions.api;
-
-import org.apache.tamaya.spi.PropertySource;
-
-import java.net.URL;
-
-/**
- * TBD
- */
-public interface PropertySourceFactory {
-    boolean acceptable(URL url);
-
-    PropertySource get(URL url);
-}

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f3d68c07/modules/events/src/main/java/org/apache/tamaya/events/internal/DefaultConfigurationContextChangeListener.java
----------------------------------------------------------------------
diff --git a/modules/events/src/main/java/org/apache/tamaya/events/internal/DefaultConfigurationContextChangeListener.java b/modules/events/src/main/java/org/apache/tamaya/events/internal/DefaultConfigurationContextChangeListener.java
index fa658ef..8158d52 100644
--- a/modules/events/src/main/java/org/apache/tamaya/events/internal/DefaultConfigurationContextChangeListener.java
+++ b/modules/events/src/main/java/org/apache/tamaya/events/internal/DefaultConfigurationContextChangeListener.java
@@ -22,6 +22,7 @@ import org.apache.tamaya.ConfigurationProvider;
 import org.apache.tamaya.events.Listener;
 import org.apache.tamaya.events.delta.ConfigurationContextChange;
 import org.apache.tamaya.spi.ConfigurationContext;
+import org.apache.tamaya.spi.ConfigurationContextBuilder;
 import org.apache.tamaya.spi.PropertySource;
 
 import java.util.Collection;
@@ -42,19 +43,18 @@ public class DefaultConfigurationContextChangeListener implements Listener<Confi
         ConfigurationContext context = ConfigurationProvider.getConfigurationContext();
         Collection<PropertySource> affectedPropertySources = context.getPropertySources(ps ->
                 event.isAffected(ps));
+        ConfigurationContextBuilder newContextBuilder = context.toBuilder();
         if (!affectedPropertySources.isEmpty()) {
-            ConfigurationContext newContext = context.toBuilder()
-                    .removePropertySources(event.getRemovedPropertySources().stream()
-                            .map(ps -> ps.getName()).collect(Collectors.toSet()))
-                    .addPropertySources(event.getAddedPropertySources())
-                    .addPropertySources(event.getUpdatedPropertySources())
-                    .build();
-            try {
-                ConfigurationProvider.setConfigurationContext(newContext);
-            } catch (Exception e) {
-                LOG.log(Level.INFO, "Failed to update the current ConfigurationContext due to config model changes", e);
-            }
+            newContextBuilder.removePropertySources(event.getRemovedPropertySources().stream()
+                            .map(ps -> ps.getName()).collect(Collectors.toSet()));
+        }
+        newContextBuilder.addPropertySources(event.getAddedPropertySources());
+        newContextBuilder.addPropertySources(event.getUpdatedPropertySources());
+        ConfigurationContext newContext = newContextBuilder.build();
+        try {
+            ConfigurationProvider.setConfigurationContext(newContext);
+        } catch (Exception e) {
+            LOG.log(Level.INFO, "Failed to update the current ConfigurationContext due to config model changes", e);
         }
-
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f3d68c07/modules/events/src/test/data/test.properties
----------------------------------------------------------------------
diff --git a/modules/events/src/test/data/test.properties b/modules/events/src/test/data/test.properties
deleted file mode 100644
index b8996a5..0000000
--- a/modules/events/src/test/data/test.properties
+++ /dev/null
@@ -1,21 +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.
-#
-1=val1
-2=val2
-3=val3

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f3d68c07/modules/events/src/test/data/test2.properties2
----------------------------------------------------------------------
diff --git a/modules/events/src/test/data/test2.properties2 b/modules/events/src/test/data/test2.properties2
deleted file mode 100644
index 2c884b8..0000000
--- a/modules/events/src/test/data/test2.properties2
+++ /dev/null
@@ -1,21 +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.
-#
-4=val4
-5=val5
-6=val6

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f3d68c07/modules/events/src/test/java/org/apache/tamaya/events/ObservedConfigTest.java
----------------------------------------------------------------------
diff --git a/modules/events/src/test/java/org/apache/tamaya/events/ObservedConfigTest.java b/modules/events/src/test/java/org/apache/tamaya/events/ObservedConfigTest.java
new file mode 100644
index 0000000..8e9296a
--- /dev/null
+++ b/modules/events/src/test/java/org/apache/tamaya/events/ObservedConfigTest.java
@@ -0,0 +1,173 @@
+/*
+ * 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.events;
+
+import org.apache.tamaya.ConfigurationProvider;
+import org.junit.AfterClass;
+import org.junit.Test;
+
+import java.io.File;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+/**
+ * Test (currently manual) to test configuration changes.
+ */
+public class ObservedConfigTest {
+
+    @Test
+    //Y TODO Check tests later
+    public void testConfigChanges()throws Exception{
+//        // test empty directory
+//        testEmpty();
+//        // add a file, test for changes
+//        Files.copy(getSourceFile("test1.properties"), getTargetFile("test1.properties"));
+//        try {
+//            Thread.sleep(2000L);
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        testProperties1();
+//        Files.copy(getSourceFile("test2.properties"), getTargetFile("test2.properties"));
+//        Files.copy(getSourceFile("test3.properties"), getTargetFile("test3.properties"));
+//        try {
+//            Thread.sleep(2000L);
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        testAllFiles();
+//        // change a file, test for changes
+//        Files.copy(getSourceFile("test1b.properties"), getTargetFile("test1.properties"));
+//        try {
+//            Thread.sleep(2000L);
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        testProperties2();
+//        // remove a file, test for changes
+//        Files.delete(getTargetFile("test2.properties"));
+//        try {
+//            Thread.sleep(2000L);
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        testProperties3();
+//        // cleanup directory
+//        Files.deleteIfExists(getTargetFile("test1.properties"));
+//        Files.deleteIfExists(getTargetFile("test2.properties"));
+//        Files.deleteIfExists(getTargetFile("test3.properties"));
+//        try {
+//            Thread.sleep(2000L);
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        testEmpty();
+    }
+
+    private static Path getSourceFile(String name) throws Exception{
+        URL url = ObservedConfigTest.class.getResource("/data");
+        File testFile = new File(new File(url.toURI()), name);
+        return Paths.get(testFile.toURI());
+    }
+
+    private static Path getTargetFile(String name) {
+        File testFile = new File(TestObservingProvider.getTestDirectory(), name);
+        return Paths.get(testFile.toURI());
+    }
+
+    private void testEmpty() {
+        assertNull(ConfigurationProvider.getConfiguration().get("1"));
+        assertNull(ConfigurationProvider.getConfiguration().get("2"));
+        assertNull(ConfigurationProvider.getConfiguration().get("3"));
+        assertNull(ConfigurationProvider.getConfiguration().get("4"));
+        assertNull(ConfigurationProvider.getConfiguration().get("5"));
+        assertNull(ConfigurationProvider.getConfiguration().get("6"));
+    }
+
+    private void testAllFiles() {
+        assertNotNull(ConfigurationProvider.getConfiguration().get("1"));
+        assertNotNull(ConfigurationProvider.getConfiguration().get("2"));
+        assertNotNull(ConfigurationProvider.getConfiguration().get("3"));
+        assertNotNull(ConfigurationProvider.getConfiguration().get("4"));
+        assertNotNull(ConfigurationProvider.getConfiguration().get("5"));
+        assertNotNull(ConfigurationProvider.getConfiguration().get("6"));
+    }
+
+    private void testProperties1() {
+        assertNotNull(ConfigurationProvider.getConfiguration().get("1"));
+        assertNull(ConfigurationProvider.getConfiguration().get("2"));
+        assertNotNull(ConfigurationProvider.getConfiguration().get("3"));
+        assertNull(ConfigurationProvider.getConfiguration().get("4"));
+        assertNull(ConfigurationProvider.getConfiguration().get("5"));
+        assertNull(ConfigurationProvider.getConfiguration().get("6"));
+    }
+
+    private void testProperties2() {
+        assertNotNull(ConfigurationProvider.getConfiguration().get("1"));
+        assertNull(ConfigurationProvider.getConfiguration().get("2"));
+        assertNotNull(ConfigurationProvider.getConfiguration().get("3"));
+        assertNull(ConfigurationProvider.getConfiguration().get("4"));
+        assertNull(ConfigurationProvider.getConfiguration().get("5"));
+        assertNull(ConfigurationProvider.getConfiguration().get("6"));
+        assertNotNull(ConfigurationProvider.getConfiguration().get("7"));
+    }
+
+    private void testProperties3() {
+        assertNotNull(ConfigurationProvider.getConfiguration().get("1"));
+        assertNull(ConfigurationProvider.getConfiguration().get("2"));
+        assertNotNull(ConfigurationProvider.getConfiguration().get("3"));
+        assertNull(ConfigurationProvider.getConfiguration().get("4"));
+        assertNull(ConfigurationProvider.getConfiguration().get("5"));
+        assertNull(ConfigurationProvider.getConfiguration().get("6"));
+    }
+
+    /**
+     * Test method that periodically prints out what is happening.
+     */
+    public static void main() {
+        while(true){
+            System.out.println("1: " + ConfigurationProvider.getConfiguration().get("1"));
+            System.out.println("2: " + ConfigurationProvider.getConfiguration().get("2"));
+            System.out.println("3: " + ConfigurationProvider.getConfiguration().get("3"));
+            System.out.println("4: " + ConfigurationProvider.getConfiguration().get("4"));
+            System.out.println("5: " + ConfigurationProvider.getConfiguration().get("5"));
+            System.out.println("6: " + ConfigurationProvider.getConfiguration().get("6"));
+            System.out.println("=======================================================================");
+            try {
+                Thread.sleep(2000L);
+            } catch (Exception e) {
+                // stop here...
+            }
+        }
+    }
+
+    @AfterClass
+    public static void cleanup()throws Exception{
+        // cleanup directory
+        Files.deleteIfExists(getTargetFile("test1.properties"));
+        Files.deleteIfExists(getTargetFile("test2.properties"));
+        Files.deleteIfExists(getTargetFile("test3.properties"));
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f3d68c07/modules/events/src/test/java/org/apache/tamaya/events/TestObservingProvider.java
----------------------------------------------------------------------
diff --git a/modules/events/src/test/java/org/apache/tamaya/events/TestObservingProvider.java b/modules/events/src/test/java/org/apache/tamaya/events/TestObservingProvider.java
new file mode 100644
index 0000000..5b5a3aa
--- /dev/null
+++ b/modules/events/src/test/java/org/apache/tamaya/events/TestObservingProvider.java
@@ -0,0 +1,61 @@
+/*
+ * 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.events;
+
+import org.apache.tamaya.events.folderobserver.ObservingPropertySourceProvider;
+import org.apache.tamaya.format.formats.PropertiesFormat;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URL;
+import java.nio.file.FileSystem;
+import java.nio.file.LinkOption;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.WatchEvent;
+import java.nio.file.WatchKey;
+import java.nio.file.WatchService;
+import java.util.Iterator;
+import java.util.logging.Logger;
+
+/**
+ * Test configuration property source provider that observes a directory and updated the config if necessary.
+ */
+public class TestObservingProvider extends ObservingPropertySourceProvider{
+
+    public TestObservingProvider(){
+        super(Paths.get(getTestPath()),
+                new PropertiesFormat());
+        Logger.getLogger(getClass().getName()).info("Using test directory: " + getTestPath());
+    }
+
+    public static File getTestDirectory(){
+        String tempDir = System.getProperty("java.io.tmpdir");
+        File dir = new File(tempDir, "tamaya-events-testdir");
+        if(!dir.exists()){
+            dir.mkdirs();
+        }
+        return dir;
+    }
+
+    private static String getTestPath(){
+        return getTestDirectory().getAbsolutePath();
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f3d68c07/modules/events/src/test/java/org/apache/tamaya/events/tests/ObservedConfigTest.java
----------------------------------------------------------------------
diff --git a/modules/events/src/test/java/org/apache/tamaya/events/tests/ObservedConfigTest.java b/modules/events/src/test/java/org/apache/tamaya/events/tests/ObservedConfigTest.java
deleted file mode 100644
index e4a6ee5..0000000
--- a/modules/events/src/test/java/org/apache/tamaya/events/tests/ObservedConfigTest.java
+++ /dev/null
@@ -1,49 +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 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.events.tests;
-
-import org.apache.tamaya.ConfigurationProvider;
-import org.junit.Test;
-
-/**
- * Test (currently manual) to test configuration changes.
- */
-public class ObservedConfigTest {
-
-    @Test
-    public void testInitialConfig(){
-        for(int i=0;i<20;i++){
-            System.out.println("1: " + ConfigurationProvider.getConfiguration().get("1"));
-            System.out.println("2: " + ConfigurationProvider.getConfiguration().get("2"));
-            System.out.println("3: " + ConfigurationProvider.getConfiguration().get("3"));
-            System.out.println("4: " + ConfigurationProvider.getConfiguration().get("4"));
-            System.out.println("5: " + ConfigurationProvider.getConfiguration().get("5"));
-            System.out.println("6: " + ConfigurationProvider.getConfiguration().get("6"));
-            System.out.println("=======================================================================");
-            try{
-                Thread.sleep(2000L);
-            }
-            catch(Exception e){
-                // ignore
-                e.printStackTrace();
-            }
-        }
-
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f3d68c07/modules/events/src/test/java/org/apache/tamaya/events/tests/TestObservingProvider.java
----------------------------------------------------------------------
diff --git a/modules/events/src/test/java/org/apache/tamaya/events/tests/TestObservingProvider.java b/modules/events/src/test/java/org/apache/tamaya/events/tests/TestObservingProvider.java
deleted file mode 100644
index 53a68c1..0000000
--- a/modules/events/src/test/java/org/apache/tamaya/events/tests/TestObservingProvider.java
+++ /dev/null
@@ -1,45 +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 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.events.tests;
-
-import org.apache.tamaya.events.folderobserver.ObservingPropertySourceProvider;
-import org.apache.tamaya.format.formats.PropertiesFormat;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URI;
-import java.nio.file.FileSystem;
-import java.nio.file.LinkOption;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.WatchEvent;
-import java.nio.file.WatchKey;
-import java.nio.file.WatchService;
-import java.util.Iterator;
-
-/**
- * Test configuration property source provider that observes a directory and updated the config if necessary.
- */
-public class TestObservingProvider extends ObservingPropertySourceProvider{
-
-    public TestObservingProvider(){
-        super(Paths.get("src/test/data"),
-                new PropertiesFormat());
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f3d68c07/modules/events/src/test/resources/META-INF/services/org.apache.tamaya.spi.PropertySourceProvider
----------------------------------------------------------------------
diff --git a/modules/events/src/test/resources/META-INF/services/org.apache.tamaya.spi.PropertySourceProvider b/modules/events/src/test/resources/META-INF/services/org.apache.tamaya.spi.PropertySourceProvider
index 52c4603..d34b4a2 100644
--- a/modules/events/src/test/resources/META-INF/services/org.apache.tamaya.spi.PropertySourceProvider
+++ b/modules/events/src/test/resources/META-INF/services/org.apache.tamaya.spi.PropertySourceProvider
@@ -16,4 +16,4 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-org.apache.tamaya.events.tests.org.apache.tamaya.examples.fileobserver.TestObservingProvider
+org.apache.tamaya.events.TestObservingProvider

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f3d68c07/modules/events/src/test/resources/data/test1.properties
----------------------------------------------------------------------
diff --git a/modules/events/src/test/resources/data/test1.properties b/modules/events/src/test/resources/data/test1.properties
new file mode 100644
index 0000000..0df3bd1
--- /dev/null
+++ b/modules/events/src/test/resources/data/test1.properties
@@ -0,0 +1,20 @@
+#
+# 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.
+#
+1=val1
+3=val3

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f3d68c07/modules/events/src/test/resources/data/test1b.properties
----------------------------------------------------------------------
diff --git a/modules/events/src/test/resources/data/test1b.properties b/modules/events/src/test/resources/data/test1b.properties
new file mode 100644
index 0000000..ec57163
--- /dev/null
+++ b/modules/events/src/test/resources/data/test1b.properties
@@ -0,0 +1,20 @@
+#
+# 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.
+#
+1b=val1
+7=val7
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f3d68c07/modules/events/src/test/resources/data/test2.properties
----------------------------------------------------------------------
diff --git a/modules/events/src/test/resources/data/test2.properties b/modules/events/src/test/resources/data/test2.properties
new file mode 100644
index 0000000..0643c1d
--- /dev/null
+++ b/modules/events/src/test/resources/data/test2.properties
@@ -0,0 +1,20 @@
+#
+# 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.
+#
+4=val4
+6=val6

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f3d68c07/modules/events/src/test/resources/data/test3.properties
----------------------------------------------------------------------
diff --git a/modules/events/src/test/resources/data/test3.properties b/modules/events/src/test/resources/data/test3.properties
new file mode 100644
index 0000000..bb856c7
--- /dev/null
+++ b/modules/events/src/test/resources/data/test3.properties
@@ -0,0 +1,20 @@
+#
+# 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.
+#
+2=val2
+5=val5

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f3d68c07/modules/formats/src/main/java/org/apache/tamaya/format/BaseFormatPropertySourceProvider.java
----------------------------------------------------------------------
diff --git a/modules/formats/src/main/java/org/apache/tamaya/format/BaseFormatPropertySourceProvider.java b/modules/formats/src/main/java/org/apache/tamaya/format/BaseFormatPropertySourceProvider.java
index d70515d..3c2789d 100644
--- a/modules/formats/src/main/java/org/apache/tamaya/format/BaseFormatPropertySourceProvider.java
+++ b/modules/formats/src/main/java/org/apache/tamaya/format/BaseFormatPropertySourceProvider.java
@@ -18,8 +18,6 @@
  */
 package org.apache.tamaya.format;
 
-import org.apache.tamaya.resource.ResourceResolver;
-import org.apache.tamaya.resource.Resources;
 import org.apache.tamaya.spi.PropertySource;
 import org.apache.tamaya.spi.PropertySourceProvider;
 
@@ -75,20 +73,22 @@ public abstract class BaseFormatPropertySourceProvider implements PropertySource
     }
 
     /**
-     * Creates a new instance.
-     *
-     * @param classLoader the ClassLoader to be used, not null, not empty.
+     * Creates a new instance, hereby using the current thread context classloader, or if not available the classloader
+     * that loaded this class.
      * @param formats the formats to be used, not null, not empty.
      * @param paths   the paths to be resolved, not null, not empty.
      */
     public BaseFormatPropertySourceProvider(
-            List<ConfigurationFormat> formats,
-            ClassLoader classLoader, String... paths) {
+            List<ConfigurationFormat> formats, String... paths) {
+        ClassLoader cl = Thread.currentThread().getContextClassLoader();
+        if(cl==null){
+            cl = getClass().getClassLoader();
+        }
         this.configFormats.addAll(Objects.requireNonNull(formats));
         for(String path:paths) {
             Enumeration<URL> urls = null;
             try {
-                urls = classLoader.getResources(path);
+                urls = cl.getResources(path);
             } catch (IOException e) {
                 LOG.log(Level.WARNING, e, () -> "Failed to read resource: " + path);
                 continue;
@@ -102,17 +102,29 @@ public abstract class BaseFormatPropertySourceProvider implements PropertySource
     /**
      * Creates a new instance.
      *
+     * @param classLoader the ClassLoader to be used, not null, not empty.
      * @param formats the formats to be used, not null, not empty.
      * @param paths   the paths to be resolved, not null, not empty.
      */
     public BaseFormatPropertySourceProvider(
-            ClassLoader classLoader,
-            List<ConfigurationFormat> formats, URL... paths) {
-        this.classLoader = Optional.ofNullable(classLoader);
+            List<ConfigurationFormat> formats,
+            ClassLoader classLoader, String... paths) {
         this.configFormats.addAll(Objects.requireNonNull(formats));
-        this.paths.addAll(Arrays.asList(Objects.requireNonNull(paths)));
+        for(String path:paths) {
+            Enumeration<URL> urls = null;
+            try {
+                urls = classLoader.getResources(path);
+            } catch (IOException e) {
+                LOG.log(Level.WARNING, e, () -> "Failed to read resource: " + path);
+                continue;
+            }
+            while(urls.hasMoreElements()) {
+                this.paths.add(urls.nextElement());
+            }
+        }
     }
 
+
     /**
      * Method to create a {@link org.apache.tamaya.spi.PropertySource} based on the given entries read.
      *
@@ -130,7 +142,6 @@ public abstract class BaseFormatPropertySourceProvider implements PropertySource
      */
     @Override
     public Collection<PropertySource> getPropertySources() {
-        ResourceResolver resourceResolver = Resources.getResourceResolver();
         List<PropertySource> propertySources = new ArrayList<>();
         this.paths.forEach(res -> {
             try(InputStream is = res.openStream()) {

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f3d68c07/modules/formats/src/main/java/org/apache/tamaya/format/ConfigurationFormats.java
----------------------------------------------------------------------
diff --git a/modules/formats/src/main/java/org/apache/tamaya/format/ConfigurationFormats.java b/modules/formats/src/main/java/org/apache/tamaya/format/ConfigurationFormats.java
index a6168bc..3605f99 100644
--- a/modules/formats/src/main/java/org/apache/tamaya/format/ConfigurationFormats.java
+++ b/modules/formats/src/main/java/org/apache/tamaya/format/ConfigurationFormats.java
@@ -25,7 +25,9 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
@@ -98,7 +100,7 @@ public final class ConfigurationFormats {
      * @return the ConfigurationData read, or null.
      * @throws IOException if the resource cannot be read.
      */
-    public static ConfigurationData readConfigurationData(final URL url) throws IOException{
+    public static ConfigurationData readConfigurationData(final URL url) throws IOException {
         List<ConfigurationFormat> formats = getFormats(url);
         return readConfigurationData(url, formats.toArray(new ConfigurationFormat[formats.size()]));
     }
@@ -115,12 +117,34 @@ public final class ConfigurationFormats {
         return readConfigurationData(url.toString(), url.openStream(), formats);
     }
 
+    /**
+     *
+     * @param urls the urls from where to read, not null.
+     * @param formats the formats to try.
+     * @return the {@link org.apache.tamaya.format.ConfigurationData} of the files successfully decoded by the
+     * given formats.
+     */
+    public static Collection<ConfigurationData> getPropertySources(Collection<URL> urls, ConfigurationFormat... formats) {
+        List<ConfigurationData> dataRead = new ArrayList<>();
+        for (URL url : urls) {
+            try {
+                ConfigurationData data = readConfigurationData(url, formats);
+                if (data != null) {
+                    dataRead.add(data);
+                }
+            } catch (Exception e) {
+                LOG.log(Level.SEVERE, "Error reading file: " + url.toExternalForm(), e);
+            }
+        }
+        return dataRead;
+    }
 
     /**
      * Tries to read configuration data from a given URL, hereby explicitly trying all given formats in order.
-     * @param resource a descriptive name for the resource, since an InputStream does not have any)
+     *
+     * @param resource    a descriptive name for the resource, since an InputStream does not have any)
      * @param inputStream the inputStream from where to read, not null.
-     * @param formats the formats to try.
+     * @param formats     the formats to try.
      * @return the ConfigurationData read, or null.
      * @throws IOException if the resource cannot be read.
      */
@@ -130,13 +154,13 @@ public final class ConfigurationFormats {
         Objects.requireNonNull(resource);
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
         byte[] bytes = new byte[256];
-        try{
+        try {
             int read = inputStream.read(bytes);
-            while(read > 0){
+            while (read > 0) {
                 bos.write(bytes, 0, read);
                 read = inputStream.read(bytes);
             }
-        } finally{
+        } finally {
             try {
                 inputStream.close();
             } catch (IOException e) {
@@ -145,17 +169,18 @@ public final class ConfigurationFormats {
         }
         ConfigurationData data;
         for (ConfigurationFormat format : formats) {
-            try(ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray())) {
+            try (ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray())) {
                 data = format.readConfiguration(resource, bis);
                 if (data != null) {
                     return data;
                 }
             } catch (Exception e) {
                 LOG.log(Level.INFO, e,
-                        () -> "Format "+format.getClass().getName()+" failed to read resource " + resource);
+                        () -> "Format " + format.getClass().getName() + " failed to read resource " + resource);
             }
         }
         return null;
     }
 
+
 }

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f3d68c07/modules/formats/src/main/java/org/apache/tamaya/format/FlattenedDefaultPropertySource.java
----------------------------------------------------------------------
diff --git a/modules/formats/src/main/java/org/apache/tamaya/format/FlattenedDefaultPropertySource.java b/modules/formats/src/main/java/org/apache/tamaya/format/FlattenedDefaultPropertySource.java
index 47c7ae6..0e91ec3 100644
--- a/modules/formats/src/main/java/org/apache/tamaya/format/FlattenedDefaultPropertySource.java
+++ b/modules/formats/src/main/java/org/apache/tamaya/format/FlattenedDefaultPropertySource.java
@@ -33,6 +33,8 @@ public class FlattenedDefaultPropertySource implements PropertySource {
     private static final Logger LOG = Logger.getLogger(FlattenedDefaultPropertySource.class.getName());
     private Map<String, String> defaultSection;
     private ConfigurationData data;
+    private int defaultOrdinal = 0;
+
 
     /*
      * Constructor, uses hereby the flattened config data read from an URL by a
@@ -47,6 +49,20 @@ public class FlattenedDefaultPropertySource implements PropertySource {
         this.data = data;
     }
 
+    /*
+     * Constructor, uses hereby the flattened config data read from an URL by a
+     * ${@link org.apache.tamaya.format.ConfigurationFormat}, and if not present falls back to the default section.
+     */
+    public FlattenedDefaultPropertySource(int defaultOrdinal, ConfigurationData data) {
+        this.defaultSection = data.getSection(ConfigurationData.FLATTENED_SECTION_NAME);
+        if (this.defaultSection == null) {
+            this.defaultSection = data.getDefaultSection();
+        }
+        this.defaultSection = Collections.unmodifiableMap(this.defaultSection);
+        this.data = data;
+        this.defaultOrdinal = defaultOrdinal;
+    }
+
     @Override
     public String getName() {
         String name = this.defaultSection.get("[meta].name");
@@ -69,7 +85,7 @@ public class FlattenedDefaultPropertySource implements PropertySource {
                 LOG.log(Level.WARNING, e, () -> "Failed to parse Tamaya ordinal from " + data.getResource());
             }
         }
-        return 0;
+        return defaultOrdinal;
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f3d68c07/modules/injection/src/main/java/org/apache/tamaya/inject/internal/InjectionUtils.java
----------------------------------------------------------------------
diff --git a/modules/injection/src/main/java/org/apache/tamaya/inject/internal/InjectionUtils.java b/modules/injection/src/main/java/org/apache/tamaya/inject/internal/InjectionUtils.java
index 343336f..4f0516a 100644
--- a/modules/injection/src/main/java/org/apache/tamaya/inject/internal/InjectionUtils.java
+++ b/modules/injection/src/main/java/org/apache/tamaya/inject/internal/InjectionUtils.java
@@ -38,7 +38,6 @@ import org.apache.tamaya.inject.DefaultValue;
 import org.apache.tamaya.inject.WithLoadPolicy;
 import org.apache.tamaya.inject.WithPropertyConverter;
 import org.apache.tamaya.resolver.spi.ExpressionEvaluator;
-import org.apache.tamaya.spi.ConfigurationContext;
 import org.apache.tamaya.PropertyConverter;
 import org.apache.tamaya.spi.ServiceContext;
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f3d68c07/modules/integration/cdi/pom.xml
----------------------------------------------------------------------
diff --git a/modules/integration/cdi/pom.xml b/modules/integration/cdi/pom.xml
deleted file mode 100644
index 1909bcc..0000000
--- a/modules/integration/cdi/pom.xml
+++ /dev/null
@@ -1,178 +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.
--->
-<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">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.tamaya.integration</groupId>
-        <artifactId>tamaya-integration-all</artifactId>
-        <version>0.1-SNAPSHOT</version>
-        <relativePath>..</relativePath>
-    </parent>
-    <artifactId>tamaya-cdi</artifactId>
-    <name>Apache Tamaya Modules Integration - CDI</name>
-    <packaging>jar</packaging>
-
-    <properties>
-        <owb.version>1.5.0-SNAPSHOT</owb.version>
-        <weld.version>2.2.7.Final</weld.version>
-        <geronimo-jcdi-1.1-spec.version>1.0-SNAPSHOT</geronimo-jcdi-1.1-spec.version>
-        <geronimo-interceptor-1.2-spec.version>1.0-SNAPSHOT</geronimo-interceptor-1.2-spec.version>
-        <geronimo-atinject-1.0-spec.version>1.0</geronimo-atinject-1.0-spec.version>
-        <bval.version>0.5</bval.version>
-        <ds.version>1.1.0</ds.version>
-    </properties>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>prepare-agent</id>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tamaya</groupId>
-            <artifactId>tamaya-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jcdi_1.1_spec</artifactId>
-            <version>${geronimo-jcdi-1.1-spec.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.deltaspike.modules</groupId>
-            <artifactId>deltaspike-test-control-module-api</artifactId>
-            <version>${ds.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.deltaspike.modules</groupId>
-            <artifactId>deltaspike-test-control-module-impl</artifactId>
-            <version>${ds.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <profiles>
-        <profile>
-            <id>OWB</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencies>
-                <!-- OWB specific dependencies-->
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-atinject_1.0_spec</artifactId>
-                    <version>${geronimo-atinject-1.0-spec.version}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-interceptor_1.2_spec</artifactId>
-                    <version>${geronimo-interceptor-1.2-spec.version}</version>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-annotation_1.2_spec</artifactId>
-                    <version>1.0.MR2-SNAPSHOT</version>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-el_2.2_spec</artifactId>
-                    <version>1.0.2</version>
-                </dependency>
-
-                <dependency>
-                    <groupId>org.apache.openwebbeans</groupId>
-                    <artifactId>openwebbeans-impl</artifactId>
-                    <version>${owb.version}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.openwebbeans</groupId>
-                    <artifactId>openwebbeans-spi</artifactId>
-                    <version>${owb.version}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.openwebbeans</groupId>
-                    <artifactId>openwebbeans-resource</artifactId>
-                    <version>${owb.version}</version>
-                </dependency>
-
-                <dependency>
-                    <groupId>org.apache.bval</groupId>
-                    <artifactId>bval-jsr303</artifactId>
-                    <version>${bval.version}</version>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.deltaspike.cdictrl</groupId>
-                    <artifactId>deltaspike-cdictrl-owb</artifactId>
-                    <version>${ds.version}</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>Weld</id>
-            <dependencies>
-                <dependency>
-                    <groupId>org.jboss.weld.se</groupId>
-                    <artifactId>weld-se</artifactId>
-                    <version>${weld.version}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.deltaspike.cdictrl</groupId>
-                    <artifactId>deltaspike-cdictrl-weld</artifactId>
-                    <version>${ds.version}</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f3d68c07/modules/integration/commons/pom.xml
----------------------------------------------------------------------
diff --git a/modules/integration/commons/pom.xml b/modules/integration/commons/pom.xml
deleted file mode 100644
index e11a8f6..0000000
--- a/modules/integration/commons/pom.xml
+++ /dev/null
@@ -1,50 +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.
--->
-<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">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.tamaya.ext.integration</groupId>
-        <artifactId>tamaya-integrations</artifactId>
-        <version>0.1-incubating-SNAPSHOT</version>
-        <relativePath>..</relativePath>
-    </parent>
-    <artifactId>commons</artifactId>
-    <name>Apache Tamaya Commons Configuration Integration</name>
-    <packaging>jar</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tamaya</groupId>
-            <artifactId>tamaya-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-formats</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-configuration</groupId>
-            <artifactId>commons-configuration</artifactId>
-            <version>1.10</version>
-        </dependency>
-    </dependencies>
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f3d68c07/modules/integration/commons/src/main/java/org/apache/tamaya/integration/commons/CommonsConfigPropertySource.java
----------------------------------------------------------------------
diff --git a/modules/integration/commons/src/main/java/org/apache/tamaya/integration/commons/CommonsConfigPropertySource.java b/modules/integration/commons/src/main/java/org/apache/tamaya/integration/commons/CommonsConfigPropertySource.java
deleted file mode 100644
index b2f2e82..0000000
--- a/modules/integration/commons/src/main/java/org/apache/tamaya/integration/commons/CommonsConfigPropertySource.java
+++ /dev/null
@@ -1,81 +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 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.integration.commons;
-
-//X TODO Move out into separate commons-config integration module...
-
-import org.apache.commons.configuration.Configuration;
-import org.apache.tamaya.spi.PropertySource;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * PropertySource that wraps {@link org.apache.commons.configuration.Configuration}.
- */
-public class CommonsConfigPropertySource implements PropertySource {
-
-    private Configuration commonsConfig;
-    private int ordinal;
-    private String name;
-
-    public CommonsConfigPropertySource(int ordinal, String name, Configuration commonsConfig) {
-        this.commonsConfig = Objects.requireNonNull(commonsConfig);
-        this.ordinal = ordinal;
-        this.name = Objects.requireNonNull(name);
-    }
-
-    public CommonsConfigPropertySource(String name, Configuration commonsConfig) {
-        commonsConfig = Objects.requireNonNull(commonsConfig);
-        this.name = Objects.requireNonNull(name);
-        try {
-            this.ordinal = commonsConfig.getInt(PropertySource.TAMAYA_ORDINAL);
-        } catch (Exception e) {
-            this.ordinal = 0;
-        }
-    }
-
-    @Override
-    public int getOrdinal() {
-        return ordinal;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public String get(String key) {
-        return commonsConfig.getString(key);
-    }
-
-    @Override
-    public Map<String, String> getProperties() {
-        Map<String, String> config = new HashMap<>();
-        Iterator<String> keyIter = commonsConfig.getKeys();
-        while (keyIter.hasNext()) {
-            String key = keyIter.next();
-            config.put(key, commonsConfig.getString(key));
-        }
-        return config;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f3d68c07/modules/integration/commons/src/main/java/org/apache/tamaya/integration/commons/IniConfigurationFormat.java
----------------------------------------------------------------------
diff --git a/modules/integration/commons/src/main/java/org/apache/tamaya/integration/commons/IniConfigurationFormat.java b/modules/integration/commons/src/main/java/org/apache/tamaya/integration/commons/IniConfigurationFormat.java
deleted file mode 100644
index 2f80977..0000000
--- a/modules/integration/commons/src/main/java/org/apache/tamaya/integration/commons/IniConfigurationFormat.java
+++ /dev/null
@@ -1,60 +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 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.integration.commons;
-
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.HierarchicalINIConfiguration;
-import org.apache.commons.configuration.SubnodeConfiguration;
-import org.apache.tamaya.ConfigException;
-import org.apache.tamaya.format.ConfigurationData;
-import org.apache.tamaya.format.ConfigurationDataBuilder;
-import org.apache.tamaya.format.ConfigurationFormat;
-
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-/**
- * Implements a ini file format based on the APache Commons
- * {@link org.apache.commons.configuration.HierarchicalINIConfiguration}.
- */
-public class IniConfigurationFormat implements ConfigurationFormat {
-
-    @Override
-    public ConfigurationData readConfiguration(URL url) {
-        ConfigurationDataBuilder builder = ConfigurationDataBuilder.of(url, this);
-        try {
-            HierarchicalINIConfiguration commonIniConfiguration = new HierarchicalINIConfiguration(url);
-            for(String section:commonIniConfiguration.getSections()){
-                SubnodeConfiguration sectionConfig = commonIniConfiguration.getSection(section);
-                Map<String, String> properties = new HashMap<>();
-                Iterator<String> keyIter = sectionConfig.getKeys();
-                while(keyIter.hasNext()){
-                    String key = keyIter.next();
-                    properties.put(key, sectionConfig.getString(key));
-                }
-                builder.addProperties(section, properties);
-            }
-        } catch (ConfigurationException e) {
-            throw new ConfigException("Failed to parse ini-file format from " + url, e);
-        }
-        return builder.build();
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f3d68c07/modules/integration/pom.xml
----------------------------------------------------------------------
diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml
deleted file mode 100644
index 105e0ac..0000000
--- a/modules/integration/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?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">
-    <parent>
-        <artifactId>tamaya-extensions-all</artifactId>
-        <groupId>org.apache.tamaya.ext</groupId>
-        <version>0.1-incubating-SNAPSHOT</version>
-        <relativePath>..</relativePath>
-    </parent>
-    <packaging>pom</packaging>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.tamaya.ext.integration</groupId>
-    <artifactId>tamaya-integrations</artifactId>
-
-    <modules>
-        <module>cdi</module>
-        <module>se</module>
-        <module>commons</module>
-    </modules>
-
-</project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f3d68c07/modules/management/pom.xml
----------------------------------------------------------------------
diff --git a/modules/management/pom.xml b/modules/management/pom.xml
deleted file mode 100644
index 31d632a..0000000
--- a/modules/management/pom.xml
+++ /dev/null
@@ -1,41 +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.
--->
-<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">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.tamaya.ext</groupId>
-        <artifactId>tamaya-extensions</artifactId>
-        <version>0.2-incubating-SNAPSHOT</version>
-        <relativePath>..</relativePath>
-    </parent>
-    <artifactId>tamaya-management</artifactId>
-    <name>Apache Tamaya Modules Integration - Java Management Extensions</name>
-    <packaging>jar</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>tamaya-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f3d68c07/modules/metamodels/environment/pom.xml
----------------------------------------------------------------------
diff --git a/modules/metamodels/environment/pom.xml b/modules/metamodels/environment/pom.xml
deleted file mode 100644
index 38370d8..0000000
--- a/modules/metamodels/environment/pom.xml
+++ /dev/null
@@ -1,34 +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.
--->
-<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">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.tamaya.ext.metamodels</groupId>
-        <artifactId>tamaya-metamodels</artifactId>
-        <version>0.2-incubating-SNAPSHOT</version>
-        <relativePath>..</relativePath>
-    </parent>
-    <artifactId>tamaya-metamodel-environment</artifactId>
-    <name>Apache Tamaya Modules Metamodels - environment</name>
-    <description>Environment Tamaya Metamodel</description>
-    <packaging>jar</packaging>
-
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f3d68c07/modules/metamodels/pom.xml
----------------------------------------------------------------------
diff --git a/modules/metamodels/pom.xml b/modules/metamodels/pom.xml
index a42c287..0d1f682 100644
--- a/modules/metamodels/pom.xml
+++ b/modules/metamodels/pom.xml
@@ -33,7 +33,6 @@ under the License.
 
     <modules>
         <module>simple</module>
-        <module>environment</module>
     </modules>
 
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f3d68c07/modules/metamodels/simple/src/main/java/org/apache/tamaya/metamodel/simple/MapPropertySource.java
----------------------------------------------------------------------
diff --git a/modules/metamodels/simple/src/main/java/org/apache/tamaya/metamodel/simple/MapPropertySource.java b/modules/metamodels/simple/src/main/java/org/apache/tamaya/metamodel/simple/MapPropertySource.java
deleted file mode 100644
index f2d237b..0000000
--- a/modules/metamodels/simple/src/main/java/org/apache/tamaya/metamodel/simple/MapPropertySource.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.apache.tamaya.metamodel.simple;
-
-import org.apache.tamaya.spi.PropertySource;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * Created by Anatole on 17.01.2015.
- */
-public class MapPropertySource implements PropertySource {
-    private int ordinal;
-    private String name;
-    private Map<String, String> properties = new HashMap<>();
-
-    public MapPropertySource(int ordinal, String name, Map<String, String> properties) {
-        this.ordinal = ordinal;
-        this.name = Objects.requireNonNull(name);
-        this.properties.putAll(properties);
-        this.properties = Collections.unmodifiableMap(this.properties);
-    }
-
-    @Override
-    public int getOrdinal() {
-        return ordinal;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public String get(String key) {
-        return properties.get(key);
-    }
-
-    @Override
-    public Map<String, String> getProperties() {
-        return properties;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f3d68c07/modules/pom.xml
----------------------------------------------------------------------
diff --git a/modules/pom.xml b/modules/pom.xml
index 98d2786..38785e3 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -35,15 +35,13 @@ under the License.
 
     <modules>
         <module>builder</module>
-        <module>apiextensions</module>
-        <module>injection</module>
+        <module>events</module>
         <module>formats</module>
+        <module>injection</module>
         <module>json</module>
+        <module>metamodels</module>
         <module>resolver</module>
         <module>resources</module>
-        <module>events</module>
-        <!-- module>metamodels</module -->
-        <!-- module>integration</module -->
     </modules>
 
     <build>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f3d68c07/modules/resources/src/test/java/org/apache/tamaya/resource/internal/PathBasedPropertySourceProvider.java
----------------------------------------------------------------------
diff --git a/modules/resources/src/test/java/org/apache/tamaya/resource/internal/PathBasedPropertySourceProvider.java b/modules/resources/src/test/java/org/apache/tamaya/resource/internal/PathBasedPropertySourceProvider.java
index 7bcaa81..ff628ad 100644
--- a/modules/resources/src/test/java/org/apache/tamaya/resource/internal/PathBasedPropertySourceProvider.java
+++ b/modules/resources/src/test/java/org/apache/tamaya/resource/internal/PathBasedPropertySourceProvider.java
@@ -23,7 +23,10 @@ import org.apache.tamaya.spi.PropertySource;
 
 import java.io.InputStream;
 import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
@@ -37,16 +40,18 @@ public class PathBasedPropertySourceProvider extends AbstractPathPropertySourceP
     }
 
     @Override
-    protected PropertySource getPropertySource(URL url) {
+    protected Collection<PropertySource> getPropertySources(URL url) {
+        List<PropertySource> list = new ArrayList<>();
         Properties props = new Properties();
         try(InputStream is = url.openStream()){
             props.load(is);
-            return new PropertiesBasedPropertySource(url.toString(), props);
+            list.add(new PropertiesBasedPropertySource(url.toString(), props));
         }
         catch(Exception e){
             e.printStackTrace();
             return null;
         }
+        return list;
     }
 
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f3d68c07/sandbox/apiextensions/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/apiextensions/pom.xml b/sandbox/apiextensions/pom.xml
new file mode 100644
index 0000000..8fa4d40
--- /dev/null
+++ b/sandbox/apiextensions/pom.xml
@@ -0,0 +1,43 @@
+<?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">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.tamaya.ext</groupId>
+        <artifactId>tamaya-sandbox</artifactId>
+        <version>0.1-incubating-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>tamaya-apiextensions</artifactId>
+    <name>Apache Tamaya API Extensions</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tamaya</groupId>
+            <artifactId>tamaya-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+    
+</project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f3d68c07/sandbox/apiextensions/src/main/java/org/apache/tamaya/modules/apiextensions/api/PropertySourceFactory.java
----------------------------------------------------------------------
diff --git a/sandbox/apiextensions/src/main/java/org/apache/tamaya/modules/apiextensions/api/PropertySourceFactory.java b/sandbox/apiextensions/src/main/java/org/apache/tamaya/modules/apiextensions/api/PropertySourceFactory.java
new file mode 100644
index 0000000..d28613d
--- /dev/null
+++ b/sandbox/apiextensions/src/main/java/org/apache/tamaya/modules/apiextensions/api/PropertySourceFactory.java
@@ -0,0 +1,32 @@
+/*
+ * 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.modules.apiextensions.api;
+
+import org.apache.tamaya.spi.PropertySource;
+
+import java.net.URL;
+
+/**
+ * TBD
+ */
+public interface PropertySourceFactory {
+    boolean acceptable(URL url);
+
+    PropertySource get(URL url);
+}

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f3d68c07/sandbox/integration/cdi/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/integration/cdi/pom.xml b/sandbox/integration/cdi/pom.xml
new file mode 100644
index 0000000..1909bcc
--- /dev/null
+++ b/sandbox/integration/cdi/pom.xml
@@ -0,0 +1,178 @@
+<!-- 
+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">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.tamaya.integration</groupId>
+        <artifactId>tamaya-integration-all</artifactId>
+        <version>0.1-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+    <artifactId>tamaya-cdi</artifactId>
+    <name>Apache Tamaya Modules Integration - CDI</name>
+    <packaging>jar</packaging>
+
+    <properties>
+        <owb.version>1.5.0-SNAPSHOT</owb.version>
+        <weld.version>2.2.7.Final</weld.version>
+        <geronimo-jcdi-1.1-spec.version>1.0-SNAPSHOT</geronimo-jcdi-1.1-spec.version>
+        <geronimo-interceptor-1.2-spec.version>1.0-SNAPSHOT</geronimo-interceptor-1.2-spec.version>
+        <geronimo-atinject-1.0-spec.version>1.0</geronimo-atinject-1.0-spec.version>
+        <bval.version>0.5</bval.version>
+        <ds.version>1.1.0</ds.version>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>prepare-agent</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-library</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tamaya</groupId>
+            <artifactId>tamaya-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jcdi_1.1_spec</artifactId>
+            <version>${geronimo-jcdi-1.1-spec.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.deltaspike.modules</groupId>
+            <artifactId>deltaspike-test-control-module-api</artifactId>
+            <version>${ds.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.deltaspike.modules</groupId>
+            <artifactId>deltaspike-test-control-module-impl</artifactId>
+            <version>${ds.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <profiles>
+        <profile>
+            <id>OWB</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <!-- OWB specific dependencies-->
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-atinject_1.0_spec</artifactId>
+                    <version>${geronimo-atinject-1.0-spec.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-interceptor_1.2_spec</artifactId>
+                    <version>${geronimo-interceptor-1.2-spec.version}</version>
+                    <scope>provided</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-annotation_1.2_spec</artifactId>
+                    <version>1.0.MR2-SNAPSHOT</version>
+                    <scope>provided</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-el_2.2_spec</artifactId>
+                    <version>1.0.2</version>
+                </dependency>
+
+                <dependency>
+                    <groupId>org.apache.openwebbeans</groupId>
+                    <artifactId>openwebbeans-impl</artifactId>
+                    <version>${owb.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.openwebbeans</groupId>
+                    <artifactId>openwebbeans-spi</artifactId>
+                    <version>${owb.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.openwebbeans</groupId>
+                    <artifactId>openwebbeans-resource</artifactId>
+                    <version>${owb.version}</version>
+                </dependency>
+
+                <dependency>
+                    <groupId>org.apache.bval</groupId>
+                    <artifactId>bval-jsr303</artifactId>
+                    <version>${bval.version}</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.deltaspike.cdictrl</groupId>
+                    <artifactId>deltaspike-cdictrl-owb</artifactId>
+                    <version>${ds.version}</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <id>Weld</id>
+            <dependencies>
+                <dependency>
+                    <groupId>org.jboss.weld.se</groupId>
+                    <artifactId>weld-se</artifactId>
+                    <version>${weld.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.deltaspike.cdictrl</groupId>
+                    <artifactId>deltaspike-cdictrl-weld</artifactId>
+                    <version>${ds.version}</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f3d68c07/sandbox/integration/commons/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/integration/commons/pom.xml b/sandbox/integration/commons/pom.xml
new file mode 100644
index 0000000..e11a8f6
--- /dev/null
+++ b/sandbox/integration/commons/pom.xml
@@ -0,0 +1,50 @@
+<!-- 
+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">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.tamaya.ext.integration</groupId>
+        <artifactId>tamaya-integrations</artifactId>
+        <version>0.1-incubating-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+    <artifactId>commons</artifactId>
+    <name>Apache Tamaya Commons Configuration Integration</name>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tamaya</groupId>
+            <artifactId>tamaya-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tamaya.ext</groupId>
+            <artifactId>tamaya-formats</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-configuration</groupId>
+            <artifactId>commons-configuration</artifactId>
+            <version>1.10</version>
+        </dependency>
+    </dependencies>
+</project>


Mime
View raw message