[05/17] git commit: Adding license plugin - more to do
Adding license plugin - more to do Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/fe34ac57 Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/fe34ac57 Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/fe34ac57 Branch: refs/heads/master Commit: fe34ac579c89407d4c8cd0dabebeaae4f00e3b73 Parents: ac87c26 Author: randgalt Authored: Wed Mar 27 10:10:09 2013 -0700 Committer: randgalt Committed: Wed Mar 27 10:10:09 2013 -0700 -- pom.xml | 30 ++ 1 files changed, 30 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/fe34ac57/pom.xml -- diff --git a/pom.xml b/pom.xml index 1082740..c32cf56 100644 --- a/pom.xml +++ b/pom.xml @@ -408,6 +408,36 @@ + + +com.mycila.maven-license-plugin +maven-license-plugin +1.9.0 + +src/etc/header.txt + +**/.gitignore +**/DISCLAIMER +**/LICENSE.txt +**/NOTICE.txt +**/README.txt +**/CHANGES.txt +**/RELEASE-NOTES + +true + +XML_STYLE + + + + +license + +check + + + +
[02/17] git commit: more details
more details
Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/e291c91f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/e291c91f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/e291c91f
Branch: refs/heads/master
Commit: e291c91f2a577bef44fe31f27ceb7ea55d36b72d
Parents: 0d967d4
Author: randgalt
Authored: Wed Mar 27 10:09:21 2013 -0700
Committer: randgalt
Committed: Wed Mar 27 10:09:21 2013 -0700
--
src/site/confluence/committers.confluence | 14 +-
1 files changed, 5 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/e291c91f/src/site/confluence/committers.confluence
--
diff --git a/src/site/confluence/committers.confluence
b/src/site/confluence/committers.confluence
index 5a65067..ed8f496 100644
--- a/src/site/confluence/committers.confluence
+++ b/src/site/confluence/committers.confluence
@@ -1,14 +1,10 @@
h1. Information/Recipes for Curator Committers
-h2. How to Publish the Curator Website
-
-_Preparation_
+h2. Maven Settings
-* Update the Maven settings file: {{~/.m2/settings.xml}}
-** Make sure your svn login is set
-** Set a chosen directory in the default profile
-* Checkout the website svn source to the chosen directory
-** {{svn co https://svn.apache.org/repos/asf/incubator/curator/site/trunk}}
_chosen-dir_
+Your Maven settings ({{~/.m2/settings.xml}}) file should have the following
(note:
+{{curator-website-checkout-path}} is used as a temporary path when deploying
the Curator
+website):
{noformat}
@@ -38,7 +34,7 @@ _Preparation_
{noformat}
-_Publishing_
+h2. How to Publish the Curator Website
Assuming you have a clean compile/install of Curator, from the root of the
Curator directory:
[01/17] git commit: updated URL
Updated Branches: refs/heads/master dac9d2576 -> 291945788 updated URL Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/0d967d49 Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/0d967d49 Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/0d967d49 Branch: refs/heads/master Commit: 0d967d49df533c088fded1a47b6c39cd32550eb2 Parents: dac9d25 Author: randgalt Authored: Wed Mar 27 10:09:07 2013 -0700 Committer: randgalt Committed: Wed Mar 27 10:09:07 2013 -0700 -- .../src/site/confluence/index.confluence |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/0d967d49/curator-examples/src/site/confluence/index.confluence -- diff --git a/curator-examples/src/site/confluence/index.confluence b/curator-examples/src/site/confluence/index.confluence index e7f3962..680a688 100644 --- a/curator-examples/src/site/confluence/index.confluence +++ b/curator-examples/src/site/confluence/index.confluence @@ -8,4 +8,5 @@ This module contains example usages of various Curator features. Each directory |/discovery|Example usage of the Curator's ServiceDiscovery| |/framework|A few examples of how to use the CuratorFramework class| -TBD - point to the source repo for examples +See the [examples source repo|https://git-wip-us.apache.org/repos/asf?p=incubator-curator.git;a=tree;f=curator-examples/src/main/java] for each example. +
[04/17] git commit: Added committers link
Added committers link Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/ac87c26d Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/ac87c26d Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/ac87c26d Branch: refs/heads/master Commit: ac87c26d49c1ce827633a90b0473318ed518dfc2 Parents: 0c87234 Author: randgalt Authored: Wed Mar 27 10:09:54 2013 -0700 Committer: randgalt Committed: Wed Mar 27 10:09:54 2013 -0700 -- src/site/site.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/ac87c26d/src/site/site.xml -- diff --git a/src/site/site.xml b/src/site/site.xml index 474ea3b..f11ee4c 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -74,7 +74,7 @@ - +
[16/17] git commit: attempt to turn off tests when releasing
attempt to turn off tests when releasing Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/b60ffd34 Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/b60ffd34 Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/b60ffd34 Branch: refs/heads/master Commit: b60ffd34228e0061a6139de60c963c601f8321eb Parents: 23ebca6 Author: randgalt Authored: Fri Mar 29 13:44:31 2013 -0700 Committer: randgalt Committed: Fri Mar 29 13:44:31 2013 -0700 -- pom.xml |9 + 1 files changed, 9 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/b60ffd34/pom.xml -- diff --git a/pom.xml b/pom.xml index 0a289c4..ff2065f 100644 --- a/pom.xml +++ b/pom.xml @@ -437,6 +437,15 @@ + + +org.apache.maven.plugins +maven-release-plugin +2.4.1 + +-Dmaven.test.skip=true + +
[14/17] git commit: ignore DISCLAIMER.txt for licensing
ignore DISCLAIMER.txt for licensing Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/d1aab338 Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/d1aab338 Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/d1aab338 Branch: refs/heads/master Commit: d1aab3381d9325aa0700c86895bf2a65f5761d88 Parents: 699fd64 Author: randgalt Authored: Wed Mar 27 14:39:40 2013 -0700 Committer: randgalt Committed: Wed Mar 27 14:39:40 2013 -0700 -- pom.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/d1aab338/pom.xml -- diff --git a/pom.xml b/pom.xml index 5fe1a81..0a289c4 100644 --- a/pom.xml +++ b/pom.xml @@ -419,7 +419,7 @@ **/*.confluence **/.gitignore -**/DISCLAIMER +**/DISCLAIMER.txt **/LICENSE.txt **/NOTICE.txt **/README.txt
[15/17] git commit: Added a note about git config for committers
Added a note about git config for committers
Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/23ebca63
Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/23ebca63
Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/23ebca63
Branch: refs/heads/master
Commit: 23ebca63146a1187f8af1f205a8de81b52a0faf6
Parents: d1aab33
Author: randgalt
Authored: Wed Mar 27 17:01:29 2013 -0700
Committer: randgalt
Committed: Wed Mar 27 17:01:29 2013 -0700
--
src/site/confluence/committers.confluence |5 +
1 files changed, 5 insertions(+), 0 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/23ebca63/src/site/confluence/committers.confluence
--
diff --git a/src/site/confluence/committers.confluence
b/src/site/confluence/committers.confluence
index ed8f496..b3452fb 100644
--- a/src/site/confluence/committers.confluence
+++ b/src/site/confluence/committers.confluence
@@ -47,3 +47,8 @@ Have a look at the staged site and make sure it's good. Then:
{noformat}
mvn site-deploy
{noformat}
+
+h2. Git Setup
+
+Apache has a good guide on how to prepare your environment for interacting
with the Curator Git repo: [https://git-wip-us.apache.org/].
+
[13/17] git commit: updated notices added disclaimers
updated notices added disclaimers Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/699fd640 Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/699fd640 Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/699fd640 Branch: refs/heads/master Commit: 699fd640bd5aeda9f5341d2c6d935eff76036a25 Parents: d808720 Author: randgalt Authored: Wed Mar 27 14:37:47 2013 -0700 Committer: randgalt Committed: Wed Mar 27 14:37:47 2013 -0700 -- DISCLAIMER.txt| 10 ++ NOTICE.txt| 20 ++-- curator-client/DISCLAIMER.txt | 10 ++ curator-client/NOTICE.txt | 20 ++-- curator-examples/DISCLAIMER.txt | 10 ++ curator-examples/NOTICE.txt | 20 ++-- curator-framework/DISCLAIMER.txt | 10 ++ curator-framework/NOTICE.txt | 20 ++-- curator-recipes/DISCLAIMER.txt| 10 ++ curator-recipes/NOTICE.txt| 20 ++-- curator-test/DISCLAIMER.txt | 10 ++ curator-test/NOTICE.txt | 20 ++-- curator-x-discovery-server/DISCLAIMER.txt | 10 ++ curator-x-discovery-server/NOTICE.txt | 20 ++-- curator-x-discovery/DISCLAIMER.txt| 10 ++ curator-x-discovery/NOTICE.txt| 20 ++-- 16 files changed, 192 insertions(+), 48 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/699fd640/DISCLAIMER.txt -- diff --git a/DISCLAIMER.txt b/DISCLAIMER.txt new file mode 100644 index 000..7c6dc44 --- /dev/null +++ b/DISCLAIMER.txt @@ -0,0 +1,10 @@ +Apache Curator is an effort undergoing incubation at the Apache Software +Foundation (ASF), sponsored by the Incubator PMC. + +Incubation is required of all newly accepted projects until a further review +indicates that the infrastructure, communications, and decision making process +have stabilized in a manner consistent with other successful ASF projects. + +While incubation status is not necessarily a reflection of the completeness +or stability of the code, it does indicate that the project has yet to be +fully endorsed by the ASF. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/699fd640/NOTICE.txt -- diff --git a/NOTICE.txt b/NOTICE.txt index f86efb4..860ac68 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1,9 +1,17 @@ -Curator -Copyright 2011 Netflix, Inc. +Apache Curator + Copyright 2013 The Apache Software Foundation -This product includes software developed by The Apache Software -Foundation (http://www.apache.org/). + This product includes software developed at + The Apache Software Foundation (http://www.apache.org/). -Alternative collection types provided by Google Guava from -http://code.google.com/p/guava-libraries/ +Google Guava +Apache License, Version 2.0 Copyright (C) 2007 Google Inc. + +Mockito +MIT License +Copyright (c) 2007 Mockito contributors + +SLF4J +Apache License, Version 2.0 +Copyright 2004-2005 Mort Bay Consulting Pty. Ltd. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/699fd640/curator-client/DISCLAIMER.txt -- diff --git a/curator-client/DISCLAIMER.txt b/curator-client/DISCLAIMER.txt new file mode 100644 index 000..7c6dc44 --- /dev/null +++ b/curator-client/DISCLAIMER.txt @@ -0,0 +1,10 @@ +Apache Curator is an effort undergoing incubation at the Apache Software +Foundation (ASF), sponsored by the Incubator PMC. + +Incubation is required of all newly accepted projects until a further review +indicates that the infrastructure, communications, and decision making process +have stabilized in a manner consistent with other successful ASF projects. + +While incubation status is not necessarily a reflection of the completeness +or stability of the code, it does indicate that the project has yet to be +fully endorsed by the ASF. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/699fd640/curator-client/NOTICE.txt -- diff --git a/curator-client/NOTICE.txt b/curator-client/NOTICE.txt index f86efb4..860ac68 100644 --- a/curator-client/NOTICE.txt +++ b/curator-client/NOTICE.txt @@ -1,9 +1,17 @@ -Curator -Copyright 2011 Netflix, Inc. +Apache Curator + Copyright 2013 The Apache Software Foundation -This product includes software developed by The
[03/17] git commit: header text for license plugin
header text for license plugin Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/0c872342 Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/0c872342 Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/0c872342 Branch: refs/heads/master Commit: 0c872342aa575b4b25bbba8bebd0c4b6655ce32d Parents: e291c91 Author: randgalt Authored: Wed Mar 27 10:09:34 2013 -0700 Committer: randgalt Committed: Wed Mar 27 10:09:34 2013 -0700 -- src/etc/header.txt | 16 1 files changed, 16 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/0c872342/src/etc/header.txt -- diff --git a/src/etc/header.txt b/src/etc/header.txt new file mode 100644 index 000..60b675e --- /dev/null +++ b/src/etc/header.txt @@ -0,0 +1,16 @@ +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.
Git Push Summary
Updated Tags: refs/tags/curator-2.0.0 [created] 975812d7b
[17/17] git commit: [maven-release-plugin] prepare release curator-2.0.0
[maven-release-plugin] prepare release curator-2.0.0 Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/29194578 Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/29194578 Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/29194578 Branch: refs/heads/master Commit: 291945788fe26e24c6b29fe1be5cc112d914d94c Parents: b60ffd3 Author: randgalt Authored: Fri Mar 29 13:44:57 2013 -0700 Committer: randgalt Committed: Fri Mar 29 13:44:57 2013 -0700 -- curator-client/pom.xml |4 ++-- curator-examples/pom.xml |4 ++-- curator-framework/pom.xml |4 ++-- curator-recipes/pom.xml|4 ++-- curator-test/pom.xml |4 ++-- curator-x-discovery-server/pom.xml |4 ++-- curator-x-discovery/pom.xml|4 ++-- pom.xml| 16 8 files changed, 22 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/29194578/curator-client/pom.xml -- diff --git a/curator-client/pom.xml b/curator-client/pom.xml index 2af3f40..c33c362 100644 --- a/curator-client/pom.xml +++ b/curator-client/pom.xml @@ -24,12 +24,12 @@ org.apache.curator curator -2.0.0-SNAPSHOT +2.0.0 org.apache.curator curator-client -2.0.0-SNAPSHOT +2.0.0 Curator Client Low-level API http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/29194578/curator-examples/pom.xml -- diff --git a/curator-examples/pom.xml b/curator-examples/pom.xml index f16a5fa..5f592f9 100644 --- a/curator-examples/pom.xml +++ b/curator-examples/pom.xml @@ -24,12 +24,12 @@ org.apache.curator curator -2.0.0-SNAPSHOT +2.0.0 org.apache.curator curator-examples -2.0.0-SNAPSHOT +2.0.0 Curator Examples Example usages of various Curator features. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/29194578/curator-framework/pom.xml -- diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml index 3ee7ea0..1c4b678 100644 --- a/curator-framework/pom.xml +++ b/curator-framework/pom.xml @@ -24,12 +24,12 @@ org.apache.curator curator -2.0.0-SNAPSHOT +2.0.0 org.apache.curator curator-framework -2.0.0-SNAPSHOT +2.0.0 Curator Framework High-level API that greatly simplifies using ZooKeeper. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/29194578/curator-recipes/pom.xml -- diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml index 974bd91..c48c024 100644 --- a/curator-recipes/pom.xml +++ b/curator-recipes/pom.xml @@ -24,12 +24,12 @@ org.apache.curator curator -2.0.0-SNAPSHOT +2.0.0 org.apache.curator curator-recipes -2.0.0-SNAPSHOT +2.0.0 Curator Recipes All of the recipes listed on the ZooKeeper recipes doc (except two phase commit). http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/29194578/curator-test/pom.xml -- diff --git a/curator-test/pom.xml b/curator-test/pom.xml index 07b877b..83ab771 100644 --- a/curator-test/pom.xml +++ b/curator-test/pom.xml @@ -24,12 +24,12 @@ org.apache.curator curator -2.0.0-SNAPSHOT +2.0.0 org.apache.curator curator-test -2.0.0-SNAPSHOT +2.0.0 Curator Testing Unit testing utilities. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/29194578/curator-x-discovery-server/pom.xml -- diff --git a/curator-x-discovery-server/pom.xml b/curator-x-discovery-server/pom.xml index ea04d7a..4676dad 100644 --- a/curator-x-discovery-server/pom.xml +++ b/curator-x-discovery-server/pom.xml @@ -24,12 +24,12 @@ org.apache.curator curator -2.0.0-SNAPSHOT +2.0.0 org.apache.curator curator-x-discovery-server -2.0.0-SNAPSHOT +2.0.0 Curator Service Discovery Server Bridges non-Java or legacy applications with the Curator Service Discovery. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/29194578/curator-x-discovery/pom.xml -- diff --git a/curator-x
[06/17] git commit: Fixed headers
Fixed headers Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/41f02e85 Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/41f02e85 Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/41f02e85 Branch: refs/heads/master Commit: 41f02e852147138673efa4b0e8c976a30e70c908 Parents: fe34ac5 Author: randgalt Authored: Wed Mar 27 11:03:49 2013 -0700 Committer: randgalt Committed: Wed Mar 27 11:03:49 2013 -0700 -- curator-client/pom.xml | 35 +++-- curator-client/src/site/site.xml | 35 +++-- curator-examples/pom.xml | 35 +++-- curator-examples/src/site/site.xml | 35 +++-- curator-framework/pom.xml| 35 +++-- curator-framework/src/site/site.xml | 35 +++-- curator-recipes/pom.xml | 35 +++-- curator-recipes/src/site/site.xml| 35 +++-- curator-test/pom.xml | 35 +++-- curator-test/src/site/site.xml | 35 +++-- curator-x-discovery-server/pom.xml | 35 +++-- curator-x-discovery-server/src/site/site.xml | 35 +++-- curator-x-discovery/pom.xml | 35 +++-- curator-x-discovery/src/site/site.xml| 35 +++-- pom.xml | 35 +++-- src/site/site.xml| 35 +++-- 16 files changed, 288 insertions(+), 272 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/41f02e85/curator-client/pom.xml -- diff --git a/curator-client/pom.xml b/curator-client/pom.xml index eca458b..2af3f40 100644 --- a/curator-client/pom.xml +++ b/curator-client/pom.xml @@ -1,20 +1,21 @@ - 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/maven-v4_0_0.xsd";> http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/41f02e85/curator-client/src/site/site.xml -- diff --git a/curator-client/src/site/site.xml b/curator-client/src/site/site.xml index d89650c..7e8fc56 100644 --- a/curator-client/src/site/site.xml +++ b/curator-client/src/site/site.xml @@ -1,20 +1,21 @@ - http://maven.apache.org/DECORATION/1.1.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/DECORATION/1.1.0 http://maven.apache.org/xsd/decoration-1.1.0.xsd"; name="Apache Curator Client"> http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/41f02e85/curator-examples/pom.xml -- diff --git a/curator-examples/pom.xml b/curator-examples/pom.xml index b663f15..f16a5fa 100644 --- a/curator-examples/pom.xml +++ b/curator-examples/pom.xml @@ -1,20 +1,21 @@ - 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/maven-v4_0_0.xsd";> http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/41f02e85/curator-examples/src/site/site.xml -- diff --git a/curator-examples/src/site/site.xml b/curator-examples/src/site/site.xml index b7533f1..8cd07be 100644 --- a/curator-examples/src/site/site.xml +++ b/curator-examples/src/site/site.xml @@ -1,20 +1,21 @@ - http://maven.apache.org/DECORATION/1.1.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/DECORATION/1.1.0 http://maven.apache.org/xsd/decoration-1.1.0.xsd"; name="Apache Curator Examples"> http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/41f02e85/curator-framework/pom.xml -- diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml index dc36950..3ee7ea0 100644 --- a/curator-framework/pom.xml +++ b/curator-framework/pom.xml @@ -1,20 +1,21 @@ - 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
git commit: [maven-release-plugin] prepare for next development iteration
Updated Branches: refs/heads/master 291945788 -> 4f119e821 [maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/4f119e82 Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/4f119e82 Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/4f119e82 Branch: refs/heads/master Commit: 4f119e8218f3bba04e195f3029065da65d67f4f0 Parents: 2919457 Author: randgalt Authored: Fri Mar 29 13:45:07 2013 -0700 Committer: randgalt Committed: Fri Mar 29 13:45:07 2013 -0700 -- curator-client/pom.xml |4 ++-- curator-examples/pom.xml |4 ++-- curator-framework/pom.xml |4 ++-- curator-recipes/pom.xml|4 ++-- curator-test/pom.xml |4 ++-- curator-x-discovery-server/pom.xml |4 ++-- curator-x-discovery/pom.xml|4 ++-- pom.xml| 16 8 files changed, 22 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/4f119e82/curator-client/pom.xml -- diff --git a/curator-client/pom.xml b/curator-client/pom.xml index c33c362..5307076 100644 --- a/curator-client/pom.xml +++ b/curator-client/pom.xml @@ -24,12 +24,12 @@ org.apache.curator curator -2.0.0 +2.0.1-SNAPSHOT org.apache.curator curator-client -2.0.0 +2.0.1-SNAPSHOT Curator Client Low-level API http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/4f119e82/curator-examples/pom.xml -- diff --git a/curator-examples/pom.xml b/curator-examples/pom.xml index 5f592f9..2ba08b2 100644 --- a/curator-examples/pom.xml +++ b/curator-examples/pom.xml @@ -24,12 +24,12 @@ org.apache.curator curator -2.0.0 +2.0.1-SNAPSHOT org.apache.curator curator-examples -2.0.0 +2.0.1-SNAPSHOT Curator Examples Example usages of various Curator features. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/4f119e82/curator-framework/pom.xml -- diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml index 1c4b678..49903d3 100644 --- a/curator-framework/pom.xml +++ b/curator-framework/pom.xml @@ -24,12 +24,12 @@ org.apache.curator curator -2.0.0 +2.0.1-SNAPSHOT org.apache.curator curator-framework -2.0.0 +2.0.1-SNAPSHOT Curator Framework High-level API that greatly simplifies using ZooKeeper. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/4f119e82/curator-recipes/pom.xml -- diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml index c48c024..a1d7f3c 100644 --- a/curator-recipes/pom.xml +++ b/curator-recipes/pom.xml @@ -24,12 +24,12 @@ org.apache.curator curator -2.0.0 +2.0.1-SNAPSHOT org.apache.curator curator-recipes -2.0.0 +2.0.1-SNAPSHOT Curator Recipes All of the recipes listed on the ZooKeeper recipes doc (except two phase commit). http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/4f119e82/curator-test/pom.xml -- diff --git a/curator-test/pom.xml b/curator-test/pom.xml index 83ab771..fb35e51 100644 --- a/curator-test/pom.xml +++ b/curator-test/pom.xml @@ -24,12 +24,12 @@ org.apache.curator curator -2.0.0 +2.0.1-SNAPSHOT org.apache.curator curator-test -2.0.0 +2.0.1-SNAPSHOT Curator Testing Unit testing utilities. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/4f119e82/curator-x-discovery-server/pom.xml -- diff --git a/curator-x-discovery-server/pom.xml b/curator-x-discovery-server/pom.xml index 4676dad..f1fb1c8 100644 --- a/curator-x-discovery-server/pom.xml +++ b/curator-x-discovery-server/pom.xml @@ -24,12 +24,12 @@ org.apache.curator curator -2.0.0 +2.0.1-SNAPSHOT org.apache.curator curator-x-discovery-server -2.0.0 +2.0.1-SNAPSHOT Curator Service Discovery Server Bridges non-Java or legacy applications with the Curator Service Discovery. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/4f119e82/curator-x-discovery/pom.
[12/17] git commit: Apache parent v10
Apache parent v10 Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/d8087206 Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/d8087206 Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/d8087206 Branch: refs/heads/master Commit: d808720697a788744b2c8506b34ea6a88fc771f7 Parents: 2d14c58 Author: randgalt Authored: Wed Mar 27 13:37:10 2013 -0700 Committer: randgalt Committed: Wed Mar 27 13:37:10 2013 -0700 -- pom.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/d8087206/pom.xml -- diff --git a/pom.xml b/pom.xml index f176966..5fe1a81 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ org.apache apache -8 +10 org.apache.curator
[07/17] Ran the license plugin to update headers
http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/2d14c587/curator-x-discovery/src/main/java/org/apache/curator/x/discovery/ServiceType.java -- diff --git a/curator-x-discovery/src/main/java/org/apache/curator/x/discovery/ServiceType.java b/curator-x-discovery/src/main/java/org/apache/curator/x/discovery/ServiceType.java index a4af146..a919ace 100644 --- a/curator-x-discovery/src/main/java/org/apache/curator/x/discovery/ServiceType.java +++ b/curator-x-discovery/src/main/java/org/apache/curator/x/discovery/ServiceType.java @@ -1,4 +1,4 @@ -/* +/** * 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 @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.curator.x.discovery; public enum ServiceType http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/2d14c587/curator-x-discovery/src/main/java/org/apache/curator/x/discovery/UriSpec.java -- diff --git a/curator-x-discovery/src/main/java/org/apache/curator/x/discovery/UriSpec.java b/curator-x-discovery/src/main/java/org/apache/curator/x/discovery/UriSpec.java index da623b8..2cbe2fc 100644 --- a/curator-x-discovery/src/main/java/org/apache/curator/x/discovery/UriSpec.java +++ b/curator-x-discovery/src/main/java/org/apache/curator/x/discovery/UriSpec.java @@ -1,4 +1,4 @@ -/* +/** * 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 @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.curator.x.discovery; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/2d14c587/curator-x-discovery/src/main/java/org/apache/curator/x/discovery/details/InstanceProvider.java -- diff --git a/curator-x-discovery/src/main/java/org/apache/curator/x/discovery/details/InstanceProvider.java b/curator-x-discovery/src/main/java/org/apache/curator/x/discovery/details/InstanceProvider.java index 8ff089e..e1e83ec 100644 --- a/curator-x-discovery/src/main/java/org/apache/curator/x/discovery/details/InstanceProvider.java +++ b/curator-x-discovery/src/main/java/org/apache/curator/x/discovery/details/InstanceProvider.java @@ -1,4 +1,4 @@ -/* +/** * 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 @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.curator.x.discovery.details; import org.apache.curator.x.discovery.ServiceInstance; http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/2d14c587/curator-x-discovery/src/main/java/org/apache/curator/x/discovery/details/InstanceSerializer.java -- diff --git a/curator-x-discovery/src/main/java/org/apache/curator/x/discovery/details/InstanceSerializer.java b/curator-x-discovery/src/main/java/org/apache/curator/x/discovery/details/InstanceSerializer.java index 8798782..3412df7 100644 --- a/curator-x-discovery/src/main/java/org/apache/curator/x/discovery/details/InstanceSerializer.java +++ b/curator-x-discovery/src/main/java/org/apache/curator/x/discovery/details/InstanceSerializer.java @@ -1,4 +1,4 @@ -/* +/** * 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 @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.curator.x.discovery.details; import org.apache.curator.x.discovery.ServiceInstance; http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/2d14c587/curator-x-discovery/src/main/java/org/apache/curator/x/discovery/details/JsonInstanceSerializer.java -- diff --git a/curator-x-discovery/src/main/java/org/apache/curator/x/discovery/details/JsonInstanceSerializer.java b/curator-x-discovery/src/main/java/org/apache/curator/x/discovery/details/JsonInstanceSerializer.java index 882ec60..b7ddbc2 100644 --- a/curator-x-discovery/src/main/java/org/apache/curator/x/discovery/details/JsonInstanceSerializer.java +++ b/curator-x-discovery/src/main/java/org/apache/curator/x/discovery/details/JsonInstanceSerializer.java @@ -1,4 +1,4 @@ -/* +/** * Licensed to the Apache Software Fou
[1/5] git commit: turn off parallel tests
Updated Branches: refs/heads/master 4f119e821 -> 79a1c6d44 turn off parallel tests Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/895eec18 Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/895eec18 Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/895eec18 Branch: refs/heads/master Commit: 895eec18afc20803181f86a2e501de1fa5e481e6 Parents: 4f119e8 Author: randgalt Authored: Fri Mar 29 19:31:19 2013 -0700 Committer: randgalt Committed: Fri Mar 29 19:31:19 2013 -0700 -- pom.xml |1 - 1 files changed, 0 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/895eec18/pom.xml -- diff --git a/pom.xml b/pom.xml index 72c5ee0..3c5dd9e 100644 --- a/pom.xml +++ b/pom.xml @@ -339,7 +339,6 @@ 2.13 true -classes
[2/5] updated disclaimers et al per spec
http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/79a1c6d4/curator-x-discovery/LICENSE -- diff --git a/curator-x-discovery/LICENSE b/curator-x-discovery/LICENSE new file mode 100644 index 000..fd3c866 --- /dev/null +++ b/curator-x-discovery/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You +
[1/5] git commit: Added license header
Updated Branches: refs/heads/master 79a1c6d44 -> daf3518bf Added license header Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/cf018154 Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/cf018154 Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/cf018154 Branch: refs/heads/master Commit: cf0181549cab593f28473353367c2364d728a460 Parents: 79a1c6d Author: randgalt Authored: Sat Mar 30 15:22:12 2013 -0700 Committer: randgalt Committed: Sat Mar 30 15:22:12 2013 -0700 -- curator-x-discovery-server/README.txt | 19 +++ 1 files changed, 19 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/cf018154/curator-x-discovery-server/README.txt -- diff --git a/curator-x-discovery-server/README.txt b/curator-x-discovery-server/README.txt index 65d05dc..98df35f 100644 --- a/curator-x-discovery-server/README.txt +++ b/curator-x-discovery-server/README.txt @@ -1,3 +1,22 @@ + +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. + + == Service Discovery Server == A REST server for use with Curator Service Discovery. This server can be used for non-Java applications that need to participate in the Curator Service Discovery.
[4/5] git commit: Add more widgets, etc.
Add more widgets, etc. Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/d69b6336 Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/d69b6336 Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/d69b6336 Branch: refs/heads/master Commit: d69b633693435cedd0a5d2086fd2fbc1f6c95621 Parents: 0090978 Author: randgalt Authored: Sat Mar 30 16:51:16 2013 -0700 Committer: randgalt Committed: Sat Mar 30 16:51:16 2013 -0700 -- src/site/site.xml | 16 1 files changed, 16 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/d69b6336/src/site/site.xml -- diff --git a/src/site/site.xml b/src/site/site.xml index ff384b1..4d8ef9a 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -28,6 +28,22 @@ 1.3.0 + + + +apache-curator +factoids + + + + +ApacheCurator +false +false + + + + Apache Curator /images/curator-logo.png
[2/5] git commit: updated scm urls
updated scm urls Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/0658b3cc Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/0658b3cc Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/0658b3cc Branch: refs/heads/master Commit: 0658b3cc608b21e9ad6a2c47af092cd93bc42713 Parents: cf01815 Author: randgalt Authored: Sat Mar 30 15:44:21 2013 -0700 Committer: randgalt Committed: Sat Mar 30 15:44:21 2013 -0700 -- pom.xml |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/0658b3cc/pom.xml -- diff --git a/pom.xml b/pom.xml index 9bd1e84..e076bd6 100644 --- a/pom.xml +++ b/pom.xml @@ -60,8 +60,8 @@ https://git-wip-us.apache.org/repos/asf?p=incubator-curator.git - scm:git:https://git-wip-us.apache.org/repos/asf/incubator-curator.git - scm:git:https://git-wip-us.apache.org/repos/asf/incubator-curator.git + scm:git://git-wip-us.apache.org/repos/asf/incubator-curator.git + scm:git://git-wip-us.apache.org/repos/asf/incubator-curator.git HEAD
[3/5] git commit: updated scm urls
updated scm urls Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/00909780 Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/00909780 Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/00909780 Branch: refs/heads/master Commit: 009097800f86708c2cb6d04a1001e1bf06aa7eb0 Parents: 0658b3c Author: randgalt Authored: Sat Mar 30 15:45:35 2013 -0700 Committer: randgalt Committed: Sat Mar 30 15:45:35 2013 -0700 -- pom.xml |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/00909780/pom.xml -- diff --git a/pom.xml b/pom.xml index e076bd6..4db1d24 100644 --- a/pom.xml +++ b/pom.xml @@ -60,8 +60,8 @@ https://git-wip-us.apache.org/repos/asf?p=incubator-curator.git - scm:git://git-wip-us.apache.org/repos/asf/incubator-curator.git - scm:git://git-wip-us.apache.org/repos/asf/incubator-curator.git + scm:https://git-wip-us.apache.org/repos/asf/incubator-curator.git + scm:https://git-wip-us.apache.org/repos/asf/incubator-curator.git HEAD
[5/5] git commit: wip
wip
Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/daf3518b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/daf3518b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/daf3518b
Branch: refs/heads/master
Commit: daf3518bf0dbe336e01cf7c6bcfbd9e423ac729e
Parents: d69b633
Author: randgalt
Authored: Sat Mar 30 20:38:41 2013 -0700
Committer: randgalt
Committed: Sat Mar 30 20:38:41 2013 -0700
--
src/site/confluence/committers.confluence |7 +++
1 files changed, 7 insertions(+), 0 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/daf3518b/src/site/confluence/committers.confluence
--
diff --git a/src/site/confluence/committers.confluence
b/src/site/confluence/committers.confluence
index b3452fb..ddd57a5 100644
--- a/src/site/confluence/committers.confluence
+++ b/src/site/confluence/committers.confluence
@@ -1,5 +1,10 @@
h1. Information/Recipes for Curator Committers
+* [Maven Settings|#maven-settings]
+* [How to Publish the Curator Website|#publish-website]
+* [Git Setup|#git-setup]
+
+{anchor:maven-settings}
h2. Maven Settings
Your Maven settings ({{~/.m2/settings.xml}}) file should have the following
(note:
@@ -34,6 +39,7 @@ website):
{noformat}
+{anchor:publish-website}
h2. How to Publish the Curator Website
Assuming you have a clean compile/install of Curator, from the root of the
Curator directory:
@@ -48,6 +54,7 @@ Have a look at the staged site and make sure it's good. Then:
mvn site-deploy
{noformat}
+{anchor:git-setup}
h2. Git Setup
Apache has a good guide on how to prepare your environment for interacting
with the Curator Git repo: [https://git-wip-us.apache.org/].
git commit: Recipe/todo list for releases
Updated Branches:
refs/heads/master daf3518bf -> 17d844b56
Recipe/todo list for releases
Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/17d844b5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/17d844b5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/17d844b5
Branch: refs/heads/master
Commit: 17d844b5638d8e6b7eed3c337c6d3ec3381b2421
Parents: daf3518
Author: randgalt
Authored: Sat Apr 6 16:33:43 2013 -0500
Committer: randgalt
Committed: Sat Apr 6 16:33:43 2013 -0500
--
src/site/confluence/committers.confluence | 114 ++-
src/site/confluence/email-examples.confluence | 54 +
2 files changed, 162 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/17d844b5/src/site/confluence/committers.confluence
--
diff --git a/src/site/confluence/committers.confluence
b/src/site/confluence/committers.confluence
index ddd57a5..4d4da08 100644
--- a/src/site/confluence/committers.confluence
+++ b/src/site/confluence/committers.confluence
@@ -1,9 +1,34 @@
h1. Information/Recipes for Curator Committers
+*Tools/Preparation*
+* [Tools|#tool-chain]
+* [GPG|#gpg]
* [Maven Settings|#maven-settings]
-* [How to Publish the Curator Website|#publish-website]
* [Git Setup|#git-setup]
+*Development*
+* [GitHub Flow|#github-flow]
+* [Jira|#use-jira]
+* [Maven Checks|maven-checks]
+
+*Release/Publishing*
+* [Prepare for Release|#release-prepare]
+* [Perform the Release|#release-perform]
+* [Vote On the Release|#release-vote]
+* [Promote the Release|#release-promote]
+* [How to Publish the Curator Website|#publish-website]
+
+{anchor:tool-chain}
+h2. Tools
+Curator is built using Maven and Git. You should be familiar with both of
these tools. For publishing,
+you also need to install GPG and create a key that is available from a well
known public site.
+
+{anchor:gpg}
+h2. GPG
+Download GPG from [http://www.gnupg.org/download/]. Then, follow the steps
described
+here,
[http://www.sonatype.com/people/2010/01/how-to-generate-pgp-signatures-with-maven/],
to
+*Generate a Key Pair* and *Distribute Your Public Key*.
+
{anchor:maven-settings}
h2. Maven Settings
@@ -29,6 +54,7 @@ website):
...
path-goes-here
+ id-of-your-pgp-key
...
...
@@ -39,6 +65,87 @@ website):
{noformat}
+{anchor:git-setup}
+h2. Git Setup
+
+Apache has a good guide on how to prepare your environment for interacting
with the Curator Git repo: [https://git-wip-us.apache.org/].
+
+
+
+h2. Development
+
+{anchor:github-flow}
+h3. GitHub Flow
+
+Curator loosely uses [GitHub
Flow|http://scottchacon.com/2011/08/31/github-flow.html]. The short form of
GitHub Flow is:
+
+* Anything in the master branch is deployable
+* To work on something new, create a descriptively named branch off of master
(ie: new-oauth2-scopes)
+* Commit to that branch locally and regularly push your work to the same named
branch on the server
+* When you need feedback or help, or you think the branch is ready for
merging, send a pull request
+* After someone else has reviewed and signed off on the feature, you can merge
it into master
+* Once it is merged and pushed to 'master', you can and should deploy
immediately
+
+{anchor:use-jira}
+h3. Jira
+
+For all but minor changes, there should be a Jira "ticket" created at
[https://issues.apache.org/jira/browse/CURATOR].
+
+{anchor:maven-checks}
+h3. Maven Checks
+Regardless of which IDE you use, you should periodically perform a {{mvn clean
install}} to validate that the various configured checks (such as license
headers,
+etc.) are passing as well as the unit tests.
+
+
+
+{anchor:release-prepare}
+h2. Prepare the Release
+
+# Do a dry run of the release/prepare step by executing {{mvn release:prepare
-DdryRun=true}}. The dry run will not commit any changes back to Git and gives
you the opportunity to verify that the release process will complete
+as expected. If you need to cancel, execute {{mvn release:clean}} and then
reset via {{git reset --hard}}.
+# Verify that the release process completed as expected:
+** The release plugin will create {{pom.xml.tag}} files which contain the
changes that would have been committed to SVN. The only differences between
{{pom.xml.tag}}
+and its corresponding {{pom.xml}} file should be the version number.
+** If other formatting changes have been made you should review the changes
and then commit and push them.
+** Once any failures or required updates have been committed to svn, rollback
the release prepare files: {{mvn release:ro
[4/5] git commit: updated scm settings
updated scm settings Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/bf1ec60b Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/bf1ec60b Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/bf1ec60b Branch: refs/heads/master Commit: bf1ec60b0e54ce6f6701942f92d39fb84f919276 Parents: b34f5d9 Author: randgalt Authored: Sun Apr 21 09:35:13 2013 -0700 Committer: randgalt Committed: Sun Apr 21 09:35:13 2013 -0700 -- pom.xml |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/bf1ec60b/pom.xml -- diff --git a/pom.xml b/pom.xml index 1d17e82..8468d85 100644 --- a/pom.xml +++ b/pom.xml @@ -60,8 +60,8 @@ https://git-wip-us.apache.org/repos/asf?p=incubator-curator.git - scm:https://git-wip-us.apache.org/repos/asf/incubator-curator.git - scm:https://git-wip-us.apache.org/repos/asf/incubator-curator.git + scm:git:https://git-wip-us.apache.org/repos/asf/incubator-curator.git + scm:git:https://git-wip-us.apache.org/repos/asf/incubator-curator.git HEAD
[3/5] git commit: Renamed parent project to Apache Curator
Renamed parent project to Apache Curator Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/b34f5d9d Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/b34f5d9d Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/b34f5d9d Branch: refs/heads/master Commit: b34f5d9d9108263ab9367599d13de92858d257b0 Parents: ba578d1 Author: randgalt Authored: Fri Apr 19 17:50:57 2013 -0700 Committer: randgalt Committed: Fri Apr 19 17:50:57 2013 -0700 -- curator-client/pom.xml |2 +- curator-examples/pom.xml |2 +- curator-framework/pom.xml |2 +- curator-recipes/pom.xml|2 +- curator-test/pom.xml |2 +- curator-x-discovery-server/pom.xml |2 +- curator-x-discovery/pom.xml|2 +- pom.xml|2 +- 8 files changed, 8 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/b34f5d9d/curator-client/pom.xml -- diff --git a/curator-client/pom.xml b/curator-client/pom.xml index 5307076..f729e69 100644 --- a/curator-client/pom.xml +++ b/curator-client/pom.xml @@ -23,7 +23,7 @@ org.apache.curator -curator +apache-curator 2.0.1-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/b34f5d9d/curator-examples/pom.xml -- diff --git a/curator-examples/pom.xml b/curator-examples/pom.xml index 2ba08b2..7f5acaf 100644 --- a/curator-examples/pom.xml +++ b/curator-examples/pom.xml @@ -23,7 +23,7 @@ org.apache.curator -curator +apache-curator 2.0.1-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/b34f5d9d/curator-framework/pom.xml -- diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml index 49903d3..0cb6a9d 100644 --- a/curator-framework/pom.xml +++ b/curator-framework/pom.xml @@ -23,7 +23,7 @@ org.apache.curator -curator +apache-curator 2.0.1-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/b34f5d9d/curator-recipes/pom.xml -- diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml index a1d7f3c..43f3fcb 100644 --- a/curator-recipes/pom.xml +++ b/curator-recipes/pom.xml @@ -23,7 +23,7 @@ org.apache.curator -curator +apache-curator 2.0.1-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/b34f5d9d/curator-test/pom.xml -- diff --git a/curator-test/pom.xml b/curator-test/pom.xml index fb35e51..33f2911 100644 --- a/curator-test/pom.xml +++ b/curator-test/pom.xml @@ -23,7 +23,7 @@ org.apache.curator -curator +apache-curator 2.0.1-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/b34f5d9d/curator-x-discovery-server/pom.xml -- diff --git a/curator-x-discovery-server/pom.xml b/curator-x-discovery-server/pom.xml index f1fb1c8..bda44d9 100644 --- a/curator-x-discovery-server/pom.xml +++ b/curator-x-discovery-server/pom.xml @@ -23,7 +23,7 @@ org.apache.curator -curator +apache-curator 2.0.1-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/b34f5d9d/curator-x-discovery/pom.xml -- diff --git a/curator-x-discovery/pom.xml b/curator-x-discovery/pom.xml index 7621f9e..97dddc8 100644 --- a/curator-x-discovery/pom.xml +++ b/curator-x-discovery/pom.xml @@ -23,7 +23,7 @@ org.apache.curator -curator +apache-curator 2.0.1-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/b34f5d9d/pom.xml -- diff --git a/pom.xml b/pom.xml index 4db1d24..1d17e82 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.apache.curator -curator +apache-curator 2.0.1-SNAPSHOT pom
[5/5] git commit: [maven-release-plugin] prepare release apache-curator-2.0.1
[maven-release-plugin] prepare release apache-curator-2.0.1 Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/74975f2b Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/74975f2b Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/74975f2b Branch: refs/heads/master Commit: 74975f2b8c11b3d101b66b3545fd191dc0b2a762 Parents: bf1ec60 Author: randgalt Authored: Mon Apr 22 10:46:12 2013 -0700 Committer: randgalt Committed: Mon Apr 22 10:46:12 2013 -0700 -- curator-client/pom.xml |4 ++-- curator-examples/pom.xml |4 ++-- curator-framework/pom.xml |4 ++-- curator-recipes/pom.xml|4 ++-- curator-test/pom.xml |4 ++-- curator-x-discovery-server/pom.xml |4 ++-- curator-x-discovery/pom.xml|4 ++-- pom.xml| 16 8 files changed, 22 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/74975f2b/curator-client/pom.xml -- diff --git a/curator-client/pom.xml b/curator-client/pom.xml index f729e69..90b88dc 100644 --- a/curator-client/pom.xml +++ b/curator-client/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.1-SNAPSHOT +2.0.1 org.apache.curator curator-client -2.0.1-SNAPSHOT +2.0.1 Curator Client Low-level API http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/74975f2b/curator-examples/pom.xml -- diff --git a/curator-examples/pom.xml b/curator-examples/pom.xml index 7f5acaf..695c6b7 100644 --- a/curator-examples/pom.xml +++ b/curator-examples/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.1-SNAPSHOT +2.0.1 org.apache.curator curator-examples -2.0.1-SNAPSHOT +2.0.1 Curator Examples Example usages of various Curator features. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/74975f2b/curator-framework/pom.xml -- diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml index 0cb6a9d..ba7f574 100644 --- a/curator-framework/pom.xml +++ b/curator-framework/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.1-SNAPSHOT +2.0.1 org.apache.curator curator-framework -2.0.1-SNAPSHOT +2.0.1 Curator Framework High-level API that greatly simplifies using ZooKeeper. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/74975f2b/curator-recipes/pom.xml -- diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml index 43f3fcb..44ea24a 100644 --- a/curator-recipes/pom.xml +++ b/curator-recipes/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.1-SNAPSHOT +2.0.1 org.apache.curator curator-recipes -2.0.1-SNAPSHOT +2.0.1 Curator Recipes All of the recipes listed on the ZooKeeper recipes doc (except two phase commit). http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/74975f2b/curator-test/pom.xml -- diff --git a/curator-test/pom.xml b/curator-test/pom.xml index 33f2911..454dd74 100644 --- a/curator-test/pom.xml +++ b/curator-test/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.1-SNAPSHOT +2.0.1 org.apache.curator curator-test -2.0.1-SNAPSHOT +2.0.1 Curator Testing Unit testing utilities. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/74975f2b/curator-x-discovery-server/pom.xml -- diff --git a/curator-x-discovery-server/pom.xml b/curator-x-discovery-server/pom.xml index bda44d9..0ae3fa3 100644 --- a/curator-x-discovery-server/pom.xml +++ b/curator-x-discovery-server/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.1-SNAPSHOT +2.0.1 org.apache.curator curator-x-discovery-server -2.0.1-SNAPSHOT +2.0.1 Curator Service Discovery Server Bridges non-Java or legacy applications with the Curator Service Discovery. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/74975f2b/curator-x-discovery/pom.xml
Git Push Summary
Updated Tags: refs/tags/apache-curator-2.0.1 [created] 69d02a865
[1/5] git commit: updated
Updated Branches: refs/heads/master 17d844b56 -> 74975f2b8 updated Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/cfc3afb2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/cfc3afb2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/cfc3afb2 Branch: refs/heads/master Commit: cfc3afb25d40ae57d8b205063832b6948eb51465 Parents: 17d844b Author: randgalt Authored: Mon Apr 15 22:36:51 2013 -0500 Committer: randgalt Committed: Mon Apr 15 22:36:51 2013 -0500 -- src/site/confluence/contributions.confluence |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/cfc3afb2/src/site/confluence/contributions.confluence -- diff --git a/src/site/confluence/contributions.confluence b/src/site/confluence/contributions.confluence index c850a2f..362ebf7 100644 --- a/src/site/confluence/contributions.confluence +++ b/src/site/confluence/contributions.confluence @@ -7,3 +7,6 @@ Curator is being extended by third parties. Here are some of the extensions: ||Bazaarvoice|| |Helpers that extend the functionality of Curator: [[https://github.com/bazaarvoice/curator-extensions]]| + +||Rackspace|| +|Service Registry Bindings for Netflix Curator: [[http://devops.rackspace.com/service-registry-curator-bindings.html]]|
[2/5] git commit: updated
updated
Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/ba578d1b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/ba578d1b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/ba578d1b
Branch: refs/heads/master
Commit: ba578d1bd1c2b35a99307e256acbf258c3241744
Parents: cfc3afb
Author: randgalt
Authored: Fri Apr 19 16:04:23 2013 -0700
Committer: randgalt
Committed: Fri Apr 19 16:04:23 2013 -0700
--
src/site/confluence/committers.confluence |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/ba578d1b/src/site/confluence/committers.confluence
--
diff --git a/src/site/confluence/committers.confluence
b/src/site/confluence/committers.confluence
index 4d4da08..1fb369c 100644
--- a/src/site/confluence/committers.confluence
+++ b/src/site/confluence/committers.confluence
@@ -125,7 +125,7 @@ h2. Perform the Release
{anchor:release-vote}
h2. Initiate a Vote On the Release
-# Create a VOTE email thread on
[@dev|mailto:d...@curator.incubator.apache.org] to record votes as replies (see
[Example Emails|email-examples.html]).
+# Create a VOTE email thread on d...@curator.incubator.apache.org to record
votes as replies (see [Example Emails|email-examples.html]).
# If the Vote succeeds, you can then promote the release:
** At [https://repository.apache.org] select the curator repo and click the
"Release" button.
** More TBD
git commit: [maven-release-plugin] prepare for next development iteration
Updated Branches: refs/heads/master 74975f2b8 -> 1df5fd0ce [maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/1df5fd0c Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/1df5fd0c Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/1df5fd0c Branch: refs/heads/master Commit: 1df5fd0ce5553270b3dcb42b5d2026eaadfffa5d Parents: 74975f2 Author: randgalt Authored: Mon Apr 22 10:46:18 2013 -0700 Committer: randgalt Committed: Mon Apr 22 10:46:18 2013 -0700 -- curator-client/pom.xml |4 ++-- curator-examples/pom.xml |4 ++-- curator-framework/pom.xml |4 ++-- curator-recipes/pom.xml|4 ++-- curator-test/pom.xml |4 ++-- curator-x-discovery-server/pom.xml |4 ++-- curator-x-discovery/pom.xml|4 ++-- pom.xml| 16 8 files changed, 22 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/1df5fd0c/curator-client/pom.xml -- diff --git a/curator-client/pom.xml b/curator-client/pom.xml index 90b88dc..f10d083 100644 --- a/curator-client/pom.xml +++ b/curator-client/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.1 +2.0.2-SNAPSHOT org.apache.curator curator-client -2.0.1 +2.0.2-SNAPSHOT Curator Client Low-level API http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/1df5fd0c/curator-examples/pom.xml -- diff --git a/curator-examples/pom.xml b/curator-examples/pom.xml index 695c6b7..1cc0865 100644 --- a/curator-examples/pom.xml +++ b/curator-examples/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.1 +2.0.2-SNAPSHOT org.apache.curator curator-examples -2.0.1 +2.0.2-SNAPSHOT Curator Examples Example usages of various Curator features. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/1df5fd0c/curator-framework/pom.xml -- diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml index ba7f574..a71b993 100644 --- a/curator-framework/pom.xml +++ b/curator-framework/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.1 +2.0.2-SNAPSHOT org.apache.curator curator-framework -2.0.1 +2.0.2-SNAPSHOT Curator Framework High-level API that greatly simplifies using ZooKeeper. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/1df5fd0c/curator-recipes/pom.xml -- diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml index 44ea24a..4c35fab 100644 --- a/curator-recipes/pom.xml +++ b/curator-recipes/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.1 +2.0.2-SNAPSHOT org.apache.curator curator-recipes -2.0.1 +2.0.2-SNAPSHOT Curator Recipes All of the recipes listed on the ZooKeeper recipes doc (except two phase commit). http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/1df5fd0c/curator-test/pom.xml -- diff --git a/curator-test/pom.xml b/curator-test/pom.xml index 454dd74..bc7eff4 100644 --- a/curator-test/pom.xml +++ b/curator-test/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.1 +2.0.2-SNAPSHOT org.apache.curator curator-test -2.0.1 +2.0.2-SNAPSHOT Curator Testing Unit testing utilities. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/1df5fd0c/curator-x-discovery-server/pom.xml -- diff --git a/curator-x-discovery-server/pom.xml b/curator-x-discovery-server/pom.xml index 0ae3fa3..b46ae26 100644 --- a/curator-x-discovery-server/pom.xml +++ b/curator-x-discovery-server/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.1 +2.0.2-SNAPSHOT org.apache.curator curator-x-discovery-server -2.0.1 +2.0.2-SNAPSHOT Curator Service Discovery Server Bridges non-Java or legacy applications with the Curator Service Discovery. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/1df5fd0c/curato
git commit: 2.0.0-incubating-SNAPSHOT
Updated Branches: refs/heads/master 1df5fd0ce -> 8a77e57c8 2.0.0-incubating-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/8a77e57c Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/8a77e57c Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/8a77e57c Branch: refs/heads/master Commit: 8a77e57c819810e4e1be3d8c425f815f8062b764 Parents: 1df5fd0 Author: randgalt Authored: Mon Apr 22 14:44:48 2013 -0700 Committer: randgalt Committed: Mon Apr 22 14:44:48 2013 -0700 -- curator-client/pom.xml |4 ++-- curator-examples/pom.xml |4 ++-- curator-framework/pom.xml |4 ++-- curator-recipes/pom.xml|4 ++-- curator-test/pom.xml |4 ++-- curator-x-discovery-server/pom.xml |4 ++-- curator-x-discovery/pom.xml|4 ++-- pom.xml| 14 +++--- 8 files changed, 21 insertions(+), 21 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/8a77e57c/curator-client/pom.xml -- diff --git a/curator-client/pom.xml b/curator-client/pom.xml index f10d083..c3d463a 100644 --- a/curator-client/pom.xml +++ b/curator-client/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.2-SNAPSHOT +2.0.0-incubating-SNAPSHOT org.apache.curator curator-client -2.0.2-SNAPSHOT +2.0.0-incubating-SNAPSHOT Curator Client Low-level API http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/8a77e57c/curator-examples/pom.xml -- diff --git a/curator-examples/pom.xml b/curator-examples/pom.xml index 1cc0865..92e3f0f 100644 --- a/curator-examples/pom.xml +++ b/curator-examples/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.2-SNAPSHOT +2.0.0-incubating-SNAPSHOT org.apache.curator curator-examples -2.0.2-SNAPSHOT +2.0.0-incubating-SNAPSHOT Curator Examples Example usages of various Curator features. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/8a77e57c/curator-framework/pom.xml -- diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml index a71b993..7313a77 100644 --- a/curator-framework/pom.xml +++ b/curator-framework/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.2-SNAPSHOT +2.0.0-incubating-SNAPSHOT org.apache.curator curator-framework -2.0.2-SNAPSHOT +2.0.0-incubating-SNAPSHOT Curator Framework High-level API that greatly simplifies using ZooKeeper. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/8a77e57c/curator-recipes/pom.xml -- diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml index 4c35fab..fa16d44 100644 --- a/curator-recipes/pom.xml +++ b/curator-recipes/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.2-SNAPSHOT +2.0.0-incubating-SNAPSHOT org.apache.curator curator-recipes -2.0.2-SNAPSHOT +2.0.0-incubating-SNAPSHOT Curator Recipes All of the recipes listed on the ZooKeeper recipes doc (except two phase commit). http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/8a77e57c/curator-test/pom.xml -- diff --git a/curator-test/pom.xml b/curator-test/pom.xml index bc7eff4..56eefe3 100644 --- a/curator-test/pom.xml +++ b/curator-test/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.2-SNAPSHOT +2.0.0-incubating-SNAPSHOT org.apache.curator curator-test -2.0.2-SNAPSHOT +2.0.0-incubating-SNAPSHOT Curator Testing Unit testing utilities. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/8a77e57c/curator-x-discovery-server/pom.xml -- diff --git a/curator-x-discovery-server/pom.xml b/curator-x-discovery-server/pom.xml index b46ae26..c6ea85a 100644 --- a/curator-x-discovery-server/pom.xml +++ b/curator-x-discovery-server/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.2-SNAPSHOT +2.0.0-incubating-SNAPSHOT org.apache.curator curator-x-discovery-server -2.0.2-SNAPSHOT +2.0.0-incubating-SNAPS
git commit: moved some pages to the wiki
Updated Branches:
refs/heads/master 8a77e57c8 -> bd79f9f68
moved some pages to the wiki
Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/bd79f9f6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/bd79f9f6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/bd79f9f6
Branch: refs/heads/master
Commit: bd79f9f68050bd24e6dd370fdda971754887867d
Parents: 8a77e57
Author: randgalt
Authored: Wed Apr 24 12:05:06 2013 -0700
Committer: randgalt
Committed: Wed Apr 24 12:05:06 2013 -0700
--
src/site/confluence/committers.confluence | 163
src/site/confluence/email-examples.confluence | 54 ---
src/site/site.xml |3 +-
3 files changed, 2 insertions(+), 218 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/bd79f9f6/src/site/confluence/committers.confluence
--
diff --git a/src/site/confluence/committers.confluence
b/src/site/confluence/committers.confluence
deleted file mode 100644
index 1fb369c..000
--- a/src/site/confluence/committers.confluence
+++ /dev/null
@@ -1,163 +0,0 @@
-h1. Information/Recipes for Curator Committers
-
-*Tools/Preparation*
-* [Tools|#tool-chain]
-* [GPG|#gpg]
-* [Maven Settings|#maven-settings]
-* [Git Setup|#git-setup]
-
-*Development*
-* [GitHub Flow|#github-flow]
-* [Jira|#use-jira]
-* [Maven Checks|maven-checks]
-
-*Release/Publishing*
-* [Prepare for Release|#release-prepare]
-* [Perform the Release|#release-perform]
-* [Vote On the Release|#release-vote]
-* [Promote the Release|#release-promote]
-* [How to Publish the Curator Website|#publish-website]
-
-{anchor:tool-chain}
-h2. Tools
-Curator is built using Maven and Git. You should be familiar with both of
these tools. For publishing,
-you also need to install GPG and create a key that is available from a well
known public site.
-
-{anchor:gpg}
-h2. GPG
-Download GPG from [http://www.gnupg.org/download/]. Then, follow the steps
described
-here,
[http://www.sonatype.com/people/2010/01/how-to-generate-pgp-signatures-with-maven/],
to
-*Generate a Key Pair* and *Distribute Your Public Key*.
-
-{anchor:maven-settings}
-h2. Maven Settings
-
-Your Maven settings ({{~/.m2/settings.xml}}) file should have the following
(note:
-{{curator-website-checkout-path}} is used as a temporary path when deploying
the Curator
-website):
-
-{noformat}
-
-...
-
-...
-
-apache.website.svnpub
-Your Apache Username
-${user.home}/.ssh/id_rsa
-
-...
-
-
-
-
-
-...
-
path-goes-here
- id-of-your-pgp-key
-...
-
-...
-
-...
-
-...
-
-{noformat}
-
-{anchor:git-setup}
-h2. Git Setup
-
-Apache has a good guide on how to prepare your environment for interacting
with the Curator Git repo: [https://git-wip-us.apache.org/].
-
-
-
-h2. Development
-
-{anchor:github-flow}
-h3. GitHub Flow
-
-Curator loosely uses [GitHub
Flow|http://scottchacon.com/2011/08/31/github-flow.html]. The short form of
GitHub Flow is:
-
-* Anything in the master branch is deployable
-* To work on something new, create a descriptively named branch off of master
(ie: new-oauth2-scopes)
-* Commit to that branch locally and regularly push your work to the same named
branch on the server
-* When you need feedback or help, or you think the branch is ready for
merging, send a pull request
-* After someone else has reviewed and signed off on the feature, you can merge
it into master
-* Once it is merged and pushed to 'master', you can and should deploy
immediately
-
-{anchor:use-jira}
-h3. Jira
-
-For all but minor changes, there should be a Jira "ticket" created at
[https://issues.apache.org/jira/browse/CURATOR].
-
-{anchor:maven-checks}
-h3. Maven Checks
-Regardless of which IDE you use, you should periodically perform a {{mvn clean
install}} to validate that the various configured checks (such as license
headers,
-etc.) are passing as well as the unit tests.
-
-
-
-{anchor:release-prepare}
-h2. Prepare the Release
-
-# Do a dry run of the release/prepare step by executing {{mvn release:prepare
-DdryRun=true}}. The dry run will not commit any changes back to Git and gives
you the opportunity to verify that the release process will complete
-as expected. If you need to cancel, execute {{mvn release:clean}} and then
reset via {{git reset --hard}}.
-# Verify that the release process completed as expected:
-** The release plugin will create {{pom.xml.tag}} files which contain the
changes that would have been com
svn commit: r1471601 [12/32] - in /incubator/curator/site/trunk: ./ apidocs/ apidocs/cache/ apidocs/cache/class-use/ apidocs/discovery/ apidocs/discovery/class-use/ apidocs/framework/ apidocs/framewor
Modified:
incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/entity/class-use/JsonServiceInstancesMarshaller.html
URL:
http://svn.apache.org/viewvc/incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/entity/class-use/JsonServiceInstancesMarshaller.html?rev=1471601&r1=1471600&r2=1471601&view=diff
==
---
incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/entity/class-use/JsonServiceInstancesMarshaller.html
(original)
+++
incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/entity/class-use/JsonServiceInstancesMarshaller.html
Wed Apr 24 19:11:01 2013
@@ -2,13 +2,13 @@
-
+
-Uses of Class
org.apache.curator.x.discovery.server.entity.JsonServiceInstancesMarshaller
(Apache Curator 2.0.1-SNAPSHOT API)
+Uses of Class
org.apache.curator.x.discovery.server.entity.JsonServiceInstancesMarshaller
(Apache Curator 2.0.0-incubating-SNAPSHOT API)
-
+
@@ -16,7 +16,7 @@ Uses of Class org.apache.curator.x.disco
function windowTitle()
{
if (location.href.indexOf('is-external=true') == -1) {
-parent.document.title="Uses of Class
org.apache.curator.x.discovery.server.entity.JsonServiceInstancesMarshaller
(Apache Curator 2.0.1-SNAPSHOT API)";
+parent.document.title="Uses of Class
org.apache.curator.x.discovery.server.entity.JsonServiceInstancesMarshaller
(Apache Curator 2.0.0-incubating-SNAPSHOT API)";
}
}
Modified:
incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/entity/class-use/JsonServiceNamesMarshaller.html
URL:
http://svn.apache.org/viewvc/incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/entity/class-use/JsonServiceNamesMarshaller.html?rev=1471601&r1=1471600&r2=1471601&view=diff
==
---
incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/entity/class-use/JsonServiceNamesMarshaller.html
(original)
+++
incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/entity/class-use/JsonServiceNamesMarshaller.html
Wed Apr 24 19:11:01 2013
@@ -2,13 +2,13 @@
-
+
-Uses of Class
org.apache.curator.x.discovery.server.entity.JsonServiceNamesMarshaller (Apache
Curator 2.0.1-SNAPSHOT API)
+Uses of Class
org.apache.curator.x.discovery.server.entity.JsonServiceNamesMarshaller (Apache
Curator 2.0.0-incubating-SNAPSHOT API)
-
+
@@ -16,7 +16,7 @@ Uses of Class org.apache.curator.x.disco
function windowTitle()
{
if (location.href.indexOf('is-external=true') == -1) {
-parent.document.title="Uses of Class
org.apache.curator.x.discovery.server.entity.JsonServiceNamesMarshaller (Apache
Curator 2.0.1-SNAPSHOT API)";
+parent.document.title="Uses of Class
org.apache.curator.x.discovery.server.entity.JsonServiceNamesMarshaller (Apache
Curator 2.0.0-incubating-SNAPSHOT API)";
}
}
Modified:
incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/entity/class-use/ServiceInstances.html
URL:
http://svn.apache.org/viewvc/incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/entity/class-use/ServiceInstances.html?rev=1471601&r1=1471600&r2=1471601&view=diff
==
---
incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/entity/class-use/ServiceInstances.html
(original)
+++
incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/entity/class-use/ServiceInstances.html
Wed Apr 24 19:11:01 2013
@@ -2,13 +2,13 @@
-
+
-Uses of Class org.apache.curator.x.discovery.server.entity.ServiceInstances
(Apache Curator 2.0.1-SNAPSHOT API)
+Uses of Class org.apache.curator.x.discovery.server.entity.ServiceInstances
(Apache Curator 2.0.0-incubating-SNAPSHOT API)
-
+
@@ -16,7 +16,7 @@ Uses of Class org.apache.curator.x.disco
function windowTitle()
{
if (location.href.indexOf('is-external=true') == -1) {
-parent.document.title="Uses of Class
org.apache.curator.x.discovery.server.entity.ServiceInstances (Apache Curator
2.0.1-SNAPSHOT API)";
+parent.document.title="Uses of Class
org.apache.curator.x.discovery.server.entity.ServiceInstances (Apache Curator
2.0.0-incubating-SNAPSHOT API)";
}
}
Modified:
incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/entity/class-use/ServiceNames.html
URL:
http://svn.apache.org/viewvc/incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/entity/class-use/ServiceNames.html?rev=1471601&r1=1471600&r2=1471601&view=diff
==
---
incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/entity/class-use/ServiceNames.html
(original)
+++
incubator/
git commit: moved some more pages to the wiki
Updated Branches: refs/heads/master bd79f9f68 -> eee5bd4c7 moved some more pages to the wiki Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/eee5bd4c Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/eee5bd4c Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/eee5bd4c Branch: refs/heads/master Commit: eee5bd4c7d81a433b1f2f0f10575c1bba7580940 Parents: bd79f9f Author: randgalt Authored: Wed Apr 24 12:53:04 2013 -0700 Committer: randgalt Committed: Wed Apr 24 12:53:04 2013 -0700 -- .../confluence/distributed-delay-queue.confluence |2 +- .../confluence/distributed-id-queue.confluence |2 +- .../distributed-priority-queue.confluence |2 +- .../site/confluence/distributed-queue.confluence |2 +- .../confluence/simple-distributed-queue.confluence |2 +- src/site/confluence/articles.confluence| 15 -- src/site/confluence/contributions.confluence | 12 - src/site/confluence/history.confluence | 27 -- src/site/confluence/patches.confluence | 38 -- src/site/confluence/tech-note-1.confluence | 39 --- src/site/confluence/tech-note-2.confluence | 19 --- src/site/confluence/tech-note-3.confluence | 25 - src/site/confluence/tech-note-4.confluence | 17 -- src/site/confluence/tech-notes.confluence |8 --- src/site/site.xml | 10 ++-- 15 files changed, 10 insertions(+), 210 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/eee5bd4c/curator-recipes/src/site/confluence/distributed-delay-queue.confluence -- diff --git a/curator-recipes/src/site/confluence/distributed-delay-queue.confluence b/curator-recipes/src/site/confluence/distributed-delay-queue.confluence index 5d33c21..2755a96 100644 --- a/curator-recipes/src/site/confluence/distributed-delay-queue.confluence +++ b/curator-recipes/src/site/confluence/distributed-delay-queue.confluence @@ -1,6 +1,6 @@ h1. Distributed Delay Queue -h2. *IMPORTANT* - We recommend that you do NOT use ZooKeeper for Queues. Please see [[Tech Note 4|../tech-note-4.html]] for details. +h2. *IMPORTANT* - We recommend that you do NOT use ZooKeeper for Queues. Please see [[Tech Note 4|https://cwiki.apache.org/confluence/display/CURATOR/TN4]] for details. h2. Description An implementation of a Distributed Delay Queue. A Delay Queue is similar to a Priority Queue. When items are added to the queue, http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/eee5bd4c/curator-recipes/src/site/confluence/distributed-id-queue.confluence -- diff --git a/curator-recipes/src/site/confluence/distributed-id-queue.confluence b/curator-recipes/src/site/confluence/distributed-id-queue.confluence index 8cdbea4..7afdd15 100644 --- a/curator-recipes/src/site/confluence/distributed-id-queue.confluence +++ b/curator-recipes/src/site/confluence/distributed-id-queue.confluence @@ -1,6 +1,6 @@ h1. Distributed ID Queue -h2. *IMPORTANT* - We recommend that you do NOT use ZooKeeper for Queues. Please see [[Tech Note 4|../tech-note-4.html]] for details. +h2. *IMPORTANT* - We recommend that you do NOT use ZooKeeper for Queues. Please see [[Tech Note 4|https://cwiki.apache.org/confluence/display/CURATOR/TN4]] for details. h2. Description This is an alternate version of [[Distributed Queue|distributed-queue.html]] that supports assigning IDs to the items http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/eee5bd4c/curator-recipes/src/site/confluence/distributed-priority-queue.confluence -- diff --git a/curator-recipes/src/site/confluence/distributed-priority-queue.confluence b/curator-recipes/src/site/confluence/distributed-priority-queue.confluence index 9162eb9..c69234a 100644 --- a/curator-recipes/src/site/confluence/distributed-priority-queue.confluence +++ b/curator-recipes/src/site/confluence/distributed-priority-queue.confluence @@ -1,6 +1,6 @@ h1. Distributed Priority Queue -h2. *IMPORTANT* - We recommend that you do NOT use ZooKeeper for Queues. Please see [[Tech Note 4|../tech-note-4.html]] for details. +h2. *IMPORTANT* - We recommend that you do NOT use ZooKeeper for Queues. Please see [[Tech Note 4|https://cwiki.apache.org/confluence/display/CURATOR/TN4]] for details. h2. Description An implementation of the Distributed Priority Queue ZK recipe. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/eee5bd4c/cura
git commit: Don't show version in the site - it's not useful
Updated Branches: refs/heads/master eee5bd4c7 -> ee5b26eef Don't show version in the site - it's not useful Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/ee5b26ee Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/ee5b26ee Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/ee5b26ee Branch: refs/heads/master Commit: ee5b26eef6df5592fa7700f90de6c707f0eed1f2 Parents: eee5bd4 Author: randgalt Authored: Wed Apr 24 15:21:43 2013 -0700 Committer: randgalt Committed: Wed Apr 24 15:21:43 2013 -0700 -- src/site/site.xml |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/ee5b26ee/src/site/site.xml -- diff --git a/src/site/site.xml b/src/site/site.xml index 007747e..e0e1a78 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -58,6 +58,8 @@ + + http://zookeeper.apache.org"/>
svn commit: r1471743 [9/24] - in /incubator/curator/site/trunk: ./ apidocs/ apidocs/cache/ apidocs/cache/class-use/ apidocs/discovery/ apidocs/discovery/class-use/ apidocs/framework/ apidocs/framework
Modified: incubator/curator/site/trunk/curator-client/dependency-management.html URL: http://svn.apache.org/viewvc/incubator/curator/site/trunk/curator-client/dependency-management.html?rev=1471743&r1=1471742&r2=1471743&view=diff == --- incubator/curator/site/trunk/curator-client/dependency-management.html (original) +++ incubator/curator/site/trunk/curator-client/dependency-management.html Wed Apr 24 22:28:10 2013 @@ -49,12 +49,11 @@ - + Last Published: 2013-04-24 - | Version: 2.0.0-incubating-SNAPSHOT - + http://zookeeper.apache.org"; class="externalLink" title="Apache ZooKeeper"> @@ -69,7 +68,7 @@ - + Apache Curator @@ -139,7 +138,7 @@ - + https://cwiki.apache.org/confluence/display/CURATOR/Tech+Notes"; class="externalLink" title="Tech Notes"> Tech Notes @@ -190,28 +189,28 @@ - + https://cwiki.apache.org/confluence/display/CURATOR/Submitting+Patches"; class="externalLink" title="Submitting Patches"> Submitting Patches - + https://cwiki.apache.org/confluence/display/CURATOR/Curator's+History" class="externalLink" title="History"> History - + https://cwiki.apache.org/confluence/display/CURATOR/Third+Party+Articles"; class="externalLink" title="Third Party Articles"> Third Party Articles - + https://cwiki.apache.org/confluence/display/CURATOR/Contributions+to+Curator"; class="externalLink" title="Third Party Contributions"> Third Party Contributions @@ -260,7 +259,7 @@ - + @@ -312,7 +311,7 @@ Copyright © 2011-2013 http://www.apache.org/";>The Apache Software Foundation. All Rights Reserved. - + Modified: incubator/curator/site/trunk/curator-client/distribution-management.html URL: http://svn.apache.org/viewvc/incubator/curator/site/trunk/curator-client/distribution-management.html?rev=1471743&r1=1471742&r2=1471743&view=diff == --- incubator/curator/site/trunk/curator-client/distribution-management.html (original) +++ incubator/curator/site/trunk/curator-client/distribution-management.html Wed Apr 24 22:28:10 2013 @@ -49,12 +49,11 @@ - + Last Published: 2013-04-24 - | Version: 2.0.0-incubating-SNAPSHOT - + http://zookeeper.apache.org"; class="externalLink" title="Apache ZooKeeper"> @@ -69,7 +68,7 @@ - + Apache Curator @@ -139,7 +138,7 @@ - + https://cwiki.apache.org/confluence/display/CURATOR/Tech+Notes"; class="externalLink" title="Tech Notes"> Tech Notes @@ -190,28 +189,28 @@ - + https://cwiki.apache.org/confluence/display/CURATOR/Submitting+Patches"; class="externalLink" title="Submitting Patches"> Submitting Patches - + https://cwiki.apache.org/confluence/display/CURATOR/Curator's+History" class="externalLink" title="History"> History - + https://cwiki.apache.org/confluence/display/CURATOR/Third+Party+Articl
svn commit: r1471743 [12/24] - in /incubator/curator/site/trunk: ./ apidocs/ apidocs/cache/ apidocs/cache/class-use/ apidocs/discovery/ apidocs/discovery/class-use/ apidocs/framework/ apidocs/framewor
Modified: incubator/curator/site/trunk/curator-framework/index.html
URL:
http://svn.apache.org/viewvc/incubator/curator/site/trunk/curator-framework/index.html?rev=1471743&r1=1471742&r2=1471743&view=diff
==
--- incubator/curator/site/trunk/curator-framework/index.html (original)
+++ incubator/curator/site/trunk/curator-framework/index.html Wed Apr 24
22:28:10 2013
@@ -49,12 +49,11 @@
-
+
Last Published: 2013-04-24
- | Version:
2.0.0-incubating-SNAPSHOT
-
+
http://zookeeper.apache.org";
class="externalLink" title="Apache ZooKeeper">
@@ -69,7 +68,7 @@
-
+
Apache Curator
@@ -139,7 +138,7 @@
-
+ https://cwiki.apache.org/confluence/display/CURATOR/Tech+Notes";
class="externalLink" title="Tech Notes">
Tech Notes
@@ -190,28 +189,28 @@
-
+ https://cwiki.apache.org/confluence/display/CURATOR/Submitting+Patches";
class="externalLink" title="Submitting Patches">
Submitting Patches
-
+ https://cwiki.apache.org/confluence/display/CURATOR/Curator's+History"
class="externalLink" title="History">
History
-
+ https://cwiki.apache.org/confluence/display/CURATOR/Third+Party+Articles";
class="externalLink" title="Third Party Articles">
Third Party Articles
-
+ https://cwiki.apache.org/confluence/display/CURATOR/Contributions+to+Curator";
class="externalLink" title="Third Party Contributions">
Third Party Contributions
@@ -260,7 +259,7 @@
-
+
@@ -340,7 +339,7 @@ client.create().forPath("/test"
Copyright ©
2011-2013
http://www.apache.org/";>The Apache Software
Foundation.
All Rights Reserved.
-
+
Modified: incubator/curator/site/trunk/curator-framework/integration.html
URL:
http://svn.apache.org/viewvc/incubator/curator/site/trunk/curator-framework/integration.html?rev=1471743&r1=1471742&r2=1471743&view=diff
==
--- incubator/curator/site/trunk/curator-framework/integration.html (original)
+++ incubator/curator/site/trunk/curator-framework/integration.html Wed Apr 24
22:28:10 2013
@@ -49,12 +49,11 @@
-
+
Last Published: 2013-04-24
- | Version:
2.0.0-incubating-SNAPSHOT
-
+
http://zookeeper.apache.org";
class="externalLink" title="Apache ZooKeeper">
@@ -69,7 +68,7 @@
-
+
Apache Curator
@@ -139,7 +138,7 @@
-
+ https://cwiki.apache.org/confluence/display/CURATOR/Tech+Notes";
class="externalLink" title="Tech Notes">
Tech Notes
@@ -190,28 +189,28 @@
-
+ https://cwiki.apache.org/confluence/display/CURATOR/Submitting+Patches";
class="externalLink" title="Submitting Patches">
Submitting Patches
-
+ https://cwiki.apache.org/confluence/display/CURATOR/Curator's+History"
class="externalLink" title="History">
History
-
+ https://cwiki.apache.org/confluence/display/CURATOR/Third+Party+Articles";
class="externalLink" title="Third Party Articles">
svn commit: r1471743 [18/24] - in /incubator/curator/site/trunk: ./ apidocs/ apidocs/cache/ apidocs/cache/class-use/ apidocs/discovery/ apidocs/discovery/class-use/ apidocs/framework/ apidocs/framewor
Modified: incubator/curator/site/trunk/curator-x-discovery-server/issue-tracking.html URL: http://svn.apache.org/viewvc/incubator/curator/site/trunk/curator-x-discovery-server/issue-tracking.html?rev=1471743&r1=1471742&r2=1471743&view=diff == --- incubator/curator/site/trunk/curator-x-discovery-server/issue-tracking.html (original) +++ incubator/curator/site/trunk/curator-x-discovery-server/issue-tracking.html Wed Apr 24 22:28:10 2013 @@ -49,12 +49,11 @@ - + Last Published: 2013-04-24 - | Version: 2.0.0-incubating-SNAPSHOT - + http://zookeeper.apache.org"; class="externalLink" title="Apache ZooKeeper"> @@ -69,7 +68,7 @@ - + Apache Curator @@ -139,7 +138,7 @@ - + https://cwiki.apache.org/confluence/display/CURATOR/Tech+Notes"; class="externalLink" title="Tech Notes"> Tech Notes @@ -190,28 +189,28 @@ - + https://cwiki.apache.org/confluence/display/CURATOR/Submitting+Patches"; class="externalLink" title="Submitting Patches"> Submitting Patches - + https://cwiki.apache.org/confluence/display/CURATOR/Curator's+History" class="externalLink" title="History"> History - + https://cwiki.apache.org/confluence/display/CURATOR/Third+Party+Articles"; class="externalLink" title="Third Party Articles"> Third Party Articles - + https://cwiki.apache.org/confluence/display/CURATOR/Contributions+to+Curator"; class="externalLink" title="Third Party Contributions"> Third Party Contributions @@ -260,7 +259,7 @@ - + @@ -312,7 +311,7 @@ Copyright © 2011-2013 http://www.apache.org/";>The Apache Software Foundation. All Rights Reserved. - + Modified: incubator/curator/site/trunk/curator-x-discovery-server/license.html URL: http://svn.apache.org/viewvc/incubator/curator/site/trunk/curator-x-discovery-server/license.html?rev=1471743&r1=1471742&r2=1471743&view=diff == --- incubator/curator/site/trunk/curator-x-discovery-server/license.html (original) +++ incubator/curator/site/trunk/curator-x-discovery-server/license.html Wed Apr 24 22:28:10 2013 @@ -49,12 +49,11 @@ - + Last Published: 2013-04-24 - | Version: 2.0.0-incubating-SNAPSHOT - + http://zookeeper.apache.org"; class="externalLink" title="Apache ZooKeeper"> @@ -69,7 +68,7 @@ - + Apache Curator @@ -139,7 +138,7 @@ - + https://cwiki.apache.org/confluence/display/CURATOR/Tech+Notes"; class="externalLink" title="Tech Notes"> Tech Notes @@ -190,28 +189,28 @@ - + https://cwiki.apache.org/confluence/display/CURATOR/Submitting+Patches"; class="externalLink" title="Submitting Patches"> Submitting Patches - + https://cwiki.apache.org/confluence/display/CURATOR/Curator's+History" class="externalLink" title="History"> History - + https://cwiki.apache.org/confluence/display/CURATOR/Third+Party+Ar
svn commit: r1471743 [16/24] - in /incubator/curator/site/trunk: ./ apidocs/ apidocs/cache/ apidocs/cache/class-use/ apidocs/discovery/ apidocs/discovery/class-use/ apidocs/framework/ apidocs/framewor
Modified: incubator/curator/site/trunk/curator-test/mail-lists.html URL: http://svn.apache.org/viewvc/incubator/curator/site/trunk/curator-test/mail-lists.html?rev=1471743&r1=1471742&r2=1471743&view=diff == --- incubator/curator/site/trunk/curator-test/mail-lists.html (original) +++ incubator/curator/site/trunk/curator-test/mail-lists.html Wed Apr 24 22:28:10 2013 @@ -44,12 +44,11 @@ - + Last Published: 2013-04-24 - | Version: 2.0.0-incubating-SNAPSHOT - + http://zookeeper.apache.org"; class="externalLink" title="Apache ZooKeeper"> @@ -64,7 +63,7 @@ - + Apache Curator @@ -134,7 +133,7 @@ - + https://cwiki.apache.org/confluence/display/CURATOR/Tech+Notes"; class="externalLink" title="Tech Notes"> Tech Notes @@ -185,28 +184,28 @@ - + https://cwiki.apache.org/confluence/display/CURATOR/Submitting+Patches"; class="externalLink" title="Submitting Patches"> Submitting Patches - + https://cwiki.apache.org/confluence/display/CURATOR/Curator's+History" class="externalLink" title="History"> History - + https://cwiki.apache.org/confluence/display/CURATOR/Third+Party+Articles"; class="externalLink" title="Third Party Articles"> Third Party Articles - + https://cwiki.apache.org/confluence/display/CURATOR/Contributions+to+Curator"; class="externalLink" title="Third Party Contributions"> Third Party Contributions @@ -255,7 +254,7 @@ - + @@ -307,7 +306,7 @@ Copyright © 2011-2013 http://www.apache.org/";>The Apache Software Foundation. All Rights Reserved. - + Modified: incubator/curator/site/trunk/curator-test/plugin-management.html URL: http://svn.apache.org/viewvc/incubator/curator/site/trunk/curator-test/plugin-management.html?rev=1471743&r1=1471742&r2=1471743&view=diff == --- incubator/curator/site/trunk/curator-test/plugin-management.html (original) +++ incubator/curator/site/trunk/curator-test/plugin-management.html Wed Apr 24 22:28:10 2013 @@ -44,12 +44,11 @@ - + Last Published: 2013-04-24 - | Version: 2.0.0-incubating-SNAPSHOT - + http://zookeeper.apache.org"; class="externalLink" title="Apache ZooKeeper"> @@ -64,7 +63,7 @@ - + Apache Curator @@ -134,7 +133,7 @@ - + https://cwiki.apache.org/confluence/display/CURATOR/Tech+Notes"; class="externalLink" title="Tech Notes"> Tech Notes @@ -185,28 +184,28 @@ - + https://cwiki.apache.org/confluence/display/CURATOR/Submitting+Patches"; class="externalLink" title="Submitting Patches"> Submitting Patches - + https://cwiki.apache.org/confluence/display/CURATOR/Curator's+History" class="externalLink" title="History"> History - + https://cwiki.apache.org/confluence/display/CURATOR/Third+Party+Articles"; class="externalLink" title="Third Party Articles"> Third Par
svn commit: r1471743 [24/24] - in /incubator/curator/site/trunk: ./ apidocs/ apidocs/cache/ apidocs/cache/class-use/ apidocs/discovery/ apidocs/discovery/class-use/ apidocs/framework/ apidocs/framewor
Modified: incubator/curator/site/trunk/utilities.html URL: http://svn.apache.org/viewvc/incubator/curator/site/trunk/utilities.html?rev=1471743&r1=1471742&r2=1471743&view=diff == --- incubator/curator/site/trunk/utilities.html (original) +++ incubator/curator/site/trunk/utilities.html Wed Apr 24 22:28:10 2013 @@ -41,12 +41,11 @@ - + Last Published: 2013-04-24 - | Version: 2.0.0-incubating-SNAPSHOT - + http://zookeeper.apache.org"; class="externalLink" title="Apache ZooKeeper"> @@ -61,7 +60,7 @@ - + Apache Curator @@ -129,7 +128,7 @@ - + https://cwiki.apache.org/confluence/display/CURATOR/Tech+Notes"; class="externalLink" title="Tech Notes"> Tech Notes @@ -180,28 +179,28 @@ - + https://cwiki.apache.org/confluence/display/CURATOR/Submitting+Patches"; class="externalLink" title="Submitting Patches"> Submitting Patches - + https://cwiki.apache.org/confluence/display/CURATOR/Curator's+History" class="externalLink" title="History"> History - + https://cwiki.apache.org/confluence/display/CURATOR/Third+Party+Articles"; class="externalLink" title="Third Party Articles"> Third Party Articles - + https://cwiki.apache.org/confluence/display/CURATOR/Contributions+to+Curator"; class="externalLink" title="Third Party Contributions"> Third Party Contributions @@ -250,7 +249,7 @@ - + @@ -310,7 +309,7 @@ zk.create(nodePath, ...); Copyright © 2011-2013 http://www.apache.org/";>The Apache Software Foundation. All Rights Reserved. - +
[1/2] git commit: wrong wiki url
Updated Branches: refs/heads/master ee5b26eef -> 327df3f3b wrong wiki url Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/acb0058d Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/acb0058d Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/acb0058d Branch: refs/heads/master Commit: acb0058db29643ca0ad4f875fec8c9d25419c181 Parents: ee5b26e Author: randgalt Authored: Fri Apr 26 13:13:13 2013 -0700 Committer: randgalt Committed: Fri Apr 26 13:13:13 2013 -0700 -- src/site/site.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/acb0058d/src/site/site.xml -- diff --git a/src/site/site.xml b/src/site/site.xml index e0e1a78..4f84645 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -82,7 +82,7 @@ -https://cwiki.apache.org/confluence/display/CURATOR/Index"/> +https://cwiki.apache.org/confluence/display/CURATOR"/>
[2/2] git commit: Make sure DISCLAIMER is put in JARs
Make sure DISCLAIMER is put in JARs
Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/327df3f3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/327df3f3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/327df3f3
Branch: refs/heads/master
Commit: 327df3f3b297d632ef66c842728b88eb6d0c1734
Parents: acb0058
Author: randgalt
Authored: Fri Apr 26 13:13:22 2013 -0700
Committer: randgalt
Committed: Fri Apr 26 13:13:22 2013 -0700
--
pom.xml |6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/327df3f3/pom.xml
--
diff --git a/pom.xml b/pom.xml
index cda1e40..f121595 100644
--- a/pom.xml
+++ b/pom.xml
@@ -315,9 +315,9 @@
${basedir}
META-INF
-DISCLAIMER.txt
-LICENSE.txt
-NOTICE.txt
+DISCLAIMER
+LICENSE
+NOTICE
git commit: [maven-release-plugin] prepare release apache-curator-2.0.0-incubating
Updated Branches: refs/heads/master 327df3f3b -> 1f995d968 [maven-release-plugin] prepare release apache-curator-2.0.0-incubating Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/1f995d96 Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/1f995d96 Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/1f995d96 Branch: refs/heads/master Commit: 1f995d968b006381272f51f90b73b19e17f7daed Parents: 327df3f Author: randgalt Authored: Fri Apr 26 13:18:33 2013 -0700 Committer: randgalt Committed: Fri Apr 26 13:18:33 2013 -0700 -- curator-client/pom.xml |4 ++-- curator-examples/pom.xml |4 ++-- curator-framework/pom.xml |4 ++-- curator-recipes/pom.xml|4 ++-- curator-test/pom.xml |4 ++-- curator-x-discovery-server/pom.xml |4 ++-- curator-x-discovery/pom.xml|4 ++-- pom.xml| 16 8 files changed, 22 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/1f995d96/curator-client/pom.xml -- diff --git a/curator-client/pom.xml b/curator-client/pom.xml index c3d463a..f847e0a 100644 --- a/curator-client/pom.xml +++ b/curator-client/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.0-incubating-SNAPSHOT +2.0.0-incubating org.apache.curator curator-client -2.0.0-incubating-SNAPSHOT +2.0.0-incubating Curator Client Low-level API http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/1f995d96/curator-examples/pom.xml -- diff --git a/curator-examples/pom.xml b/curator-examples/pom.xml index 92e3f0f..275a540 100644 --- a/curator-examples/pom.xml +++ b/curator-examples/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.0-incubating-SNAPSHOT +2.0.0-incubating org.apache.curator curator-examples -2.0.0-incubating-SNAPSHOT +2.0.0-incubating Curator Examples Example usages of various Curator features. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/1f995d96/curator-framework/pom.xml -- diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml index 7313a77..56cde52 100644 --- a/curator-framework/pom.xml +++ b/curator-framework/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.0-incubating-SNAPSHOT +2.0.0-incubating org.apache.curator curator-framework -2.0.0-incubating-SNAPSHOT +2.0.0-incubating Curator Framework High-level API that greatly simplifies using ZooKeeper. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/1f995d96/curator-recipes/pom.xml -- diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml index fa16d44..573041c 100644 --- a/curator-recipes/pom.xml +++ b/curator-recipes/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.0-incubating-SNAPSHOT +2.0.0-incubating org.apache.curator curator-recipes -2.0.0-incubating-SNAPSHOT +2.0.0-incubating Curator Recipes All of the recipes listed on the ZooKeeper recipes doc (except two phase commit). http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/1f995d96/curator-test/pom.xml -- diff --git a/curator-test/pom.xml b/curator-test/pom.xml index 56eefe3..1d7ab45 100644 --- a/curator-test/pom.xml +++ b/curator-test/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.0-incubating-SNAPSHOT +2.0.0-incubating org.apache.curator curator-test -2.0.0-incubating-SNAPSHOT +2.0.0-incubating Curator Testing Unit testing utilities. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/1f995d96/curator-x-discovery-server/pom.xml -- diff --git a/curator-x-discovery-server/pom.xml b/curator-x-discovery-server/pom.xml index c6ea85a..0806d6f 100644 --- a/curator-x-discovery-server/pom.xml +++ b/curator-x-discovery-server/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.0-incubating-SNAPSHOT +2.0.0-incubating org.apache.curator curato
Git Push Summary
Updated Tags: refs/tags/apache-curator-2.0.0-incubating [created] 1e911960e
git commit: [maven-release-plugin] prepare for next development iteration
Updated Branches: refs/heads/master 1f995d968 -> 9d6586f33 [maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/9d6586f3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/9d6586f3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/9d6586f3 Branch: refs/heads/master Commit: 9d6586f33145ad1ff91a1a8846a851d492f6abc5 Parents: 1f995d9 Author: randgalt Authored: Fri Apr 26 13:18:38 2013 -0700 Committer: randgalt Committed: Fri Apr 26 13:18:38 2013 -0700 -- curator-client/pom.xml |4 ++-- curator-examples/pom.xml |4 ++-- curator-framework/pom.xml |4 ++-- curator-recipes/pom.xml|4 ++-- curator-test/pom.xml |4 ++-- curator-x-discovery-server/pom.xml |4 ++-- curator-x-discovery/pom.xml|4 ++-- pom.xml| 16 8 files changed, 22 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/9d6586f3/curator-client/pom.xml -- diff --git a/curator-client/pom.xml b/curator-client/pom.xml index f847e0a..97b4334 100644 --- a/curator-client/pom.xml +++ b/curator-client/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.0-incubating +2.0.1-incubating-SNAPSHOT org.apache.curator curator-client -2.0.0-incubating +2.0.1-incubating-SNAPSHOT Curator Client Low-level API http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/9d6586f3/curator-examples/pom.xml -- diff --git a/curator-examples/pom.xml b/curator-examples/pom.xml index 275a540..fd9ff8a 100644 --- a/curator-examples/pom.xml +++ b/curator-examples/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.0-incubating +2.0.1-incubating-SNAPSHOT org.apache.curator curator-examples -2.0.0-incubating +2.0.1-incubating-SNAPSHOT Curator Examples Example usages of various Curator features. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/9d6586f3/curator-framework/pom.xml -- diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml index 56cde52..6c3bd1d 100644 --- a/curator-framework/pom.xml +++ b/curator-framework/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.0-incubating +2.0.1-incubating-SNAPSHOT org.apache.curator curator-framework -2.0.0-incubating +2.0.1-incubating-SNAPSHOT Curator Framework High-level API that greatly simplifies using ZooKeeper. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/9d6586f3/curator-recipes/pom.xml -- diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml index 573041c..b9890a0 100644 --- a/curator-recipes/pom.xml +++ b/curator-recipes/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.0-incubating +2.0.1-incubating-SNAPSHOT org.apache.curator curator-recipes -2.0.0-incubating +2.0.1-incubating-SNAPSHOT Curator Recipes All of the recipes listed on the ZooKeeper recipes doc (except two phase commit). http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/9d6586f3/curator-test/pom.xml -- diff --git a/curator-test/pom.xml b/curator-test/pom.xml index 1d7ab45..1a749c5 100644 --- a/curator-test/pom.xml +++ b/curator-test/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.0-incubating +2.0.1-incubating-SNAPSHOT org.apache.curator curator-test -2.0.0-incubating +2.0.1-incubating-SNAPSHOT Curator Testing Unit testing utilities. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/9d6586f3/curator-x-discovery-server/pom.xml -- diff --git a/curator-x-discovery-server/pom.xml b/curator-x-discovery-server/pom.xml index 0806d6f..5f177f1 100644 --- a/curator-x-discovery-server/pom.xml +++ b/curator-x-discovery-server/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.0-incubating +2.0.1-incubating-SNAPSHOT org.apache.curator curator-x-discov
git commit: Make sure checksums are generated when installing
Updated Branches: refs/heads/master 9d6586f33 -> 07540ac15 Make sure checksums are generated when installing Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/07540ac1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/07540ac1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/07540ac1 Branch: refs/heads/master Commit: 07540ac15df7153218c6b7f5b66ad89ab2eb406d Parents: 9d6586f Author: randgalt Authored: Mon Apr 29 16:44:04 2013 -0700 Committer: randgalt Committed: Mon Apr 29 16:44:04 2013 -0700 -- pom.xml |9 + 1 files changed, 9 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/07540ac1/pom.xml -- diff --git a/pom.xml b/pom.xml index 09a50ac..538daf1 100644 --- a/pom.xml +++ b/pom.xml @@ -325,6 +325,15 @@ org.apache.maven.plugins +maven-install-plugin +2.3.1 + +true + + + + +org.apache.maven.plugins maven-compiler-plugin 3.0
git commit: Starting a KEYS file
Updated Branches: refs/heads/master 07540ac15 -> 05be2863b Starting a KEYS file Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/05be2863 Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/05be2863 Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/05be2863 Branch: refs/heads/master Commit: 05be2863b502e17d36285af97f3d3834043af025 Parents: 07540ac Author: randgalt Authored: Tue Apr 30 09:45:03 2013 -0700 Committer: randgalt Committed: Tue Apr 30 09:45:03 2013 -0700 -- KEYS | 47 +++ 1 files changed, 47 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/05be2863/KEYS -- diff --git a/KEYS b/KEYS new file mode 100644 index 000..1e29f32 --- /dev/null +++ b/KEYS @@ -0,0 +1,47 @@ +This file contains the PGP keys of various developers. + +Users: pgp < KEYS + gpg --import KEYS +Developers: +pgp -kxa and append it to this file. +(pgpk -ll && pgpk -xa ) >> this file. +(gpg --list-sigs + && gpg --armor --export ) >> this file. + +pub 2048R/66489D97 2013-03-01 +uid Jordan Zimmerman (randgalt) +sig 366489D97 2013-03-01 Jordan Zimmerman (randgalt) +sub 2048R/0A65D9FB 2013-03-01 +sig 66489D97 2013-03-01 Jordan Zimmerman (randgalt) + +-BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG/MacGPG2 v2.0.17 (Darwin) +Comment: GPGTools - http://gpgtools.org + +mQENBFEw+WwBCADJ7QwF3bcVovTlZP3NlnCzWs+OCeeLCkbkxfJ4LUWcyptt0flV +HjYeEH+gHb4ZXIv4iABwG8YcQ4OSw0rmE8z7ae8D/tAPjhOzav0kk+s5h8mGWrKp +x4tePrfeLQBqI7PSG2q2OrlNfPpqxOlpxdlL9SAdwGvUEli+E91UPPw/5aEQ0BiB +PvxRqLF1yBfxJ564J1Ju8AZ1/9+adwmpSoYni+t3kBJu9VaiGWL+lt3f/xujBmop +014Cy1D6nGTofwNnbDgOhd3u44q9xbGYBo7bvxoO/RCSOT/EBsg/7PRjhGj8oQ8O +z8B008pvCzN/Dh32Bi2m8w83G+XkKzd7CBG5ABEBAAG0MUpvcmRhbiBaaW1tZXJt +YW4gKHJhbmRnYWx0KSA8cmFuZGdhbHRAYXBhY2hlLm9yZz6JATgEEwECACIFAlEw ++WwCGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEJ6949BmSJ2XdhAIAIPQ +M2D0bG8/Muza86I2jEx6N8ulF0Vghaf0rKtwDUs06yA80Id8Q5R0o/DN3JzT4x9Y +33M3748uaEc1Nau04HiWw3fn0gLgdvA7VriPNxJW3QbWWADhnOH/y7IWUGSSp+D3 +UD3ScsY0gBDAW+lOXNqMZ2OTtawTAF51xNIn3kDUXcG9BwAILSbBvoDxdgEzjO8/ +5w6ezyapatUt7UF2BqkZS7Posyd9gEsh5zMfkZE6stWd2StE/6IdazHT7UXknQ4t +h3HfqTXlW1gOU1MvOzLHb4/jeQUXDb6UWLMHa0NHN1IDyAlcrlJHIVBpbxjEM4e3 +BFPTgQQuw5qxmzu/rSq5AQ0EUTD5bAEIAKwnGO+J00FccMV7O/zz4u6NR8MPnXcR +Frjqy1njIp6esDnZMjFcM6obCwJ5187GWbhWa8zRwGkRMp43dpaHyL24h93X+8e1 +JX4494/pjKRqnxpws/x3GhCd1D+Ovrv9ilhJWQdXYD+JfLoDF6pqmuxYwXWSRqKM +5qSp4uIO3xbUasxmSNertJ/NKNGkQu8UO3LeMhCikRvT3T7Pq350HCJ8QYRTJ4sg +ozcEqPqAgfzwlTAmaatllOaoxZ1K/pp3uSGhHR6EsMeWiSQINMA9AtT/1D3+SFA0 +hqBLstDkvqzafjs+6f0aSBEt6fELuH1hA8ynsmxudlADEF0pzChJmJUAEQEAAYkB +HwQYAQIACQUCUTD5bAIbDAAKCRCevePQZkidl/N5B/9iU+KI9/eKrPMFq2F2kTe7 +N7P52wC/KysK9Xmr6fKKlrY4eLs+y54iifH5cLHVLwNu63Bb4rxcLKGqqg0sRh5v +04DfzfkL4+5XulqfsEESmhYlUbtWn5s2h78HKtmM53HdSFJVV9mGD95SOmJgmLpb +pcc4vkibU6O4ExMxjBTkS0eorFVLWs2jUpQp/swrPgCB1lvw5mP96RziZ6Y3fovt +jspDEC1NEFEQsjzfvQPfi39LhtufKxaFbkamQ4bDJfmEA3fohmSfcJqzvhX5WBRr +UThk9LkkrpGAq3HQc4xNm2AvCF/Ja4qDh15VadLYNiZXBNHTT+3ncecgnltNpVRa +=Y7m5 +-END PGP PUBLIC KEY BLOCK-
git commit: Defeat Maven's auto generated DEPENDENCIES file
Updated Branches: refs/heads/master 05be2863b -> 19991d690 Defeat Maven's auto generated DEPENDENCIES file Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/19991d69 Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/19991d69 Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/19991d69 Branch: refs/heads/master Commit: 19991d690c676faaa85322a11d09fc9e11742237 Parents: 05be286 Author: randgalt Authored: Tue Apr 30 13:54:35 2013 -0700 Committer: randgalt Committed: Tue Apr 30 13:54:35 2013 -0700 -- DEPENDENCIES |1 + 1 files changed, 1 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/19991d69/DEPENDENCIES -- diff --git a/DEPENDENCIES b/DEPENDENCIES new file mode 100644 index 000..c9f272f --- /dev/null +++ b/DEPENDENCIES @@ -0,0 +1 @@ +* intentionally left blank *
[1/2] git commit: Add additional ignorable license files
Updated Branches: refs/heads/master 19991d690 -> 3355e3b25 Add additional ignorable license files Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/1d8553d0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/1d8553d0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/1d8553d0 Branch: refs/heads/master Commit: 1d8553d04c1c69198c4c1cb1fc836407ea6cd9a1 Parents: 19991d6 Author: randgalt Authored: Tue Apr 30 13:56:37 2013 -0700 Committer: randgalt Committed: Tue Apr 30 13:56:37 2013 -0700 -- pom.xml |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/1d8553d0/pom.xml -- diff --git a/pom.xml b/pom.xml index 538daf1..c451555 100644 --- a/pom.xml +++ b/pom.xml @@ -428,6 +428,8 @@ **/*.confluence **/.gitignore **/DISCLAIMER +**/DEPENDENCIES +**/KEYS **/LICENSE **/NOTICE **/README
[2/2] git commit: Added simple read me
Added simple read me Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/3355e3b2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/3355e3b2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/3355e3b2 Branch: refs/heads/master Commit: 3355e3b25b8bcb7bc286c785372dcce59103277f Parents: 1d8553d Author: randgalt Authored: Tue Apr 30 14:08:44 2013 -0700 Committer: randgalt Committed: Tue Apr 30 14:08:44 2013 -0700 -- README |7 +++ 1 files changed, 7 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/3355e3b2/README -- diff --git a/README b/README new file mode 100644 index 000..e56bc3c --- /dev/null +++ b/README @@ -0,0 +1,7 @@ +Apache Curator +-- +Curator is a set of Java libraries that make using Apache ZooKeeper much easier. + +Website: http://curator.incubator.apache.org/ + +Getting started: http://curator.incubator.apache.org/getting-started.html
Git Push Summary
Updated Tags: refs/tags/apache-curator-2.0.0-incubating [deleted] 1e911960e
git commit: Back to apache-curator-2.0.0-incubating-SNAPSHOT
Updated Branches: refs/heads/master 3355e3b25 -> 7a208dbe9 Back to apache-curator-2.0.0-incubating-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/7a208dbe Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/7a208dbe Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/7a208dbe Branch: refs/heads/master Commit: 7a208dbe90f6c981036cb188d32f1a5949664366 Parents: 3355e3b Author: randgalt Authored: Tue Apr 30 14:13:26 2013 -0700 Committer: randgalt Committed: Tue Apr 30 14:13:26 2013 -0700 -- curator-client/pom.xml |4 ++-- curator-examples/pom.xml |4 ++-- curator-framework/pom.xml |4 ++-- curator-recipes/pom.xml|4 ++-- curator-test/pom.xml |4 ++-- curator-x-discovery-server/pom.xml |4 ++-- curator-x-discovery/pom.xml|4 ++-- pom.xml| 14 +++--- 8 files changed, 21 insertions(+), 21 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/7a208dbe/curator-client/pom.xml -- diff --git a/curator-client/pom.xml b/curator-client/pom.xml index 97b4334..c0dd4ce 100644 --- a/curator-client/pom.xml +++ b/curator-client/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.1-incubating-SNAPSHOT +apache-curator-2.0.0-incubating-SNAPSHOT org.apache.curator curator-client -2.0.1-incubating-SNAPSHOT +apache-curator-2.0.0-incubating-SNAPSHOT Curator Client Low-level API http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/7a208dbe/curator-examples/pom.xml -- diff --git a/curator-examples/pom.xml b/curator-examples/pom.xml index fd9ff8a..39410d6 100644 --- a/curator-examples/pom.xml +++ b/curator-examples/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.1-incubating-SNAPSHOT +apache-curator-2.0.0-incubating-SNAPSHOT org.apache.curator curator-examples -2.0.1-incubating-SNAPSHOT +apache-curator-2.0.0-incubating-SNAPSHOT Curator Examples Example usages of various Curator features. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/7a208dbe/curator-framework/pom.xml -- diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml index 6c3bd1d..4b6368a 100644 --- a/curator-framework/pom.xml +++ b/curator-framework/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.1-incubating-SNAPSHOT +apache-curator-2.0.0-incubating-SNAPSHOT org.apache.curator curator-framework -2.0.1-incubating-SNAPSHOT +apache-curator-2.0.0-incubating-SNAPSHOT Curator Framework High-level API that greatly simplifies using ZooKeeper. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/7a208dbe/curator-recipes/pom.xml -- diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml index b9890a0..2800438 100644 --- a/curator-recipes/pom.xml +++ b/curator-recipes/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.1-incubating-SNAPSHOT +apache-curator-2.0.0-incubating-SNAPSHOT org.apache.curator curator-recipes -2.0.1-incubating-SNAPSHOT +apache-curator-2.0.0-incubating-SNAPSHOT Curator Recipes All of the recipes listed on the ZooKeeper recipes doc (except two phase commit). http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/7a208dbe/curator-test/pom.xml -- diff --git a/curator-test/pom.xml b/curator-test/pom.xml index 1a749c5..beb7c50 100644 --- a/curator-test/pom.xml +++ b/curator-test/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.1-incubating-SNAPSHOT +apache-curator-2.0.0-incubating-SNAPSHOT org.apache.curator curator-test -2.0.1-incubating-SNAPSHOT +apache-curator-2.0.0-incubating-SNAPSHOT Curator Testing Unit testing utilities. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/7a208dbe/curator-x-discovery-server/pom.xml -- diff --git a/curator-x-discovery-server/pom.xml b/curator-x-discovery-server/pom.xml index 5f177f1..1cf0b25 100644 --- a/curator-x-discovery-server/pom.xml +++ b/curato
git commit: Oops - misspelled the version
Updated Branches: refs/heads/master 7a208dbe9 -> 62d017e8a Oops - misspelled the version Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/62d017e8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/62d017e8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/62d017e8 Branch: refs/heads/master Commit: 62d017e8afec95b5c5a810e3db0432822d3289f5 Parents: 7a208db Author: randgalt Authored: Tue Apr 30 14:23:42 2013 -0700 Committer: randgalt Committed: Tue Apr 30 14:23:42 2013 -0700 -- curator-client/pom.xml |4 ++-- curator-examples/pom.xml |4 ++-- curator-framework/pom.xml |4 ++-- curator-recipes/pom.xml|4 ++-- curator-test/pom.xml |4 ++-- curator-x-discovery-server/pom.xml |4 ++-- curator-x-discovery/pom.xml|4 ++-- pom.xml| 14 +++--- 8 files changed, 21 insertions(+), 21 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/62d017e8/curator-client/pom.xml -- diff --git a/curator-client/pom.xml b/curator-client/pom.xml index c0dd4ce..c3d463a 100644 --- a/curator-client/pom.xml +++ b/curator-client/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -apache-curator-2.0.0-incubating-SNAPSHOT +2.0.0-incubating-SNAPSHOT org.apache.curator curator-client -apache-curator-2.0.0-incubating-SNAPSHOT +2.0.0-incubating-SNAPSHOT Curator Client Low-level API http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/62d017e8/curator-examples/pom.xml -- diff --git a/curator-examples/pom.xml b/curator-examples/pom.xml index 39410d6..92e3f0f 100644 --- a/curator-examples/pom.xml +++ b/curator-examples/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -apache-curator-2.0.0-incubating-SNAPSHOT +2.0.0-incubating-SNAPSHOT org.apache.curator curator-examples -apache-curator-2.0.0-incubating-SNAPSHOT +2.0.0-incubating-SNAPSHOT Curator Examples Example usages of various Curator features. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/62d017e8/curator-framework/pom.xml -- diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml index 4b6368a..7313a77 100644 --- a/curator-framework/pom.xml +++ b/curator-framework/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -apache-curator-2.0.0-incubating-SNAPSHOT +2.0.0-incubating-SNAPSHOT org.apache.curator curator-framework -apache-curator-2.0.0-incubating-SNAPSHOT +2.0.0-incubating-SNAPSHOT Curator Framework High-level API that greatly simplifies using ZooKeeper. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/62d017e8/curator-recipes/pom.xml -- diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml index 2800438..fa16d44 100644 --- a/curator-recipes/pom.xml +++ b/curator-recipes/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -apache-curator-2.0.0-incubating-SNAPSHOT +2.0.0-incubating-SNAPSHOT org.apache.curator curator-recipes -apache-curator-2.0.0-incubating-SNAPSHOT +2.0.0-incubating-SNAPSHOT Curator Recipes All of the recipes listed on the ZooKeeper recipes doc (except two phase commit). http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/62d017e8/curator-test/pom.xml -- diff --git a/curator-test/pom.xml b/curator-test/pom.xml index beb7c50..56eefe3 100644 --- a/curator-test/pom.xml +++ b/curator-test/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -apache-curator-2.0.0-incubating-SNAPSHOT +2.0.0-incubating-SNAPSHOT org.apache.curator curator-test -apache-curator-2.0.0-incubating-SNAPSHOT +2.0.0-incubating-SNAPSHOT Curator Testing Unit testing utilities. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/62d017e8/curator-x-discovery-server/pom.xml -- diff --git a/curator-x-discovery-server/pom.xml b/curator-x-discovery-server/pom.xml index 1cf0b25..c6ea85a 100644 --- a/curator-x-discovery-server/pom.xml +++ b/curator-x-discovery-ser
git commit: [maven-release-plugin] prepare release apache-curator-2.0.0-incubating
Updated Branches: refs/heads/master 62d017e8a -> 734913cd5 [maven-release-plugin] prepare release apache-curator-2.0.0-incubating Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/734913cd Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/734913cd Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/734913cd Branch: refs/heads/master Commit: 734913cd5a258c7a9bbfdeab7ece9adfa975e96c Parents: 62d017e Author: randgalt Authored: Tue Apr 30 14:27:53 2013 -0700 Committer: randgalt Committed: Tue Apr 30 14:27:53 2013 -0700 -- curator-client/pom.xml |4 ++-- curator-examples/pom.xml |4 ++-- curator-framework/pom.xml |4 ++-- curator-recipes/pom.xml|4 ++-- curator-test/pom.xml |4 ++-- curator-x-discovery-server/pom.xml |4 ++-- curator-x-discovery/pom.xml|4 ++-- pom.xml| 16 8 files changed, 22 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/734913cd/curator-client/pom.xml -- diff --git a/curator-client/pom.xml b/curator-client/pom.xml index c3d463a..f847e0a 100644 --- a/curator-client/pom.xml +++ b/curator-client/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.0-incubating-SNAPSHOT +2.0.0-incubating org.apache.curator curator-client -2.0.0-incubating-SNAPSHOT +2.0.0-incubating Curator Client Low-level API http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/734913cd/curator-examples/pom.xml -- diff --git a/curator-examples/pom.xml b/curator-examples/pom.xml index 92e3f0f..275a540 100644 --- a/curator-examples/pom.xml +++ b/curator-examples/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.0-incubating-SNAPSHOT +2.0.0-incubating org.apache.curator curator-examples -2.0.0-incubating-SNAPSHOT +2.0.0-incubating Curator Examples Example usages of various Curator features. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/734913cd/curator-framework/pom.xml -- diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml index 7313a77..56cde52 100644 --- a/curator-framework/pom.xml +++ b/curator-framework/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.0-incubating-SNAPSHOT +2.0.0-incubating org.apache.curator curator-framework -2.0.0-incubating-SNAPSHOT +2.0.0-incubating Curator Framework High-level API that greatly simplifies using ZooKeeper. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/734913cd/curator-recipes/pom.xml -- diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml index fa16d44..573041c 100644 --- a/curator-recipes/pom.xml +++ b/curator-recipes/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.0-incubating-SNAPSHOT +2.0.0-incubating org.apache.curator curator-recipes -2.0.0-incubating-SNAPSHOT +2.0.0-incubating Curator Recipes All of the recipes listed on the ZooKeeper recipes doc (except two phase commit). http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/734913cd/curator-test/pom.xml -- diff --git a/curator-test/pom.xml b/curator-test/pom.xml index 56eefe3..1d7ab45 100644 --- a/curator-test/pom.xml +++ b/curator-test/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.0-incubating-SNAPSHOT +2.0.0-incubating org.apache.curator curator-test -2.0.0-incubating-SNAPSHOT +2.0.0-incubating Curator Testing Unit testing utilities. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/734913cd/curator-x-discovery-server/pom.xml -- diff --git a/curator-x-discovery-server/pom.xml b/curator-x-discovery-server/pom.xml index c6ea85a..0806d6f 100644 --- a/curator-x-discovery-server/pom.xml +++ b/curator-x-discovery-server/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.0-incubating-SNAPSHOT +2.0.0-incubating org.apache.curator curato
Git Push Summary
Updated Tags: refs/tags/apache-curator-2.0.0-incubating [created] cbd0938fc
git commit: [maven-release-plugin] prepare for next development iteration
Updated Branches: refs/heads/master 734913cd5 -> 0babac5c3 [maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/0babac5c Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/0babac5c Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/0babac5c Branch: refs/heads/master Commit: 0babac5c3abba9d4e38dc587ca4218b0bba11190 Parents: 734913c Author: randgalt Authored: Tue Apr 30 14:27:58 2013 -0700 Committer: randgalt Committed: Tue Apr 30 14:27:58 2013 -0700 -- curator-client/pom.xml |4 ++-- curator-examples/pom.xml |4 ++-- curator-framework/pom.xml |4 ++-- curator-recipes/pom.xml|4 ++-- curator-test/pom.xml |4 ++-- curator-x-discovery-server/pom.xml |4 ++-- curator-x-discovery/pom.xml|4 ++-- pom.xml| 16 8 files changed, 22 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/0babac5c/curator-client/pom.xml -- diff --git a/curator-client/pom.xml b/curator-client/pom.xml index f847e0a..97b4334 100644 --- a/curator-client/pom.xml +++ b/curator-client/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.0-incubating +2.0.1-incubating-SNAPSHOT org.apache.curator curator-client -2.0.0-incubating +2.0.1-incubating-SNAPSHOT Curator Client Low-level API http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/0babac5c/curator-examples/pom.xml -- diff --git a/curator-examples/pom.xml b/curator-examples/pom.xml index 275a540..fd9ff8a 100644 --- a/curator-examples/pom.xml +++ b/curator-examples/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.0-incubating +2.0.1-incubating-SNAPSHOT org.apache.curator curator-examples -2.0.0-incubating +2.0.1-incubating-SNAPSHOT Curator Examples Example usages of various Curator features. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/0babac5c/curator-framework/pom.xml -- diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml index 56cde52..6c3bd1d 100644 --- a/curator-framework/pom.xml +++ b/curator-framework/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.0-incubating +2.0.1-incubating-SNAPSHOT org.apache.curator curator-framework -2.0.0-incubating +2.0.1-incubating-SNAPSHOT Curator Framework High-level API that greatly simplifies using ZooKeeper. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/0babac5c/curator-recipes/pom.xml -- diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml index 573041c..b9890a0 100644 --- a/curator-recipes/pom.xml +++ b/curator-recipes/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.0-incubating +2.0.1-incubating-SNAPSHOT org.apache.curator curator-recipes -2.0.0-incubating +2.0.1-incubating-SNAPSHOT Curator Recipes All of the recipes listed on the ZooKeeper recipes doc (except two phase commit). http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/0babac5c/curator-test/pom.xml -- diff --git a/curator-test/pom.xml b/curator-test/pom.xml index 1d7ab45..1a749c5 100644 --- a/curator-test/pom.xml +++ b/curator-test/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.0-incubating +2.0.1-incubating-SNAPSHOT org.apache.curator curator-test -2.0.0-incubating +2.0.1-incubating-SNAPSHOT Curator Testing Unit testing utilities. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/0babac5c/curator-x-discovery-server/pom.xml -- diff --git a/curator-x-discovery-server/pom.xml b/curator-x-discovery-server/pom.xml index 0806d6f..5f177f1 100644 --- a/curator-x-discovery-server/pom.xml +++ b/curator-x-discovery-server/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.0-incubating +2.0.1-incubating-SNAPSHOT org.apache.curator curator-x-discov
svn commit: r1477864 [21/32] - in /incubator/curator/site/trunk: ./ apidocs/ apidocs/cache/ apidocs/cache/class-use/ apidocs/discovery/ apidocs/discovery/class-use/ apidocs/framework/ apidocs/framewor
Modified: incubator/curator/site/trunk/curator-recipes/shared-counter.html URL: http://svn.apache.org/viewvc/incubator/curator/site/trunk/curator-recipes/shared-counter.html?rev=1477864&r1=1477863&r2=1477864&view=diff == --- incubator/curator/site/trunk/curator-recipes/shared-counter.html (original) +++ incubator/curator/site/trunk/curator-recipes/shared-counter.html Tue Apr 30 22:48:04 2013 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> - + Apache Curator Recipes - @@ -53,7 +53,7 @@ - Last Published: 2013-04-24 + Last Published: 2013-04-30 @@ -169,7 +169,7 @@ - https://cwiki.apache.org/confluence/display/CURATOR/Index"; class="externalLink" title="Wiki"> + https://cwiki.apache.org/confluence/display/CURATOR"; class="externalLink" title="Wiki"> Wiki Modified: incubator/curator/site/trunk/curator-recipes/shared-lock.html URL: http://svn.apache.org/viewvc/incubator/curator/site/trunk/curator-recipes/shared-lock.html?rev=1477864&r1=1477863&r2=1477864&view=diff == --- incubator/curator/site/trunk/curator-recipes/shared-lock.html (original) +++ incubator/curator/site/trunk/curator-recipes/shared-lock.html Tue Apr 30 22:48:04 2013 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> - + Apache Curator Recipes - @@ -53,7 +53,7 @@ - Last Published: 2013-04-24 + Last Published: 2013-04-30 @@ -169,7 +169,7 @@ - https://cwiki.apache.org/confluence/display/CURATOR/Index"; class="externalLink" title="Wiki"> + https://cwiki.apache.org/confluence/display/CURATOR"; class="externalLink" title="Wiki"> Wiki Modified: incubator/curator/site/trunk/curator-recipes/shared-reentrant-lock.html URL: http://svn.apache.org/viewvc/incubator/curator/site/trunk/curator-recipes/shared-reentrant-lock.html?rev=1477864&r1=1477863&r2=1477864&view=diff == --- incubator/curator/site/trunk/curator-recipes/shared-reentrant-lock.html (original) +++ incubator/curator/site/trunk/curator-recipes/shared-reentrant-lock.html Tue Apr 30 22:48:04 2013 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> - + Apache Curator Recipes - @@ -53,7 +53,7 @@ - Last Published: 2013-04-24 + Last Published: 2013-04-30 @@ -169,7 +169,7 @@ - https://cwiki.apache.org/confluence/display/CURATOR/Index"; class="externalLink" title="Wiki"> + https://cwiki.apache.org/confluence/display/CURATOR"; class="externalLink" title="Wiki"> Wiki Modified: incubator/curator/site/trunk/curator-recipes/shared-reentrant-read-write-lock.html URL: http://svn.apache.org/viewvc/incubator/curator/site/trunk/curator-recipes/shared-reentrant-read-write-lock.html?rev=1477864&r1=1477863&r2=1477864&view=diff == --- incubator/curator/site/trunk/curator-recipes/shared-reentrant-read-write-lock.html (original) +++ incubator/curator/site/trunk/curator-recipes/shared-reentrant-read-write-lock.html Tue Apr 30 22:48:04 2013 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> - + Apache Curator Recipes - @@ -53,7 +53,7 @@ - Last Published: 2013-04-24 + Last Published: 2013-04-30 @@ -169,7 +169,7 @@ - https://cwiki.apache.org/confluence/display/CURATOR/Index"; class="externalLink" title="Wiki"> + https://cwiki.apache.org/confluence/display/CURATOR"; class="externalLink" title="Wiki"> Wiki Modified: incubator/curator/site/trunk/curator-recipes/shared-semaphore.html URL: http://svn.apache.org/viewvc/incubator/curator/site/trunk/curator-recipes/shared-semaphore.htm
svn commit: r1477864 [32/32] - in /incubator/curator/site/trunk: ./ apidocs/ apidocs/cache/ apidocs/cache/class-use/ apidocs/discovery/ apidocs/discovery/class-use/ apidocs/framework/ apidocs/framewor
Modified:
incubator/curator/site/trunk/testapidocs/org/apache/curator/x/discovery/server/jetty_resteasy/RestEasyApplication.html
URL:
http://svn.apache.org/viewvc/incubator/curator/site/trunk/testapidocs/org/apache/curator/x/discovery/server/jetty_resteasy/RestEasyApplication.html?rev=1477864&r1=1477863&r2=1477864&view=diff
==
---
incubator/curator/site/trunk/testapidocs/org/apache/curator/x/discovery/server/jetty_resteasy/RestEasyApplication.html
(original)
+++
incubator/curator/site/trunk/testapidocs/org/apache/curator/x/discovery/server/jetty_resteasy/RestEasyApplication.html
Tue Apr 30 22:48:04 2013
@@ -2,13 +2,13 @@
-
+
-RestEasyApplication (Apache Curator 2.0.0-incubating-SNAPSHOT Test API)
+RestEasyApplication (Apache Curator 2.0.1-incubating-SNAPSHOT Test API)
-
+
@@ -16,7 +16,7 @@ RestEasyApplication (Apache Curator 2.0.
function windowTitle()
{
if (location.href.indexOf('is-external=true') == -1) {
-parent.document.title="RestEasyApplication (Apache Curator
2.0.0-incubating-SNAPSHOT Test API)";
+parent.document.title="RestEasyApplication (Apache Curator
2.0.1-incubating-SNAPSHOT Test API)";
}
}
Modified:
incubator/curator/site/trunk/testapidocs/org/apache/curator/x/discovery/server/jetty_resteasy/RestEasySingletons.html
URL:
http://svn.apache.org/viewvc/incubator/curator/site/trunk/testapidocs/org/apache/curator/x/discovery/server/jetty_resteasy/RestEasySingletons.html?rev=1477864&r1=1477863&r2=1477864&view=diff
==
---
incubator/curator/site/trunk/testapidocs/org/apache/curator/x/discovery/server/jetty_resteasy/RestEasySingletons.html
(original)
+++
incubator/curator/site/trunk/testapidocs/org/apache/curator/x/discovery/server/jetty_resteasy/RestEasySingletons.html
Tue Apr 30 22:48:04 2013
@@ -2,13 +2,13 @@
-
+
-RestEasySingletons (Apache Curator 2.0.0-incubating-SNAPSHOT Test API)
+RestEasySingletons (Apache Curator 2.0.1-incubating-SNAPSHOT Test API)
-
+
@@ -16,7 +16,7 @@ RestEasySingletons (Apache Curator 2.0.0
function windowTitle()
{
if (location.href.indexOf('is-external=true') == -1) {
-parent.document.title="RestEasySingletons (Apache Curator
2.0.0-incubating-SNAPSHOT Test API)";
+parent.document.title="RestEasySingletons (Apache Curator
2.0.1-incubating-SNAPSHOT Test API)";
}
}
Modified:
incubator/curator/site/trunk/testapidocs/org/apache/curator/x/discovery/server/jetty_resteasy/StringDiscoveryResource.html
URL:
http://svn.apache.org/viewvc/incubator/curator/site/trunk/testapidocs/org/apache/curator/x/discovery/server/jetty_resteasy/StringDiscoveryResource.html?rev=1477864&r1=1477863&r2=1477864&view=diff
==
---
incubator/curator/site/trunk/testapidocs/org/apache/curator/x/discovery/server/jetty_resteasy/StringDiscoveryResource.html
(original)
+++
incubator/curator/site/trunk/testapidocs/org/apache/curator/x/discovery/server/jetty_resteasy/StringDiscoveryResource.html
Tue Apr 30 22:48:04 2013
@@ -2,13 +2,13 @@
-
+
-StringDiscoveryResource (Apache Curator 2.0.0-incubating-SNAPSHOT Test API)
+StringDiscoveryResource (Apache Curator 2.0.1-incubating-SNAPSHOT Test API)
-
+
@@ -16,7 +16,7 @@ StringDiscoveryResource (Apache Curator
function windowTitle()
{
if (location.href.indexOf('is-external=true') == -1) {
-parent.document.title="StringDiscoveryResource (Apache Curator
2.0.0-incubating-SNAPSHOT Test API)";
+parent.document.title="StringDiscoveryResource (Apache Curator
2.0.1-incubating-SNAPSHOT Test API)";
}
}
Modified:
incubator/curator/site/trunk/testapidocs/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.html
URL:
http://svn.apache.org/viewvc/incubator/curator/site/trunk/testapidocs/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.html?rev=1477864&r1=1477863&r2=1477864&view=diff
==
---
incubator/curator/site/trunk/testapidocs/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.html
(original)
+++
incubator/curator/site/trunk/testapidocs/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.html
Tue Apr 30 22:48:04 2013
@@ -2,13 +2,13 @@
-
+
-TestStringsWithRestEasy (Apache Curator 2.0.0-incubating-SNAPSHOT Test API)
+TestStringsWithRestEasy (Apache Curator 2.0.1-incubating-SNAPSHOT Test API)
-
+
@@ -16,7 +16,7 @@ TestStringsWithRestEasy (Apache Curator
function windowTitle()
{
if (location.href.indexOf('is-external=true') == -1) {
-parent.document.title="TestStringsWithRestEasy (Apache Curator
2.0.0-incubating-SNAPSHOT Test API)";
+parent.document.title="Tes
[2/2] git commit: not needed
not needed Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/f8567052 Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/f8567052 Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/f8567052 Branch: refs/heads/master Commit: f8567052d72d4d933affbd1b3273396a7e7dc490 Parents: 046b49d Author: randgalt Authored: Wed May 1 10:01:50 2013 -0700 Committer: randgalt Committed: Wed May 1 10:01:50 2013 -0700 -- CHANGES | 558 -- KEYS| 47 - 2 files changed, 0 insertions(+), 605 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/f8567052/CHANGES -- diff --git a/CHANGES b/CHANGES deleted file mode 100644 index de9f3a4..000 --- a/CHANGES +++ /dev/null @@ -1,558 +0,0 @@ -1.3.4 - x -= -* Issue 257: Fixed a race condition in LeaderLatch that cause the recipe to create -two nodes in some edge cases. - -1.3.3 - March 6, 2013 -= -* Issue 250: Restore support for passing null to usingWatcher(). - -* Issue 251: Allow a custom Executor Service to be used for PathChildrenCache. - -* DistributedDoubleBarrier wasn't handling wait expiration correctly and was sending negative -numbers to wait(). - -* Issue 254: Check that executorService isn't null before closing. - -* Pull 258: Fix bad performing use of Guava's transform. - -1.3.2 - February 6, 2013 - -* MAJOR BUG FIX - Issue 232: ZooKeeper guarantees that "A watch object, or function/context pair, will only -be triggered once for a given notification." Curator was breaking this guarantee by internally creating a -new Watcher object each time one was needed. This is now fixed and ZooKeeper's guarantee is restored. Big -thanks to user barkbay for his persistence and help on this. - -* Issue 247: POST_INITIALIZED_EVENT wasn't correctly handling an initially empty node. - -* Issue 245: Auth info specified in the CuratorFrameworkFactory.Builder was not being re-set in cases -where the internal ZooKeeper handle was recreated. i.e. if the cluster has issues auth info would be lost. - -* The default watcher in the ZooKeeper handle is now cleared before the ZooKeeper handle is closed. This avoids -an edge case where events meant for the old ZooKeeper handle get processed. - -1.3.1 - January 28, 2013 - -* Tightened up a possible race deep inside the connection management. - -* PathChildrenCache.rebuild() and PathChildrenCache.rebuildNode() were not handling deleted nodes. - -* Issue 237: New feature. PathChildrenCache now optionally posts an event when the initial cache is -populated. To accommodate this behavior there is a new version of start() that takes an enum. See the -Javadoc for each value. For this new behavior, use StartMode.POST_INITIALIZED_EVENT. Once the cache -is initialized a PathChildrenCacheEvent.Type.INITIALIZED will be posted. Huge thanks to user philflesh -for the idea and co-implementation. - -1.3.0 - January 10, 2013 - -* MAJOR CHANGE (thus a version bump): I'd always thought that if the client is disconnected from the server -long enough then an Expired event would be generated. Testing, however, shows this not to be the case. I believe -it's related to ZOOKEEPER-1159. The behavior associated with this is that if the clients lost connection to the -cluster for longer than the session expiration they would _never_ be able to reconnect. The connection would -be permanently lost. Many users were seeing this as endless log messages indicating "Connection timed out -for connection...". As a workaround, in 1.3.0+ when the Curator state changes to LOST, a flag will be set -so that the next time Curator needs to get the ZooKeeper instance, the current instance will be closed and a new -ZooKeeper instance will be allocated (as if the session had expired). - -* Added checks for illegal namespaces. - -* Issue 232: NodeCache wasn't handling server connection issues well. It would repeatedly execute checkExists() -with a watcher causing the heap to fill with watcher objects. - -* Issue 233: An internal idiom being used to create an EnsurePath instance with the parent of a passed in path -wasn't correct. Due to an unfortunate implementation of ZKPaths.PathAndNode (mea culpa) the root path is specified -differently than non-root paths. To work around this, I added a method to EnsurePath - excludingLast() - that -can be used instead of the idiom. - -* Issue 230: Added a filter to control which IP address are returned
git commit: Added disclaimer
Updated Branches:
refs/heads/master f8567052d -> 2bb576b2d
Added disclaimer
Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/2bb576b2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/2bb576b2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/2bb576b2
Branch: refs/heads/master
Commit: 2bb576b2dc46d2caf9fc18b0472ba78ff1755b10
Parents: f856705
Author: randgalt
Authored: Wed May 1 13:31:24 2013 -0700
Committer: randgalt
Committed: Wed May 1 13:31:24 2013 -0700
--
src/site/confluence/index.confluence |8
1 files changed, 8 insertions(+), 0 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/2bb576b2/src/site/confluence/index.confluence
--
diff --git a/src/site/confluence/index.confluence
b/src/site/confluence/index.confluence
index ba1bdd5..479eb76 100644
--- a/src/site/confluence/index.confluence
+++ b/src/site/confluence/index.confluence
@@ -32,3 +32,11 @@ most users, the only artifact you need is
{{curator-recipes}}.
|org.apache.curator|curator-examples|Example usages of various Curator
features.|
|org.apache.curator|curator-x-discovery|A Service Discovery implementation
built on the Curator Framework.|
|org.apache.curator|curator-x-discovery-server|A RESTful server that can be
used with Curator Discovery.|
+
+h2. Disclaimer
+
+Apache Curator is an effort undergoing incubation at the Apache Software
Foundation (ASF), sponsored by the Incubator PMC.
+
+Incubation is required of all newly accepted projects until a further review
indicates that the infrastructure, communications, and decision making process
have stabilized in a manner consistent with other successful ASF projects.
+
+While incubation status is not necessarily a reflection of the completeness or
stability of the code, it does indicate that the project has yet to be fully
endorsed by the ASF.
git commit: Fixed formatting
Updated Branches: refs/heads/master 2bb576b2d -> 23e4513cd Fixed formatting Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/23e4513c Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/23e4513c Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/23e4513c Branch: refs/heads/master Commit: 23e4513cd91bb108d42ded0317801bc698f81dff Parents: 2bb576b Author: randgalt Authored: Wed May 1 13:32:31 2013 -0700 Committer: randgalt Committed: Wed May 1 13:32:31 2013 -0700 -- NOTICE|6 +++--- curator-client/NOTICE |6 +++--- curator-examples/NOTICE |6 +++--- curator-framework/NOTICE |6 +++--- curator-recipes/NOTICE|6 +++--- curator-test/NOTICE |6 +++--- curator-x-discovery-server/NOTICE |6 +++--- curator-x-discovery/NOTICE|6 +++--- 8 files changed, 24 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/23e4513c/NOTICE -- diff --git a/NOTICE b/NOTICE index bf09616..897aa73 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ Apache Curator - Copyright 2013 The Apache Software Foundation +Copyright 2013 The Apache Software Foundation - This product includes software developed at - The Apache Software Foundation (http://www.apache.org/). +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/23e4513c/curator-client/NOTICE -- diff --git a/curator-client/NOTICE b/curator-client/NOTICE index bf09616..897aa73 100644 --- a/curator-client/NOTICE +++ b/curator-client/NOTICE @@ -1,5 +1,5 @@ Apache Curator - Copyright 2013 The Apache Software Foundation +Copyright 2013 The Apache Software Foundation - This product includes software developed at - The Apache Software Foundation (http://www.apache.org/). +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/23e4513c/curator-examples/NOTICE -- diff --git a/curator-examples/NOTICE b/curator-examples/NOTICE index bf09616..897aa73 100644 --- a/curator-examples/NOTICE +++ b/curator-examples/NOTICE @@ -1,5 +1,5 @@ Apache Curator - Copyright 2013 The Apache Software Foundation +Copyright 2013 The Apache Software Foundation - This product includes software developed at - The Apache Software Foundation (http://www.apache.org/). +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/23e4513c/curator-framework/NOTICE -- diff --git a/curator-framework/NOTICE b/curator-framework/NOTICE index bf09616..897aa73 100644 --- a/curator-framework/NOTICE +++ b/curator-framework/NOTICE @@ -1,5 +1,5 @@ Apache Curator - Copyright 2013 The Apache Software Foundation +Copyright 2013 The Apache Software Foundation - This product includes software developed at - The Apache Software Foundation (http://www.apache.org/). +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/23e4513c/curator-recipes/NOTICE -- diff --git a/curator-recipes/NOTICE b/curator-recipes/NOTICE index bf09616..897aa73 100644 --- a/curator-recipes/NOTICE +++ b/curator-recipes/NOTICE @@ -1,5 +1,5 @@ Apache Curator - Copyright 2013 The Apache Software Foundation +Copyright 2013 The Apache Software Foundation - This product includes software developed at - The Apache Software Foundation (http://www.apache.org/). +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/23e4513c/curator-test/NOTICE -- diff --git a/curator-test/NOTICE b/curator-test/NOTICE index bf09616..897aa73 100644 --- a/curator-test/NOTICE +++ b/curator-test/NOTICE @@ -1,5 +1,5 @@ Apache Curator - Copyright 2013 The Apache Software Foundation +Copyright 2013 The Apache Software Foundation - This product includes software developed at - The Apache Software Foundation (h
Git Push Summary
Updated Tags: refs/tags/apache-curator-2.0.0-incubating [deleted] cbd0938fc
git commit: Added RAT plugin for convenience
Updated Branches: refs/heads/master 23e4513cd -> 8d416653d Added RAT plugin for convenience Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/8d416653 Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/8d416653 Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/8d416653 Branch: refs/heads/master Commit: 8d416653d42a949141ccd9889b00f3fbd8baba09 Parents: 23e4513 Author: randgalt Authored: Wed May 1 13:37:49 2013 -0700 Committer: randgalt Committed: Wed May 1 13:37:49 2013 -0700 -- pom.xml | 22 ++ 1 files changed, 22 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/8d416653/pom.xml -- diff --git a/pom.xml b/pom.xml index c451555..fc0efa6 100644 --- a/pom.xml +++ b/pom.xml @@ -456,6 +456,28 @@ -Dmaven.test.skip=true + + +org.apache.rat +apache-rat-plugin +0.8 + +0 +false + +**/*.confluence +**/.gitignore +**/DISCLAIMER +**/DEPENDENCIES +**/KEYS +**/LICENSE +**/NOTICE +**/README +**/CHANGES +**/RELEASE-NOTES + + +
[3/3] git commit: [maven-release-plugin] prepare release apache-curator-2.0.0-incubating
[maven-release-plugin] prepare release apache-curator-2.0.0-incubating Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/4b7b7b67 Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/4b7b7b67 Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/4b7b7b67 Branch: refs/heads/master Commit: 4b7b7b67f4ca941bca0f3c4346b86f768f04d867 Parents: 399b42b Author: randgalt Authored: Wed May 1 13:51:52 2013 -0700 Committer: randgalt Committed: Wed May 1 13:51:52 2013 -0700 -- curator-client/pom.xml |4 ++-- curator-examples/pom.xml |4 ++-- curator-framework/pom.xml |4 ++-- curator-recipes/pom.xml|4 ++-- curator-test/pom.xml |4 ++-- curator-x-discovery-server/pom.xml |4 ++-- curator-x-discovery/pom.xml|4 ++-- pom.xml| 16 8 files changed, 22 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/4b7b7b67/curator-client/pom.xml -- diff --git a/curator-client/pom.xml b/curator-client/pom.xml index c3d463a..f847e0a 100644 --- a/curator-client/pom.xml +++ b/curator-client/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.0-incubating-SNAPSHOT +2.0.0-incubating org.apache.curator curator-client -2.0.0-incubating-SNAPSHOT +2.0.0-incubating Curator Client Low-level API http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/4b7b7b67/curator-examples/pom.xml -- diff --git a/curator-examples/pom.xml b/curator-examples/pom.xml index 92e3f0f..275a540 100644 --- a/curator-examples/pom.xml +++ b/curator-examples/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.0-incubating-SNAPSHOT +2.0.0-incubating org.apache.curator curator-examples -2.0.0-incubating-SNAPSHOT +2.0.0-incubating Curator Examples Example usages of various Curator features. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/4b7b7b67/curator-framework/pom.xml -- diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml index 7313a77..56cde52 100644 --- a/curator-framework/pom.xml +++ b/curator-framework/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.0-incubating-SNAPSHOT +2.0.0-incubating org.apache.curator curator-framework -2.0.0-incubating-SNAPSHOT +2.0.0-incubating Curator Framework High-level API that greatly simplifies using ZooKeeper. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/4b7b7b67/curator-recipes/pom.xml -- diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml index fa16d44..573041c 100644 --- a/curator-recipes/pom.xml +++ b/curator-recipes/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.0-incubating-SNAPSHOT +2.0.0-incubating org.apache.curator curator-recipes -2.0.0-incubating-SNAPSHOT +2.0.0-incubating Curator Recipes All of the recipes listed on the ZooKeeper recipes doc (except two phase commit). http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/4b7b7b67/curator-test/pom.xml -- diff --git a/curator-test/pom.xml b/curator-test/pom.xml index 56eefe3..1d7ab45 100644 --- a/curator-test/pom.xml +++ b/curator-test/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.0-incubating-SNAPSHOT +2.0.0-incubating org.apache.curator curator-test -2.0.0-incubating-SNAPSHOT +2.0.0-incubating Curator Testing Unit testing utilities. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/4b7b7b67/curator-x-discovery-server/pom.xml -- diff --git a/curator-x-discovery-server/pom.xml b/curator-x-discovery-server/pom.xml index c6ea85a..0806d6f 100644 --- a/curator-x-discovery-server/pom.xml +++ b/curator-x-discovery-server/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.0-incubating-SNAPSHOT +2.0.0-incubating org.apache.curator curator-x-discovery-server -2.0.0-incubating-SNAPSHOT +2.0.0-incubating
[1/3] git commit: Back to 2.0.0-incubating again
Updated Branches: refs/heads/master 8d416653d -> 4b7b7b67f Back to 2.0.0-incubating again Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/faf4e376 Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/faf4e376 Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/faf4e376 Branch: refs/heads/master Commit: faf4e376b5eaec83b4613086a392a8ec764802ec Parents: 8d41665 Author: randgalt Authored: Wed May 1 13:50:09 2013 -0700 Committer: randgalt Committed: Wed May 1 13:50:09 2013 -0700 -- curator-client/pom.xml |4 ++-- curator-examples/pom.xml |4 ++-- curator-framework/pom.xml |4 ++-- curator-recipes/pom.xml|4 ++-- curator-test/pom.xml |4 ++-- curator-x-discovery-server/pom.xml |4 ++-- curator-x-discovery/pom.xml|4 ++-- pom.xml| 14 +++--- 8 files changed, 21 insertions(+), 21 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/faf4e376/curator-client/pom.xml -- diff --git a/curator-client/pom.xml b/curator-client/pom.xml index 97b4334..f847e0a 100644 --- a/curator-client/pom.xml +++ b/curator-client/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.1-incubating-SNAPSHOT +2.0.0-incubating org.apache.curator curator-client -2.0.1-incubating-SNAPSHOT +2.0.0-incubating Curator Client Low-level API http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/faf4e376/curator-examples/pom.xml -- diff --git a/curator-examples/pom.xml b/curator-examples/pom.xml index fd9ff8a..275a540 100644 --- a/curator-examples/pom.xml +++ b/curator-examples/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.1-incubating-SNAPSHOT +2.0.0-incubating org.apache.curator curator-examples -2.0.1-incubating-SNAPSHOT +2.0.0-incubating Curator Examples Example usages of various Curator features. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/faf4e376/curator-framework/pom.xml -- diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml index 6c3bd1d..56cde52 100644 --- a/curator-framework/pom.xml +++ b/curator-framework/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.1-incubating-SNAPSHOT +2.0.0-incubating org.apache.curator curator-framework -2.0.1-incubating-SNAPSHOT +2.0.0-incubating Curator Framework High-level API that greatly simplifies using ZooKeeper. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/faf4e376/curator-recipes/pom.xml -- diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml index b9890a0..573041c 100644 --- a/curator-recipes/pom.xml +++ b/curator-recipes/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.1-incubating-SNAPSHOT +2.0.0-incubating org.apache.curator curator-recipes -2.0.1-incubating-SNAPSHOT +2.0.0-incubating Curator Recipes All of the recipes listed on the ZooKeeper recipes doc (except two phase commit). http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/faf4e376/curator-test/pom.xml -- diff --git a/curator-test/pom.xml b/curator-test/pom.xml index 1a749c5..1d7ab45 100644 --- a/curator-test/pom.xml +++ b/curator-test/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.1-incubating-SNAPSHOT +2.0.0-incubating org.apache.curator curator-test -2.0.1-incubating-SNAPSHOT +2.0.0-incubating Curator Testing Unit testing utilities. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/faf4e376/curator-x-discovery-server/pom.xml -- diff --git a/curator-x-discovery-server/pom.xml b/curator-x-discovery-server/pom.xml index 5f177f1..0806d6f 100644 --- a/curator-x-discovery-server/pom.xml +++ b/curator-x-discovery-server/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.1-incubating-SNAPSHOT +2.0.0-incubating org.apache.curator curator-x-discovery-server -2.0.1-incubating-SNAPS
[2/3] git commit: Back to 2.0.0-incubating again
Back to 2.0.0-incubating again Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/399b42b5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/399b42b5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/399b42b5 Branch: refs/heads/master Commit: 399b42b5bcaea331497b0c3b014899eeaa5fa1eb Parents: faf4e37 Author: randgalt Authored: Wed May 1 13:50:40 2013 -0700 Committer: randgalt Committed: Wed May 1 13:50:40 2013 -0700 -- curator-client/pom.xml |4 ++-- curator-examples/pom.xml |4 ++-- curator-framework/pom.xml |4 ++-- curator-recipes/pom.xml|4 ++-- curator-test/pom.xml |4 ++-- curator-x-discovery-server/pom.xml |4 ++-- curator-x-discovery/pom.xml|4 ++-- pom.xml| 14 +++--- 8 files changed, 21 insertions(+), 21 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/399b42b5/curator-client/pom.xml -- diff --git a/curator-client/pom.xml b/curator-client/pom.xml index f847e0a..c3d463a 100644 --- a/curator-client/pom.xml +++ b/curator-client/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.0-incubating +2.0.0-incubating-SNAPSHOT org.apache.curator curator-client -2.0.0-incubating +2.0.0-incubating-SNAPSHOT Curator Client Low-level API http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/399b42b5/curator-examples/pom.xml -- diff --git a/curator-examples/pom.xml b/curator-examples/pom.xml index 275a540..92e3f0f 100644 --- a/curator-examples/pom.xml +++ b/curator-examples/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.0-incubating +2.0.0-incubating-SNAPSHOT org.apache.curator curator-examples -2.0.0-incubating +2.0.0-incubating-SNAPSHOT Curator Examples Example usages of various Curator features. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/399b42b5/curator-framework/pom.xml -- diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml index 56cde52..7313a77 100644 --- a/curator-framework/pom.xml +++ b/curator-framework/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.0-incubating +2.0.0-incubating-SNAPSHOT org.apache.curator curator-framework -2.0.0-incubating +2.0.0-incubating-SNAPSHOT Curator Framework High-level API that greatly simplifies using ZooKeeper. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/399b42b5/curator-recipes/pom.xml -- diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml index 573041c..fa16d44 100644 --- a/curator-recipes/pom.xml +++ b/curator-recipes/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.0-incubating +2.0.0-incubating-SNAPSHOT org.apache.curator curator-recipes -2.0.0-incubating +2.0.0-incubating-SNAPSHOT Curator Recipes All of the recipes listed on the ZooKeeper recipes doc (except two phase commit). http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/399b42b5/curator-test/pom.xml -- diff --git a/curator-test/pom.xml b/curator-test/pom.xml index 1d7ab45..56eefe3 100644 --- a/curator-test/pom.xml +++ b/curator-test/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.0-incubating +2.0.0-incubating-SNAPSHOT org.apache.curator curator-test -2.0.0-incubating +2.0.0-incubating-SNAPSHOT Curator Testing Unit testing utilities. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/399b42b5/curator-x-discovery-server/pom.xml -- diff --git a/curator-x-discovery-server/pom.xml b/curator-x-discovery-server/pom.xml index 0806d6f..c6ea85a 100644 --- a/curator-x-discovery-server/pom.xml +++ b/curator-x-discovery-server/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.0-incubating +2.0.0-incubating-SNAPSHOT org.apache.curator curator-x-discovery-server -2.0.0-incubating +2.0.0-incubating-SNAPSHOT Curator Service Discovery Server
Git Push Summary
Updated Tags: refs/tags/apache-curator-2.0.0-incubating [created] 9bd468d1e
git commit: [maven-release-plugin] prepare for next development iteration
Updated Branches: refs/heads/master 4b7b7b67f -> 97cda3947 [maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/97cda394 Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/97cda394 Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/97cda394 Branch: refs/heads/master Commit: 97cda3947c7db5542647de789c0c9dc6b8d28c34 Parents: 4b7b7b6 Author: randgalt Authored: Wed May 1 13:51:58 2013 -0700 Committer: randgalt Committed: Wed May 1 13:51:58 2013 -0700 -- curator-client/pom.xml |4 ++-- curator-examples/pom.xml |4 ++-- curator-framework/pom.xml |4 ++-- curator-recipes/pom.xml|4 ++-- curator-test/pom.xml |4 ++-- curator-x-discovery-server/pom.xml |4 ++-- curator-x-discovery/pom.xml|4 ++-- pom.xml| 16 8 files changed, 22 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/97cda394/curator-client/pom.xml -- diff --git a/curator-client/pom.xml b/curator-client/pom.xml index f847e0a..97b4334 100644 --- a/curator-client/pom.xml +++ b/curator-client/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.0-incubating +2.0.1-incubating-SNAPSHOT org.apache.curator curator-client -2.0.0-incubating +2.0.1-incubating-SNAPSHOT Curator Client Low-level API http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/97cda394/curator-examples/pom.xml -- diff --git a/curator-examples/pom.xml b/curator-examples/pom.xml index 275a540..fd9ff8a 100644 --- a/curator-examples/pom.xml +++ b/curator-examples/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.0-incubating +2.0.1-incubating-SNAPSHOT org.apache.curator curator-examples -2.0.0-incubating +2.0.1-incubating-SNAPSHOT Curator Examples Example usages of various Curator features. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/97cda394/curator-framework/pom.xml -- diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml index 56cde52..6c3bd1d 100644 --- a/curator-framework/pom.xml +++ b/curator-framework/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.0-incubating +2.0.1-incubating-SNAPSHOT org.apache.curator curator-framework -2.0.0-incubating +2.0.1-incubating-SNAPSHOT Curator Framework High-level API that greatly simplifies using ZooKeeper. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/97cda394/curator-recipes/pom.xml -- diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml index 573041c..b9890a0 100644 --- a/curator-recipes/pom.xml +++ b/curator-recipes/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.0-incubating +2.0.1-incubating-SNAPSHOT org.apache.curator curator-recipes -2.0.0-incubating +2.0.1-incubating-SNAPSHOT Curator Recipes All of the recipes listed on the ZooKeeper recipes doc (except two phase commit). http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/97cda394/curator-test/pom.xml -- diff --git a/curator-test/pom.xml b/curator-test/pom.xml index 1d7ab45..1a749c5 100644 --- a/curator-test/pom.xml +++ b/curator-test/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.0-incubating +2.0.1-incubating-SNAPSHOT org.apache.curator curator-test -2.0.0-incubating +2.0.1-incubating-SNAPSHOT Curator Testing Unit testing utilities. http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/97cda394/curator-x-discovery-server/pom.xml -- diff --git a/curator-x-discovery-server/pom.xml b/curator-x-discovery-server/pom.xml index 0806d6f..5f177f1 100644 --- a/curator-x-discovery-server/pom.xml +++ b/curator-x-discovery-server/pom.xml @@ -24,12 +24,12 @@ org.apache.curator apache-curator -2.0.0-incubating +2.0.1-incubating-SNAPSHOT org.apache.curator curator-x-discov
svn commit: r1478212 [9/20] - in /incubator/curator/site/trunk: ./ apidocs/ apidocs/cache/ apidocs/cache/class-use/ apidocs/discovery/ apidocs/discovery/class-use/ apidocs/framework/ apidocs/framework
Modified: incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/contexts/class-use/MapDiscoveryContext.html URL: http://svn.apache.org/viewvc/incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/contexts/class-use/MapDiscoveryContext.html?rev=1478212&r1=1478211&r2=1478212&view=diff == --- incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/contexts/class-use/MapDiscoveryContext.html (original) +++ incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/contexts/class-use/MapDiscoveryContext.html Wed May 1 22:03:22 2013 @@ -2,13 +2,13 @@ - + Uses of Class org.apache.curator.x.discovery.server.contexts.MapDiscoveryContext (Apache Curator 2.0.1-incubating-SNAPSHOT API) - + Modified: incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/contexts/class-use/StringDiscoveryContext.html URL: http://svn.apache.org/viewvc/incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/contexts/class-use/StringDiscoveryContext.html?rev=1478212&r1=1478211&r2=1478212&view=diff == --- incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/contexts/class-use/StringDiscoveryContext.html (original) +++ incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/contexts/class-use/StringDiscoveryContext.html Wed May 1 22:03:22 2013 @@ -2,13 +2,13 @@ - + Uses of Class org.apache.curator.x.discovery.server.contexts.StringDiscoveryContext (Apache Curator 2.0.1-incubating-SNAPSHOT API) - + Modified: incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/contexts/package-frame.html URL: http://svn.apache.org/viewvc/incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/contexts/package-frame.html?rev=1478212&r1=1478211&r2=1478212&view=diff == --- incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/contexts/package-frame.html (original) +++ incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/contexts/package-frame.html Wed May 1 22:03:22 2013 @@ -2,13 +2,13 @@ - + org.apache.curator.x.discovery.server.contexts (Apache Curator 2.0.1-incubating-SNAPSHOT API) - + Modified: incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/contexts/package-summary.html URL: http://svn.apache.org/viewvc/incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/contexts/package-summary.html?rev=1478212&r1=1478211&r2=1478212&view=diff == --- incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/contexts/package-summary.html (original) +++ incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/contexts/package-summary.html Wed May 1 22:03:22 2013 @@ -2,13 +2,13 @@ - + org.apache.curator.x.discovery.server.contexts (Apache Curator 2.0.1-incubating-SNAPSHOT API) - + Modified: incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/contexts/package-tree.html URL: http://svn.apache.org/viewvc/incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/contexts/package-tree.html?rev=1478212&r1=1478211&r2=1478212&view=diff == --- incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/contexts/package-tree.html (original) +++ incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/contexts/package-tree.html Wed May 1 22:03:22 2013 @@ -2,13 +2,13 @@ - + org.apache.curator.x.discovery.server.contexts Class Hierarchy (Apache Curator 2.0.1-incubating-SNAPSHOT API) - + Modified: incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/contexts/package-use.html URL: http://svn.apache.org/viewvc/incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/contexts/package-use.html?rev=1478212&r1=1478211&r2=1478212&view=diff == --- incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/contexts/package-use.html (original) +++ incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/contexts/package-use.html Wed May 1 22:03:22 2013 @@ -2,13 +2,13 @@ - + Uses of Package org.apache.curator.x.discovery.server.contexts (Apache Curator 2.0.1-incubating-SNAPSHOT API) - + Modified: incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/entity/JsonServiceInstanceMarshaller.htm
git commit: CURATOR-21 PathChildrenCache currently takes an Executor, but only to fire off a Runnable that does a blocking while loop waiting for work. This means that you must have one thread per Pat
Updated Branches:
refs/heads/CURATOR-21 [created] 75b540414
CURATOR-21
PathChildrenCache currently takes an Executor, but only to fire off a Runnable
that does a blocking while loop waiting for work. This means that you must have
one thread per PathChildrenCache, which is not that great.
PathChildrenCache should just use the Executor's work queuing mechanism to
enqueue work items instead of maintaining its own work queue mechanism.
Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/75b54041
Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/75b54041
Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/75b54041
Branch: refs/heads/CURATOR-21
Commit: 75b540414f860446f106a1cdbdea121046be2e98
Parents: 97cda39
Author: randgalt
Authored: Sun May 5 07:20:02 2013 -0700
Committer: randgalt
Committed: Sun May 5 07:20:02 2013 -0700
--
.../apache/curator/framework/CuratorFramework.java |3 +
.../framework/recipes/cache/PathChildrenCache.java | 132 +
.../recipes/cache/PathChildrenCacheEvent.java | 21 ++
.../recipes/cache/TestPathChildrenCache.java | 251 +++
4 files changed, 350 insertions(+), 57 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/75b54041/curator-framework/src/main/java/org/apache/curator/framework/CuratorFramework.java
--
diff --git
a/curator-framework/src/main/java/org/apache/curator/framework/CuratorFramework.java
b/curator-framework/src/main/java/org/apache/curator/framework/CuratorFramework.java
index 7938b2e..0ca9b23 100644
---
a/curator-framework/src/main/java/org/apache/curator/framework/CuratorFramework.java
+++
b/curator-framework/src/main/java/org/apache/curator/framework/CuratorFramework.java
@@ -74,6 +74,9 @@ public interface CuratorFramework extends Closeable
/**
* Start an exists builder
*
+ * The builder will return a Stat object as if
org.apache.zookeeper.ZooKeeper.exists() were called. Thus, a null
+ * means that it does not exist and an actual Stat object means it does
exist.
+ *
* @return builder object
*/
public ExistsBuilder checkExists();
http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/75b54041/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/PathChildrenCache.java
--
diff --git
a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/PathChildrenCache.java
b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/PathChildrenCache.java
index 9b25001..76efc6c 100644
---
a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/PathChildrenCache.java
+++
b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/PathChildrenCache.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.curator.framework.recipes.cache;
import com.google.common.annotations.VisibleForTesting;
@@ -46,12 +47,10 @@ import java.io.IOException;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.Exchanger;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.atomic.AtomicReference;
@@ -74,12 +73,20 @@ public class PathChildrenCache implements Closeable
private final boolean cacheData;
private final boolean dataIsCompressed;
private final EnsurePath ensurePath;
-private final BlockingQueue operations = new
LinkedBlockingQueue();
private final ListenerContainer listeners = new
ListenerContainer();
private final ConcurrentMap currentData =
Maps.newConcurrentMap();
private final AtomicReference> initialSet = new
AtomicReference>();
+private final Set operationsQuantizer =
Sets.newSetFromMap(Maps.newConcurrentMap());
+private final AtomicReference state = new
AtomicReference(State.LATENT);
+
+private enum State
+{
+LATENT,
+STARTED,
+CLOSED
+}
-private static final ChildData NULL_CHILD_DATA = new ChildData(null,
null, null);
+private static final ChildData NULL_CHILD_DATA = new ChildData(null, null,
null);
private final Watcher childrenWatcher = new Watcher()
{
@@ -217,8 +224,8 @@ public class PathChildrenCache implements Closeable
* @param buildInitial if true, {@link #rebuild
svn commit: r1929 - /dev/incubator/curator/
Author: randgalt Date: Mon May 6 18:13:33 2013 New Revision: 1929 Log: Stage of Curator 2.0.0-incubating Added: dev/incubator/curator/apache-curator-2.0.0-incubating-source-release.zip (with props) dev/incubator/curator/apache-curator-2.0.0-incubating-source-release.zip.asc dev/incubator/curator/apache-curator-2.0.0-incubating-source-release.zip.md5 dev/incubator/curator/apache-curator-2.0.0-incubating-source-release.zip.sha1 Added: dev/incubator/curator/apache-curator-2.0.0-incubating-source-release.zip == Binary file - no diff available. Propchange: dev/incubator/curator/apache-curator-2.0.0-incubating-source-release.zip -- svn:mime-type = application/octet-stream Added: dev/incubator/curator/apache-curator-2.0.0-incubating-source-release.zip.asc == --- dev/incubator/curator/apache-curator-2.0.0-incubating-source-release.zip.asc (added) +++ dev/incubator/curator/apache-curator-2.0.0-incubating-source-release.zip.asc Mon May 6 18:13:33 2013 @@ -0,0 +1,12 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG/MacGPG2 v2.0.17 (Darwin) +Comment: GPGTools - http://gpgtools.org + +iQEcBAABAgAGBQJRgYEIAAoJEJ6949BmSJ2Xk3QIAJ/unvmwbQ0xmUv+VV0G+AOI +ZvTumau793zFR33laqnDGt3krS1pmfOv/ph84tEbBhpQ6H+DOnL+C0HsS0fcZPug +YnpjKIXD5VeC+DpzZMFk8M/1rE+Js//Fe5TxSNOuSlDev/XnhEryK3pbSRZbFH8N +MmiNSXK+37ZTIqj3XuKxyri8+WhPJhNpdy5UBKAHsyUxJ/WptSn4mvJkQ8lYSVBO +sVg6s4MRaVKMS5Qh+Su2exuFDwt7TL/Rx5OFNjo3TFSpj91QXnxNvbUCUMBOucCa +Z1969MsHEeoE1xiWM+dFioXv9EhnRDXqn7W7cvsgL2909v8mX4yV9TyxZ5ijnZQ= +=M+tT +-END PGP SIGNATURE- Added: dev/incubator/curator/apache-curator-2.0.0-incubating-source-release.zip.md5 == --- dev/incubator/curator/apache-curator-2.0.0-incubating-source-release.zip.md5 (added) +++ dev/incubator/curator/apache-curator-2.0.0-incubating-source-release.zip.md5 Mon May 6 18:13:33 2013 @@ -0,0 +1 @@ +93bc3d5f80a89cfe049bee69a9542154 \ No newline at end of file Added: dev/incubator/curator/apache-curator-2.0.0-incubating-source-release.zip.sha1 == --- dev/incubator/curator/apache-curator-2.0.0-incubating-source-release.zip.sha1 (added) +++ dev/incubator/curator/apache-curator-2.0.0-incubating-source-release.zip.sha1 Mon May 6 18:13:33 2013 @@ -0,0 +1 @@ +2bc35b9a93212946845eb98dd1b3840147d39f64 \ No newline at end of file
svn commit: r1930 - /dev/incubator/curator/2.0.0-incubating/
Author: randgalt Date: Mon May 6 18:22:34 2013 New Revision: 1930 Log: put staging artifacts in release dir Added: dev/incubator/curator/2.0.0-incubating/ dev/incubator/curator/2.0.0-incubating/apache-curator-2.0.0-incubating-source-release.zip (with props) dev/incubator/curator/2.0.0-incubating/apache-curator-2.0.0-incubating-source-release.zip.asc dev/incubator/curator/2.0.0-incubating/apache-curator-2.0.0-incubating-source-release.zip.md5 dev/incubator/curator/2.0.0-incubating/apache-curator-2.0.0-incubating-source-release.zip.sha1 Added: dev/incubator/curator/2.0.0-incubating/apache-curator-2.0.0-incubating-source-release.zip == Binary file - no diff available. Propchange: dev/incubator/curator/2.0.0-incubating/apache-curator-2.0.0-incubating-source-release.zip -- svn:mime-type = application/octet-stream Added: dev/incubator/curator/2.0.0-incubating/apache-curator-2.0.0-incubating-source-release.zip.asc == --- dev/incubator/curator/2.0.0-incubating/apache-curator-2.0.0-incubating-source-release.zip.asc (added) +++ dev/incubator/curator/2.0.0-incubating/apache-curator-2.0.0-incubating-source-release.zip.asc Mon May 6 18:22:34 2013 @@ -0,0 +1,12 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG/MacGPG2 v2.0.17 (Darwin) +Comment: GPGTools - http://gpgtools.org + +iQEcBAABAgAGBQJRgYEIAAoJEJ6949BmSJ2Xk3QIAJ/unvmwbQ0xmUv+VV0G+AOI +ZvTumau793zFR33laqnDGt3krS1pmfOv/ph84tEbBhpQ6H+DOnL+C0HsS0fcZPug +YnpjKIXD5VeC+DpzZMFk8M/1rE+Js//Fe5TxSNOuSlDev/XnhEryK3pbSRZbFH8N +MmiNSXK+37ZTIqj3XuKxyri8+WhPJhNpdy5UBKAHsyUxJ/WptSn4mvJkQ8lYSVBO +sVg6s4MRaVKMS5Qh+Su2exuFDwt7TL/Rx5OFNjo3TFSpj91QXnxNvbUCUMBOucCa +Z1969MsHEeoE1xiWM+dFioXv9EhnRDXqn7W7cvsgL2909v8mX4yV9TyxZ5ijnZQ= +=M+tT +-END PGP SIGNATURE- Added: dev/incubator/curator/2.0.0-incubating/apache-curator-2.0.0-incubating-source-release.zip.md5 == --- dev/incubator/curator/2.0.0-incubating/apache-curator-2.0.0-incubating-source-release.zip.md5 (added) +++ dev/incubator/curator/2.0.0-incubating/apache-curator-2.0.0-incubating-source-release.zip.md5 Mon May 6 18:22:34 2013 @@ -0,0 +1 @@ +93bc3d5f80a89cfe049bee69a9542154 \ No newline at end of file Added: dev/incubator/curator/2.0.0-incubating/apache-curator-2.0.0-incubating-source-release.zip.sha1 == --- dev/incubator/curator/2.0.0-incubating/apache-curator-2.0.0-incubating-source-release.zip.sha1 (added) +++ dev/incubator/curator/2.0.0-incubating/apache-curator-2.0.0-incubating-source-release.zip.sha1 Mon May 6 18:22:34 2013 @@ -0,0 +1 @@ +2bc35b9a93212946845eb98dd1b3840147d39f64 \ No newline at end of file
svn commit: r1931 - /release/incubator/curator/2.0.0-incubating/
Author: randgalt Date: Mon May 6 18:23:27 2013 New Revision: 1931 Log: Create dir for release Added: release/incubator/curator/2.0.0-incubating/
svn commit: r1932 - /dev/incubator/curator/
Author: randgalt Date: Mon May 6 18:25:46 2013 New Revision: 1932 Log: files moved to dir Removed: dev/incubator/curator/apache-curator-2.0.0-incubating-source-release.zip dev/incubator/curator/apache-curator-2.0.0-incubating-source-release.zip.asc dev/incubator/curator/apache-curator-2.0.0-incubating-source-release.zip.md5 dev/incubator/curator/apache-curator-2.0.0-incubating-source-release.zip.sha1
Git Push Summary
Updated Branches: refs/heads/2.0.1-incubating [created] 75b540414
[1/2] git commit: temp checkin
Updated Branches:
refs/heads/CURATOR-17 [created] 10df9fc24
temp checkin
Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/86b82ab6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/86b82ab6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/86b82ab6
Branch: refs/heads/CURATOR-17
Commit: 86b82ab61d951429121e2f869bc00ff4cede9407
Parents: 97cda39
Author: randgalt
Authored: Mon May 6 11:56:19 2013 -0700
Committer: randgalt
Committed: Mon May 6 11:56:19 2013 -0700
--
.../curator/utils/CloseableExecutorService.java| 28 ++
.../utils/CloseableExecutorServiceBase.java| 124 +++
.../utils/CloseableScheduledExecutorService.java | 100 +
.../org/apache/curator/utils/FutureContainer.java | 91 +
.../utils/TestCloseableExecutorService.java| 282 +++
.../framework/recipes/cache/PathChildrenCache.java | 25 +-
.../curator/framework/recipes/locks/Reaper.java| 14 +-
7 files changed, 642 insertions(+), 22 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/86b82ab6/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java
--
diff --git
a/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java
b/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java
new file mode 100644
index 000..cf92ef4
--- /dev/null
+++
b/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java
@@ -0,0 +1,28 @@
+package org.apache.curator.utils;
+
+import com.google.common.util.concurrent.ListeningExecutorService;
+import com.google.common.util.concurrent.MoreExecutors;
+import java.util.concurrent.ExecutorService;
+
+/**
+ * Decorates an {@link ExecutorService} such that submitted tasks
+ * are recorded and can be closed en masse.
+ */
+public class CloseableExecutorService extends CloseableExecutorServiceBase
+{
+private final ListeningExecutorService executorService;
+
+/**
+ * @param executorService the service to decorate
+ */
+public CloseableExecutorService(ExecutorService executorService)
+{
+this.executorService =
MoreExecutors.listeningDecorator(executorService);
+}
+
+@Override
+protected ListeningExecutorService getService()
+{
+return executorService;
+}
+}
http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/86b82ab6/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorServiceBase.java
--
diff --git
a/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorServiceBase.java
b/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorServiceBase.java
new file mode 100644
index 000..92371d7
--- /dev/null
+++
b/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorServiceBase.java
@@ -0,0 +1,124 @@
+package org.apache.curator.utils;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.ListeningExecutorService;
+import com.google.common.util.concurrent.MoreExecutors;
+import java.io.Closeable;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+/**
+ * Decorates an {@link ExecutorService} such that submitted tasks
+ * are recorded and can be closed en masse.
+ */
+abstract class CloseableExecutorServiceBase implements Closeable
+{
+private final Set> futures = Sets.newSetFromMap(Maps.,
Boolean>newConcurrentMap());
+private final AtomicBoolean isClosed = new AtomicBoolean(false);
+
+protected abstract ListeningExecutorService getService();
+
+@Override
+public void close()
+{
+isClosed.set(true);
+Iterator> iterator = futures.iterator();
+while ( iterator.hasNext() )
+{
+Future future = iterator.next();
+iterator.remove();
+future.cancel(true);
+}
+}
+
+/**
+ * @see ExecutorService#isShutdown()
+ * @return true/false
+ */
+public boolean isShutdown()
+{
+return getService().isShutdown();
+}
+
+/**
+ * @see ExecutorService#isTerminated()
+ * @return true/false
+ */
+public boolean isTerminated()
+{
+return g
[2/2] git commit: CURATOR-17 PathChildrenCache.close() calls shutdownNow() on its executor, always. Instead, it Curator (in general) should only close tasks it has started. This is now done via wrappe
CURATOR-17
PathChildrenCache.close() calls shutdownNow() on its executor, always. Instead,
it Curator (in general) should only close tasks it has started. This is now done
via wrapped executors in a new class that tracks tasks started by Curator.
Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/10df9fc2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/10df9fc2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/10df9fc2
Branch: refs/heads/CURATOR-17
Commit: 10df9fc24a2c36eac9812af1cc4c10c0bab1ae9b
Parents: 86b82ab
Author: randgalt
Authored: Mon May 6 13:11:49 2013 -0700
Committer: randgalt
Committed: Mon May 6 13:11:49 2013 -0700
--
.../curator/utils/CloseableExecutorService.java| 111 +-
.../utils/CloseableExecutorServiceBase.java| 124 ---
.../utils/CloseableScheduledExecutorService.java | 104 --
.../org/apache/curator/utils/FutureContainer.java | 91
.../utils/TestCloseableExecutorService.java| 160 ++-
.../framework/recipes/cache/PathChildrenCache.java | 16 +-
.../framework/recipes/locks/ChildReaper.java |9 +-
.../curator/framework/recipes/locks/Reaper.java| 11 +-
.../framework/recipes/locks/TestReaper.java| 55 +++---
9 files changed, 258 insertions(+), 423 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/10df9fc2/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java
--
diff --git
a/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java
b/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java
index cf92ef4..4024d29 100644
---
a/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java
+++
b/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java
@@ -1,28 +1,121 @@
package org.apache.curator.utils;
-import com.google.common.util.concurrent.ListeningExecutorService;
-import com.google.common.util.concurrent.MoreExecutors;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+import java.io.Closeable;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.FutureTask;
+import java.util.concurrent.RunnableFuture;
+import java.util.concurrent.atomic.AtomicBoolean;
/**
- * Decorates an {@link ExecutorService} such that submitted tasks
- * are recorded and can be closed en masse.
+ * Decoration on an ExecutorService that tracks created futures and provides
+ * a method to close futures created via this class
*/
-public class CloseableExecutorService extends CloseableExecutorServiceBase
+public class CloseableExecutorService implements Closeable
{
-private final ListeningExecutorService executorService;
+private final Set> futures = Sets.newSetFromMap(Maps.,
Boolean>newConcurrentMap());
+private final ExecutorService executorService;
+protected final AtomicBoolean isOpen = new AtomicBoolean(true);
+
+protected class InternalFutureTask extends FutureTask
+{
+private final RunnableFuture task;
+
+InternalFutureTask(RunnableFuture task)
+{
+super(task, null);
+this.task = task;
+futures.add(task);
+}
+
+protected void done()
+{
+futures.remove(task);
+}
+}
/**
* @param executorService the service to decorate
*/
public CloseableExecutorService(ExecutorService executorService)
{
-this.executorService =
MoreExecutors.listeningDecorator(executorService);
+this.executorService = executorService;
+}
+
+/**
+ * Returns true if this executor has been shut down.
+ *
+ * @return true if this executor has been shut down
+ */
+public boolean isShutdown()
+{
+return !isOpen.get();
}
+@VisibleForTesting
+int size()
+{
+return futures.size();
+}
+
+/**
+ * Closes any tasks currently in progress
+ */
@Override
-protected ListeningExecutorService getService()
+public void close()
{
-return executorService;
+isOpen.set(false);
+Iterator> iterator = futures.iterator();
+while ( iterator.hasNext() )
+{
+Future future = iterator.next();
+iterator.remove();
+if ( !future.ca
svn commit: r1948 - /release/incubator/curator/2.0.0-incubating/
Author: randgalt Date: Thu May 9 15:40:57 2013 New Revision: 1948 Log: prep for release Removed: release/incubator/curator/2.0.0-incubating/
svn commit: r1949 - /release/incubator/curator/2.0.0-incubating/
Author: randgalt Date: Thu May 9 15:42:17 2013 New Revision: 1949 Log: Release Apache Curator 2.0.0-incubating Added: release/incubator/curator/2.0.0-incubating/ release/incubator/curator/2.0.0-incubating/apache-curator-2.0.0-incubating-source-release.zip (with props) release/incubator/curator/2.0.0-incubating/apache-curator-2.0.0-incubating-source-release.zip.asc release/incubator/curator/2.0.0-incubating/apache-curator-2.0.0-incubating-source-release.zip.md5 release/incubator/curator/2.0.0-incubating/apache-curator-2.0.0-incubating-source-release.zip.sha1 Added: release/incubator/curator/2.0.0-incubating/apache-curator-2.0.0-incubating-source-release.zip == Binary file - no diff available. Propchange: release/incubator/curator/2.0.0-incubating/apache-curator-2.0.0-incubating-source-release.zip -- svn:mime-type = application/octet-stream Added: release/incubator/curator/2.0.0-incubating/apache-curator-2.0.0-incubating-source-release.zip.asc == --- release/incubator/curator/2.0.0-incubating/apache-curator-2.0.0-incubating-source-release.zip.asc (added) +++ release/incubator/curator/2.0.0-incubating/apache-curator-2.0.0-incubating-source-release.zip.asc Thu May 9 15:42:17 2013 @@ -0,0 +1,12 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG/MacGPG2 v2.0.17 (Darwin) +Comment: GPGTools - http://gpgtools.org + +iQEcBAABAgAGBQJRgYEIAAoJEJ6949BmSJ2Xk3QIAJ/unvmwbQ0xmUv+VV0G+AOI +ZvTumau793zFR33laqnDGt3krS1pmfOv/ph84tEbBhpQ6H+DOnL+C0HsS0fcZPug +YnpjKIXD5VeC+DpzZMFk8M/1rE+Js//Fe5TxSNOuSlDev/XnhEryK3pbSRZbFH8N +MmiNSXK+37ZTIqj3XuKxyri8+WhPJhNpdy5UBKAHsyUxJ/WptSn4mvJkQ8lYSVBO +sVg6s4MRaVKMS5Qh+Su2exuFDwt7TL/Rx5OFNjo3TFSpj91QXnxNvbUCUMBOucCa +Z1969MsHEeoE1xiWM+dFioXv9EhnRDXqn7W7cvsgL2909v8mX4yV9TyxZ5ijnZQ= +=M+tT +-END PGP SIGNATURE- Added: release/incubator/curator/2.0.0-incubating/apache-curator-2.0.0-incubating-source-release.zip.md5 == --- release/incubator/curator/2.0.0-incubating/apache-curator-2.0.0-incubating-source-release.zip.md5 (added) +++ release/incubator/curator/2.0.0-incubating/apache-curator-2.0.0-incubating-source-release.zip.md5 Thu May 9 15:42:17 2013 @@ -0,0 +1 @@ +93bc3d5f80a89cfe049bee69a9542154 \ No newline at end of file Added: release/incubator/curator/2.0.0-incubating/apache-curator-2.0.0-incubating-source-release.zip.sha1 == --- release/incubator/curator/2.0.0-incubating/apache-curator-2.0.0-incubating-source-release.zip.sha1 (added) +++ release/incubator/curator/2.0.0-incubating/apache-curator-2.0.0-incubating-source-release.zip.sha1 Thu May 9 15:42:17 2013 @@ -0,0 +1 @@ +2bc35b9a93212946845eb98dd1b3840147d39f64 \ No newline at end of file
svn commit: r1480706 [9/20] - in /incubator/curator/site/trunk: ./ apidocs/ apidocs/cache/ apidocs/cache/class-use/ apidocs/discovery/ apidocs/discovery/class-use/ apidocs/framework/ apidocs/framework
Modified: incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/contexts/class-use/MapDiscoveryContext.html URL: http://svn.apache.org/viewvc/incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/contexts/class-use/MapDiscoveryContext.html?rev=1480706&r1=1480705&r2=1480706&view=diff == --- incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/contexts/class-use/MapDiscoveryContext.html (original) +++ incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/contexts/class-use/MapDiscoveryContext.html Thu May 9 16:03:28 2013 @@ -2,13 +2,13 @@ - + Uses of Class org.apache.curator.x.discovery.server.contexts.MapDiscoveryContext (Apache Curator 2.0.1-incubating-SNAPSHOT API) - + Modified: incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/contexts/class-use/StringDiscoveryContext.html URL: http://svn.apache.org/viewvc/incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/contexts/class-use/StringDiscoveryContext.html?rev=1480706&r1=1480705&r2=1480706&view=diff == --- incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/contexts/class-use/StringDiscoveryContext.html (original) +++ incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/contexts/class-use/StringDiscoveryContext.html Thu May 9 16:03:28 2013 @@ -2,13 +2,13 @@ - + Uses of Class org.apache.curator.x.discovery.server.contexts.StringDiscoveryContext (Apache Curator 2.0.1-incubating-SNAPSHOT API) - + Modified: incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/contexts/package-frame.html URL: http://svn.apache.org/viewvc/incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/contexts/package-frame.html?rev=1480706&r1=1480705&r2=1480706&view=diff == --- incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/contexts/package-frame.html (original) +++ incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/contexts/package-frame.html Thu May 9 16:03:28 2013 @@ -2,13 +2,13 @@ - + org.apache.curator.x.discovery.server.contexts (Apache Curator 2.0.1-incubating-SNAPSHOT API) - + Modified: incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/contexts/package-summary.html URL: http://svn.apache.org/viewvc/incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/contexts/package-summary.html?rev=1480706&r1=1480705&r2=1480706&view=diff == --- incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/contexts/package-summary.html (original) +++ incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/contexts/package-summary.html Thu May 9 16:03:28 2013 @@ -2,13 +2,13 @@ - + org.apache.curator.x.discovery.server.contexts (Apache Curator 2.0.1-incubating-SNAPSHOT API) - + Modified: incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/contexts/package-tree.html URL: http://svn.apache.org/viewvc/incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/contexts/package-tree.html?rev=1480706&r1=1480705&r2=1480706&view=diff == --- incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/contexts/package-tree.html (original) +++ incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/contexts/package-tree.html Thu May 9 16:03:28 2013 @@ -2,13 +2,13 @@ - + org.apache.curator.x.discovery.server.contexts Class Hierarchy (Apache Curator 2.0.1-incubating-SNAPSHOT API) - + Modified: incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/contexts/package-use.html URL: http://svn.apache.org/viewvc/incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/contexts/package-use.html?rev=1480706&r1=1480705&r2=1480706&view=diff == --- incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/contexts/package-use.html (original) +++ incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/contexts/package-use.html Thu May 9 16:03:28 2013 @@ -2,13 +2,13 @@ - + Uses of Package org.apache.curator.x.discovery.server.contexts (Apache Curator 2.0.1-incubating-SNAPSHOT API) - + Modified: incubator/curator/site/trunk/apidocs/org/apache/curator/x/discovery/server/entity/JsonServiceInstanceMarshaller.htm
[2/3] git commit: Merge branch 'master' into 2.0.1-incubating
Merge branch 'master' into 2.0.1-incubating Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/9acf5929 Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/9acf5929 Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/9acf5929 Branch: refs/heads/CURATOR-22 Commit: 9acf5929f54493759411cbf4fd38b5fd56261aaf Parents: 75b5404 9eff1cf Author: randgalt Authored: Thu May 9 16:23:25 2013 -0700 Committer: randgalt Committed: Thu May 9 16:23:25 2013 -0700 -- src/site/site.xml |1 + 1 files changed, 1 insertions(+), 0 deletions(-) --
[1/3] git commit: Added a link to releases wiki page
Updated Branches: refs/heads/CURATOR-22 [created] 3d6181cae Added a link to releases wiki page Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/9eff1cf0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/9eff1cf0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/9eff1cf0 Branch: refs/heads/CURATOR-22 Commit: 9eff1cf0e52cd2445a2cb5dc6e78965f49175b86 Parents: 97cda39 Author: randgalt Authored: Thu May 9 08:53:43 2013 -0700 Committer: randgalt Committed: Thu May 9 08:53:43 2013 -0700 -- src/site/site.xml |1 + 1 files changed, 1 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/9eff1cf0/src/site/site.xml -- diff --git a/src/site/site.xml b/src/site/site.xml index 4f84645..0445e9b 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -83,6 +83,7 @@ https://cwiki.apache.org/confluence/display/CURATOR"/> +https://cwiki.apache.org/confluence/display/CURATOR/Releases"/>
[3/3] git commit: CURATOR-22 Add a listener to LeaderLatch
CURATOR-22
Add a listener to LeaderLatch
Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/3d6181ca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/3d6181ca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/3d6181ca
Branch: refs/heads/CURATOR-22
Commit: 3d6181cae984807bd2f89cecc2e5b55d0574a5b3
Parents: 9acf592
Author: randgalt
Authored: Thu May 9 16:46:50 2013 -0700
Committer: randgalt
Committed: Thu May 9 16:46:50 2013 -0700
--
.../framework/recipes/leader/LeaderLatch.java | 244 ++-
.../recipes/leader/LeaderLatchListener.java| 46 +++
.../framework/recipes/leader/TestLeaderLatch.java | 181 ---
3 files changed, 351 insertions(+), 120 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/3d6181ca/curator-recipes/src/main/java/org/apache/curator/framework/recipes/leader/LeaderLatch.java
--
diff --git
a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/leader/LeaderLatch.java
b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/leader/LeaderLatch.java
index 36a0636..508ca7c 100644
---
a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/leader/LeaderLatch.java
+++
b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/leader/LeaderLatch.java
@@ -16,13 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.curator.framework.recipes.leader;
import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Function;
import com.google.common.base.Preconditions;
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.api.BackgroundCallback;
import org.apache.curator.framework.api.CuratorEvent;
+import org.apache.curator.framework.listen.ListenerContainer;
import org.apache.curator.framework.recipes.locks.LockInternals;
import org.apache.curator.framework.recipes.locks.LockInternalsSorter;
import org.apache.curator.framework.recipes.locks.StandardLockInternalsDriver;
@@ -41,29 +44,31 @@ import java.io.IOException;
import java.util.Collection;
import java.util.List;
import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Executor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
/**
*
- * Abstraction to select a "leader" amongst multiple contenders in a group
of JMVs connected to
- * a Zookeeper cluster. If a group of N thread/processes contend for
leadership one will
- * randomly be assigned leader until it releases leadership at which time
another one from the
- * group will randomly be chosen
+ * Abstraction to select a "leader" amongst multiple contenders in a group of
JMVs connected to
+ * a Zookeeper cluster. If a group of N thread/processes contend for
leadership one will
+ * randomly be assigned leader until it releases leadership at which time
another one from the
+ * group will randomly be chosen
*
*/
public class LeaderLatch implements Closeable
{
-private final Loggerlog =
LoggerFactory.getLogger(getClass());
-private final CuratorFramework client;
-private final StringlatchPath;
-private final Stringid;
-private final AtomicReferencestate = new
AtomicReference(State.LATENT);
-private final AtomicBoolean hasLeadership = new
AtomicBoolean(false);
-private final AtomicReference ourPath = new
AtomicReference();
-
-private final ConnectionStateListener listener = new
ConnectionStateListener()
+private final Logger log = LoggerFactory.getLogger(getClass());
+private final CuratorFramework client;
+private final String latchPath;
+private final String id;
+private final AtomicReference state = new
AtomicReference(State.LATENT);
+private final AtomicBoolean hasLeadership = new AtomicBoolean(false);
+private final AtomicReference ourPath = new
AtomicReference();
+private final ListenerContainer listeners = new
ListenerContainer();
+
+private final ConnectionStateListener listener = new
ConnectionStateListener()
{
@Override
public void stateChanged(CuratorFramework client, ConnectionState
newState)
@@ -74,7 +79,7 @@ public class LeaderLatch implements Closeable
private static final String LOCK_NAME = "latch-";
-private static final LockInter
[3/4] git commit: Merge branch 'master' into 2.0.1-incubating
Merge branch 'master' into 2.0.1-incubating Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/9acf5929 Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/9acf5929 Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/9acf5929 Branch: refs/heads/2.0.1-incubating Commit: 9acf5929f54493759411cbf4fd38b5fd56261aaf Parents: 75b5404 9eff1cf Author: randgalt Authored: Thu May 9 16:23:25 2013 -0700 Committer: randgalt Committed: Thu May 9 16:23:25 2013 -0700 -- src/site/site.xml |1 + 1 files changed, 1 insertions(+), 0 deletions(-) --
[2/4] git commit: Added a link to releases wiki page
Added a link to releases wiki page Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/9eff1cf0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/9eff1cf0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/9eff1cf0 Branch: refs/heads/master Commit: 9eff1cf0e52cd2445a2cb5dc6e78965f49175b86 Parents: 97cda39 Author: randgalt Authored: Thu May 9 08:53:43 2013 -0700 Committer: randgalt Committed: Thu May 9 08:53:43 2013 -0700 -- src/site/site.xml |1 + 1 files changed, 1 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/9eff1cf0/src/site/site.xml -- diff --git a/src/site/site.xml b/src/site/site.xml index 4f84645..0445e9b 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -83,6 +83,7 @@ https://cwiki.apache.org/confluence/display/CURATOR"/> +https://cwiki.apache.org/confluence/display/CURATOR/Releases"/>
[1/4] git commit: Added a link to releases wiki page
Updated Branches: refs/heads/2.0.1-incubating 75b540414 -> 3d6181cae refs/heads/master 97cda3947 -> 9eff1cf0e Added a link to releases wiki page Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/9eff1cf0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/9eff1cf0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/9eff1cf0 Branch: refs/heads/2.0.1-incubating Commit: 9eff1cf0e52cd2445a2cb5dc6e78965f49175b86 Parents: 97cda39 Author: randgalt Authored: Thu May 9 08:53:43 2013 -0700 Committer: randgalt Committed: Thu May 9 08:53:43 2013 -0700 -- src/site/site.xml |1 + 1 files changed, 1 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/9eff1cf0/src/site/site.xml -- diff --git a/src/site/site.xml b/src/site/site.xml index 4f84645..0445e9b 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -83,6 +83,7 @@ https://cwiki.apache.org/confluence/display/CURATOR"/> +https://cwiki.apache.org/confluence/display/CURATOR/Releases"/>
[4/4] git commit: CURATOR-22 Add a listener to LeaderLatch
CURATOR-22
Add a listener to LeaderLatch
Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/3d6181ca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/3d6181ca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/3d6181ca
Branch: refs/heads/2.0.1-incubating
Commit: 3d6181cae984807bd2f89cecc2e5b55d0574a5b3
Parents: 9acf592
Author: randgalt
Authored: Thu May 9 16:46:50 2013 -0700
Committer: randgalt
Committed: Thu May 9 16:46:50 2013 -0700
--
.../framework/recipes/leader/LeaderLatch.java | 244 ++-
.../recipes/leader/LeaderLatchListener.java| 46 +++
.../framework/recipes/leader/TestLeaderLatch.java | 181 ---
3 files changed, 351 insertions(+), 120 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/3d6181ca/curator-recipes/src/main/java/org/apache/curator/framework/recipes/leader/LeaderLatch.java
--
diff --git
a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/leader/LeaderLatch.java
b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/leader/LeaderLatch.java
index 36a0636..508ca7c 100644
---
a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/leader/LeaderLatch.java
+++
b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/leader/LeaderLatch.java
@@ -16,13 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.curator.framework.recipes.leader;
import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Function;
import com.google.common.base.Preconditions;
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.api.BackgroundCallback;
import org.apache.curator.framework.api.CuratorEvent;
+import org.apache.curator.framework.listen.ListenerContainer;
import org.apache.curator.framework.recipes.locks.LockInternals;
import org.apache.curator.framework.recipes.locks.LockInternalsSorter;
import org.apache.curator.framework.recipes.locks.StandardLockInternalsDriver;
@@ -41,29 +44,31 @@ import java.io.IOException;
import java.util.Collection;
import java.util.List;
import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Executor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
/**
*
- * Abstraction to select a "leader" amongst multiple contenders in a group
of JMVs connected to
- * a Zookeeper cluster. If a group of N thread/processes contend for
leadership one will
- * randomly be assigned leader until it releases leadership at which time
another one from the
- * group will randomly be chosen
+ * Abstraction to select a "leader" amongst multiple contenders in a group of
JMVs connected to
+ * a Zookeeper cluster. If a group of N thread/processes contend for
leadership one will
+ * randomly be assigned leader until it releases leadership at which time
another one from the
+ * group will randomly be chosen
*
*/
public class LeaderLatch implements Closeable
{
-private final Loggerlog =
LoggerFactory.getLogger(getClass());
-private final CuratorFramework client;
-private final StringlatchPath;
-private final Stringid;
-private final AtomicReferencestate = new
AtomicReference(State.LATENT);
-private final AtomicBoolean hasLeadership = new
AtomicBoolean(false);
-private final AtomicReference ourPath = new
AtomicReference();
-
-private final ConnectionStateListener listener = new
ConnectionStateListener()
+private final Logger log = LoggerFactory.getLogger(getClass());
+private final CuratorFramework client;
+private final String latchPath;
+private final String id;
+private final AtomicReference state = new
AtomicReference(State.LATENT);
+private final AtomicBoolean hasLeadership = new AtomicBoolean(false);
+private final AtomicReference ourPath = new
AtomicReference();
+private final ListenerContainer listeners = new
ListenerContainer();
+
+private final ConnectionStateListener listener = new
ConnectionStateListener()
{
@Override
public void stateChanged(CuratorFramework client, ConnectionState
newState)
@@ -74,7 +79,7 @@ public class LeaderLatch implements Closeable
private static final String LOCK_NAME = "latch-";
-private static final LockInter
git commit: CURATOR-24 Improve the handling of hung ZooKeeper connections
Updated Branches:
refs/heads/CURATOR-24 [created] 11ae23adc
CURATOR-24
Improve the handling of hung ZooKeeper connections
Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/11ae23ad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/11ae23ad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/11ae23ad
Branch: refs/heads/CURATOR-24
Commit: 11ae23adc013fa6526ac001bce2f5b2967a1d9b5
Parents: 38f28b5
Author: randgalt
Authored: Thu May 9 17:18:09 2013 -0700
Committer: randgalt
Committed: Thu May 9 17:18:09 2013 -0700
--
.../java/org/apache/curator/ConnectionState.java | 169 +++
.../org/apache/curator/CuratorZookeeperClient.java |9 -
.../framework/state/ConnectionStateManager.java|5 -
3 files changed, 84 insertions(+), 99 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/11ae23ad/curator-client/src/main/java/org/apache/curator/ConnectionState.java
--
diff --git
a/curator-client/src/main/java/org/apache/curator/ConnectionState.java
b/curator-client/src/main/java/org/apache/curator/ConnectionState.java
index 8de3e27..bbb0588 100644
--- a/curator-client/src/main/java/org/apache/curator/ConnectionState.java
+++ b/curator-client/src/main/java/org/apache/curator/ConnectionState.java
@@ -38,24 +38,23 @@ import java.util.concurrent.atomic.AtomicReference;
class ConnectionState implements Watcher, Closeable
{
-private volatile long connectionStartMs = 0;
-
-private final Loggerlog =
LoggerFactory.getLogger(getClass());
-private final HandleHolder zooKeeper;
-private final AtomicBoolean isConnected = new
AtomicBoolean(false);
-private final AtomicBoolean lost = new
AtomicBoolean(false);
-private final EnsembleProvider ensembleProvider;
-private final int connectionTimeoutMs;
+private static final int MAX_BACKGROUND_EXCEPTIONS = 10;
+private static final boolean LOG_EVENTS =
Boolean.getBoolean(DebugUtils.PROPERTY_LOG_EVENTS);
+private final Logger log = LoggerFactory.getLogger(getClass());
+private final HandleHolder zooKeeper;
+private final AtomicBoolean isConnected = new AtomicBoolean(false);
+private final EnsembleProvider ensembleProvider;
+private final int sessionTimeoutMs;
+private final int connectionTimeoutMs;
private final AtomicReference tracer;
-private final Queue backgroundExceptions = new
ConcurrentLinkedQueue();
-private final QueueparentWatchers = new
ConcurrentLinkedQueue();
-
-private static final intMAX_BACKGROUND_EXCEPTIONS = 10;
-private static final booleanLOG_EVENTS =
Boolean.getBoolean(DebugUtils.PROPERTY_LOG_EVENTS);
+private final Queue backgroundExceptions = new
ConcurrentLinkedQueue();
+private final Queue parentWatchers = new
ConcurrentLinkedQueue();
+private volatile long connectionStartMs = 0;
ConnectionState(ZookeeperFactory zookeeperFactory, EnsembleProvider
ensembleProvider, int sessionTimeoutMs, int connectionTimeoutMs, Watcher
parentWatcher, AtomicReference tracer, boolean canBeReadOnly)
{
this.ensembleProvider = ensembleProvider;
+this.sessionTimeoutMs = sessionTimeoutMs;
this.connectionTimeoutMs = connectionTimeoutMs;
this.tracer = tracer;
if ( parentWatcher != null )
@@ -73,12 +72,6 @@ class ConnectionState implements Watcher, Closeable
throw new SessionFailRetryLoop.SessionFailedException();
}
-if ( lost.compareAndSet(true, false) )
-{
-log.info("resetting after loss");
-reset();
-}
-
Exception exception = backgroundExceptions.poll();
if ( exception != null )
{
@@ -90,24 +83,7 @@ class ConnectionState implements Watcher, Closeable
boolean localIsConnected = isConnected.get();
if ( !localIsConnected )
{
-longelapsed = System.currentTimeMillis() -
connectionStartMs;
-if ( elapsed >= connectionTimeoutMs )
-{
-if ( zooKeeper.hasNewConnectionString() )
-{
-handleNewConnectionString();
-}
-else
-{
-KeeperException.ConnectionLossException
connectionLossException = new KeeperException.ConnectionLossException();
-if (
!Boolean.getBoolean(DebugUtils.PROPERTY_DONT_LOG_CONNECTION_ISSUES) )
-{
-log.error(String.format("Co
git commit: CURATOR-24 Improve the handling of hung ZooKeeper connections
Updated Branches:
refs/heads/2.0.1-incubating 38f28b5c9 -> 11ae23adc
CURATOR-24
Improve the handling of hung ZooKeeper connections
Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/11ae23ad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/11ae23ad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/11ae23ad
Branch: refs/heads/2.0.1-incubating
Commit: 11ae23adc013fa6526ac001bce2f5b2967a1d9b5
Parents: 38f28b5
Author: randgalt
Authored: Thu May 9 17:18:09 2013 -0700
Committer: randgalt
Committed: Thu May 9 17:18:09 2013 -0700
--
.../java/org/apache/curator/ConnectionState.java | 169 +++
.../org/apache/curator/CuratorZookeeperClient.java |9 -
.../framework/state/ConnectionStateManager.java|5 -
3 files changed, 84 insertions(+), 99 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/11ae23ad/curator-client/src/main/java/org/apache/curator/ConnectionState.java
--
diff --git
a/curator-client/src/main/java/org/apache/curator/ConnectionState.java
b/curator-client/src/main/java/org/apache/curator/ConnectionState.java
index 8de3e27..bbb0588 100644
--- a/curator-client/src/main/java/org/apache/curator/ConnectionState.java
+++ b/curator-client/src/main/java/org/apache/curator/ConnectionState.java
@@ -38,24 +38,23 @@ import java.util.concurrent.atomic.AtomicReference;
class ConnectionState implements Watcher, Closeable
{
-private volatile long connectionStartMs = 0;
-
-private final Loggerlog =
LoggerFactory.getLogger(getClass());
-private final HandleHolder zooKeeper;
-private final AtomicBoolean isConnected = new
AtomicBoolean(false);
-private final AtomicBoolean lost = new
AtomicBoolean(false);
-private final EnsembleProvider ensembleProvider;
-private final int connectionTimeoutMs;
+private static final int MAX_BACKGROUND_EXCEPTIONS = 10;
+private static final boolean LOG_EVENTS =
Boolean.getBoolean(DebugUtils.PROPERTY_LOG_EVENTS);
+private final Logger log = LoggerFactory.getLogger(getClass());
+private final HandleHolder zooKeeper;
+private final AtomicBoolean isConnected = new AtomicBoolean(false);
+private final EnsembleProvider ensembleProvider;
+private final int sessionTimeoutMs;
+private final int connectionTimeoutMs;
private final AtomicReference tracer;
-private final Queue backgroundExceptions = new
ConcurrentLinkedQueue();
-private final QueueparentWatchers = new
ConcurrentLinkedQueue();
-
-private static final intMAX_BACKGROUND_EXCEPTIONS = 10;
-private static final booleanLOG_EVENTS =
Boolean.getBoolean(DebugUtils.PROPERTY_LOG_EVENTS);
+private final Queue backgroundExceptions = new
ConcurrentLinkedQueue();
+private final Queue parentWatchers = new
ConcurrentLinkedQueue();
+private volatile long connectionStartMs = 0;
ConnectionState(ZookeeperFactory zookeeperFactory, EnsembleProvider
ensembleProvider, int sessionTimeoutMs, int connectionTimeoutMs, Watcher
parentWatcher, AtomicReference tracer, boolean canBeReadOnly)
{
this.ensembleProvider = ensembleProvider;
+this.sessionTimeoutMs = sessionTimeoutMs;
this.connectionTimeoutMs = connectionTimeoutMs;
this.tracer = tracer;
if ( parentWatcher != null )
@@ -73,12 +72,6 @@ class ConnectionState implements Watcher, Closeable
throw new SessionFailRetryLoop.SessionFailedException();
}
-if ( lost.compareAndSet(true, false) )
-{
-log.info("resetting after loss");
-reset();
-}
-
Exception exception = backgroundExceptions.poll();
if ( exception != null )
{
@@ -90,24 +83,7 @@ class ConnectionState implements Watcher, Closeable
boolean localIsConnected = isConnected.get();
if ( !localIsConnected )
{
-longelapsed = System.currentTimeMillis() -
connectionStartMs;
-if ( elapsed >= connectionTimeoutMs )
-{
-if ( zooKeeper.hasNewConnectionString() )
-{
-handleNewConnectionString();
-}
-else
-{
-KeeperException.ConnectionLossException
connectionLossException = new KeeperException.ConnectionLossException();
-if (
!Boolean.getBoolean(DebugUtils.PROPERTY_DONT_LOG_CONNECTION_ISSUES) )
-{
-log.err
git commit: Don't throw if future can't be canceled. Just log it
Updated Branches:
refs/heads/CURATOR-17 10df9fc24 -> 601bc4c93
Don't throw if future can't be canceled. Just log it
Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/601bc4c9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/601bc4c9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/601bc4c9
Branch: refs/heads/CURATOR-17
Commit: 601bc4c93229bea70bd4d24121901d36394d6cd5
Parents: 10df9fc
Author: randgalt
Authored: Fri May 10 19:02:21 2013 -0700
Committer: randgalt
Committed: Fri May 10 19:02:21 2013 -0700
--
.../curator/utils/CloseableExecutorService.java|6 --
1 files changed, 4 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/601bc4c9/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java
--
diff --git
a/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java
b/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java
index 4024d29..74c6d28 100644
---
a/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java
+++
b/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java
@@ -4,6 +4,8 @@ import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.Closeable;
import java.util.Iterator;
import java.util.Set;
@@ -20,6 +22,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
*/
public class CloseableExecutorService implements Closeable
{
+private final Logger log =
LoggerFactory.getLogger(CloseableExecutorService.class);
private final Set> futures = Sets.newSetFromMap(Maps.,
Boolean>newConcurrentMap());
private final ExecutorService executorService;
protected final AtomicBoolean isOpen = new AtomicBoolean(true);
@@ -79,8 +82,7 @@ public class CloseableExecutorService implements Closeable
iterator.remove();
if ( !future.cancel(true) )
{
-System.err.println("Could not cancel");
-throw new RuntimeException("Could not cancel");
+log.warn("Could not cancel " + future);
}
}
}
[3/4] git commit: Don't throw if future can't be canceled. Just log it
Don't throw if future can't be canceled. Just log it
Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/601bc4c9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/601bc4c9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/601bc4c9
Branch: refs/heads/2.0.1-incubating
Commit: 601bc4c93229bea70bd4d24121901d36394d6cd5
Parents: 10df9fc
Author: randgalt
Authored: Fri May 10 19:02:21 2013 -0700
Committer: randgalt
Committed: Fri May 10 19:02:21 2013 -0700
--
.../curator/utils/CloseableExecutorService.java|6 --
1 files changed, 4 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/601bc4c9/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java
--
diff --git
a/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java
b/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java
index 4024d29..74c6d28 100644
---
a/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java
+++
b/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java
@@ -4,6 +4,8 @@ import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.Closeable;
import java.util.Iterator;
import java.util.Set;
@@ -20,6 +22,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
*/
public class CloseableExecutorService implements Closeable
{
+private final Logger log =
LoggerFactory.getLogger(CloseableExecutorService.class);
private final Set> futures = Sets.newSetFromMap(Maps.,
Boolean>newConcurrentMap());
private final ExecutorService executorService;
protected final AtomicBoolean isOpen = new AtomicBoolean(true);
@@ -79,8 +82,7 @@ public class CloseableExecutorService implements Closeable
iterator.remove();
if ( !future.cancel(true) )
{
-System.err.println("Could not cancel");
-throw new RuntimeException("Could not cancel");
+log.warn("Could not cancel " + future);
}
}
}
[4/4] git commit: Introduced CloseableExecutorService. Instead of blindly shutting down exectors, this container shuts down any futures created by an executor. This resolves issues where custom execut
Introduced CloseableExecutorService. Instead of blindly shutting down exectors,
this container
shuts down any futures created by an executor. This resolves issues where
custom executors
are given to Curator.
Merge branch 'CURATOR-17' into 2.0.1-incubating
Conflicts:
curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/PathChildrenCache.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/6e3c9e27
Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/6e3c9e27
Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/6e3c9e27
Branch: refs/heads/2.0.1-incubating
Commit: 6e3c9e27b8e6e2cda6ad146b8a63a60346badb0d
Parents: 11ae23a 601bc4c
Author: randgalt
Authored: Fri May 10 19:11:23 2013 -0700
Committer: randgalt
Committed: Fri May 10 19:11:23 2013 -0700
--
.../curator/utils/CloseableExecutorService.java| 123 +++
.../utils/CloseableScheduledExecutorService.java | 72
.../utils/TestCloseableExecutorService.java| 252 +++
.../framework/recipes/cache/PathChildrenCache.java |9 +-
.../framework/recipes/locks/ChildReaper.java |9 +-
.../curator/framework/recipes/locks/Reaper.java| 25 +-
.../recipes/cache/TestPathChildrenCache.java | 27 +--
.../framework/recipes/locks/TestReaper.java| 55 ++--
8 files changed, 502 insertions(+), 70 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/6e3c9e27/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/PathChildrenCache.java
--
diff --cc
curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/PathChildrenCache.java
index 76efc6c,61c3af7..ec2d328
---
a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/PathChildrenCache.java
+++
b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/PathChildrenCache.java
@@@ -350,11 -355,10 +351,11 @@@ public class PathChildrenCache implemen
@Override
public void close() throws IOException
{
-Preconditions.checkState(!executorService.isShutdown(), "has not been
started");
-
-
client.getConnectionStateListenable().removeListener(connectionStateListener);
-executorService.close();
+if ( state.compareAndSet(State.STARTED, State.CLOSED) )
+{
+
client.getConnectionStateListenable().removeListener(connectionStateListener);
- executorService.shutdownNow();
++executorService.close();
+}
}
/**
@@@ -751,24 -749,9 +752,24 @@@
}
}
-private void offerOperation(Operation operation)
+/**
+ * Submits a runnable to the executor.
+ *
+ * This method is synchronized because it has to check state about
whether this instance is still open. Without this check
+ * there is a race condition with the dataWatchers that get set. Even
after this object is closed() it can still be
+ * called by those watchers, because the close() method cannot actually
disable the watcher.
+ *
+ * The synchronization overhead should be minimal if non-existant as this
is generally only called from the
+ * ZK client thread and will only contend if close() is called in
parallel with an update, and that's the exact state
+ * we want to protect from.
+ *
+ * @param command The runnable to run
+ */
+private synchronized void submitToExecutor(final Runnable command)
{
-operations.remove(operation); // avoids herding for refresh
operations
-operations.offer(operation);
+if ( state.get() == State.STARTED )
+{
- executorService.execute(command);
++executorService.submit(command);
+}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/6e3c9e27/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestPathChildrenCache.java
--
diff --cc
curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestPathChildrenCache.java
index 7fed5f8,e51125b..4b117fb
---
a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestPathChildrenCache.java
+++
b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestPathChildrenCache.java
@@@ -730,253 -728,4 +729,229 @@@ public class TestPathChildrenCache exte
client.close();
}
}
+
+@Test
+public void testBasicsOnTwoCachesWithSameExecutor() throws Exception
+{
+
[1/4] git commit: temp checkin
Updated Branches:
refs/heads/2.0.1-incubating 11ae23adc -> 6e3c9e27b
temp checkin
Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/86b82ab6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/86b82ab6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/86b82ab6
Branch: refs/heads/2.0.1-incubating
Commit: 86b82ab61d951429121e2f869bc00ff4cede9407
Parents: 97cda39
Author: randgalt
Authored: Mon May 6 11:56:19 2013 -0700
Committer: randgalt
Committed: Mon May 6 11:56:19 2013 -0700
--
.../curator/utils/CloseableExecutorService.java| 28 ++
.../utils/CloseableExecutorServiceBase.java| 124 +++
.../utils/CloseableScheduledExecutorService.java | 100 +
.../org/apache/curator/utils/FutureContainer.java | 91 +
.../utils/TestCloseableExecutorService.java| 282 +++
.../framework/recipes/cache/PathChildrenCache.java | 25 +-
.../curator/framework/recipes/locks/Reaper.java| 14 +-
7 files changed, 642 insertions(+), 22 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/86b82ab6/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java
--
diff --git
a/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java
b/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java
new file mode 100644
index 000..cf92ef4
--- /dev/null
+++
b/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java
@@ -0,0 +1,28 @@
+package org.apache.curator.utils;
+
+import com.google.common.util.concurrent.ListeningExecutorService;
+import com.google.common.util.concurrent.MoreExecutors;
+import java.util.concurrent.ExecutorService;
+
+/**
+ * Decorates an {@link ExecutorService} such that submitted tasks
+ * are recorded and can be closed en masse.
+ */
+public class CloseableExecutorService extends CloseableExecutorServiceBase
+{
+private final ListeningExecutorService executorService;
+
+/**
+ * @param executorService the service to decorate
+ */
+public CloseableExecutorService(ExecutorService executorService)
+{
+this.executorService =
MoreExecutors.listeningDecorator(executorService);
+}
+
+@Override
+protected ListeningExecutorService getService()
+{
+return executorService;
+}
+}
http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/86b82ab6/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorServiceBase.java
--
diff --git
a/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorServiceBase.java
b/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorServiceBase.java
new file mode 100644
index 000..92371d7
--- /dev/null
+++
b/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorServiceBase.java
@@ -0,0 +1,124 @@
+package org.apache.curator.utils;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.ListeningExecutorService;
+import com.google.common.util.concurrent.MoreExecutors;
+import java.io.Closeable;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+/**
+ * Decorates an {@link ExecutorService} such that submitted tasks
+ * are recorded and can be closed en masse.
+ */
+abstract class CloseableExecutorServiceBase implements Closeable
+{
+private final Set> futures = Sets.newSetFromMap(Maps.,
Boolean>newConcurrentMap());
+private final AtomicBoolean isClosed = new AtomicBoolean(false);
+
+protected abstract ListeningExecutorService getService();
+
+@Override
+public void close()
+{
+isClosed.set(true);
+Iterator> iterator = futures.iterator();
+while ( iterator.hasNext() )
+{
+Future future = iterator.next();
+iterator.remove();
+future.cancel(true);
+}
+}
+
+/**
+ * @see ExecutorService#isShutdown()
+ * @return true/false
+ */
+public boolean isShutdown()
+{
+return getService().isShutdown();
+}
+
+/**
+ * @see ExecutorService#isTerminated()
+ * @return true/false
+ */
+public boolean isTerminated()
+{
+
[2/4] git commit: CURATOR-17 PathChildrenCache.close() calls shutdownNow() on its executor, always. Instead, it Curator (in general) should only close tasks it has started. This is now done via wrappe
CURATOR-17
PathChildrenCache.close() calls shutdownNow() on its executor, always. Instead,
it Curator (in general) should only close tasks it has started. This is now done
via wrapped executors in a new class that tracks tasks started by Curator.
Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/10df9fc2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/10df9fc2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/10df9fc2
Branch: refs/heads/2.0.1-incubating
Commit: 10df9fc24a2c36eac9812af1cc4c10c0bab1ae9b
Parents: 86b82ab
Author: randgalt
Authored: Mon May 6 13:11:49 2013 -0700
Committer: randgalt
Committed: Mon May 6 13:11:49 2013 -0700
--
.../curator/utils/CloseableExecutorService.java| 111 +-
.../utils/CloseableExecutorServiceBase.java| 124 ---
.../utils/CloseableScheduledExecutorService.java | 104 --
.../org/apache/curator/utils/FutureContainer.java | 91
.../utils/TestCloseableExecutorService.java| 160 ++-
.../framework/recipes/cache/PathChildrenCache.java | 16 +-
.../framework/recipes/locks/ChildReaper.java |9 +-
.../curator/framework/recipes/locks/Reaper.java| 11 +-
.../framework/recipes/locks/TestReaper.java| 55 +++---
9 files changed, 258 insertions(+), 423 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/10df9fc2/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java
--
diff --git
a/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java
b/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java
index cf92ef4..4024d29 100644
---
a/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java
+++
b/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java
@@ -1,28 +1,121 @@
package org.apache.curator.utils;
-import com.google.common.util.concurrent.ListeningExecutorService;
-import com.google.common.util.concurrent.MoreExecutors;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+import java.io.Closeable;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.FutureTask;
+import java.util.concurrent.RunnableFuture;
+import java.util.concurrent.atomic.AtomicBoolean;
/**
- * Decorates an {@link ExecutorService} such that submitted tasks
- * are recorded and can be closed en masse.
+ * Decoration on an ExecutorService that tracks created futures and provides
+ * a method to close futures created via this class
*/
-public class CloseableExecutorService extends CloseableExecutorServiceBase
+public class CloseableExecutorService implements Closeable
{
-private final ListeningExecutorService executorService;
+private final Set> futures = Sets.newSetFromMap(Maps.,
Boolean>newConcurrentMap());
+private final ExecutorService executorService;
+protected final AtomicBoolean isOpen = new AtomicBoolean(true);
+
+protected class InternalFutureTask extends FutureTask
+{
+private final RunnableFuture task;
+
+InternalFutureTask(RunnableFuture task)
+{
+super(task, null);
+this.task = task;
+futures.add(task);
+}
+
+protected void done()
+{
+futures.remove(task);
+}
+}
/**
* @param executorService the service to decorate
*/
public CloseableExecutorService(ExecutorService executorService)
{
-this.executorService =
MoreExecutors.listeningDecorator(executorService);
+this.executorService = executorService;
+}
+
+/**
+ * Returns true if this executor has been shut down.
+ *
+ * @return true if this executor has been shut down
+ */
+public boolean isShutdown()
+{
+return !isOpen.get();
}
+@VisibleForTesting
+int size()
+{
+return futures.size();
+}
+
+/**
+ * Closes any tasks currently in progress
+ */
@Override
-protected ListeningExecutorService getService()
+public void close()
{
-return executorService;
+isOpen.set(false);
+Iterator> iterator = futures.iterator();
+while ( iterator.hasNext() )
+{
+Future future = iterator.next();
+iterator.remove();
+if ( !future.ca
git commit: Added license headers
Updated Branches: refs/heads/2.0.1-incubating 6e3c9e27b -> 70fcae0b0 Added license headers Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/70fcae0b Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/70fcae0b Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/70fcae0b Branch: refs/heads/2.0.1-incubating Commit: 70fcae0b075fbaa30639403a4d9e2dfec6d773c6 Parents: 6e3c9e2 Author: randgalt Authored: Fri May 10 23:54:59 2013 -0700 Committer: randgalt Committed: Fri May 10 23:54:59 2013 -0700 -- .../curator/utils/CloseableExecutorService.java| 19 +++ .../utils/CloseableScheduledExecutorService.java | 19 +++ .../utils/TestCloseableExecutorService.java| 19 +++ 3 files changed, 57 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/70fcae0b/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java -- diff --git a/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java b/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java index 74c6d28..8ff7b32 100644 --- a/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java +++ b/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java @@ -1,3 +1,22 @@ +/* + * 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.curator.utils; import com.google.common.annotations.VisibleForTesting; http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/70fcae0b/curator-client/src/main/java/org/apache/curator/utils/CloseableScheduledExecutorService.java -- diff --git a/curator-client/src/main/java/org/apache/curator/utils/CloseableScheduledExecutorService.java b/curator-client/src/main/java/org/apache/curator/utils/CloseableScheduledExecutorService.java index 737ff6b..c2bea63 100644 --- a/curator-client/src/main/java/org/apache/curator/utils/CloseableScheduledExecutorService.java +++ b/curator-client/src/main/java/org/apache/curator/utils/CloseableScheduledExecutorService.java @@ -1,3 +1,22 @@ +/* + * 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.curator.utils; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/70fcae0b/curator-client/src/test/java/org/apache/curator/utils/TestCloseableExecutorService.java -- diff --git a/curator-client/src/test/java/org/apache/curator/utils/TestCloseableExecutorService.java b/curator-client/src/test/java/org/apache/curator/utils/TestCloseableExecutorService.java index 72b63fd..cb71116 100644 --- a/curator-client/src/test/java/org/apache/curator/utils/TestCloseableExecutorService.java +++ b/curator-client/src/test/java/org/apache/curator/utils/TestCloseableExecutorService.java @@ -1,3 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more cont
git commit: Added license headers
Updated Branches: refs/heads/CURATOR-17 601bc4c93 -> 0eee2ec53 Added license headers Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/0eee2ec5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/0eee2ec5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/0eee2ec5 Branch: refs/heads/CURATOR-17 Commit: 0eee2ec5362a740ee4feaf388f09699e8c658dd4 Parents: 601bc4c Author: randgalt Authored: Sat May 11 12:25:31 2013 -0700 Committer: randgalt Committed: Sat May 11 12:25:31 2013 -0700 -- .../curator/utils/CloseableExecutorService.java| 19 +++ .../utils/CloseableScheduledExecutorService.java | 19 +++ .../utils/TestCloseableExecutorService.java| 19 +++ 3 files changed, 57 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/0eee2ec5/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java -- diff --git a/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java b/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java index 74c6d28..8ff7b32 100644 --- a/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java +++ b/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java @@ -1,3 +1,22 @@ +/* + * 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.curator.utils; import com.google.common.annotations.VisibleForTesting; http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/0eee2ec5/curator-client/src/main/java/org/apache/curator/utils/CloseableScheduledExecutorService.java -- diff --git a/curator-client/src/main/java/org/apache/curator/utils/CloseableScheduledExecutorService.java b/curator-client/src/main/java/org/apache/curator/utils/CloseableScheduledExecutorService.java index 737ff6b..c2bea63 100644 --- a/curator-client/src/main/java/org/apache/curator/utils/CloseableScheduledExecutorService.java +++ b/curator-client/src/main/java/org/apache/curator/utils/CloseableScheduledExecutorService.java @@ -1,3 +1,22 @@ +/* + * 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.curator.utils; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/0eee2ec5/curator-client/src/test/java/org/apache/curator/utils/TestCloseableExecutorService.java -- diff --git a/curator-client/src/test/java/org/apache/curator/utils/TestCloseableExecutorService.java b/curator-client/src/test/java/org/apache/curator/utils/TestCloseableExecutorService.java index 72b63fd..cb71116 100644 --- a/curator-client/src/test/java/org/apache/curator/utils/TestCloseableExecutorService.java +++ b/curator-client/src/test/java/org/apache/curator/utils/TestCloseableExecutorService.java @@ -1,3 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contribut
git commit: Added license headers
Updated Branches: refs/heads/2.0.1-incubating 70fcae0b0 -> 39ca0565e Added license headers Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/39ca0565 Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/39ca0565 Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/39ca0565 Branch: refs/heads/2.0.1-incubating Commit: 39ca0565ec0e1869c2fe0211a9f0b04126121048 Parents: 70fcae0 Author: randgalt Authored: Sat May 11 12:58:01 2013 -0700 Committer: randgalt Committed: Sat May 11 12:58:01 2013 -0700 -- .../curator/utils/CloseableExecutorService.java|2 +- .../utils/CloseableScheduledExecutorService.java |2 +- .../utils/TestCloseableExecutorService.java|2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/39ca0565/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java -- diff --git a/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java b/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java index 8ff7b32..bb4855d 100644 --- a/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java +++ b/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java @@ -1,4 +1,4 @@ -/* +/** * 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 http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/39ca0565/curator-client/src/main/java/org/apache/curator/utils/CloseableScheduledExecutorService.java -- diff --git a/curator-client/src/main/java/org/apache/curator/utils/CloseableScheduledExecutorService.java b/curator-client/src/main/java/org/apache/curator/utils/CloseableScheduledExecutorService.java index c2bea63..6f3797d 100644 --- a/curator-client/src/main/java/org/apache/curator/utils/CloseableScheduledExecutorService.java +++ b/curator-client/src/main/java/org/apache/curator/utils/CloseableScheduledExecutorService.java @@ -1,4 +1,4 @@ -/* +/** * 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 http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/39ca0565/curator-client/src/test/java/org/apache/curator/utils/TestCloseableExecutorService.java -- diff --git a/curator-client/src/test/java/org/apache/curator/utils/TestCloseableExecutorService.java b/curator-client/src/test/java/org/apache/curator/utils/TestCloseableExecutorService.java index cb71116..c083655 100644 --- a/curator-client/src/test/java/org/apache/curator/utils/TestCloseableExecutorService.java +++ b/curator-client/src/test/java/org/apache/curator/utils/TestCloseableExecutorService.java @@ -1,4 +1,4 @@ -/* +/** * 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
[04/12] git commit: Merge branch 'master' into 2.0.1-incubating
Merge branch 'master' into 2.0.1-incubating Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/9acf5929 Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/9acf5929 Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/9acf5929 Branch: refs/heads/master Commit: 9acf5929f54493759411cbf4fd38b5fd56261aaf Parents: 75b5404 9eff1cf Author: randgalt Authored: Thu May 9 16:23:25 2013 -0700 Committer: randgalt Committed: Thu May 9 16:23:25 2013 -0700 -- src/site/site.xml |1 + 1 files changed, 1 insertions(+), 0 deletions(-) --
[08/12] git commit: Don't throw if future can't be canceled. Just log it
Don't throw if future can't be canceled. Just log it
Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/601bc4c9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/601bc4c9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/601bc4c9
Branch: refs/heads/master
Commit: 601bc4c93229bea70bd4d24121901d36394d6cd5
Parents: 10df9fc
Author: randgalt
Authored: Fri May 10 19:02:21 2013 -0700
Committer: randgalt
Committed: Fri May 10 19:02:21 2013 -0700
--
.../curator/utils/CloseableExecutorService.java|6 --
1 files changed, 4 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/601bc4c9/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java
--
diff --git
a/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java
b/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java
index 4024d29..74c6d28 100644
---
a/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java
+++
b/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java
@@ -4,6 +4,8 @@ import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.Closeable;
import java.util.Iterator;
import java.util.Set;
@@ -20,6 +22,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
*/
public class CloseableExecutorService implements Closeable
{
+private final Logger log =
LoggerFactory.getLogger(CloseableExecutorService.class);
private final Set> futures = Sets.newSetFromMap(Maps.,
Boolean>newConcurrentMap());
private final ExecutorService executorService;
protected final AtomicBoolean isOpen = new AtomicBoolean(true);
@@ -79,8 +82,7 @@ public class CloseableExecutorService implements Closeable
iterator.remove();
if ( !future.cancel(true) )
{
-System.err.println("Could not cancel");
-throw new RuntimeException("Could not cancel");
+log.warn("Could not cancel " + future);
}
}
}
[11/12] git commit: Added license headers
Added license headers Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/39ca0565 Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/39ca0565 Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/39ca0565 Branch: refs/heads/master Commit: 39ca0565ec0e1869c2fe0211a9f0b04126121048 Parents: 70fcae0 Author: randgalt Authored: Sat May 11 12:58:01 2013 -0700 Committer: randgalt Committed: Sat May 11 12:58:01 2013 -0700 -- .../curator/utils/CloseableExecutorService.java|2 +- .../utils/CloseableScheduledExecutorService.java |2 +- .../utils/TestCloseableExecutorService.java|2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/39ca0565/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java -- diff --git a/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java b/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java index 8ff7b32..bb4855d 100644 --- a/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java +++ b/curator-client/src/main/java/org/apache/curator/utils/CloseableExecutorService.java @@ -1,4 +1,4 @@ -/* +/** * 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 http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/39ca0565/curator-client/src/main/java/org/apache/curator/utils/CloseableScheduledExecutorService.java -- diff --git a/curator-client/src/main/java/org/apache/curator/utils/CloseableScheduledExecutorService.java b/curator-client/src/main/java/org/apache/curator/utils/CloseableScheduledExecutorService.java index c2bea63..6f3797d 100644 --- a/curator-client/src/main/java/org/apache/curator/utils/CloseableScheduledExecutorService.java +++ b/curator-client/src/main/java/org/apache/curator/utils/CloseableScheduledExecutorService.java @@ -1,4 +1,4 @@ -/* +/** * 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 http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/39ca0565/curator-client/src/test/java/org/apache/curator/utils/TestCloseableExecutorService.java -- diff --git a/curator-client/src/test/java/org/apache/curator/utils/TestCloseableExecutorService.java b/curator-client/src/test/java/org/apache/curator/utils/TestCloseableExecutorService.java index cb71116..c083655 100644 --- a/curator-client/src/test/java/org/apache/curator/utils/TestCloseableExecutorService.java +++ b/curator-client/src/test/java/org/apache/curator/utils/TestCloseableExecutorService.java @@ -1,4 +1,4 @@ -/* +/** * 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
