[2/2] incubator-tamaya git commit: Added Spring tests and ensured a minimal implementation.

2015-11-11 Thread anatole 
Added Spring tests and ensured a minimal implementation.


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

Branch: refs/heads/master
Commit: 6fab0f93223056c5de48b07759e230ccbaae7002
Parents: 043a3e6
Author: anatole 
Authored: Thu Nov 12 01:24:52 2015 +0100
Committer: anatole 
Committed: Thu Nov 12 01:24:52 2015 +0100

--
 .../SpringConfigInjectionPostProcessor.java |  3 ++
 .../integration/spring/TamayaEnvironment.java   | 18 
 .../integration/spring/TamayaSpringConfig.java  | 10 +++-
 .../spring/TamayaSpringPropertySource.java  |  1 +
 .../spring/ConfiguredSpringBean.java| 10 
 .../integration/spring/SpringConfigTest2.java   | 48 
 .../META-INF/javaconfiguration.properties   |  3 +-
 .../test/resources/spring-config-scanOnly.xml   | 35 ++
 .../spring/src/test/resources/spring-config.xml |  2 -
 9 files changed, 126 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/6fab0f93/modules/integration/spring/src/main/java/org/apache/tamaya/integration/spring/SpringConfigInjectionPostProcessor.java
--
diff --git 
a/modules/integration/spring/src/main/java/org/apache/tamaya/integration/spring/SpringConfigInjectionPostProcessor.java
 
b/modules/integration/spring/src/main/java/org/apache/tamaya/integration/spring/SpringConfigInjectionPostProcessor.java
index 1193b8d..91f0047 100644
--- 
a/modules/integration/spring/src/main/java/org/apache/tamaya/integration/spring/SpringConfigInjectionPostProcessor.java
+++ 
b/modules/integration/spring/src/main/java/org/apache/tamaya/integration/spring/SpringConfigInjectionPostProcessor.java
@@ -21,10 +21,13 @@ package org.apache.tamaya.integration.spring;
 import org.apache.tamaya.inject.ConfigurationInjection;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.config.BeanPostProcessor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.stereotype.Component;
 
 /**
  * PostProcessor that performs injection of configured values using Tamaya 
{@link ConfigurationInjection}.
  */
