You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by an...@apache.org on 2015/07/28 00:55:48 UTC
incubator-tamaya git commit: Added missing scm sections (pom).
Readded simpke model. Fixed compile issues.
Repository: incubator-tamaya
Updated Branches:
refs/heads/master fdaabd906 -> f35cd28e6
Added missing scm sections (pom).
Readded simpke model.
Fixed compile issues.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/f35cd28e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/f35cd28e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/f35cd28e
Branch: refs/heads/master
Commit: f35cd28e654f2b67ea421ed2b8b0a92037356ad6
Parents: fdaabd9
Author: anatole <at...@gmail.com>
Authored: Tue Jul 28 00:55:35 2015 +0200
Committer: anatole <at...@gmail.com>
Committed: Tue Jul 28 00:55:35 2015 +0200
----------------------------------------------------------------------
buildconfigurations/pom.xml | 12 +++
distribution/pom.xml | 11 +++
docs/pom.xml | 12 +++
examples/1-minimal-example/pom.xml | 12 +++
.../2-simple-propertysource-example/pom.xml | 12 +++
examples/3-resources-example/pom.xml | 12 +++
examples/4-resolver-example/pom.xml | 12 +++
examples/5-injection-example/pom.xml | 12 +++
examples/6-fileobserver-example/pom.xml | 11 +++
examples/7-builder-example/pom.xml | 67 +++++++++++++++++
examples/pom.xml | 12 +++
java7/api/pom.xml | 12 +++
java7/core/pom.xml | 11 +++
java7/pom.xml | 12 +++
java8/api/pom.xml | 12 +++
java8/core/pom.xml | 12 +++
modules/builder/pom.xml | 13 ++++
.../tamaya/builder/SimplePropertySource.java | 30 ++++++++
modules/events/pom.xml | 12 +++
modules/formats/pom.xml | 12 +++
.../tamaya/format/ConfigurationDataBuilder.java | 2 +-
modules/injection/pom.xml | 12 +++
modules/json/pom.xml | 12 +++
modules/pom.xml | 12 +++
modules/resolver/pom.xml | 12 +++
modules/resources/pom.xml | 12 +++
sandbox/environment/pom.xml | 12 +++
sandbox/functions/pom.xml | 12 +++
sandbox/integration/cdi/pom.xml | 12 +++
sandbox/integration/commons/pom.xml | 12 +++
sandbox/jodatime/pom.xml | 12 +++
sandbox/management/pom.xml | 12 +++
sandbox/metamodels/pom.xml | 12 +++
sandbox/metamodels/simple/pom.xml | 12 +++
.../ConfigDirPropertySourceProvider.java | 77 ++++++++++++++++++++
.../MetainfConfigPropertySourceProvider.java | 63 ++++++++++++++++
...org.apache.tamaya.spi.PropertySourceProvider | 20 +++++
.../tamaya/metamodel/simple/SimpleTest.java | 24 ++++++
.../resources/META-INF/config/test.properties | 20 +++++
.../resources/META-INF/config/test2.properties | 20 +++++
sandbox/pom.xml | 12 +++
sandbox/remote/pom.xml | 12 +++
sandbox/sysprops/pom.xml | 13 +++-
43 files changed, 727 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f35cd28e/buildconfigurations/pom.xml
----------------------------------------------------------------------
diff --git a/buildconfigurations/pom.xml b/buildconfigurations/pom.xml
index c0574ea..970944e 100644
--- a/buildconfigurations/pom.xml
+++ b/buildconfigurations/pom.xml
@@ -36,5 +36,17 @@ under the License.
<properties>
<skipTests>true</skipTests>
</properties>
+
+ <scm>
+ <connection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </connection>
+ <developerConnection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </developerConnection>
+ <url>
+ https://git-wip-us.apache.org/repos/asf?p=incubator-tamaya.git
+ </url>
+ </scm>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f35cd28e/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 144d820..3e94629 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -266,6 +266,17 @@ under the License.
</dependencies>
+ <scm>
+ <connection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </connection>
+ <developerConnection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </developerConnection>
+ <url>
+ https://git-wip-us.apache.org/repos/asf?p=incubator-tamaya.git
+ </url>
+ </scm>
<build>
<plugins>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f35cd28e/docs/pom.xml
----------------------------------------------------------------------
diff --git a/docs/pom.xml b/docs/pom.xml
index 83bdbe1..c416146 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -48,6 +48,18 @@ under the License.
</dependency>
</dependencies>
+ <scm>
+ <connection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </connection>
+ <developerConnection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </developerConnection>
+ <url>
+ https://git-wip-us.apache.org/repos/asf?p=incubator-tamaya.git
+ </url>
+ </scm>
+
<build>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f35cd28e/examples/1-minimal-example/pom.xml
----------------------------------------------------------------------
diff --git a/examples/1-minimal-example/pom.xml b/examples/1-minimal-example/pom.xml
index fe5ef9d..b29cba0 100644
--- a/examples/1-minimal-example/pom.xml
+++ b/examples/1-minimal-example/pom.xml
@@ -27,6 +27,18 @@ under the License.
<description>This project contains a simple example based on the core functionality only.</description>
<packaging>jar</packaging>
+ <scm>
+ <connection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </connection>
+ <developerConnection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </developerConnection>
+ <url>
+ https://git-wip-us.apache.org/repos/asf?p=incubator-tamaya.git
+ </url>
+ </scm>
+
<dependencies>
<dependency>
<groupId>org.apache.tamaya</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f35cd28e/examples/2-simple-propertysource-example/pom.xml
----------------------------------------------------------------------
diff --git a/examples/2-simple-propertysource-example/pom.xml b/examples/2-simple-propertysource-example/pom.xml
index 8c0b428..c0df6aa 100644
--- a/examples/2-simple-propertysource-example/pom.xml
+++ b/examples/2-simple-propertysource-example/pom.xml
@@ -27,6 +27,18 @@ under the License.
<description>This project contains a simple example based on the core functionality only.</description>
<packaging>jar</packaging>
+ <scm>
+ <connection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </connection>
+ <developerConnection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </developerConnection>
+ <url>
+ https://git-wip-us.apache.org/repos/asf?p=incubator-tamaya.git
+ </url>
+ </scm>
+
<dependencies>
<dependency>
<groupId>org.apache.tamaya</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f35cd28e/examples/3-resources-example/pom.xml
----------------------------------------------------------------------
diff --git a/examples/3-resources-example/pom.xml b/examples/3-resources-example/pom.xml
index c9746d2..af1895b 100644
--- a/examples/3-resources-example/pom.xml
+++ b/examples/3-resources-example/pom.xml
@@ -27,6 +27,18 @@ under the License.
<description>This project contains a simple example using the resource location module.</description>
<packaging>jar</packaging>
+ <scm>
+ <connection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </connection>
+ <developerConnection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </developerConnection>
+ <url>
+ https://git-wip-us.apache.org/repos/asf?p=incubator-tamaya.git
+ </url>
+ </scm>
+
<dependencies>
<dependency>
<groupId>org.apache.tamaya</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f35cd28e/examples/4-resolver-example/pom.xml
----------------------------------------------------------------------
diff --git a/examples/4-resolver-example/pom.xml b/examples/4-resolver-example/pom.xml
index b1c342b..892f280 100644
--- a/examples/4-resolver-example/pom.xml
+++ b/examples/4-resolver-example/pom.xml
@@ -27,6 +27,18 @@ under the License.
<description>This project contains a simple example using the resolver module.</description>
<packaging>jar</packaging>
+ <scm>
+ <connection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </connection>
+ <developerConnection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </developerConnection>
+ <url>
+ https://git-wip-us.apache.org/repos/asf?p=incubator-tamaya.git
+ </url>
+ </scm>
+
<dependencies>
<dependency>
<groupId>org.apache.tamaya</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f35cd28e/examples/5-injection-example/pom.xml
----------------------------------------------------------------------
diff --git a/examples/5-injection-example/pom.xml b/examples/5-injection-example/pom.xml
index 8839d5a..a315901 100644
--- a/examples/5-injection-example/pom.xml
+++ b/examples/5-injection-example/pom.xml
@@ -27,6 +27,18 @@ under the License.
<description>This project contains a simple illustrating how configuration values can be injected.</description>
<packaging>jar</packaging>
+ <scm>
+ <connection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </connection>
+ <developerConnection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </developerConnection>
+ <url>
+ https://git-wip-us.apache.org/repos/asf?p=incubator-tamaya.git
+ </url>
+ </scm>
+
<dependencies>
<dependency>
<groupId>org.apache.tamaya</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f35cd28e/examples/6-fileobserver-example/pom.xml
----------------------------------------------------------------------
diff --git a/examples/6-fileobserver-example/pom.xml b/examples/6-fileobserver-example/pom.xml
index 96bbba4..b0abe5c 100644
--- a/examples/6-fileobserver-example/pom.xml
+++ b/examples/6-fileobserver-example/pom.xml
@@ -29,6 +29,17 @@ under the License.
</description>
<packaging>jar</packaging>
+ <scm>
+ <connection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </connection>
+ <developerConnection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </developerConnection>
+ <url>
+ https://git-wip-us.apache.org/repos/asf?p=incubator-tamaya.git
+ </url>
+ </scm>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f35cd28e/examples/7-builder-example/pom.xml
----------------------------------------------------------------------
diff --git a/examples/7-builder-example/pom.xml b/examples/7-builder-example/pom.xml
new file mode 100644
index 0000000..0460c45
--- /dev/null
+++ b/examples/7-builder-example/pom.xml
@@ -0,0 +1,67 @@
+<!--
+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>
+
+ <artifactId>tamaya-example-builder</artifactId>
+ <groupId>org.apache.tamaya.examples</groupId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <name>Apache Tamaya Example: Builder</name>
+ <description>This project contains a simple example building a configuration manually.
+ </description>
+ <packaging>jar</packaging>
+
+ <scm>
+ <connection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </connection>
+ <developerConnection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </developerConnection>
+ <url>
+ https://git-wip-us.apache.org/repos/asf?p=incubator-tamaya.git
+ </url>
+ </scm>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tamaya</groupId>
+ <artifactId>tamaya-core</artifactId>
+ <version>0.1-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tamaya.ext</groupId>
+ <artifactId>tamaya-events</artifactId>
+ <version>0.1-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.4</version>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f35cd28e/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 05ea342..a34d9ad 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -33,6 +33,18 @@ under the License.
<description>This project contains several examples that illustrate usage of Tamaya.</description>
<packaging>pom</packaging>
+ <scm>
+ <connection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </connection>
+ <developerConnection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </developerConnection>
+ <url>
+ https://git-wip-us.apache.org/repos/asf?p=incubator-tamaya.git
+ </url>
+ </scm>
+
<modules>
<module>1-minimal-example</module>
<module>2-simple-propertysource-example</module>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f35cd28e/java7/api/pom.xml
----------------------------------------------------------------------
diff --git a/java7/api/pom.xml b/java7/api/pom.xml
index 50f5576..8d28c43 100644
--- a/java7/api/pom.xml
+++ b/java7/api/pom.xml
@@ -34,6 +34,18 @@ under the License.
The API defines a complete Java7 based API for reading of configuration data.
</description>
+ <scm>
+ <connection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </connection>
+ <developerConnection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </developerConnection>
+ <url>
+ https://git-wip-us.apache.org/repos/asf?p=incubator-tamaya.git
+ </url>
+ </scm>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f35cd28e/java7/core/pom.xml
----------------------------------------------------------------------
diff --git a/java7/core/pom.xml b/java7/core/pom.xml
index 4727712..a6c78ae 100644
--- a/java7/core/pom.xml
+++ b/java7/core/pom.xml
@@ -30,6 +30,17 @@ under the License.
<artifactId>tamaya-java7-core</artifactId>
<name>Apache Tamaya Java 7 Core</name>
+ <scm>
+ <connection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </connection>
+ <developerConnection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </developerConnection>
+ <url>
+ https://git-wip-us.apache.org/repos/asf?p=incubator-tamaya.git
+ </url>
+ </scm>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f35cd28e/java7/pom.xml
----------------------------------------------------------------------
diff --git a/java7/pom.xml b/java7/pom.xml
index 52e4fbe..ca5ea7c 100644
--- a/java7/pom.xml
+++ b/java7/pom.xml
@@ -41,6 +41,18 @@ under the License.
<module>core</module>
</modules>
+ <scm>
+ <connection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </connection>
+ <developerConnection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </developerConnection>
+ <url>
+ https://git-wip-us.apache.org/repos/asf?p=incubator-tamaya.git
+ </url>
+ </scm>
+
<build>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f35cd28e/java8/api/pom.xml
----------------------------------------------------------------------
diff --git a/java8/api/pom.xml b/java8/api/pom.xml
index b7d2d9a..9704685 100644
--- a/java8/api/pom.xml
+++ b/java8/api/pom.xml
@@ -33,6 +33,18 @@ under the License.
The API defines a complete SE based API for reading of configuration data.
</description>
+ <scm>
+ <connection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </connection>
+ <developerConnection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </developerConnection>
+ <url>
+ https://git-wip-us.apache.org/repos/asf?p=incubator-tamaya.git
+ </url>
+ </scm>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f35cd28e/java8/core/pom.xml
----------------------------------------------------------------------
diff --git a/java8/core/pom.xml b/java8/core/pom.xml
index 0e48292..8c04e1c 100644
--- a/java8/core/pom.xml
+++ b/java8/core/pom.xml
@@ -30,6 +30,18 @@ under the License.
<artifactId>tamaya-core</artifactId>
<name>Apache Tamaya Java 8 Core</name>
+ <scm>
+ <connection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </connection>
+ <developerConnection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </developerConnection>
+ <url>
+ https://git-wip-us.apache.org/repos/asf?p=incubator-tamaya.git
+ </url>
+ </scm>
+
<dependencies>
<dependency>
<groupId>org.apache.tamaya</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f35cd28e/modules/builder/pom.xml
----------------------------------------------------------------------
diff --git a/modules/builder/pom.xml b/modules/builder/pom.xml
index 97d42b7..d203b01 100644
--- a/modules/builder/pom.xml
+++ b/modules/builder/pom.xml
@@ -33,12 +33,24 @@ under the License.
<inceptionYear>2015</inceptionYear>
+ <scm>
+ <connection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </connection>
+ <developerConnection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </developerConnection>
+ <url>
+ https://git-wip-us.apache.org/repos/asf?p=incubator-tamaya.git
+ </url>
+ </scm>
<dependencies>
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-api</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -51,6 +63,7 @@ under the License.
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-core</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f35cd28e/modules/builder/src/main/java/org/apache/tamaya/builder/SimplePropertySource.java
----------------------------------------------------------------------
diff --git a/modules/builder/src/main/java/org/apache/tamaya/builder/SimplePropertySource.java b/modules/builder/src/main/java/org/apache/tamaya/builder/SimplePropertySource.java
index f343973..f39a0cc 100644
--- a/modules/builder/src/main/java/org/apache/tamaya/builder/SimplePropertySource.java
+++ b/modules/builder/src/main/java/org/apache/tamaya/builder/SimplePropertySource.java
@@ -23,6 +23,8 @@ import org.apache.tamaya.spi.PropertySource;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
+import java.util.logging.Level;
+import java.util.logging.Logger;
/**
* Simple property source implementation using a map.
@@ -39,16 +41,44 @@ public class SimplePropertySource implements PropertySource {
}
@Override
+ public int getOrdinal(){
+ String configuredOrdinal = get(TAMAYA_ORDINAL);
+ if(configuredOrdinal!=null){
+ try{
+ return Integer.parseInt(configuredOrdinal);
+ } catch(Exception e){
+ Logger.getLogger(getClass().getName()).log(Level.WARNING,
+ "Configured Ordinal is not an int number: " + configuredOrdinal, e);
+ }
+ }
+ return getDefaultOrdinal();
+ }
+
+ public int getDefaultOrdinal(){
+ return 0;
+ }
+
+ @Override
public String getName() {
return name;
}
@Override
+ public String get(String key) {
+ return null;
+ }
+
+ @Override
public Map<String, String> getProperties() {
return this.properties;
}
@Override
+ public boolean isScannable() {
+ return false;
+ }
+
+ @Override
public String toString(){
return "SimplePropertySource(name="+name+", numProps="+properties.size()+")";
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f35cd28e/modules/events/pom.xml
----------------------------------------------------------------------
diff --git a/modules/events/pom.xml b/modules/events/pom.xml
index e89069e..ffb279f 100644
--- a/modules/events/pom.xml
+++ b/modules/events/pom.xml
@@ -35,6 +35,18 @@ under the License.
<jdkVersion>1.7</jdkVersion>
</properties>
+ <scm>
+ <connection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </connection>
+ <developerConnection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </developerConnection>
+ <url>
+ https://git-wip-us.apache.org/repos/asf?p=incubator-tamaya.git
+ </url>
+ </scm>
+
<dependencies>
<dependency>
<groupId>org.apache.tamaya</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f35cd28e/modules/formats/pom.xml
----------------------------------------------------------------------
diff --git a/modules/formats/pom.xml b/modules/formats/pom.xml
index 6d0c1fa..f1fdab2 100644
--- a/modules/formats/pom.xml
+++ b/modules/formats/pom.xml
@@ -33,6 +33,18 @@ under the License.
<jdkVersion>1.7</jdkVersion>
</properties>
+ <scm>
+ <connection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </connection>
+ <developerConnection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </developerConnection>
+ <url>
+ https://git-wip-us.apache.org/repos/asf?p=incubator-tamaya.git
+ </url>
+ </scm>
+
<dependencies>
<dependency>
<groupId>org.apache.tamaya</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f35cd28e/modules/formats/src/main/java/org/apache/tamaya/format/ConfigurationDataBuilder.java
----------------------------------------------------------------------
diff --git a/modules/formats/src/main/java/org/apache/tamaya/format/ConfigurationDataBuilder.java b/modules/formats/src/main/java/org/apache/tamaya/format/ConfigurationDataBuilder.java
index ddb03c6..02de604 100644
--- a/modules/formats/src/main/java/org/apache/tamaya/format/ConfigurationDataBuilder.java
+++ b/modules/formats/src/main/java/org/apache/tamaya/format/ConfigurationDataBuilder.java
@@ -74,7 +74,7 @@ public final class ConfigurationDataBuilder {
if (data.hasCombinedProperties()) {
b.getCombinedProperties().putAll(data.getCombinedProperties());
}
- if (data.hasSections()) {
+ if (!data.getSections().isEmpty()) {
b.getSections().putAll(data.getSections());
}
return b;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f35cd28e/modules/injection/pom.xml
----------------------------------------------------------------------
diff --git a/modules/injection/pom.xml b/modules/injection/pom.xml
index 68f9fb2..14b41a2 100644
--- a/modules/injection/pom.xml
+++ b/modules/injection/pom.xml
@@ -34,6 +34,18 @@ under the License.
<jdkVersion>1.7</jdkVersion>
</properties>
+ <scm>
+ <connection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </connection>
+ <developerConnection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </developerConnection>
+ <url>
+ https://git-wip-us.apache.org/repos/asf?p=incubator-tamaya.git
+ </url>
+ </scm>
+
<dependencies>
<dependency>
<groupId>org.apache.tamaya</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f35cd28e/modules/json/pom.xml
----------------------------------------------------------------------
diff --git a/modules/json/pom.xml b/modules/json/pom.xml
index e11f893..70e9c5a 100644
--- a/modules/json/pom.xml
+++ b/modules/json/pom.xml
@@ -36,6 +36,18 @@ under the License.
<jdkVersion>1.7</jdkVersion>
</properties>
+ <scm>
+ <connection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </connection>
+ <developerConnection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </developerConnection>
+ <url>
+ https://git-wip-us.apache.org/repos/asf?p=incubator-tamaya.git
+ </url>
+ </scm>
+
<dependencies>
<dependency>
<groupId>org.apache.tamaya</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f35cd28e/modules/pom.xml
----------------------------------------------------------------------
diff --git a/modules/pom.xml b/modules/pom.xml
index e0c86dc..4d07add 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -43,6 +43,18 @@ under the License.
<module>resources</module>
</modules>
+ <scm>
+ <connection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </connection>
+ <developerConnection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </developerConnection>
+ <url>
+ https://git-wip-us.apache.org/repos/asf?p=incubator-tamaya.git
+ </url>
+ </scm>
+
<build>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f35cd28e/modules/resolver/pom.xml
----------------------------------------------------------------------
diff --git a/modules/resolver/pom.xml b/modules/resolver/pom.xml
index bbfe1eb..8ff9407 100644
--- a/modules/resolver/pom.xml
+++ b/modules/resolver/pom.xml
@@ -34,6 +34,18 @@ under the License.
<jdkVersion>1.7</jdkVersion>
</properties>
+ <scm>
+ <connection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </connection>
+ <developerConnection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </developerConnection>
+ <url>
+ https://git-wip-us.apache.org/repos/asf?p=incubator-tamaya.git
+ </url>
+ </scm>
+
<dependencies>
<dependency>
<groupId>org.apache.tamaya</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f35cd28e/modules/resources/pom.xml
----------------------------------------------------------------------
diff --git a/modules/resources/pom.xml b/modules/resources/pom.xml
index 09adaa0..d9ee015 100644
--- a/modules/resources/pom.xml
+++ b/modules/resources/pom.xml
@@ -34,6 +34,18 @@ under the License.
<jdkVersion>1.7</jdkVersion>
</properties>
+ <scm>
+ <connection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </connection>
+ <developerConnection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </developerConnection>
+ <url>
+ https://git-wip-us.apache.org/repos/asf?p=incubator-tamaya.git
+ </url>
+ </scm>
+
<dependencies>
<dependency>
<groupId>org.apache.tamaya</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f35cd28e/sandbox/environment/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/environment/pom.xml b/sandbox/environment/pom.xml
index 666140d..8cf755b 100644
--- a/sandbox/environment/pom.xml
+++ b/sandbox/environment/pom.xml
@@ -31,6 +31,18 @@ under the License.
<name>Apache Tamaya Modules - Environment Manager</name>
<packaging>jar</packaging>
+ <scm>
+ <connection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </connection>
+ <developerConnection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </developerConnection>
+ <url>
+ https://git-wip-us.apache.org/repos/asf?p=incubator-tamaya.git
+ </url>
+ </scm>
+
<dependencies>
<dependency>
<groupId>org.apache.tamaya</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f35cd28e/sandbox/functions/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/functions/pom.xml b/sandbox/functions/pom.xml
index 06dd0ed..3a3481e 100644
--- a/sandbox/functions/pom.xml
+++ b/sandbox/functions/pom.xml
@@ -30,6 +30,18 @@ under the License.
<name>Apache Tamaya Common Functional Extensions</name>
<packaging>jar</packaging>
+ <scm>
+ <connection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </connection>
+ <developerConnection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </developerConnection>
+ <url>
+ https://git-wip-us.apache.org/repos/asf?p=incubator-tamaya.git
+ </url>
+ </scm>
+
<dependencies>
<dependency>
<groupId>org.apache.tamaya</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f35cd28e/sandbox/integration/cdi/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/integration/cdi/pom.xml b/sandbox/integration/cdi/pom.xml
index fcecae3..1f81863 100644
--- a/sandbox/integration/cdi/pom.xml
+++ b/sandbox/integration/cdi/pom.xml
@@ -39,6 +39,18 @@ under the License.
<ds.version>1.1.0</ds.version>
</properties>
+ <scm>
+ <connection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </connection>
+ <developerConnection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </developerConnection>
+ <url>
+ https://git-wip-us.apache.org/repos/asf?p=incubator-tamaya.git
+ </url>
+ </scm>
+
<build>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f35cd28e/sandbox/integration/commons/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/integration/commons/pom.xml b/sandbox/integration/commons/pom.xml
index c2be1fe..944430f 100644
--- a/sandbox/integration/commons/pom.xml
+++ b/sandbox/integration/commons/pom.xml
@@ -30,6 +30,18 @@ under the License.
<name>Apache Tamaya Commons Configuration Integration</name>
<packaging>jar</packaging>
+ <scm>
+ <connection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </connection>
+ <developerConnection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </developerConnection>
+ <url>
+ https://git-wip-us.apache.org/repos/asf?p=incubator-tamaya.git
+ </url>
+ </scm>
+
<dependencies>
<dependency>
<groupId>org.apache.tamaya</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f35cd28e/sandbox/jodatime/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/jodatime/pom.xml b/sandbox/jodatime/pom.xml
index 08448ab..ce5339e 100644
--- a/sandbox/jodatime/pom.xml
+++ b/sandbox/jodatime/pom.xml
@@ -43,6 +43,18 @@ under the License.
<jodatime.version>2.3</jodatime.version>
</properties>
+ <scm>
+ <connection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </connection>
+ <developerConnection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </developerConnection>
+ <url>
+ https://git-wip-us.apache.org/repos/asf?p=incubator-tamaya.git
+ </url>
+ </scm>
+
<dependencies>
<dependency>
<groupId>org.apache.tamaya</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f35cd28e/sandbox/management/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/management/pom.xml b/sandbox/management/pom.xml
index 07812e1..bcd1674 100644
--- a/sandbox/management/pom.xml
+++ b/sandbox/management/pom.xml
@@ -31,6 +31,18 @@ under the License.
<name>Apache Tamaya Modules - Java Management Extensions</name>
<packaging>jar</packaging>
+ <scm>
+ <connection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </connection>
+ <developerConnection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </developerConnection>
+ <url>
+ https://git-wip-us.apache.org/repos/asf?p=incubator-tamaya.git
+ </url>
+ </scm>
+
<dependencies>
<dependency>
<groupId>org.apache.tamaya</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f35cd28e/sandbox/metamodels/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/metamodels/pom.xml b/sandbox/metamodels/pom.xml
index 9843d37..38cd5eb 100644
--- a/sandbox/metamodels/pom.xml
+++ b/sandbox/metamodels/pom.xml
@@ -36,4 +36,16 @@ under the License.
<module>simple</module>
</modules>
+ <scm>
+ <connection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </connection>
+ <developerConnection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </developerConnection>
+ <url>
+ https://git-wip-us.apache.org/repos/asf?p=incubator-tamaya.git
+ </url>
+ </scm>
+
</project>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f35cd28e/sandbox/metamodels/simple/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/metamodels/simple/pom.xml b/sandbox/metamodels/simple/pom.xml
index 6665762..8e9bf29 100644
--- a/sandbox/metamodels/simple/pom.xml
+++ b/sandbox/metamodels/simple/pom.xml
@@ -31,6 +31,18 @@ under the License.
<description>Simple Tamaya Metamodel, e.g. feasible for SE commandline tools and simple use cases.</description>
<packaging>jar</packaging>
+ <scm>
+ <connection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </connection>
+ <developerConnection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </developerConnection>
+ <url>
+ https://git-wip-us.apache.org/repos/asf?p=incubator-tamaya.git
+ </url>
+ </scm>
+
<dependencies>
<dependency>
<groupId>org.apache.tamaya</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f35cd28e/sandbox/metamodels/simple/src/main/java/org/apache/tamaya/metamodel/simple/internal/ConfigDirPropertySourceProvider.java
----------------------------------------------------------------------
diff --git a/sandbox/metamodels/simple/src/main/java/org/apache/tamaya/metamodel/simple/internal/ConfigDirPropertySourceProvider.java b/sandbox/metamodels/simple/src/main/java/org/apache/tamaya/metamodel/simple/internal/ConfigDirPropertySourceProvider.java
new file mode 100644
index 0000000..0e6d3fe
--- /dev/null
+++ b/sandbox/metamodels/simple/src/main/java/org/apache/tamaya/metamodel/simple/internal/ConfigDirPropertySourceProvider.java
@@ -0,0 +1,77 @@
+/*
+ * 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.metamodel.simple.internal;
+
+
+import org.apache.tamaya.format.ConfigurationData;
+import org.apache.tamaya.format.ConfigurationFormats;
+import org.apache.tamaya.format.FlattenedDefaultPropertySource;
+import org.apache.tamaya.resource.AbstractPathPropertySourceProvider;
+import org.apache.tamaya.spi.PropertySource;
+
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * Created by Anatole on 20.03.2015.
+ */
+public class ConfigDirPropertySourceProvider extends AbstractPathPropertySourceProvider {
+
+ public ConfigDirPropertySourceProvider() {
+ super(getConfigLocation());
+ }
+
+ private static String getConfigLocation() {
+ String location = System.getProperty("configdir");
+ if (location == null) {
+ location = "./config";
+ }
+ if (!location.endsWith("/")) {
+ location += "/";
+ }
+ if (!location.startsWith("file:")) {
+ location += "file:";
+ }
+ return location + "**/*.*";
+ }
+
+ @Override
+ protected Collection<PropertySource> getPropertySources(URL url) {
+ try {
+ ConfigurationData config = ConfigurationFormats.readConfigurationData(url);
+ return asCollection(new FlattenedDefaultPropertySource(config));
+ } catch (Exception e) {
+ Logger.getLogger(getClass().getName()).log(Level.SEVERE,
+ "Failed to read configuration from " + url, e);
+ return Collections.emptySet();
+ }
+ }
+
+ private Collection<PropertySource> asCollection(PropertySource propertySource) {
+ List<PropertySource> result = new ArrayList<>(1);
+ result.add(propertySource);
+ return result;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f35cd28e/sandbox/metamodels/simple/src/main/java/org/apache/tamaya/metamodel/simple/internal/MetainfConfigPropertySourceProvider.java
----------------------------------------------------------------------
diff --git a/sandbox/metamodels/simple/src/main/java/org/apache/tamaya/metamodel/simple/internal/MetainfConfigPropertySourceProvider.java b/sandbox/metamodels/simple/src/main/java/org/apache/tamaya/metamodel/simple/internal/MetainfConfigPropertySourceProvider.java
new file mode 100644
index 0000000..55f27f9
--- /dev/null
+++ b/sandbox/metamodels/simple/src/main/java/org/apache/tamaya/metamodel/simple/internal/MetainfConfigPropertySourceProvider.java
@@ -0,0 +1,63 @@
+/*
+ * 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.metamodel.simple.internal;
+
+
+import org.apache.tamaya.format.ConfigurationData;
+import org.apache.tamaya.format.ConfigurationFormats;
+import org.apache.tamaya.format.FlattenedDefaultPropertySource;
+import org.apache.tamaya.resource.AbstractPathPropertySourceProvider;
+import org.apache.tamaya.spi.PropertySource;
+
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * Created by Anatole on 20.03.2015.
+ */
+public class MetainfConfigPropertySourceProvider extends AbstractPathPropertySourceProvider {
+
+ public MetainfConfigPropertySourceProvider() {
+ super("classpath:META-INF/config/**/*.*");
+ }
+
+ @Override
+ protected Collection<PropertySource> getPropertySources(URL url) {
+ try {
+ ConfigurationData config = ConfigurationFormats.readConfigurationData(url);
+ return asCollection(new FlattenedDefaultPropertySource(config));
+ } catch (Exception e) {
+ Logger.getLogger(getClass().getName()).log(Level.SEVERE,
+ "Failed to read configuration from " + url, e);
+ return Collections.emptySet();
+ }
+ }
+
+ private Collection<PropertySource> asCollection(PropertySource propertySource) {
+ List<PropertySource> result = new ArrayList<>(1);
+ result.add(propertySource);
+ return result;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f35cd28e/sandbox/metamodels/simple/src/main/resources/META-INF/services/org.apache.tamaya.spi.PropertySourceProvider
----------------------------------------------------------------------
diff --git a/sandbox/metamodels/simple/src/main/resources/META-INF/services/org.apache.tamaya.spi.PropertySourceProvider b/sandbox/metamodels/simple/src/main/resources/META-INF/services/org.apache.tamaya.spi.PropertySourceProvider
new file mode 100644
index 0000000..931db19
--- /dev/null
+++ b/sandbox/metamodels/simple/src/main/resources/META-INF/services/org.apache.tamaya.spi.PropertySourceProvider
@@ -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.
+#
+org.apache.tamaya.metamodel.simple.internal.ConfigDirPropertySourceProvider
+org.apache.tamaya.metamodel.simple.internal.MetaInfConfigPropertySourceProvider
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f35cd28e/sandbox/metamodels/simple/src/test/java/org/apache/tamaya/metamodel/simple/SimpleTest.java
----------------------------------------------------------------------
diff --git a/sandbox/metamodels/simple/src/test/java/org/apache/tamaya/metamodel/simple/SimpleTest.java b/sandbox/metamodels/simple/src/test/java/org/apache/tamaya/metamodel/simple/SimpleTest.java
new file mode 100644
index 0000000..5492e25
--- /dev/null
+++ b/sandbox/metamodels/simple/src/test/java/org/apache/tamaya/metamodel/simple/SimpleTest.java
@@ -0,0 +1,24 @@
+package org.apache.tamaya.metamodel.simple;
+
+import org.apache.tamaya.Configuration;
+import org.apache.tamaya.ConfigurationProvider;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+/**
+ * Created by Anatole on 26.07.2015.
+ */
+public class SimpleTest {
+
+ @Test
+ public void testClasspathConfig() {
+ Configuration config = ConfigurationProvider.getConfiguration();
+ assertEquals(config.get("test1"), "1");
+ assertEquals(config.get("test2"), "2");
+ assertEquals(config.get("test3"), "3");
+ assertEquals(config.get("test4"), "4");
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f35cd28e/sandbox/metamodels/simple/src/test/resources/META-INF/config/test.properties
----------------------------------------------------------------------
diff --git a/sandbox/metamodels/simple/src/test/resources/META-INF/config/test.properties b/sandbox/metamodels/simple/src/test/resources/META-INF/config/test.properties
new file mode 100644
index 0000000..af16b23
--- /dev/null
+++ b/sandbox/metamodels/simple/src/test/resources/META-INF/config/test.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.
+#
+test1=1
+test2=2
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f35cd28e/sandbox/metamodels/simple/src/test/resources/META-INF/config/test2.properties
----------------------------------------------------------------------
diff --git a/sandbox/metamodels/simple/src/test/resources/META-INF/config/test2.properties b/sandbox/metamodels/simple/src/test/resources/META-INF/config/test2.properties
new file mode 100644
index 0000000..58524b7
--- /dev/null
+++ b/sandbox/metamodels/simple/src/test/resources/META-INF/config/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.
+#
+test3=3
+test4=4
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f35cd28e/sandbox/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/pom.xml b/sandbox/pom.xml
index 6113216..34eda6e 100644
--- a/sandbox/pom.xml
+++ b/sandbox/pom.xml
@@ -34,6 +34,18 @@ under the License.
a release.</description>
<packaging>pom</packaging>
+ <scm>
+ <connection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </connection>
+ <developerConnection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </developerConnection>
+ <url>
+ https://git-wip-us.apache.org/repos/asf?p=incubator-tamaya.git
+ </url>
+ </scm>
+
<modules>
<module>integration</module>
<module>management</module>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f35cd28e/sandbox/remote/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/remote/pom.xml b/sandbox/remote/pom.xml
index 26c1bbd..7163671 100644
--- a/sandbox/remote/pom.xml
+++ b/sandbox/remote/pom.xml
@@ -31,6 +31,18 @@ under the License.
<name>Apache Tamaya Remote PropertySource</name>
<packaging>jar</packaging>
+ <scm>
+ <connection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </connection>
+ <developerConnection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </developerConnection>
+ <url>
+ https://git-wip-us.apache.org/repos/asf?p=incubator-tamaya.git
+ </url>
+ </scm>
+
<dependencies>
<dependency>
<groupId>org.apache.tamaya</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f35cd28e/sandbox/sysprops/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/sysprops/pom.xml b/sandbox/sysprops/pom.xml
index 6e62b39..a8f4269 100644
--- a/sandbox/sysprops/pom.xml
+++ b/sandbox/sysprops/pom.xml
@@ -30,8 +30,17 @@ under the License.
<name>Apache Tamaya - Configured Java SE System Properties</name>
<packaging>jar</packaging>
- <properties>
- </properties>
+ <scm>
+ <connection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </connection>
+ <developerConnection>
+ scm:git://git.apache.org/incubator-tamaya.git
+ </developerConnection>
+ <url>
+ https://git-wip-us.apache.org/repos/asf?p=incubator-tamaya.git
+ </url>
+ </scm>
<build>
<plugins>