date:20160314

incubator-tamaya git commit: Updated doc.

2016-03-14 Thread anatole

Repository: incubator-tamaya
Updated Branches:
  refs/heads/master f9adf5930 -> 5e4d9ef4a


Updated doc.


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

Branch: refs/heads/master
Commit: 5e4d9ef4a59bea01120de7dae05559569bc48710
Parents: f9adf59
Author: anatole 
Authored: Tue Mar 15 01:48:52 2016 +0100
Committer: anatole 
Committed: Tue Mar 15 01:48:52 2016 +0100

--
 docs/src/main/asciidoc/API.adoc | 12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/5e4d9ef4/docs/src/main/asciidoc/API.adoc
--
diff --git a/docs/src/main/asciidoc/API.adoc b/docs/src/main/asciidoc/API.adoc
index c00a47d..be3cc38 100644
--- a/docs/src/main/asciidoc/API.adoc
+++ b/docs/src/main/asciidoc/API.adoc
@@ -193,6 +193,8 @@ public interface Configuration{
 // extension points
 Configuration with(ConfigOperator operator);
  T query(ConfigQuery query);
+
+ConfigurationContext getContext();
 }
 
 
@@ -462,13 +464,12 @@ public interface PropertyValueCombinationPolicy{
  The Configuration Context
 
 A +Configuration+ is basically based on a so called +ConfigurationContext+, 
which is
-managed by the +ConfigurationProvider+. Similarly the current 
+ConfigurationContext+ can be accessed from the
-+ConfigurationProvider+ singleton:
+accessible from +Configuration.getContext()+:
 
 [source,java]
 .Accessing the current +ConfigurationContext+
 
-ConfigurationContext context = ConfigurationProvider.getConfigurationContext();
+ConfigurationContext context = 
ConfigurationProvider.getConfiguration().getContext();
 
 
 The +ConfigurationContext+ provides access to the internal building blocks 
that determine the final +Configuration+:
@@ -511,7 +512,7 @@ accessed either
 [source,java]
 .Accessing a +ConfigurationContextBuilder+
 
-ConfigurationContextBuilder preinitializedContextBuilder = 
ConfigurationProvider.getConfigurationContext().toBuilder();
+ConfigurationContextBuilder preinitializedContextBuilder = 
ConfigurationProvider.getConfiguration().getContext().toBuilder();
 ConfigurationContextBuilder emptyContextBuilder = 
ConfigurationProvider.getConfigurationContextBuilder();
 
 
@@ -520,7 +521,8 @@ With such a builder a new +ConfigurationContext+ can be 
created and then applied
 [source,java]
 .Creating and applying a new +ConfigurationContext+
 
-ConfigurationContextBuilder preinitializedContextBuilder = 
ConfigurationProvider.getConfigurationContext().toBuilder();
+ConfigurationContextBuilder preinitializedContextBuilder = 
ConfigurationProvider.getConfiguration().getContext()
+   .toBuilder();
 ConfigurationContext context = 
preinitializedContextBuilder.addPropertySources(new MyPropertySource())

.addPropertyFilter(new MyFilter()).build();
 ConfigurationProvider.setConfigurationContext(context);

[1/2] incubator-tamaya git commit: Fixed javadoc issues, updated documentation.

2016-03-14 Thread anatole

Repository: incubator-tamaya
Updated Branches:
  refs/heads/master 9b7fed40c -> f9adf5930


Fixed javadoc issues, updated 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/f9adf593
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/f9adf593
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/f9adf593

Branch: refs/heads/master
Commit: f9adf5930b587dc9f8444142612b8404c9023838
Parents: 38b4a96
Author: anatole 
Authored: Tue Mar 15 01:39:17 2016 +0100
Committer: anatole 
Committed: Tue Mar 15 01:42:50 2016 +0100

--
 .../mutableconfig/MutableConfiguration.java |   1 -
 .../MutableConfigurationProvider.java   |  16 +-
 .../DefaultMutableConfigurationSpi.java |   2 +-
 .../asciidoc/extensions/mod_mutable_config.adoc | 203 +--
 4 files changed, 153 insertions(+), 69 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f9adf593/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/MutableConfiguration.java
--
diff --git 
a/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/MutableConfiguration.java
 
b/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/MutableConfiguration.java
index ac0b10d..a0cb471 100644
--- 
a/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/MutableConfiguration.java
+++ 
b/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/MutableConfiguration.java
@@ -221,5 +221,4 @@ public interface MutableConfiguration extends Configuration 
{
  */
 MutableConfiguration remove(String... keys);
 
-
 }

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f9adf593/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/MutableConfigurationProvider.java
--
diff --git 
a/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/MutableConfigurationProvider.java
 
b/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/MutableConfigurationProvider.java
index 4afa9cb..878dd0e 100644
--- 
a/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/MutableConfigurationProvider.java
+++ 
b/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/MutableConfigurationProvider.java
@@ -20,6 +20,7 @@ package org.apache.tamaya.mutableconfig;
 
 import org.apache.tamaya.ConfigException;
 import org.apache.tamaya.Configuration;
+import org.apache.tamaya.ConfigurationProvider;
 import org.apache.tamaya.mutableconfig.spi.MutableConfigurationProviderSpi;
 import org.apache.tamaya.mutableconfig.spi.MutablePropertySource;
 import org.apache.tamaya.spi.PropertySource;
@@ -65,8 +66,21 @@ public final class MutableConfigurationProvider {
 private MutableConfigurationProvider(){}
 
 /**
+ * Creates a new {@link MutableConfiguration} for the given default 
configuration, using all
+ * {@link MutablePropertySource} instances found in its context and {@code 
autoCommit = false}.
+ *
+ * @return a new MutableConfiguration instance
+ */
+public static MutableConfiguration getMutableConfiguration(){
+return mutableConfigurationProviderSpi.createMutableConfiguration(
+ConfigurationProvider.getConfiguration());
+}
+
+
+/**
  * Creates a new {@link MutableConfiguration} for the given configuration, 
using all
- * {@link MutablePropertySource} instances found in its context and {@code 
autoCommit = true}.
+ * {@link MutablePropertySource} instances found in its context and {@code 
autoCommit = false}.
+ *
  *
  * @param configuration the configuration to use to write the 
changes/config.
  * @return a new MutableConfiguration instance

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f9adf593/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/internal/DefaultMutableConfigurationSpi.java
--
diff --git 
a/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/internal/DefaultMutableConfigurationSpi.java
 
b/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/internal/DefaultMutableConfigurationSpi.java
index 178e21f..af52024 100644
--- 
a/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/internal/DefaultMutableConfigurationSpi.java
+++ 
b/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/internal/DefaultMutableConfigurationSpi.java
@@ -27,7 +27,7 @@ import

[2/2] incubator-tamaya git commit: Fixed javadocs issues.

2016-03-14 Thread anatole

Fixed javadocs 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/38b4a967
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/38b4a967
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/38b4a967

Branch: refs/heads/master
Commit: 38b4a967b6bcae9f00e1b58663b7b61b1dd348a4
Parents: 9b7fed4
Author: anatole 
Authored: Tue Mar 15 00:52:20 2016 +0100
Committer: anatole 
Committed: Tue Mar 15 01:42:50 2016 +0100

--
 .../tamaya/consul/ConsulPropertySource.java |   4 +-
 .../apache/tamaya/etcd/EtcdPropertySource.java  |   4 +-
 .../mutableconfig/MutableConfiguration.java |   6 +-
 .../MutableConfigurationProvider.java   |   3 +
 .../AbstractMutablePropertySource.java  |  23 +--
 .../propertysources/ConfigChangeContext.java| 152 +++
 .../MutablePropertiesPropertySource.java|   9 +-
 .../MutableXmlPropertiesPropertySource.java |   9 +-
 .../propertysources/TransactionContext.java | 152 ---
 .../spi/MutablePropertySource.java  |   8 +
 .../PropertiesFileConfigBackendTest.java|  10 --
 11 files changed, 190 insertions(+), 190 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/38b4a967/modules/integration/consul/src/main/java/org/apache/tamaya/consul/ConsulPropertySource.java
--
diff --git 
a/modules/integration/consul/src/main/java/org/apache/tamaya/consul/ConsulPropertySource.java
 
b/modules/integration/consul/src/main/java/org/apache/tamaya/consul/ConsulPropertySource.java
index b4227a8..9b61840 100644
--- 
a/modules/integration/consul/src/main/java/org/apache/tamaya/consul/ConsulPropertySource.java
+++ 
b/modules/integration/consul/src/main/java/org/apache/tamaya/consul/ConsulPropertySource.java
@@ -24,7 +24,7 @@ import com.orbitz.consul.Consul;
 import com.orbitz.consul.KeyValueClient;
 import com.orbitz.consul.model.kv.Value;
 import 
org.apache.tamaya.mutableconfig.propertysources.AbstractMutablePropertySource;
-import org.apache.tamaya.mutableconfig.propertysources.TransactionContext;
+import org.apache.tamaya.mutableconfig.propertysources.ConfigChangeContext;
 import org.apache.tamaya.spi.PropertyValue;
 import org.apache.tamaya.spi.PropertyValueBuilder;
 
@@ -165,7 +165,7 @@ public class ConsulPropertySource extends 
AbstractMutablePropertySource {
 }
 
 @Override
-protected void commitInternal(TransactionContext context) {
+protected void commitInternal(ConfigChangeContext context) {
 for(HostAndPort hostAndPort: ConsulBackends.getConsulBackends()){
 try{
 Consul consul = 
Consul.builder().withHostAndPort(hostAndPort).build();

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/38b4a967/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/EtcdPropertySource.java
--
diff --git 
a/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/EtcdPropertySource.java
 
b/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/EtcdPropertySource.java
index 9434f65..f84fd0d 100644
--- 
a/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/EtcdPropertySource.java
+++ 
b/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/EtcdPropertySource.java
@@ -19,7 +19,7 @@
 package org.apache.tamaya.etcd;
 
 import 
org.apache.tamaya.mutableconfig.propertysources.AbstractMutablePropertySource;
-import org.apache.tamaya.mutableconfig.propertysources.TransactionContext;
+import org.apache.tamaya.mutableconfig.propertysources.ConfigChangeContext;
 import org.apache.tamaya.spi.PropertyValue;
 import org.apache.tamaya.spi.PropertyValueBuilder;
 
@@ -167,7 +167,7 @@ public class EtcdPropertySource extends 
AbstractMutablePropertySource{
 }
 
 @Override
-protected void commitInternal(TransactionContext context) {
+protected void commitInternal(ConfigChangeContext context) {
 for(EtcdAccessor accessor: EtcdBackends.getEtcdBackends()){
 try{
 for(String k: context.getRemovedProperties()){

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/38b4a967/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/MutableConfiguration.java
--
diff --git 
a/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/MutableConfiguration.java
 
b/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/MutableConfiguration.java
index 4108928..ac0b10d 100644
---

Jenkins build is back to normal : Tamaya-Master-branch #510

2016-03-14 Thread Apache Jenkins Server

See

[2/2] incubator-tamaya git commit: Fixed quality issues and compile errors.

2016-03-14 Thread anatole

Fixed quality issues and compile errors.


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

Branch: refs/heads/master
Commit: cb425996a7ecb8eddeb55cd8e0d09a9f80ce0f73
Parents: 8873c20
Author: anatole 
Authored: Mon Mar 14 19:25:05 2016 +0100
Committer: anatole 
Committed: Mon Mar 14 19:25:05 2016 +0100

--
 .../tamaya/mutableconfig/MutableConfigurationProvider.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/cb425996/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/MutableConfigurationProvider.java
--
diff --git 
a/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/MutableConfigurationProvider.java
 
b/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/MutableConfigurationProvider.java
index 56c0e2a..67e971f 100644
--- 
a/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/MutableConfigurationProvider.java
+++ 
b/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/MutableConfigurationProvider.java
@@ -43,7 +43,7 @@ public final class MutableConfigurationProvider {
 /**
  * URIs used by this query instance to identify the backends to use for 
write operations.
  */
-private static final MutableConfigurationProviderSpi 
mutableConfigurationProviderSpi = loadSpi();
+private static MutableConfigurationProviderSpi 
mutableConfigurationProviderSpi = loadSpi();
 
 /**
  * SPI loader method.
@@ -53,8 +53,8 @@ public final class MutableConfigurationProvider {
 private static MutableConfigurationProviderSpi loadSpi() {
 try{
 return ServiceContextManager.getServiceContext().getService(
-MutableConfigurationProviderSpi.class)  ;  }
-catch(Exception e){
+MutableConfigurationProviderSpi.class)  ;
+} catch(Exception e){
 throw new ConfigException("Failed to initialize 
MutableConfigurationProviderSpi - " +
 "mutable configuration support.");
 }

[1/2] incubator-tamaya git commit: Fixed quality issues and compile errors.

2016-03-14 Thread anatole

Repository: incubator-tamaya
Updated Branches:
  refs/heads/master 343531a49 -> cb425996a


Fixed quality issues and compile errors.


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

Branch: refs/heads/master
Commit: 8873c202b0fa7e46df17f77d55d8dc04ce43f041
Parents: 343531a
Author: anatole 
Authored: Mon Mar 14 19:24:41 2016 +0100
Committer: anatole 
Committed: Mon Mar 14 19:24:41 2016 +0100

--
 .../tamaya/examples/fileobserver/TestConfigView.java  |  6 ++
 .../mutableconfig/propertysources/TransactionContext.java | 10 ++
 2 files changed, 12 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/8873c202/examples/6-fileobserver-example/src/test/java/org/aspache/tamaya/examples/fileobserver/TestConfigView.java
--
diff --git 
a/examples/6-fileobserver-example/src/test/java/org/aspache/tamaya/examples/fileobserver/TestConfigView.java
 
b/examples/6-fileobserver-example/src/test/java/org/aspache/tamaya/examples/fileobserver/TestConfigView.java
index 060c61e..c04fb62 100644
--- 
a/examples/6-fileobserver-example/src/test/java/org/aspache/tamaya/examples/fileobserver/TestConfigView.java
+++ 
b/examples/6-fileobserver-example/src/test/java/org/aspache/tamaya/examples/fileobserver/TestConfigView.java
@@ -24,6 +24,7 @@ import org.apache.tamaya.ConfigQuery;
 import org.apache.tamaya.Configuration;
 import org.apache.tamaya.ConfigurationProvider;
 import org.apache.tamaya.TypeLiteral;
+import org.apache.tamaya.spi.ConfigurationContext;
 import org.apache.tamaya.spi.ConversionContext;
 import org.apache.tamaya.spi.PropertyConverter;
 
@@ -71,6 +72,11 @@ public class TestConfigView implements ConfigOperator{
 }
 
 @Override
+public ConfigurationContext getContext() {
+return null;
+}
+
+@Override
 public String get(String key) {
 return getProperties().get(key);
 }

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/8873c202/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/propertysources/TransactionContext.java
--
diff --git 
a/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/propertysources/TransactionContext.java
 
b/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/propertysources/TransactionContext.java
index 2b417d9..b8604f6 100644
--- 
a/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/propertysources/TransactionContext.java
+++ 
b/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/propertysources/TransactionContext.java
@@ -123,11 +123,13 @@ public final class TransactionContext{
 
 @Override
 public boolean equals(Object o) {
-if (this == o) return true;
-if (!(o instanceof TransactionContext)) return false;
-
+if (this == o) {
+return true;
+}
+if (!(o instanceof TransactionContext)) {
+return false;
+}
 TransactionContext that = (TransactionContext) o;
-
 return transactionId.equals(that.transactionId);
 
 }

incubator-tamaya git commit: Updated doc.

[1/2] incubator-tamaya git commit: Fixed javadoc issues, updated documentation.

[2/2] incubator-tamaya git commit: Fixed javadocs issues.

Jenkins build is back to normal : Tamaya-Master-branch #510

[2/2] incubator-tamaya git commit: Fixed quality issues and compile errors.

[1/2] incubator-tamaya git commit: Fixed quality issues and compile errors.

6 matches

Site Navigation

Mail list logo

Footer information