+@Component
 public class SpringConfigInjectionPostProcessor implements BeanPostProcessor{
 
 @Override

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/6fab0f93/modules/integration/spring/src/main/java/org/apache/tamaya/integration/spring/TamayaEnvironment.java
--
diff --git 
a/modules/integration/spring/src/main/java/org/apache/tamaya/integration/spring/TamayaEnvironment.java
 
b/modules/integration/spring/src/main/java/org/apache/tamaya/integration/spring/TamayaEnvironment.java
new file mode 100644
index 000..6f3214f
--- /dev/null
+++ 
b/modules/integration/spring/src/main/java/org/apache/tamaya/integration/spring/TamayaEnvironment.java
@@ -0,0 +1,18 @@
+package org.apache.tamaya.integration.spring;
+
+import org.springframework.core.env.MapPropertySource;
+import org.springframework.core.env.MutablePropertySources;
+import org.springframework.core.env.StandardEnvironment;
+import org.springframework.core.env.SystemEnvironmentPropertySource;
+import org.springframework.stereotype.Component;
+
+/**
+ * Created by atsticks on 12.11.15.
+ */
+public class TamayaEnvironment extends StandardEnvironment{
+
+protected void customizePropertySources(MutablePropertySources 
propertySources) {
+super.customizePropertySources(propertySources);
+propertySources.addLast(new TamayaSpringPropertySource());
+}
+}

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/6fab0f93/modules/integration/spring/src/main/java/org/apache/tamaya/integration/spring/TamayaSpringConfig.java
--
diff --git 
a/modules/integration/spring/src/main/java/org/apache/tamaya/integration/spring/TamayaSpringConfig.java
 
b/modules/integration/spring/src/main/java/org/apache/tamaya/integration/spring/TamayaSpringConfig.java
index e3adf3f..15e616e 100644
--- 
a/modules/integration/spring/src/main/java/org/apache/tamaya/integration/spring/TamayaSpringConfig.java
+++ 
b/modules/integration/spring/src/main/java/org/apache/tamaya/integration/spring/TamayaSpringConfig.java
@@ -24,6 +24,9 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import 
org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 import

[1/2] incubator-tamaya git commit: Added Spring documentation.

2015-11-11 Thread anatole 
Repository: incubator-tamaya
Updated Branches:
  refs/heads/master b28242105 -> 6fab0f932


Added Spring documentation.


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

Branch: refs/heads/master
Commit: 043a3e612c91f6e7f97ee25fcdc31b6389957b75
Parents: b282421
Author: anatole 
Authored: Thu Nov 12 01:24:05 2015 +0100
Committer: anatole 
Committed: Thu Nov 12 01:24:05 2015 +0100

--
 src/site/asciidoc/extensions/mod_spring.adoc | 166 ++
 1 file changed, 166 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/043a3e61/src/site/asciidoc/extensions/mod_spring.adoc
--
diff --git a/src/site/asciidoc/extensions/mod_spring.adoc 
b/src/site/asciidoc/extensions/mod_spring.adoc
new file mode 100644
index 000..10c979a
--- /dev/null
+++ b/src/site/asciidoc/extensions/mod_spring.adoc
@@ -0,0 +1,166 @@
+= Apache Tamaya -- Extension: Spring Integration
+
+:name: Tamaya
+:rootpackage: org.apache.tamaya.integration.spring
+:title: Apache Tamaya Extension: Spring Integration
+:revdate: November 2015
+:authorinitials: ATR
+:author: Anatole Tresch
+:email: 
+:source-highlighter: coderay
+:website: http://tamaya.incubator.apache.org/
+:toc:
+:toc-placement: manual
+:encoding: UTF-8
+:numbered:
+// 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.
+'''
+
+<<<
+
+toc::[]
+
+<<<
+:numbered!:
+<<<
+[[Remote]]
+== Tamaya Spring Integration (Extension Module)
+=== Overview
+
+Apache Tamaya currently provides two implementations also full integration for 
Spring:
+
+* A Spring +@Configuration+ implementation that also provides a Tamaya based 
version of
+  +org.springframework.context.support.PropertySourcesPlaceholderConfigurer+.
+* +org.apache.tamaya.integration.spring.TamayaEnvironment+ is the Tamaya based 
implementation of the Spring
+  +Environment+ interface.
+* +TamayaSpringPropertySource+ implements an additional Spring 
+PropertySource+.
+* Finally 
+org.apache.tamaya.integration.spring.SpringConfigInjectionPostProcessor+ 
implements a Bean +PostProcessor+,
+  which adds all the full fledged Tamaya configuration capabilities to Spring.
+
+
+=== Compatibility
+
+Both modules are based on Java 7, so they will not run on Java 7 and beyond. 
The extension shown here works similarly
+with Spring Framework as well as Spring Boot.
+
+
+=== Installation
+
+To benefit from Tamaya Spring integration you only must one of the following 
dependencies to your module:
+
+[source, xml]
+---
+
+  org.apache.tamaya.ext
+  tamaya-spring
+  {tamayaVersion}
+
+---
+
+
+=== Registering Tamaya Spring Configuration
+
+Basically to activate the Tamaya Spring support the most simple thing is to a 
enable the Tamaya package for being
+scanned for Spring components, e.g.
+
+[source, xml]
+
+http://www.springframework.org/schema/beans;
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+   xmlns:context="http://www.springframework.org/schema/context;
+   xsi:schemaLocation="http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans.xsd 
http://www.springframework.org/schema/context 
http://www.springframework.org/schema/context/spring-context.xsd;>
+
+
+
+
+...
+
+
+
+
+NOTE: Of course you can also use the newer +@ComponentScan+ annotation as 
described by the Spring documentation.
+
+
+Similarly if you dont want to use component scanning you can configure things 
using plain old XML. Simply add the
+following lines somewhere into one of your application context

Build failed in Jenkins: Tamaya-Master-branch #430

2015-11-11 Thread Apache Jenkins Server 
See 

Changes:

[anatole] Added Spring documentation.

[anatole] Added Spring tests and ensured a minimal implementation.

--
Started by an SCM change
[EnvInject] - Loading node environment variables.
[EnvInject] - Preparing an environment for the build.
[EnvInject] - Keeping Jenkins system variables.
[EnvInject] - Keeping Jenkins build variables.
[EnvInject] - Injecting contributions.
Building remotely on ubuntu-1 (docker Ubuntu ubuntu ubuntu1) in workspace 

 > git rev-parse --is-inside-work-tree # timeout=10
Fetching changes from the remote Git repository
 > git config remote.origin.url 
 > https://git-wip-us.apache.org/repos/asf/incubator-tamaya.git # timeout=10
Fetching upstream changes from 
https://git-wip-us.apache.org/repos/asf/incubator-tamaya.git
 > git --version # timeout=10
 > git -c core.askpass=true fetch --tags --progress 
 > https://git-wip-us.apache.org/repos/asf/incubator-tamaya.git 
 > +refs/heads/*:refs/remotes/origin/*
 > git rev-parse refs/remotes/origin/master^{commit} # timeout=10
 > git rev-parse refs/remotes/origin/origin/master^{commit} # timeout=10
Checking out Revision 6fab0f93223056c5de48b07759e230ccbaae7002 
(refs/remotes/origin/master)
 > git config core.sparsecheckout # timeout=10
 > git checkout -f 6fab0f93223056c5de48b07759e230ccbaae7002
 > git rev-list b28242105cafff4e7806b1af139f988ec063d90c # timeout=10
Parsing POMs
Modules changed, recalculating dependency graph
Established TCP socket on 38316
maven32-agent.jar already up to date
maven32-interceptor.jar already up to date
maven3-interceptor-commons.jar already up to date
[Tamaya-Master-branch] $ 
/home/jenkins/jenkins-slave/tools/hudson.model.JDK/latest1.8/bin/java -Xmx2g 
-Xms256m -XX:MaxPermSize=512m -cp 
/home/jenkins/jenkins-slave/maven32-agent.jar:/home/jenkins/jenkins-slave/tools/hudson.tasks.Maven_MavenInstallation/maven-3.3.3/boot/plexus-classworlds-2.5.2.jar:/home/jenkins/jenkins-slave/tools/hudson.tasks.Maven_MavenInstallation/maven-3.3.3/conf/logging
 jenkins.maven3.agent.Maven32Main 
/home/jenkins/jenkins-slave/tools/hudson.tasks.Maven_MavenInstallation/maven-3.3.3
 /home/jenkins/jenkins-slave/slave.jar 
/home/jenkins/jenkins-slave/maven32-interceptor.jar 
/home/jenkins/jenkins-slave/maven3-interceptor-commons.jar 38316
Java HotSpot(TM) 64-Bit Server VM warning: ignoring option MaxPermSize=512m; 
support was removed in 8.0
<===[JENKINS REMOTING CAPACITY]===>   channel started
Executing Maven:  -B -f 
 
-Dmaven.repo.local=/home/jenkins/jenkins-slave/maven-repositories/0 clean 
install deploy
[INFO] Scanning for projects...
[WARNING] 
[WARNING] Some problems were encountered while building the effective model for 
org.apache.tamaya.ext:tamaya-spring:bundle:0.2-incubating-SNAPSHOT
[WARNING] 'build.plugins.plugin.version' for org.jacoco:jacoco-maven-plugin is 
missing. @ org.apache.tamaya.ext:tamaya-spring:[unknown-version], 

 line 40, column 21
[WARNING] 
[WARNING] Some problems were encountered while building the effective model for 
org.apache.tamaya.ext:tamaya-cdi-se:bundle:0.2-incubating-SNAPSHOT
[WARNING] 'build.plugins.plugin.version' for org.jacoco:jacoco-maven-plugin is 
missing. @ org.apache.tamaya.ext:tamaya-cdi-se:[unknown-version], 

 line 45, column 21
[WARNING] 
[WARNING] Some problems were encountered while building the effective model for 
org.apache.tamaya.ext:tamaya-cdi:bundle:0.2-incubating-SNAPSHOT
[WARNING] 'build.plugins.plugin.version' for org.jacoco:jacoco-maven-plugin is 
missing. @ org.apache.tamaya.ext:tamaya-cdi:[unknown-version], 

 line 48, column 21
[WARNING] 
[WARNING] Some problems were encountered while building the effective model for 
org.apache.tamaya.ext:tamaya-osgi-felix:bundle:0.2-incubating-SNAPSHOT
[WARNING] 'dependencies.dependency.scope' for 
org.jboss.arquillian:arquillian-bom:pom must be one of [provided, compile, 
runtime, test, system] but is 'import'. @ 
org.apache.tamaya.ext:tamaya-osgi-felix:[unknown-version], 

 line 84, column 20
[WARNING] 
[WARNING] Some problems were encountered while building the effective model for 
org.apache.tamaya.ext:tamaya-camel:bundle:0.2-incubating-SNAPSHOT
[WARNING] 'build.plugins.plugin.version' for org.jacoco:jacoco-maven-plugin is 
missing. @ org.apache.tamaya.ext:tamaya-camel:[unknown-version], 

 line 39, column 21
[WARNING] 
[WARNING] Some problems were