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 2016/01/17 01:33:18 UTC
incubator-tamaya git commit: Fixed up pom files to refer to new
module name. Commented non-working block.
Repository: incubator-tamaya
Updated Branches:
refs/heads/master bdb291870 -> ee35fed6e
Fixed up pom files to refer to new module name. Commented non-working block.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/ee35fed6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/ee35fed6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/ee35fed6
Branch: refs/heads/master
Commit: ee35fed6e85c0bb2b16be69aeca64e4fbf413776
Parents: bdb2918
Author: John D. Ament <jo...@apache.org>
Authored: Sat Jan 16 19:35:26 2016 -0500
Committer: John D. Ament <jo...@apache.org>
Committed: Sat Jan 16 19:35:26 2016 -0500
----------------------------------------------------------------------
code/api/pom.xml | 2 +-
code/core/pom.xml | 2 +-
.../etcd/internal/EtcdConfigChangeRequest.java | 24 ++++++++++----------
.../mutableconfig/ConfigChangeRequest.java | 2 +-
4 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ee35fed6/code/api/pom.xml
----------------------------------------------------------------------
diff --git a/code/api/pom.xml b/code/api/pom.xml
index 3709c41..6f77b19 100644
--- a/code/api/pom.xml
+++ b/code/api/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya</groupId>
- <artifactId>code</artifactId>
+ <artifactId>tamaya-code</artifactId>
<version>0.2-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ee35fed6/code/core/pom.xml
----------------------------------------------------------------------
diff --git a/code/core/pom.xml b/code/core/pom.xml
index 3088bd6..4a496db 100644
--- a/code/core/pom.xml
+++ b/code/core/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya</groupId>
- <artifactId>code</artifactId>
+ <artifactId>tamaya-code</artifactId>
<version>0.2-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ee35fed6/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/internal/EtcdConfigChangeRequest.java
----------------------------------------------------------------------
diff --git a/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/internal/EtcdConfigChangeRequest.java b/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/internal/EtcdConfigChangeRequest.java
index 27757ad..f3c7813 100644
--- a/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/internal/EtcdConfigChangeRequest.java
+++ b/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/internal/EtcdConfigChangeRequest.java
@@ -60,18 +60,18 @@ class EtcdConfigChangeRequest extends AbstractConfigChangeRequest{
checkClosed();
for(EtcdAccessor accessor: EtcdBackends.getEtcdBackends()){
try{
- for(String k:getRemoved()){
- Map<String,String> res = accessor.delete(k);
- if(res.get("_ERROR")!=null){
- LOG.info("Failed to remove key from etcd: " + k);
- }
- }
- for(Map.Entry<String,String> en:getProperties().entrySet()){
- Map<String,String> res = accessor.set(en.getKey(), en.getValue());
- if(res.get("_ERROR")!=null){
- LOG.info("Failed key from etcd: " + en.getKey() + "=" + en.getValue());
- }
- }
+// for(String k:getRemoved()){
+// Map<String,String> res = accessor.delete(k);
+// if(res.get("_ERROR")!=null){
+// LOG.info("Failed to remove key from etcd: " + k);
+// }
+// }
+// for(Map.Entry<String,String> en:getProperties().entrySet()){
+// Map<String,String> res = accessor.set(en.getKey(), en.getValue());
+// if(res.get("_ERROR")!=null){
+// LOG.info("Failed key from etcd: " + en.getKey() + "=" + en.getValue());
+// }
+// }
} catch(Exception e){
LOG.log(Level.FINE, "etcd access failed on " + accessor.getUrl() + ", trying next...", e);
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ee35fed6/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ConfigChangeRequest.java
----------------------------------------------------------------------
diff --git a/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ConfigChangeRequest.java b/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ConfigChangeRequest.java
index 97bc614..d1cec76 100644
--- a/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ConfigChangeRequest.java
+++ b/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ConfigChangeRequest.java
@@ -28,7 +28,7 @@ import java.util.Map;
* Hereby not all configuration entries are necessarily mutable, since some entries may be read from non
* mutable areas of configuration. Of course, it is always possible to add a mutable shadow layer on top of all
* configuration to enable whatever changes applied. The exact management and storage persistence algorithm should be
- * transparent.<br/>
+ * transparent.<br>
* As a consequence clients should first check, using the corresponding methods, if entries are to edited or removed
* actually are eligible for change/creation or removal.
*/
Re: incubator-tamaya git commit: Fixed up pom files to refer to new
module name. Commented non-working block.
Posted by "John D. Ament" <jo...@apache.org>.
Hope no one minds, I fixed up the codebase. Looks like two poms got missed
with your rename Anatole and fixed a javadoc lint error that was failing in
jenkins.
The etcd thing... I dunno, it was referring to methods not used and I
couldn't find the equivalents.
On Sat, Jan 16, 2016 at 7:33 PM <jo...@apache.org> wrote:
> Repository: incubator-tamaya
> Updated Branches:
> refs/heads/master bdb291870 -> ee35fed6e
>
>
> Fixed up pom files to refer to new module name. Commented non-working
> block.
>
>
> Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
> Commit:
> http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/ee35fed6
> Tree:
> http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/ee35fed6
> Diff:
> http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/ee35fed6
>
> Branch: refs/heads/master
> Commit: ee35fed6e85c0bb2b16be69aeca64e4fbf413776
> Parents: bdb2918
> Author: John D. Ament <jo...@apache.org>
> Authored: Sat Jan 16 19:35:26 2016 -0500
> Committer: John D. Ament <jo...@apache.org>
> Committed: Sat Jan 16 19:35:26 2016 -0500
>
> ----------------------------------------------------------------------
> code/api/pom.xml | 2 +-
> code/core/pom.xml | 2 +-
> .../etcd/internal/EtcdConfigChangeRequest.java | 24 ++++++++++----------
> .../mutableconfig/ConfigChangeRequest.java | 2 +-
> 4 files changed, 15 insertions(+), 15 deletions(-)
> ----------------------------------------------------------------------
>
>
>
> http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ee35fed6/code/api/pom.xml
> ----------------------------------------------------------------------
> diff --git a/code/api/pom.xml b/code/api/pom.xml
> index 3709c41..6f77b19 100644
> --- a/code/api/pom.xml
> +++ b/code/api/pom.xml
> @@ -21,7 +21,7 @@ under the License.
>
> <parent>
> <groupId>org.apache.tamaya</groupId>
> - <artifactId>code</artifactId>
> + <artifactId>tamaya-code</artifactId>
> <version>0.2-incubating-SNAPSHOT</version>
> <relativePath>../pom.xml</relativePath>
> </parent>
>
>
> http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ee35fed6/code/core/pom.xml
> ----------------------------------------------------------------------
> diff --git a/code/core/pom.xml b/code/core/pom.xml
> index 3088bd6..4a496db 100644
> --- a/code/core/pom.xml
> +++ b/code/core/pom.xml
> @@ -21,7 +21,7 @@ under the License.
>
> <parent>
> <groupId>org.apache.tamaya</groupId>
> - <artifactId>code</artifactId>
> + <artifactId>tamaya-code</artifactId>
> <version>0.2-incubating-SNAPSHOT</version>
> <relativePath>../pom.xml</relativePath>
> </parent>
>
>
> http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ee35fed6/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/internal/EtcdConfigChangeRequest.java
> ----------------------------------------------------------------------
> diff --git
> a/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/internal/EtcdConfigChangeRequest.java
> b/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/internal/EtcdConfigChangeRequest.java
> index 27757ad..f3c7813 100644
> ---
> a/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/internal/EtcdConfigChangeRequest.java
> +++
> b/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/internal/EtcdConfigChangeRequest.java
> @@ -60,18 +60,18 @@ class EtcdConfigChangeRequest extends
> AbstractConfigChangeRequest{
> checkClosed();
> for(EtcdAccessor accessor: EtcdBackends.getEtcdBackends()){
> try{
> - for(String k:getRemoved()){
> - Map<String,String> res = accessor.delete(k);
> - if(res.get("_ERROR")!=null){
> - LOG.info("Failed to remove key from etcd: " + k);
> - }
> - }
> - for(Map.Entry<String,String>
> en:getProperties().entrySet()){
> - Map<String,String> res = accessor.set(en.getKey(),
> en.getValue());
> - if(res.get("_ERROR")!=null){
> - LOG.info("Failed key from etcd: " + en.getKey()
> + "=" + en.getValue());
> - }
> - }
> +// for(String k:getRemoved()){
> +// Map<String,String> res = accessor.delete(k);
> +// if(res.get("_ERROR")!=null){
> +// LOG.info("Failed to remove key from etcd: " +
> k);
> +// }
> +// }
> +// for(Map.Entry<String,String>
> en:getProperties().entrySet()){
> +// Map<String,String> res = accessor.set(en.getKey(),
> en.getValue());
> +// if(res.get("_ERROR")!=null){
> +// LOG.info("Failed key from etcd: " +
> en.getKey() + "=" + en.getValue());
> +// }
> +// }
> } catch(Exception e){
> LOG.log(Level.FINE, "etcd access failed on " +
> accessor.getUrl() + ", trying next...", e);
> }
>
>
> http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ee35fed6/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ConfigChangeRequest.java
> ----------------------------------------------------------------------
> diff --git
> a/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ConfigChangeRequest.java
> b/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ConfigChangeRequest.java
> index 97bc614..d1cec76 100644
> ---
> a/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ConfigChangeRequest.java
> +++
> b/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ConfigChangeRequest.java
> @@ -28,7 +28,7 @@ import java.util.Map;
> * Hereby not all configuration entries are necessarily mutable, since
> some entries may be read from non
> * mutable areas of configuration. Of course, it is always possible to
> add a mutable shadow layer on top of all
> * configuration to enable whatever changes applied. The exact management
> and storage persistence algorithm should be
> - * transparent.<br/>
> + * transparent.<br>
> * As a consequence clients should first check, using the corresponding
> methods, if entries are to edited or removed
> * actually are eligible for change/creation or removal.
> */
>
>