You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by jo...@apache.org on 2015/08/03 05:38:31 UTC
incubator-tamaya git commit: Release prep work. Fixed up some header
formatting, changed the parent within the examples project.
Repository: incubator-tamaya
Updated Branches:
refs/heads/master df1f26e4e -> 61c32a6f9
Release prep work. Fixed up some header formatting, changed the parent within the examples project.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/61c32a6f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/61c32a6f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/61c32a6f
Branch: refs/heads/master
Commit: 61c32a6f91687c11fe77cff67a3f41eb8b25cb5e
Parents: df1f26e
Author: John D. Ament <jo...@apache.org>
Authored: Sun Aug 2 23:38:24 2015 -0400
Committer: John D. Ament <jo...@apache.org>
Committed: Sun Aug 2 23:38:24 2015 -0400
----------------------------------------------------------------------
NOTICE | 13 ++------
examples/1-minimal-example/pom.xml | 8 +++--
.../2-simple-propertysource-example/pom.xml | 10 ++++--
examples/3-resources-example/pom.xml | 9 ++++--
examples/4-resolver-example/pom.xml | 8 +++--
examples/5-injection-example/pom.xml | 9 ++++--
examples/6-fileobserver-example/pom.xml | 8 +++--
examples/7-builder-example/pom.xml | 8 +++--
.../apache/tamaya/ConfigurationProvider.java | 24 ++++++++-------
.../java/org/apache/tamaya/TypeLiteral.java | 32 +++++++++++---------
.../apache/tamaya/ConfigurationProvider.java | 24 ++++++++-------
.../java/org/apache/tamaya/TypeLiteral.java | 32 +++++++++++---------
pom.xml | 1 +
13 files changed, 109 insertions(+), 77 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/61c32a6f/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 3bd2e43..15f3597 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,12 +1,5 @@
-Apache Tamaya
-Copyright 2014 The Apache Software Foundation.
-
-Initial Contributors:
-- Anatole Tresch (atsticks at gmail dot com)
-- Werner Keil (werner dot keil at gmail dot com)
-- Otávio Goncalves de Santana (otaviopolianasantana at gmail dot com)
-- Juven Xu (juvenshun at gmail dot com)
+Apache Tamaya (incubating)
+Copyright 2014-2015 The Apache Software Foundation.
This product includes software developed at
-- Anatole Tresch (http://github.com/atsticks)
-- The Apache Software Foundation (http://www.apache.org/).
+The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/61c32a6f/examples/1-minimal-example/pom.xml
----------------------------------------------------------------------
diff --git a/examples/1-minimal-example/pom.xml b/examples/1-minimal-example/pom.xml
index fe5ef9d..0b22b9d 100644
--- a/examples/1-minimal-example/pom.xml
+++ b/examples/1-minimal-example/pom.xml
@@ -19,10 +19,14 @@ 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-examples</artifactId>
+ <version>0.1-incubating-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
<artifactId>tamaya-example-minimal</artifactId>
<groupId>org.apache.tamaya.examples</groupId>
- <version>1.0-incubating-SNAPSHOT</version>
<name>Apache Tamaya Example: Minimal Version</name>
<description>This project contains a simple example based on the core functionality only.</description>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/61c32a6f/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..7ebe7a3 100644
--- a/examples/2-simple-propertysource-example/pom.xml
+++ b/examples/2-simple-propertysource-example/pom.xml
@@ -19,11 +19,15 @@ 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-examples</artifactId>
+ <version>0.1-incubating-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
<artifactId>tamaya-example-simple-propertysource</artifactId>
<groupId>org.apache.tamaya.examples</groupId>
- <version>1.0-incubating-SNAPSHOT</version>
- <name>Apache Tamaya Example: Minimal Version</name>
+ <name>Apache Tamaya Example: Simple Property Source Version</name>
<description>This project contains a simple example based on the core functionality only.</description>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/61c32a6f/examples/3-resources-example/pom.xml
----------------------------------------------------------------------
diff --git a/examples/3-resources-example/pom.xml b/examples/3-resources-example/pom.xml
index c9746d2..6a14eac 100644
--- a/examples/3-resources-example/pom.xml
+++ b/examples/3-resources-example/pom.xml
@@ -19,10 +19,15 @@ 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-examples</artifactId>
+ <version>0.1-incubating-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
<artifactId>tamaya-example-resources</artifactId>
<groupId>org.apache.tamaya.examples</groupId>
- <version>1.0-incubating-SNAPSHOT</version>
+
<name>Apache Tamaya Example: Resource Location</name>
<description>This project contains a simple example using the resource location module.</description>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/61c32a6f/examples/4-resolver-example/pom.xml
----------------------------------------------------------------------
diff --git a/examples/4-resolver-example/pom.xml b/examples/4-resolver-example/pom.xml
index b1c342b..ed73a63 100644
--- a/examples/4-resolver-example/pom.xml
+++ b/examples/4-resolver-example/pom.xml
@@ -19,10 +19,14 @@ 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-examples</artifactId>
+ <version>0.1-incubating-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
<artifactId>tamaya-example-resolver</artifactId>
<groupId>org.apache.tamaya.examples</groupId>
- <version>1.0-incubating-SNAPSHOT</version>
<name>Apache Tamaya Example: Value Resolution</name>
<description>This project contains a simple example using the resolver module.</description>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/61c32a6f/examples/5-injection-example/pom.xml
----------------------------------------------------------------------
diff --git a/examples/5-injection-example/pom.xml b/examples/5-injection-example/pom.xml
index 8839d5a..1363183 100644
--- a/examples/5-injection-example/pom.xml
+++ b/examples/5-injection-example/pom.xml
@@ -19,10 +19,15 @@ 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-examples</artifactId>
+ <version>0.1-incubating-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
<artifactId>tamaya-example-injection</artifactId>
<groupId>org.apache.tamaya.examples</groupId>
- <version>1.0-incubating-SNAPSHOT</version>
+
<name>Apache Tamaya Example: Configuration Injection</name>
<description>This project contains a simple illustrating how configuration values can be injected.</description>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/61c32a6f/examples/6-fileobserver-example/pom.xml
----------------------------------------------------------------------
diff --git a/examples/6-fileobserver-example/pom.xml b/examples/6-fileobserver-example/pom.xml
index f8e19cd..c7d2a3a 100644
--- a/examples/6-fileobserver-example/pom.xml
+++ b/examples/6-fileobserver-example/pom.xml
@@ -19,10 +19,14 @@ 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-examples</artifactId>
+ <version>0.1-incubating-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
<artifactId>tamaya-example-fileobserver</artifactId>
<groupId>org.apache.tamaya.examples</groupId>
- <version>1.0-incubating-SNAPSHOT</version>
<name>Apache Tamaya Example: File Observer</name>
<description>This project contains a simple example observing a directory for (config) file changes, that updates
the configuration correspondingly.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/61c32a6f/examples/7-builder-example/pom.xml
----------------------------------------------------------------------
diff --git a/examples/7-builder-example/pom.xml b/examples/7-builder-example/pom.xml
index 53c078c..3fbfebe 100644
--- a/examples/7-builder-example/pom.xml
+++ b/examples/7-builder-example/pom.xml
@@ -19,10 +19,14 @@ 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-examples</artifactId>
+ <version>0.1-incubating-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
<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>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/61c32a6f/java7/api/src/main/java/org/apache/tamaya/ConfigurationProvider.java
----------------------------------------------------------------------
diff --git a/java7/api/src/main/java/org/apache/tamaya/ConfigurationProvider.java b/java7/api/src/main/java/org/apache/tamaya/ConfigurationProvider.java
index 45d541c..9e8f294 100644
--- a/java7/api/src/main/java/org/apache/tamaya/ConfigurationProvider.java
+++ b/java7/api/src/main/java/org/apache/tamaya/ConfigurationProvider.java
@@ -1,18 +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 of the License at
+ * 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.
+ * 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;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/61c32a6f/java7/api/src/main/java/org/apache/tamaya/TypeLiteral.java
----------------------------------------------------------------------
diff --git a/java7/api/src/main/java/org/apache/tamaya/TypeLiteral.java b/java7/api/src/main/java/org/apache/tamaya/TypeLiteral.java
index ce5da22..cb32bb8 100644
--- a/java7/api/src/main/java/org/apache/tamaya/TypeLiteral.java
+++ b/java7/api/src/main/java/org/apache/tamaya/TypeLiteral.java
@@ -1,19 +1,21 @@
/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * 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;
import java.io.Serializable;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/61c32a6f/java8/api/src/main/java/org/apache/tamaya/ConfigurationProvider.java
----------------------------------------------------------------------
diff --git a/java8/api/src/main/java/org/apache/tamaya/ConfigurationProvider.java b/java8/api/src/main/java/org/apache/tamaya/ConfigurationProvider.java
index af17a2d..c353da1 100644
--- a/java8/api/src/main/java/org/apache/tamaya/ConfigurationProvider.java
+++ b/java8/api/src/main/java/org/apache/tamaya/ConfigurationProvider.java
@@ -1,18 +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 of the License at
+ * 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.
+ * 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;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/61c32a6f/java8/api/src/main/java/org/apache/tamaya/TypeLiteral.java
----------------------------------------------------------------------
diff --git a/java8/api/src/main/java/org/apache/tamaya/TypeLiteral.java b/java8/api/src/main/java/org/apache/tamaya/TypeLiteral.java
index b29a699..b34ed6b 100644
--- a/java8/api/src/main/java/org/apache/tamaya/TypeLiteral.java
+++ b/java8/api/src/main/java/org/apache/tamaya/TypeLiteral.java
@@ -1,19 +1,21 @@
/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * 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;
import java.io.Serializable;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/61c32a6f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 68dd71c..c98b664 100644
--- a/pom.xml
+++ b/pom.xml
@@ -202,6 +202,7 @@ under the License.
<module>java8</module>
<module>modules</module>
<module>docs</module>
+ <module>examples</module>
<module>distribution</module>
</modules>