You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@curator.apache.org by ra...@apache.org on 2017/07/23 02:41:09 UTC
[01/23] curator git commit: version 4.0.0-SNAPSHOT
Repository: curator
Updated Branches:
refs/heads/master afc206c7e -> b26410d53
version 4.0.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/42ee566f
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/42ee566f
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/42ee566f
Branch: refs/heads/master
Commit: 42ee566f4f93cf074b93eb08266634d2e993bf4c
Parents: 7e611bd
Author: randgalt <ra...@apache.org>
Authored: Thu Jul 20 13:59:53 2017 -0500
Committer: randgalt <ra...@apache.org>
Committed: Thu Jul 20 13:59:53 2017 -0500
----------------------------------------------------------------------
curator-client/pom.xml | 4 ++--
curator-examples/pom.xml | 2 +-
curator-framework/pom.xml | 4 ++--
curator-recipes/pom.xml | 4 ++--
curator-test/pom.xml | 4 ++--
curator-x-async/pom.xml | 2 +-
curator-x-discovery-server/pom.xml | 4 ++--
curator-x-discovery/pom.xml | 4 ++--
curator-x-rpc/pom.xml | 4 ++--
pom.xml | 2 +-
10 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/42ee566f/curator-client/pom.xml
----------------------------------------------------------------------
diff --git a/curator-client/pom.xml b/curator-client/pom.xml
index 13c1551..4b210da 100644
--- a/curator-client/pom.xml
+++ b/curator-client/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.curator</groupId>
<artifactId>apache-curator</artifactId>
- <version>3.3.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>curator-client</artifactId>
- <version>3.3.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Curator Client</name>
http://git-wip-us.apache.org/repos/asf/curator/blob/42ee566f/curator-examples/pom.xml
----------------------------------------------------------------------
diff --git a/curator-examples/pom.xml b/curator-examples/pom.xml
index cc65570..c092603 100644
--- a/curator-examples/pom.xml
+++ b/curator-examples/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.curator</groupId>
<artifactId>apache-curator</artifactId>
- <version>3.3.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>curator-examples</artifactId>
http://git-wip-us.apache.org/repos/asf/curator/blob/42ee566f/curator-framework/pom.xml
----------------------------------------------------------------------
diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml
index 2f36e73..3ae9f54 100644
--- a/curator-framework/pom.xml
+++ b/curator-framework/pom.xml
@@ -24,11 +24,11 @@
<parent>
<groupId>org.apache.curator</groupId>
<artifactId>apache-curator</artifactId>
- <version>3.3.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>curator-framework</artifactId>
- <version>3.3.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Curator Framework</name>
http://git-wip-us.apache.org/repos/asf/curator/blob/42ee566f/curator-recipes/pom.xml
----------------------------------------------------------------------
diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml
index 77f2a51..42451ac 100644
--- a/curator-recipes/pom.xml
+++ b/curator-recipes/pom.xml
@@ -24,11 +24,11 @@
<parent>
<groupId>org.apache.curator</groupId>
<artifactId>apache-curator</artifactId>
- <version>3.3.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>curator-recipes</artifactId>
- <version>3.3.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Curator Recipes</name>
http://git-wip-us.apache.org/repos/asf/curator/blob/42ee566f/curator-test/pom.xml
----------------------------------------------------------------------
diff --git a/curator-test/pom.xml b/curator-test/pom.xml
index fb28d53..8f3f1e1 100644
--- a/curator-test/pom.xml
+++ b/curator-test/pom.xml
@@ -24,11 +24,11 @@
<parent>
<groupId>org.apache.curator</groupId>
<artifactId>apache-curator</artifactId>
- <version>3.3.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>curator-test</artifactId>
- <version>3.3.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<name>Curator Testing</name>
<description>Unit testing utilities.</description>
http://git-wip-us.apache.org/repos/asf/curator/blob/42ee566f/curator-x-async/pom.xml
----------------------------------------------------------------------
diff --git a/curator-x-async/pom.xml b/curator-x-async/pom.xml
index 925896b..ceae835 100644
--- a/curator-x-async/pom.xml
+++ b/curator-x-async/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.curator</groupId>
<artifactId>apache-curator</artifactId>
- <version>3.3.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/curator/blob/42ee566f/curator-x-discovery-server/pom.xml
----------------------------------------------------------------------
diff --git a/curator-x-discovery-server/pom.xml b/curator-x-discovery-server/pom.xml
index b23e2cf..b77ef41 100644
--- a/curator-x-discovery-server/pom.xml
+++ b/curator-x-discovery-server/pom.xml
@@ -24,11 +24,11 @@
<parent>
<groupId>org.apache.curator</groupId>
<artifactId>apache-curator</artifactId>
- <version>3.3.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>curator-x-discovery-server</artifactId>
- <version>3.3.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Curator Service Discovery Server</name>
http://git-wip-us.apache.org/repos/asf/curator/blob/42ee566f/curator-x-discovery/pom.xml
----------------------------------------------------------------------
diff --git a/curator-x-discovery/pom.xml b/curator-x-discovery/pom.xml
index be49f20..f6d89ff 100644
--- a/curator-x-discovery/pom.xml
+++ b/curator-x-discovery/pom.xml
@@ -24,11 +24,11 @@
<parent>
<groupId>org.apache.curator</groupId>
<artifactId>apache-curator</artifactId>
- <version>3.3.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>curator-x-discovery</artifactId>
- <version>3.3.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Curator Service Discovery</name>
http://git-wip-us.apache.org/repos/asf/curator/blob/42ee566f/curator-x-rpc/pom.xml
----------------------------------------------------------------------
diff --git a/curator-x-rpc/pom.xml b/curator-x-rpc/pom.xml
index e831e1f..c35cc2f 100644
--- a/curator-x-rpc/pom.xml
+++ b/curator-x-rpc/pom.xml
@@ -22,12 +22,12 @@
<parent>
<artifactId>apache-curator</artifactId>
<groupId>org.apache.curator</groupId>
- <version>3.3.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>curator-x-rpc</artifactId>
- <version>3.3.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<name>Curator RPC Proxy</name>
<description>A proxy that bridges non-java environments with the Curator framework and recipes</description>
http://git-wip-us.apache.org/repos/asf/curator/blob/42ee566f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index aa8fd86..64a4848 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<groupId>org.apache.curator</groupId>
<artifactId>apache-curator</artifactId>
- <version>3.3.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Curator</name>
[02/23] curator git commit: Moved to version 4.0.0 - website,
doxia refreshes
Posted by ra...@apache.org.
Moved to version 4.0.0 - website, doxia refreshes
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/e10e40f9
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/e10e40f9
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/e10e40f9
Branch: refs/heads/master
Commit: e10e40f9da3d7923c5a996a728bda79a4aca2b27
Parents: 42ee566
Author: randgalt <ra...@apache.org>
Authored: Thu Jul 20 14:40:58 2017 -0500
Committer: randgalt <ra...@apache.org>
Committed: Thu Jul 20 14:40:58 2017 -0500
----------------------------------------------------------------------
curator-client/src/site/site.xml | 4 ++--
curator-examples/src/site/site.xml | 4 ++--
curator-framework/src/site/site.xml | 4 ++--
curator-recipes/src/site/site.xml | 4 ++--
curator-test/src/site/site.xml | 4 ++--
curator-x-async/src/site/site.xml | 8 +++----
curator-x-discovery-server/src/site/site.xml | 4 ++--
curator-x-discovery/src/site/site.xml | 4 ++--
curator-x-rpc/src/site/site.xml | 4 ++--
pom.xml | 4 ++--
src/site/resources/css/site.css | 26 ++++-------------------
src/site/site.xml | 18 +++++++++++-----
12 files changed, 39 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/e10e40f9/curator-client/src/site/site.xml
----------------------------------------------------------------------
diff --git a/curator-client/src/site/site.xml b/curator-client/src/site/site.xml
index 45d5e05..5a84db1 100644
--- a/curator-client/src/site/site.xml
+++ b/curator-client/src/site/site.xml
@@ -21,13 +21,13 @@
-->
<project xmlns="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">
<body>
- <head>
+ <head><![CDATA[
<link rel="stylesheet" href="../css/site.css" />
<script type="text/javascript">
$(function(){
$('a[title="Client"]').parent().addClass("active");
});
</script>
- </head>
+ ]]></head>
</body>
</project>
http://git-wip-us.apache.org/repos/asf/curator/blob/e10e40f9/curator-examples/src/site/site.xml
----------------------------------------------------------------------
diff --git a/curator-examples/src/site/site.xml b/curator-examples/src/site/site.xml
index 9d43ada..eab1751 100644
--- a/curator-examples/src/site/site.xml
+++ b/curator-examples/src/site/site.xml
@@ -21,13 +21,13 @@
-->
<project xmlns="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">
<body>
- <head>
+ <head><![CDATA[
<link rel="stylesheet" href="../css/site.css" />
<script type="text/javascript">
$(function(){
$('a[title="Examples"]').parent().addClass("active");
});
</script>
- </head>
+ ]]></head>
</body>
</project>
http://git-wip-us.apache.org/repos/asf/curator/blob/e10e40f9/curator-framework/src/site/site.xml
----------------------------------------------------------------------
diff --git a/curator-framework/src/site/site.xml b/curator-framework/src/site/site.xml
index 4a66e87..9f2767b 100644
--- a/curator-framework/src/site/site.xml
+++ b/curator-framework/src/site/site.xml
@@ -21,7 +21,7 @@
-->
<project xmlns="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 Framework">
<body>
- <head>
+ <head><![CDATA[
<link rel="stylesheet" href="../css/site.css" />
<script type="text/javascript">
$(function(){
@@ -32,6 +32,6 @@
}
});
</script>
- </head>
+ ]]></head>
</body>
</project>
http://git-wip-us.apache.org/repos/asf/curator/blob/e10e40f9/curator-recipes/src/site/site.xml
----------------------------------------------------------------------
diff --git a/curator-recipes/src/site/site.xml b/curator-recipes/src/site/site.xml
index 2e4527b..5ea4837 100644
--- a/curator-recipes/src/site/site.xml
+++ b/curator-recipes/src/site/site.xml
@@ -21,7 +21,7 @@
-->
<project xmlns="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 Recipes">
<body>
- <head>
+ <head><![CDATA[
<link rel="stylesheet" href="../css/site.css" />
<script type="text/javascript">
$(function(){
@@ -31,6 +31,6 @@
}
});
</script>
- </head>
+ ]]></head>
</body>
</project>
http://git-wip-us.apache.org/repos/asf/curator/blob/e10e40f9/curator-test/src/site/site.xml
----------------------------------------------------------------------
diff --git a/curator-test/src/site/site.xml b/curator-test/src/site/site.xml
index 5a73601..f71dd75 100644
--- a/curator-test/src/site/site.xml
+++ b/curator-test/src/site/site.xml
@@ -21,8 +21,8 @@
-->
<project xmlns="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 Test">
<body>
- <head>
+ <head><![CDATA[
<link rel="stylesheet" href="../css/site.css" />
- </head>
+ ]]></head>
</body>
</project>
http://git-wip-us.apache.org/repos/asf/curator/blob/e10e40f9/curator-x-async/src/site/site.xml
----------------------------------------------------------------------
diff --git a/curator-x-async/src/site/site.xml b/curator-x-async/src/site/site.xml
index 70b5d4b..c8707f4 100644
--- a/curator-x-async/src/site/site.xml
+++ b/curator-x-async/src/site/site.xml
@@ -21,9 +21,9 @@
-->
<project xmlns="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="Curator Async">
<body>
- <head>
+ <head><![CDATA[
<link rel="stylesheet" href="../css/site.css" />
- <script type="text/javascript"><![CDATA[
+ <script type="text/javascript">
$(function(){
if ( location && location.pathname && location.pathname.endsWith('/index.html') ) {
$('a[title="Java 8/Async"]').parent().addClass("active");
@@ -33,7 +33,7 @@
$('a[title="Strongly Typed Models"]').parent().addClass("active");
}
});
- ]]></script>
- </head>
+ </script>
+ ]]></head>
</body>
</project>
http://git-wip-us.apache.org/repos/asf/curator/blob/e10e40f9/curator-x-discovery-server/src/site/site.xml
----------------------------------------------------------------------
diff --git a/curator-x-discovery-server/src/site/site.xml b/curator-x-discovery-server/src/site/site.xml
index d236ff6..bf57e9a 100644
--- a/curator-x-discovery-server/src/site/site.xml
+++ b/curator-x-discovery-server/src/site/site.xml
@@ -21,13 +21,13 @@
-->
<project xmlns="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="Discovery Service Server">
<body>
- <head>
+ <head><![CDATA[
<link rel="stylesheet" href="../css/site.css" />
<script type="text/javascript">
$(function(){
$('a[title="Service Discovery Server"]').parent().addClass("active");
});
</script>
- </head>
+ ]]></head>
</body>
</project>
http://git-wip-us.apache.org/repos/asf/curator/blob/e10e40f9/curator-x-discovery/src/site/site.xml
----------------------------------------------------------------------
diff --git a/curator-x-discovery/src/site/site.xml b/curator-x-discovery/src/site/site.xml
index 5ece90a..8b40d5f 100644
--- a/curator-x-discovery/src/site/site.xml
+++ b/curator-x-discovery/src/site/site.xml
@@ -21,13 +21,13 @@
-->
<project xmlns="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="Discovery Service">
<body>
- <head>
+ <head><![CDATA[
<link rel="stylesheet" href="../css/site.css" />
<script type="text/javascript">
$(function(){
$('a[title="Service Discovery"]').parent().addClass("active");
});
</script>
- </head>
+ ]]></head>
</body>
</project>
http://git-wip-us.apache.org/repos/asf/curator/blob/e10e40f9/curator-x-rpc/src/site/site.xml
----------------------------------------------------------------------
diff --git a/curator-x-rpc/src/site/site.xml b/curator-x-rpc/src/site/site.xml
index fca1e73..2f5b8e8 100644
--- a/curator-x-rpc/src/site/site.xml
+++ b/curator-x-rpc/src/site/site.xml
@@ -21,13 +21,13 @@
-->
<project xmlns="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="Curator RPC Proxy">
<body>
- <head>
+ <head><![CDATA[
<link rel="stylesheet" href="../css/site.css" />
<script type="text/javascript">
$(function(){
$('a[title="Curator RPC Proxy"]').parent().addClass("active");
});
</script>
- </head>
+ ]]></head>
</body>
</project>
http://git-wip-us.apache.org/repos/asf/curator/blob/e10e40f9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 64a4848..be382c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>17</version>
+ <version>18</version>
</parent>
<groupId>org.apache.curator</groupId>
@@ -63,7 +63,7 @@
<maven-project-info-reports-plugin-version>2.7</maven-project-info-reports-plugin-version>
<maven-bundle-plugin-version>3.2.0</maven-bundle-plugin-version>
<maven-javadoc-plugin-version>2.10.3</maven-javadoc-plugin-version>
- <doxia-module-confluence-version>1.6</doxia-module-confluence-version>
+ <doxia-module-confluence-version>1.7</doxia-module-confluence-version>
<maven-license-plugin-version>1.9.0</maven-license-plugin-version>
<commons-math-version>2.2</commons-math-version>
<jackson-mapper-asl-version>1.9.13</jackson-mapper-asl-version>
http://git-wip-us.apache.org/repos/asf/curator/blob/e10e40f9/src/site/resources/css/site.css
----------------------------------------------------------------------
diff --git a/src/site/resources/css/site.css b/src/site/resources/css/site.css
index b60d059..5f9beb9 100644
--- a/src/site/resources/css/site.css
+++ b/src/site/resources/css/site.css
@@ -16,21 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-body
-{
- font-size: 16px;
- line-height: 22px;
-}
tt
{
- font-size: 14px;
- background-color: transparent;
-}
-
-pre
-{
- font-size: 14px;
+ background-color: #eee;
}
.well, .breadcrumb
@@ -58,15 +47,8 @@ a:hover
background-color: #DDDDDD;
}
-footer
-{
- font-size: 12px;
- line-height: 15px;
-}
-
-h2
+.search-query
{
- text-align: center;
- border-bottom: 1px solid #0035AC;
- margin-bottom: 18px;
+ margin-top: 15px;
+ width: 183px;
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/curator/blob/e10e40f9/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index 8136c9a..c2ed319 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -25,7 +25,7 @@
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
- <version>1.3.0</version>
+ <version>1.6</version>
</skin>
<custom>
@@ -38,9 +38,17 @@
<googlePlusOne />
<twitter>
<user>ApacheCurator</user>
- <showUser>false</showUser>
- <showFollowers>false</showFollowers>
+ <showUser>true</showUser>
+ <showFollowers>true</showFollowers>
</twitter>
+ <googleSearch>
+ <sitesearch>${project.url}</sitesearch>
+ </googleSearch>
+ <gitHub>
+ <projectId>apache/curator</projectId>
+ <ribbonOrientation>right</ribbonOrientation>
+ <ribbonColor>black</ribbonColor>
+ </gitHub>
</fluidoSkin>
</custom>
@@ -119,12 +127,12 @@
<item name="Thanks" href="http://www.apache.org/foundation/thanks.html"/>
</menu>
- <footer>
+ <footer><![CDATA[
<div class="row span12" style="margin-bottom: 8px;">
Apache Curator, the Apache feather logo, and the Apache Curator project logos are
trademarks of The Apache Software Foundation. All other marks mentioned may be
trademarks or registered trademarks of their respective owners.
</div>
- </footer>
+ ]]></footer>
</body>
</project>
[21/23] curator git commit: doh - filterIsSetLatch has to be reset
for each iteration (in setup). I can't be a final field
Posted by ra...@apache.org.
doh - filterIsSetLatch has to be reset for each iteration (in setup). I can't be a final field
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/e819268d
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/e819268d
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/e819268d
Branch: refs/heads/master
Commit: e819268dc30703ed251a78e8ab769c85b6afb17f
Parents: 73cdf16
Author: randgalt <ra...@apache.org>
Authored: Sat Jul 22 11:19:37 2017 -0500
Committer: randgalt <ra...@apache.org>
Committed: Sat Jul 22 11:19:37 2017 -0500
----------------------------------------------------------------------
.../apache/curator/x/async/migrations/TestMigrationManager.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/e819268d/curator-x-async/src/test/java/org/apache/curator/x/async/migrations/TestMigrationManager.java
----------------------------------------------------------------------
diff --git a/curator-x-async/src/test/java/org/apache/curator/x/async/migrations/TestMigrationManager.java b/curator-x-async/src/test/java/org/apache/curator/x/async/migrations/TestMigrationManager.java
index bc724f5..6cc7fd1 100644
--- a/curator-x-async/src/test/java/org/apache/curator/x/async/migrations/TestMigrationManager.java
+++ b/curator-x-async/src/test/java/org/apache/curator/x/async/migrations/TestMigrationManager.java
@@ -67,7 +67,7 @@ public class TestMigrationManager extends CompletableBaseClassForTests
private CuratorOp v3op;
private MigrationManager manager;
private final AtomicReference<CountDownLatch> filterLatch = new AtomicReference<>();
- private final CountDownLatch filterIsSetLatch = new CountDownLatch(1);
+ private CountDownLatch filterIsSetLatch;
@BeforeMethod
@Override
@@ -75,6 +75,8 @@ public class TestMigrationManager extends CompletableBaseClassForTests
{
super.setup();
+ filterIsSetLatch = new CountDownLatch(1);
+
CuratorFramework rawClient = CuratorFrameworkFactory.newClient(server.getConnectString(), timing.session(), timing.connection(), new RetryOneTime(100));
rawClient.start();
[10/23] curator git commit: Doh - wasn't checking for null on
debugCount
Posted by ra...@apache.org.
Doh - wasn't checking for null on debugCount
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/329729a6
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/329729a6
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/329729a6
Branch: refs/heads/master
Commit: 329729a6e03959fcf7eef3546562a555889c8ab7
Parents: 7b780b5
Author: randgalt <ra...@apache.org>
Authored: Fri Jul 21 11:47:23 2017 -0500
Committer: randgalt <ra...@apache.org>
Committed: Fri Jul 21 11:47:23 2017 -0500
----------------------------------------------------------------------
.../org/apache/curator/x/async/migrations/MigrationManager.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/329729a6/curator-x-async/src/main/java/org/apache/curator/x/async/migrations/MigrationManager.java
----------------------------------------------------------------------
diff --git a/curator-x-async/src/main/java/org/apache/curator/x/async/migrations/MigrationManager.java b/curator-x-async/src/main/java/org/apache/curator/x/async/migrations/MigrationManager.java
index e51f0e4..55c12a8 100644
--- a/curator-x-async/src/main/java/org/apache/curator/x/async/migrations/MigrationManager.java
+++ b/curator-x-async/src/main/java/org/apache/curator/x/async/migrations/MigrationManager.java
@@ -191,7 +191,10 @@ public class MigrationManager
private CompletionStage<Void> applyMetaDataAfterEnsure(List<Migration> toBeApplied, String thisMetaDataPath)
{
- debugCount.incrementAndGet();
+ if ( debugCount != null )
+ {
+ debugCount.incrementAndGet();
+ }
List<CuratorOp> operations = new ArrayList<>();
String metaDataBasePath = ZKPaths.makePath(thisMetaDataPath, META_DATA_NODE_NAME);
[15/23] curator git commit: Merge branch 'master' into CURATOR-426
Posted by ra...@apache.org.
Merge branch 'master' into CURATOR-426
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/31d7f9a2
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/31d7f9a2
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/31d7f9a2
Branch: refs/heads/master
Commit: 31d7f9a2040975dee08cb685d61cceb7015f9e32
Parents: 0906eb5 afc206c
Author: randgalt <ra...@apache.org>
Authored: Fri Jul 21 14:27:07 2017 -0500
Committer: randgalt <ra...@apache.org>
Committed: Fri Jul 21 14:27:07 2017 -0500
----------------------------------------------------------------------
.../main/java/org/apache/curator/RetryLoop.java | 2 +-
.../org/apache/curator/utils/Compatibility.java | 76 +++++
.../curator/utils/InjectSessionExpiration.java | 107 +++++++
.../java/org/apache/curator/BasicTests.java | 4 +-
.../curator/TestSessionFailRetryLoop.java | 11 +-
.../curator/framework/CuratorFramework.java | 7 +
.../framework/CuratorFrameworkFactory.java | 24 +-
.../apache/curator/framework/SafeIsTtlMode.java | 44 +++
.../imps/CompatibleCreateCallback.java | 26 ++
.../framework/imps/CreateBuilderImpl.java | 136 ++++++---
.../curator/framework/imps/CreateZK35.java | 47 +++
.../framework/imps/CuratorFrameworkImpl.java | 24 +-
.../imps/CuratorMultiTransactionImpl.java | 18 +-
.../framework/imps/WatcherRemovalManager.java | 7 +-
.../framework/state/ConnectionStateManager.java | 6 +-
.../curator/framework/imps/TestCleanState.java | 7 +
.../framework/imps/TestCreateReturningStat.java | 13 +-
.../imps/TestEnabledSessionExpiredState.java | 8 +-
.../curator/framework/imps/TestFramework.java | 3 +-
.../framework/imps/TestFrameworkEdges.java | 13 +-
.../framework/imps/TestReconfiguration.java | 11 +-
.../framework/imps/TestRemoveWatches.java | 6 +-
.../curator/framework/imps/TestTtlNodes.java | 6 +-
.../imps/TestWatcherRemovalManager.java | 6 +-
curator-recipes/pom.xml | 16 +
.../framework/recipes/nodes/PersistentNode.java | 3 +-
.../recipes/cache/TestEventOrdering.java | 4 +-
.../framework/recipes/cache/TestNodeCache.java | 4 +-
.../recipes/cache/TestPathChildrenCache.java | 4 +-
.../framework/recipes/cache/TestTreeCache.java | 7 +-
.../recipes/leader/TestLeaderLatch.java | 3 +-
.../recipes/leader/TestLeaderSelector.java | 9 +-
.../recipes/locks/TestInterProcessMutex.java | 5 +-
.../locks/TestInterProcessMutexBase.java | 17 +-
.../nodes/TestPersistentEphemeralNode.java | 14 +-
.../recipes/nodes/TestPersistentNode.java | 3 +-
.../recipes/nodes/TestPersistentTtlNode.java | 6 +-
.../recipes/shared/TestSharedCount.java | 6 +-
curator-test-zk34/README.md | 11 +
curator-test-zk34/pom.xml | 191 ++++++++++++
.../org/apache/curator/test/Compatibility.java | 35 +++
.../apache/curator/test/TestCompatibility.java | 97 ++++++
.../src/test/resources/log4j.properties | 27 ++
.../org/apache/curator/test/Compatibility.java | 34 +++
.../apache/curator/test/KillServerSession.java | 122 --------
.../org/apache/curator/test/KillSession.java | 67 -----
.../java/org/apache/curator/test/Timing.java | 75 +----
.../test/compatibility/CuratorTestBase.java | 28 ++
.../test/compatibility/KillSession2.java | 40 +++
.../curator/test/compatibility/Timing2.java | 299 +++++++++++++++++++
.../compatibility/Zk35MethodInterceptor.java | 56 ++++
.../x/async/CompletableBaseClassForTests.java | 4 +-
.../discovery/details/TestServiceDiscovery.java | 8 +-
pom.xml | 8 +
src/site/resources/images/arrow.png | Bin 0 -> 2159 bytes
src/site/site.xml | 5 +-
56 files changed, 1427 insertions(+), 393 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/31d7f9a2/curator-recipes/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/31d7f9a2/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/31d7f9a2/src/site/site.xml
----------------------------------------------------------------------
[16/23] curator git commit: curator-test-zk34 had wrong parent pom
version:
Posted by ra...@apache.org.
curator-test-zk34 had wrong parent pom version:
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/0f493b97
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/0f493b97
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/0f493b97
Branch: refs/heads/master
Commit: 0f493b9757a11a197a55deb97cb4c2dd5fd4e429
Parents: 31d7f9a
Author: randgalt <ra...@apache.org>
Authored: Fri Jul 21 16:04:06 2017 -0500
Committer: randgalt <ra...@apache.org>
Committed: Fri Jul 21 16:04:06 2017 -0500
----------------------------------------------------------------------
curator-test-zk34/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/0f493b97/curator-test-zk34/pom.xml
----------------------------------------------------------------------
diff --git a/curator-test-zk34/pom.xml b/curator-test-zk34/pom.xml
index d417875..3cd9946 100644
--- a/curator-test-zk34/pom.xml
+++ b/curator-test-zk34/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>apache-curator</artifactId>
<groupId>org.apache.curator</groupId>
- <version>3.3.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
[09/23] curator git commit: Updated assert message for
testConcurrency1 as well
Posted by ra...@apache.org.
Updated assert message for testConcurrency1 as well
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/7b780b5b
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/7b780b5b
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/7b780b5b
Branch: refs/heads/master
Commit: 7b780b5b01cdd5ad75ac9b42bfd276d73cb42c3b
Parents: 3ad6ca7
Author: randgalt <ra...@apache.org>
Authored: Fri Jul 21 11:32:51 2017 -0500
Committer: randgalt <ra...@apache.org>
Committed: Fri Jul 21 11:32:51 2017 -0500
----------------------------------------------------------------------
.../apache/curator/x/async/migrations/TestMigrationManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/7b780b5b/curator-x-async/src/test/java/org/apache/curator/x/async/migrations/TestMigrationManager.java
----------------------------------------------------------------------
diff --git a/curator-x-async/src/test/java/org/apache/curator/x/async/migrations/TestMigrationManager.java b/curator-x-async/src/test/java/org/apache/curator/x/async/migrations/TestMigrationManager.java
index 063b961..bc724f5 100644
--- a/curator-x-async/src/test/java/org/apache/curator/x/async/migrations/TestMigrationManager.java
+++ b/curator-x-async/src/test/java/org/apache/curator/x/async/migrations/TestMigrationManager.java
@@ -313,7 +313,7 @@ public class TestMigrationManager extends CompletableBaseClassForTests
}
catch ( Throwable e )
{
- Assert.assertTrue(Throwables.getRootCause(e) instanceof AsyncWrappers.TimeoutException);
+ Assert.assertTrue(Throwables.getRootCause(e) instanceof AsyncWrappers.TimeoutException, "Should throw AsyncWrappers.TimeoutException, was: " + Throwables.getStackTraceAsString(Throwables.getRootCause(e)));
}
latch.countDown();
[06/23] curator git commit: Merge branch 'master' into CURATOR-426
Posted by ra...@apache.org.
Merge branch 'master' into CURATOR-426
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/d3aaddef
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/d3aaddef
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/d3aaddef
Branch: refs/heads/master
Commit: d3aaddefceaf659cb32d865ead1cd3e294f2fddb
Parents: ee6859e 95b70d2
Author: randgalt <ra...@apache.org>
Authored: Fri Jul 21 06:32:53 2017 -0500
Committer: randgalt <ra...@apache.org>
Committed: Fri Jul 21 06:32:53 2017 -0500
----------------------------------------------------------------------
curator-x-rpc/pom.xml | 189 -
.../curator/x/rpc/CuratorProjectionServer.java | 152 -
.../AuthorizationConfiguration.java | 45 -
...dedExponentialBackoffRetryConfiguration.java | 69 -
.../x/rpc/configuration/Configuration.java | 86 -
.../rpc/configuration/ConfigurationBuilder.java | 87 -
.../configuration/ConnectionConfiguration.java | 129 -
.../ExponentialBackoffRetryConfiguration.java | 58 -
.../configuration/RetryNTimesConfiguration.java | 58 -
.../configuration/RetryPolicyConfiguration.java | 28 -
.../curator/x/rpc/connections/Closer.java | 24 -
.../x/rpc/connections/ConnectionManager.java | 141 -
.../curator/x/rpc/connections/CuratorEntry.java | 170 -
.../x/rpc/details/RpcBackgroundCallback.java | 44 -
.../curator/x/rpc/details/RpcWatcher.java | 43 -
.../x/rpc/idl/discovery/DiscoveryInstance.java | 95 -
.../idl/discovery/DiscoveryInstanceType.java | 26 -
.../rpc/idl/discovery/DiscoveryProjection.java | 38 -
.../discovery/DiscoveryProviderProjection.java | 38 -
.../x/rpc/idl/discovery/DiscoveryService.java | 259 -
.../idl/discovery/DiscoveryServiceLowLevel.java | 159 -
.../rpc/idl/discovery/ProviderStrategyType.java | 27 -
.../x/rpc/idl/exceptions/ExceptionType.java | 26 -
.../x/rpc/idl/exceptions/NodeExceptionType.java | 27 -
.../x/rpc/idl/exceptions/RpcException.java | 98 -
.../idl/exceptions/ZooKeeperExceptionType.java | 40 -
.../idl/services/CuratorProjectionService.java | 765 -
.../x/rpc/idl/services/EventService.java | 55 -
.../curator/x/rpc/idl/structs/CreateSpec.java | 66 -
.../x/rpc/idl/structs/CuratorProjection.java | 38 -
.../curator/x/rpc/idl/structs/DeleteSpec.java | 50 -
.../curator/x/rpc/idl/structs/ExistsSpec.java | 46 -
.../x/rpc/idl/structs/GetChildrenSpec.java | 46 -
.../curator/x/rpc/idl/structs/GetDataSpec.java | 50 -
.../curator/x/rpc/idl/structs/LeaderEvent.java | 46 -
.../x/rpc/idl/structs/LeaderProjection.java | 38 -
.../curator/x/rpc/idl/structs/LeaderResult.java | 42 -
.../x/rpc/idl/structs/LeaseProjection.java | 38 -
.../x/rpc/idl/structs/LockProjection.java | 38 -
.../x/rpc/idl/structs/NodeCacheProjection.java | 38 -
.../x/rpc/idl/structs/OptionalChildrenList.java | 39 -
.../curator/x/rpc/idl/structs/OptionalData.java | 38 -
.../rpc/idl/structs/OptionalLockProjection.java | 38 -
.../curator/x/rpc/idl/structs/OptionalPath.java | 38 -
.../x/rpc/idl/structs/OptionalRpcStat.java | 38 -
.../structs/PathChildrenCacheProjection.java | 38 -
.../idl/structs/PathChildrenCacheStartMode.java | 26 -
.../PersistentEphemeralNodeProjection.java | 38 -
.../curator/x/rpc/idl/structs/RpcAcl.java | 42 -
.../curator/x/rpc/idl/structs/RpcChildData.java | 57 -
.../x/rpc/idl/structs/RpcCreateMode.java | 31 -
.../x/rpc/idl/structs/RpcCuratorEvent.java | 224 -
.../x/rpc/idl/structs/RpcCuratorEventType.java | 46 -
.../curator/x/rpc/idl/structs/RpcEventType.java | 31 -
.../apache/curator/x/rpc/idl/structs/RpcId.java | 42 -
.../x/rpc/idl/structs/RpcKeeperState.java | 34 -
.../x/rpc/idl/structs/RpcParticipant.java | 42 -
.../idl/structs/RpcPathChildrenCacheEvent.java | 54 -
.../structs/RpcPathChildrenCacheEventType.java | 33 -
.../structs/RpcPersistentEphemeralNodeMode.java | 30 -
.../curator/x/rpc/idl/structs/RpcStat.java | 95 -
.../x/rpc/idl/structs/RpcWatchedEvent.java | 54 -
.../curator/x/rpc/idl/structs/SetDataSpec.java | 58 -
.../curator/x/rpc/idl/structs/Version.java | 38 -
.../src/main/resources/curator/help.txt | 72 -
curator-x-rpc/src/main/scripts/apply-thrift.sh | 36 -
curator-x-rpc/src/main/scripts/generate.sh | 56 -
curator-x-rpc/src/main/thrift/curator.thrift | 297 -
.../site/confluence/configuration.confluence | 143 -
.../src/site/confluence/deploy.confluence | 31 -
.../src/site/confluence/events.confluence | 90 -
.../src/site/confluence/index.confluence | 49 -
.../src/site/confluence/reference.confluence | 120 -
.../src/site/confluence/usage.confluence | 115 -
.../src/site/resources/images/topology.png | Bin 135534 -> 0 bytes
curator-x-rpc/src/site/site.xml | 33 -
.../java/org/apache/curator/generated/Acl.java | 491 -
.../org/apache/curator/generated/ChildData.java | 604 -
.../apache/curator/generated/CreateMode.java | 51 -
.../apache/curator/generated/CreateSpec.java | 1001 -
.../apache/curator/generated/CuratorEvent.java | 1636 --
.../curator/generated/CuratorEventType.java | 99 -
.../curator/generated/CuratorException.java | 736 -
.../curator/generated/CuratorProjection.java | 388 -
.../curator/generated/CuratorService.java | 24123 -----------------
.../apache/curator/generated/DeleteSpec.java | 691 -
.../curator/generated/DiscoveryInstance.java | 1201 -
.../generated/DiscoveryInstanceType.java | 48 -
.../curator/generated/DiscoveryProjection.java | 388 -
.../generated/DiscoveryProviderProjection.java | 388 -
.../curator/generated/DiscoveryService.java | 7236 -----
.../generated/DiscoveryServiceLowLevel.java | 6966 -----
.../apache/curator/generated/EventService.java | 1082 -
.../org/apache/curator/generated/EventType.java | 54 -
.../apache/curator/generated/ExceptionType.java | 48 -
.../apache/curator/generated/ExistsSpec.java | 586 -
.../curator/generated/GetChildrenSpec.java | 586 -
.../apache/curator/generated/GetDataSpec.java | 680 -
.../java/org/apache/curator/generated/Id.java | 488 -
.../apache/curator/generated/KeeperState.java | 63 -
.../apache/curator/generated/LeaderEvent.java | 586 -
.../curator/generated/LeaderProjection.java | 388 -
.../apache/curator/generated/LeaderResult.java | 491 -
.../curator/generated/LeaseProjection.java | 388 -
.../curator/generated/LockProjection.java | 388 -
.../curator/generated/NodeCacheProjection.java | 388 -
.../curator/generated/NodeExceptionType.java | 51 -
.../curator/generated/OptionalChildrenList.java | 437 -
.../apache/curator/generated/OptionalData.java | 399 -
.../generated/OptionalLockProjection.java | 393 -
.../apache/curator/generated/OptionalPath.java | 388 -
.../apache/curator/generated/OptionalStat.java | 393 -
.../apache/curator/generated/Participant.java | 486 -
.../generated/PathChildrenCacheEvent.java | 609 -
.../generated/PathChildrenCacheEventType.java | 60 -
.../generated/PathChildrenCacheProjection.java | 388 -
.../generated/PathChildrenCacheStartMode.java | 48 -
.../generated/PersistentEphemeralNodeMode.java | 51 -
.../PersistentEphemeralNodeProjection.java | 388 -
.../curator/generated/ProviderStrategyType.java | 51 -
.../apache/curator/generated/SetDataSpec.java | 896 -
.../java/org/apache/curator/generated/Stat.java | 1326 -
.../org/apache/curator/generated/Version.java | 386 -
.../apache/curator/generated/WatchedEvent.java | 620 -
.../generated/ZooKeeperExceptionType.java | 90 -
.../java/org/apache/curator/x/rpc/RpcTests.java | 294 -
.../org/apache/curator/x/rpc/TestClient.java | 168 -
.../org/apache/curator/x/rpc/TestServer.java | 34 -
.../resources/configuration/connections.json | 27 -
.../test/resources/configuration/logging.json | 19 -
.../test/resources/configuration/simple.json | 7 -
.../src/test/resources/configuration/test.json | 14 -
pom.xml | 7 -
src/site/confluence/index.confluence | 1 -
src/site/site.xml | 1 -
135 files changed, 66053 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/d3aaddef/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/d3aaddef/src/site/site.xml
----------------------------------------------------------------------
[11/23] curator git commit: Merge branch 'master' into CURATOR-426
Posted by ra...@apache.org.
Merge branch 'master' into CURATOR-426
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/b57f9ef6
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/b57f9ef6
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/b57f9ef6
Branch: refs/heads/master
Commit: b57f9ef65c1c0fcf948da3f9d66e31c74d5e3db9
Parents: 329729a 840b434
Author: randgalt <ra...@apache.org>
Authored: Fri Jul 21 12:50:52 2017 -0500
Committer: randgalt <ra...@apache.org>
Committed: Fri Jul 21 12:50:52 2017 -0500
----------------------------------------------------------------------
.../server/jetty_resteasy/TestStringsWithRestEasy.java | 6 +++---
pom.xml | 9 +++++----
2 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/b57f9ef6/pom.xml
----------------------------------------------------------------------
[08/23] curator git commit: Avoid test flakiness by not starting the
second migration until the first is in filter()
Posted by ra...@apache.org.
Avoid test flakiness by not starting the second migration until the first is in filter()
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/3ad6ca76
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/3ad6ca76
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/3ad6ca76
Branch: refs/heads/master
Commit: 3ad6ca7658b92d38417c47be536ddf3aa8dc61f1
Parents: 71ed99d
Author: randgalt <ra...@apache.org>
Authored: Fri Jul 21 11:26:47 2017 -0500
Committer: randgalt <ra...@apache.org>
Committed: Fri Jul 21 11:26:47 2017 -0500
----------------------------------------------------------------------
.../apache/curator/x/async/migrations/TestMigrationManager.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/3ad6ca76/curator-x-async/src/test/java/org/apache/curator/x/async/migrations/TestMigrationManager.java
----------------------------------------------------------------------
diff --git a/curator-x-async/src/test/java/org/apache/curator/x/async/migrations/TestMigrationManager.java b/curator-x-async/src/test/java/org/apache/curator/x/async/migrations/TestMigrationManager.java
index c781f60..063b961 100644
--- a/curator-x-async/src/test/java/org/apache/curator/x/async/migrations/TestMigrationManager.java
+++ b/curator-x-async/src/test/java/org/apache/curator/x/async/migrations/TestMigrationManager.java
@@ -67,6 +67,7 @@ public class TestMigrationManager extends CompletableBaseClassForTests
private CuratorOp v3op;
private MigrationManager manager;
private final AtomicReference<CountDownLatch> filterLatch = new AtomicReference<>();
+ private final CountDownLatch filterIsSetLatch = new CountDownLatch(1);
@BeforeMethod
@Override
@@ -99,6 +100,7 @@ public class TestMigrationManager extends CompletableBaseClassForTests
CountDownLatch localLatch = filterLatch.getAndSet(null);
if ( localLatch != null )
{
+ filterIsSetLatch.countDown();
try
{
localLatch.await();
@@ -301,6 +303,7 @@ public class TestMigrationManager extends CompletableBaseClassForTests
CountDownLatch latch = new CountDownLatch(1);
filterLatch.set(latch);
CompletionStage<Void> first = manager.migrate(migrationSet);
+ Assert.assertTrue(timing.awaitLatch(filterIsSetLatch));
MigrationManager manager2 = new MigrationManager(client, LOCK_PATH, META_DATA_PATH, executor, Duration.ofMillis(timing.forSleepingABit().milliseconds()));
try
@@ -328,6 +331,7 @@ public class TestMigrationManager extends CompletableBaseClassForTests
CountDownLatch latch = new CountDownLatch(1);
filterLatch.set(latch);
CompletionStage<Void> first = manager.migrate(migrationSet);
+ Assert.assertTrue(timing.awaitLatch(filterIsSetLatch));
CompletionStage<Void> second = manager.migrate(migrationSet);
try
[17/23] curator git commit: testSessionSurvives is a bit flakey. Add
a connection state listener to make it less timing dependent
Posted by ra...@apache.org.
testSessionSurvives is a bit flakey. Add a connection state listener to make it less timing dependent
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/9f601cc1
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/9f601cc1
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/9f601cc1
Branch: refs/heads/master
Commit: 9f601cc15fc475eabe96fff2e0a915eadf08f748
Parents: 0f493b9
Author: randgalt <ra...@apache.org>
Authored: Fri Jul 21 22:23:35 2017 -0500
Committer: randgalt <ra...@apache.org>
Committed: Fri Jul 21 22:23:35 2017 -0500
----------------------------------------------------------------------
.../curator/framework/imps/TestWithCluster.java | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/9f601cc1/curator-framework/src/test/java/org/apache/curator/framework/imps/TestWithCluster.java
----------------------------------------------------------------------
diff --git a/curator-framework/src/test/java/org/apache/curator/framework/imps/TestWithCluster.java b/curator-framework/src/test/java/org/apache/curator/framework/imps/TestWithCluster.java
index e846020..c8050de 100644
--- a/curator-framework/src/test/java/org/apache/curator/framework/imps/TestWithCluster.java
+++ b/curator-framework/src/test/java/org/apache/curator/framework/imps/TestWithCluster.java
@@ -48,6 +48,20 @@ public class TestWithCluster
client = CuratorFrameworkFactory.newClient(cluster.getConnectString(), timing.session(), timing.connection(), new ExponentialBackoffRetry(100, 3));
client.start();
+ final CountDownLatch reconnectedLatch = new CountDownLatch(1);
+ ConnectionStateListener listener = new ConnectionStateListener()
+ {
+ @Override
+ public void stateChanged(CuratorFramework client, ConnectionState newState)
+ {
+ if ( newState == ConnectionState.RECONNECTED )
+ {
+ reconnectedLatch.countDown();;
+ }
+ }
+ };
+ client.getConnectionStateListenable().addListener(listener);
+
client.create().withMode(CreateMode.EPHEMERAL).forPath("/temp", "value".getBytes());
Assert.assertNotNull(client.checkExists().forPath("/temp"));
@@ -59,7 +73,7 @@ public class TestWithCluster
timing.sleepABit();
}
- timing.sleepABit();
+ Assert.assertTrue(timing.awaitLatch(reconnectedLatch));
Assert.assertNotNull(client.checkExists().forPath("/temp"));
}
finally
[23/23] curator git commit: some doc changes
Posted by ra...@apache.org.
some doc changes
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/b26410d5
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/b26410d5
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/b26410d5
Branch: refs/heads/master
Commit: b26410d53aefa7cc46e0a6edd4e03f35298077ee
Parents: 7d7cb9d
Author: randgalt <ra...@apache.org>
Authored: Sat Jul 22 14:12:51 2017 -0500
Committer: randgalt <ra...@apache.org>
Committed: Sat Jul 22 14:12:51 2017 -0500
----------------------------------------------------------------------
src/site/confluence/index.confluence | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/b26410d5/src/site/confluence/index.confluence
----------------------------------------------------------------------
diff --git a/src/site/confluence/index.confluence b/src/site/confluence/index.confluence
index e6a3d10..1546693 100644
--- a/src/site/confluence/index.confluence
+++ b/src/site/confluence/index.confluence
@@ -34,5 +34,5 @@ most users, the only artifact you need is curator\-recipes.
h2. ZooKeeper Compatibility
Apache Curator is meant to be used with ZooKeeper 3.5\+. However, it is also compatible with ZooKeeper 3.4.x.
-See [[Compatibility|compatibility.html]] for details.
+See [[Compatibility|zk-compatibility.html]] for details.
[12/23] curator git commit: latest updates
Posted by ra...@apache.org.
latest updates
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/2204c155
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/2204c155
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/2204c155
Branch: refs/heads/master
Commit: 2204c15508f7b5757dfcbba8234ca57de8b0884d
Parents: b57f9ef
Author: randgalt <ra...@apache.org>
Authored: Fri Jul 21 13:31:52 2017 -0500
Committer: randgalt <ra...@apache.org>
Committed: Fri Jul 21 13:31:52 2017 -0500
----------------------------------------------------------------------
src/site/confluence/index.confluence | 22 +++++++---------------
1 file changed, 7 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/2204c155/src/site/confluence/index.confluence
----------------------------------------------------------------------
diff --git a/src/site/confluence/index.confluence b/src/site/confluence/index.confluence
index 4caf9c8..e6a3d10 100644
--- a/src/site/confluence/index.confluence
+++ b/src/site/confluence/index.confluence
@@ -12,14 +12,9 @@ h2. Getting Started
See the page for quick start: [[Getting Started|getting-started.html]].
-h2. Components
+!images/arrow.png!
-|[[Recipes|curator-recipes/index.html]]|Implementations of some of the common ZooKeeper "recipes". The implementations are built on top of the Curator Framework.|
-|[[Framework|curator-framework/index.html]]|The Curator Framework is a high\-level API that greatly simplifies using ZooKeeper. It adds many features that build on ZooKeeper and handles the complexity of managing connections to the ZooKeeper cluster and retrying operations.|
-|[[Utilities|utilities.html]]|Various utilities that are useful when using ZooKeeper.|
-|[[Client|curator-client/index.html]]|A replacement for the bundled {{ZooKeeper}} class that takes care of some low\-level housekeeping and provides some useful utilities.|
-|[[Errors|errors.html]]|How Curator deals with errors, connection issues, recoverable exceptions, etc.|
-|Extensions|The curator\-recipes package implements the common recipes that are described in the ZooKeeper documentation. To avoid bloating that package, recipes/applications that have a vertical appeal will be put in separate "extension" packages using the naming convention curator\-x\-name.|
+Use the navigation links in the left\-nav menu for detailed information.
h2. Maven / Artifacts
@@ -28,19 +23,16 @@ most users, the only artifact you need is curator\-recipes.
||GroupID/Org||ArtifactID/Name||Description||
|org.apache.curator|curator\-recipes|All of the recipes. Note: this artifact has dependencies on client and framework and, so, Maven (or whatever tool you're using) should pull those in automatically.|
+|org.apache.curator|curator\-async|Asynchronous DSL with O/R modeling, migrations and many other features.|
|org.apache.curator|curator\-framework|The Curator Framework high level API. This is built on top of the client and should pull it in automatically.|
|org.apache.curator|curator\-client|The Curator Client \- replacement for the ZooKeeper class in the ZK distribution.|
|org.apache.curator|curator\-test|Contains the TestingServer, the TestingCluster and a few other tools useful for testing.|
|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.|
+|org.apache.curator|curator\-x\-discovery\-server|A RESTful server that can be used with Curator Discovery.|
-h2. Versions
+h2. ZooKeeper Compatibility
-The are currently two released versions of Curator, 2.x.x and 3.x.x:
+Apache Curator is meant to be used with ZooKeeper 3.5\+. However, it is also compatible with ZooKeeper 3.4.x.
+See [[Compatibility|compatibility.html]] for details.
-* Curator 2.x.x \- compatible with both ZooKeeper 3.4.x and ZooKeeper 3.5.x
-* Curator 3.x.x \- compatible only with ZooKeeper 3.5.x and includes support for new features such as dynamic reconfiguration, etc.
-
-ZooKeeper 3.5.x adds a number of new features including dynamic reconfiguration, watcher removal and others. The Curator 3.x.x Jira
-issues tracking these features are here: [[https://issues.apache.org/jira/browse/CURATOR-159]].
[20/23] curator git commit: It seems that, for classic connection,
the first events are SUSPENDED/LOST, How did this ever work?
Posted by ra...@apache.org.
It seems that, for classic connection, the first events are SUSPENDED/LOST, How did this ever work?
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/73cdf160
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/73cdf160
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/73cdf160
Branch: refs/heads/master
Commit: 73cdf1608460c8187928febcd3829ad4ebec8951
Parents: 4ce1f9d
Author: randgalt <ra...@apache.org>
Authored: Sat Jul 22 10:47:55 2017 -0500
Committer: randgalt <ra...@apache.org>
Committed: Sat Jul 22 10:47:55 2017 -0500
----------------------------------------------------------------------
.../client/TestResetConnectionWithBackgroundFailure.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/73cdf160/curator-recipes/src/test/java/org/apache/curator/framework/client/TestResetConnectionWithBackgroundFailure.java
----------------------------------------------------------------------
diff --git a/curator-recipes/src/test/java/org/apache/curator/framework/client/TestResetConnectionWithBackgroundFailure.java b/curator-recipes/src/test/java/org/apache/curator/framework/client/TestResetConnectionWithBackgroundFailure.java
index 852d9aa..bfc9cf4 100644
--- a/curator-recipes/src/test/java/org/apache/curator/framework/client/TestResetConnectionWithBackgroundFailure.java
+++ b/curator-recipes/src/test/java/org/apache/curator/framework/client/TestResetConnectionWithBackgroundFailure.java
@@ -86,6 +86,11 @@ public class TestResetConnectionWithBackgroundFailure extends BaseClassForTests
client.getConnectionStateListenable().addListener(listener1);
log.debug("Starting ZK server");
server.restart();
+ if ( Boolean.getBoolean("curator-use-classic-connection-handling") )
+ {
+ Assert.assertEquals(listenerSequence.poll(forWaiting.milliseconds(), TimeUnit.MILLISECONDS), ConnectionState.SUSPENDED);
+ Assert.assertEquals(listenerSequence.poll(forWaiting.milliseconds(), TimeUnit.MILLISECONDS), ConnectionState.LOST);
+ }
Assert.assertEquals(listenerSequence.poll(forWaiting.milliseconds(), TimeUnit.MILLISECONDS), ConnectionState.CONNECTED);
log.debug("Stopping ZK server");
[14/23] curator git commit: more doc tweaks
Posted by ra...@apache.org.
more doc tweaks
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/0906eb53
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/0906eb53
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/0906eb53
Branch: refs/heads/master
Commit: 0906eb539d6b5aa3ad65bf7413f5c955288758b8
Parents: 46ce6b7
Author: randgalt <ra...@apache.org>
Authored: Fri Jul 21 14:24:56 2017 -0500
Committer: randgalt <ra...@apache.org>
Committed: Fri Jul 21 14:24:56 2017 -0500
----------------------------------------------------------------------
src/site/confluence/compatibility.confluence | 53 ++++++++++++++++++++---
src/site/site.xml | 2 +-
2 files changed, 47 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/0906eb53/src/site/confluence/compatibility.confluence
----------------------------------------------------------------------
diff --git a/src/site/confluence/compatibility.confluence b/src/site/confluence/compatibility.confluence
index ef3324f..4103bf2 100644
--- a/src/site/confluence/compatibility.confluence
+++ b/src/site/confluence/compatibility.confluence
@@ -1,9 +1,48 @@
-h1. API Compatibility
+h1. ZooKeeper Version Compatibility
-A [[Clirr|http://clirr.sourceforge.net/]] report is generated for each Curator module:
+While ZooKeeper 3.5.x is still considered "beta" by the ZooKeeper development team, the reality is that it is
+used in production by many users. However, ZooKeeper 3.4.x is also used in production. Prior to Apache Curator
+4.0, both versions of ZooKeeper were supported via two versions of Apache Curator. Starting with Curator 4.0
+both versions of ZooKeeper are supported via the same Curator libraries.
+
+h2. ZooKeeper 3.5.x
+
+* Curator 4.0 has a hard dependency on ZooKeeper 3.5.x
+* If you are using ZooKeeper 3.5.x there's nothing additional to do \- just use Curator 4.0
+
+h2. ZooKeeper 3.4.x
+
+Curator 4.0 supports ZooKeeper 3.4.x ensembles in a soft\-compatibility mode. To use this mode
+you must exclude ZooKeeper when adding Curator to your dependency management tool.
+
+_Maven_
+
+{code}
+<dependency>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-recipes</artifactId>
+ <version>${curator-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ </exclusion>
+ </exclusions>
+</dependency>
+{code}
+
+_Gradle_
+
+{code}
+compile('org.apache.curator:curator-recipes:$curatorVersion') {
+ exclude('org.apache.zookeeper:zookeeper')
+}
+{code}
+
+You must add a dependency on ZooKeeper 3.4.x also.
+
+Curator will detect which ZooKeeper library is in use and automatically set ZooKeeper 3.4 compatibility
+mode as needed. In this mode, all features not supported by 3.4 are disabled. It is up to your
+application code to "do the right thing" and not use these features. Use the {{isZk34CompatibilityMode()}}
+method to determine which mode Curator is using at runtime.
-* [[Curator Client Report|curator-client/clirr-report.html]]
-* [[Curator Framework Report|curator-framework/clirr-report.html]]
-* [[Curator Recipes Report|curator-recipes/clirr-report.html]]
-* [[Curator Discovery Report|curator-x-discovery/clirr-report.html]]
-* [[Curator Discovery Server Report|curator-x-discovery-server/clirr-report.html]]
http://git-wip-us.apache.org/repos/asf/curator/blob/0906eb53/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index d78b5b7..8bff322 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -39,7 +39,7 @@
<twitter>
<user>ApacheCurator</user>
<showUser>true</showUser>
- <showFollowers>true</showFollowers>
+ <showFollowers>false</showFollowers>
</twitter>
<googleSearch>
<sitesearch>${project.url}</sitesearch>
[18/23] curator git commit: Maven's incremental compiler was messing
up some of the classes that are copied from curator-test. So,
turn it off for this module
Posted by ra...@apache.org.
Maven's incremental compiler was messing up some of the classes that are copied from curator-test. So, turn it off for this module
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/4bc60637
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/4bc60637
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/4bc60637
Branch: refs/heads/master
Commit: 4bc6063757cc5aa4d2a7f6bf9c42110f266f82b9
Parents: 9f601cc
Author: randgalt <ra...@apache.org>
Authored: Sat Jul 22 01:10:15 2017 -0500
Committer: randgalt <ra...@apache.org>
Committed: Sat Jul 22 01:10:15 2017 -0500
----------------------------------------------------------------------
curator-test-zk34/pom.xml | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/4bc60637/curator-test-zk34/pom.xml
----------------------------------------------------------------------
diff --git a/curator-test-zk34/pom.xml b/curator-test-zk34/pom.xml
index 3cd9946..3ec50cc 100644
--- a/curator-test-zk34/pom.xml
+++ b/curator-test-zk34/pom.xml
@@ -139,6 +139,14 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <useIncrementalCompilation>false</useIncrementalCompilation>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<executions>
<execution>
[19/23] curator git commit: when retrying,
output the offending exception
Posted by ra...@apache.org.
when retrying, output the offending exception
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/4ce1f9d0
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/4ce1f9d0
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/4ce1f9d0
Branch: refs/heads/master
Commit: 4ce1f9d018227a03523e0e973cb1571a17a5ee5d
Parents: 4bc6063
Author: randgalt <ra...@apache.org>
Authored: Sat Jul 22 10:47:36 2017 -0500
Committer: randgalt <ra...@apache.org>
Committed: Sat Jul 22 10:47:36 2017 -0500
----------------------------------------------------------------------
.../java/org/apache/curator/test/BaseClassForTests.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/4ce1f9d0/curator-test/src/main/java/org/apache/curator/test/BaseClassForTests.java
----------------------------------------------------------------------
diff --git a/curator-test/src/main/java/org/apache/curator/test/BaseClassForTests.java b/curator-test/src/main/java/org/apache/curator/test/BaseClassForTests.java
index 8238c82..1c87be4 100644
--- a/curator-test/src/main/java/org/apache/curator/test/BaseClassForTests.java
+++ b/curator-test/src/main/java/org/apache/curator/test/BaseClassForTests.java
@@ -41,7 +41,6 @@ public class BaseClassForTests
protected TestingServer server;
private final Logger log = LoggerFactory.getLogger(getClass());
- private static final int RETRY_WAIT_MS = 5000;
private static final String INTERNAL_PROPERTY_DONT_LOG_CONNECTION_ISSUES;
private static final String INTERNAL_PROPERTY_REMOVE_WATCHERS_IN_FOREGROUND;
private static final String INTERNAL_PROPERTY_VALIDATE_NAMESPACE_WATCHER_MAP_EMPTY;
@@ -167,7 +166,14 @@ public class BaseClassForTests
return false;
}
- log.error("Retrying 1 time");
+ if ( result.getThrowable() != null )
+ {
+ log.error("Retrying 1 time", result.getThrowable());
+ }
+ else
+ {
+ log.error("Retrying 1 time");
+ }
retryContext.isRetrying.set(true);
return true;
}
[13/23] curator git commit: Curator Java 8/Async isn't technically an
extension anymore
Posted by ra...@apache.org.
Curator Java 8/Async isn't technically an extension anymore
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/46ce6b7a
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/46ce6b7a
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/46ce6b7a
Branch: refs/heads/master
Commit: 46ce6b7ae338ced5d2fd71bb7ce0e7df6085b208
Parents: 2204c15
Author: randgalt <ra...@apache.org>
Authored: Fri Jul 21 13:44:01 2017 -0500
Committer: randgalt <ra...@apache.org>
Committed: Fri Jul 21 13:44:01 2017 -0500
----------------------------------------------------------------------
src/site/site.xml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/46ce6b7a/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index 15e1a0c..d78b5b7 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -107,8 +107,7 @@
<menu name="Extensions" inherit="top">
<item name="Service Discovery" href="curator-x-discovery/index.html"/>
<item name="Service Discovery Server" href="curator-x-discovery-server/index.html"/>
- <item name="Curator Java 8/Async" href="curator-x-async/index.html"/>
- </menu>
+\ </menu>
<menu name="Community" inherit="top">
<item name="Submitting Pull Requests" href="https://cwiki.apache.org/confluence/display/CURATOR/Submitting+Pull+Requests"/>
[03/23] curator git commit: include version
Posted by ra...@apache.org.
include version
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/a096cd8d
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/a096cd8d
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/a096cd8d
Branch: refs/heads/master
Commit: a096cd8dd25345a2a8a3f87d37a173f17a8a1e25
Parents: e10e40f
Author: randgalt <ra...@apache.org>
Authored: Thu Jul 20 14:53:16 2017 -0500
Committer: randgalt <ra...@apache.org>
Committed: Thu Jul 20 14:53:16 2017 -0500
----------------------------------------------------------------------
src/site/site.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/a096cd8d/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index c2ed319..828971e 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -66,7 +66,7 @@
<publishDate/>
- <version position="none"/>
+ <version position="left"/>
<body>
<links>
[05/23] curator git commit: Oops - default ctor
ModeledFrameworkBuilder didn't set modeledOptions
Posted by ra...@apache.org.
Oops - default ctor ModeledFrameworkBuilder didn't set modeledOptions
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/ee6859ee
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/ee6859ee
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/ee6859ee
Branch: refs/heads/master
Commit: ee6859eeed4ed13b018de409726052d47f3344bc
Parents: 8a9f7a8
Author: randgalt <ra...@apache.org>
Authored: Fri Jul 21 04:17:22 2017 -0500
Committer: randgalt <ra...@apache.org>
Committed: Fri Jul 21 04:17:22 2017 -0500
----------------------------------------------------------------------
.../org/apache/curator/x/async/modeled/ModeledFrameworkBuilder.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/ee6859ee/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/ModeledFrameworkBuilder.java
----------------------------------------------------------------------
diff --git a/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/ModeledFrameworkBuilder.java b/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/ModeledFrameworkBuilder.java
index 1df68e6..4c4d639 100644
--- a/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/ModeledFrameworkBuilder.java
+++ b/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/ModeledFrameworkBuilder.java
@@ -161,6 +161,7 @@ public class ModeledFrameworkBuilder<T>
ModeledFrameworkBuilder()
{
+ modeledOptions = Collections.singleton(ModeledOptions.ignoreMissingNodesForChildren);
}
ModeledFrameworkBuilder(AsyncCuratorFramework client, ModelSpec<T> modelSpec)
[07/23] curator git commit: Include the unexpected exception in the
assertion
Posted by ra...@apache.org.
Include the unexpected exception in the assertion
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/71ed99d3
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/71ed99d3
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/71ed99d3
Branch: refs/heads/master
Commit: 71ed99d3d8a6c3b7f6a54b55b3b052daf927f8e0
Parents: d3aadde
Author: randgalt <ra...@apache.org>
Authored: Fri Jul 21 11:12:38 2017 -0500
Committer: randgalt <ra...@apache.org>
Committed: Fri Jul 21 11:12:38 2017 -0500
----------------------------------------------------------------------
.../apache/curator/x/async/migrations/TestMigrationManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/71ed99d3/curator-x-async/src/test/java/org/apache/curator/x/async/migrations/TestMigrationManager.java
----------------------------------------------------------------------
diff --git a/curator-x-async/src/test/java/org/apache/curator/x/async/migrations/TestMigrationManager.java b/curator-x-async/src/test/java/org/apache/curator/x/async/migrations/TestMigrationManager.java
index 47d09ab..c781f60 100644
--- a/curator-x-async/src/test/java/org/apache/curator/x/async/migrations/TestMigrationManager.java
+++ b/curator-x-async/src/test/java/org/apache/curator/x/async/migrations/TestMigrationManager.java
@@ -337,7 +337,7 @@ public class TestMigrationManager extends CompletableBaseClassForTests
}
catch ( Throwable e )
{
- Assert.assertTrue(Throwables.getRootCause(e) instanceof TimeoutException);
+ Assert.assertTrue(Throwables.getRootCause(e) instanceof TimeoutException, "Should throw TimeoutException, was: " + Throwables.getStackTraceAsString(Throwables.getRootCause(e)));
}
latch.countDown();
[22/23] curator git commit: some doc changes: :
Posted by ra...@apache.org.
some doc changes:
:
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/7d7cb9d6
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/7d7cb9d6
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/7d7cb9d6
Branch: refs/heads/master
Commit: 7d7cb9d6ab1084c053839416d71607479bd356de
Parents: e819268
Author: randgalt <ra...@apache.org>
Authored: Sat Jul 22 13:26:41 2017 -0500
Committer: randgalt <ra...@apache.org>
Committed: Sat Jul 22 13:26:41 2017 -0500
----------------------------------------------------------------------
src/site/confluence/compatibility.confluence | 54 +++-----------------
src/site/confluence/zk-compatibility.confluence | 48 +++++++++++++++++
src/site/site.xml | 5 +-
3 files changed, 59 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/7d7cb9d6/src/site/confluence/compatibility.confluence
----------------------------------------------------------------------
diff --git a/src/site/confluence/compatibility.confluence b/src/site/confluence/compatibility.confluence
index 4103bf2..467f1fc 100644
--- a/src/site/confluence/compatibility.confluence
+++ b/src/site/confluence/compatibility.confluence
@@ -1,48 +1,10 @@
-h1. ZooKeeper Version Compatibility
+h1. API Compatibility
-While ZooKeeper 3.5.x is still considered "beta" by the ZooKeeper development team, the reality is that it is
-used in production by many users. However, ZooKeeper 3.4.x is also used in production. Prior to Apache Curator
-4.0, both versions of ZooKeeper were supported via two versions of Apache Curator. Starting with Curator 4.0
-both versions of ZooKeeper are supported via the same Curator libraries.
-
-h2. ZooKeeper 3.5.x
-
-* Curator 4.0 has a hard dependency on ZooKeeper 3.5.x
-* If you are using ZooKeeper 3.5.x there's nothing additional to do \- just use Curator 4.0
-
-h2. ZooKeeper 3.4.x
-
-Curator 4.0 supports ZooKeeper 3.4.x ensembles in a soft\-compatibility mode. To use this mode
-you must exclude ZooKeeper when adding Curator to your dependency management tool.
-
-_Maven_
-
-{code}
-<dependency>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-recipes</artifactId>
- <version>${curator-version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- </exclusion>
- </exclusions>
-</dependency>
-{code}
-
-_Gradle_
-
-{code}
-compile('org.apache.curator:curator-recipes:$curatorVersion') {
- exclude('org.apache.zookeeper:zookeeper')
-}
-{code}
-
-You must add a dependency on ZooKeeper 3.4.x also.
-
-Curator will detect which ZooKeeper library is in use and automatically set ZooKeeper 3.4 compatibility
-mode as needed. In this mode, all features not supported by 3.4 are disabled. It is up to your
-application code to "do the right thing" and not use these features. Use the {{isZk34CompatibilityMode()}}
-method to determine which mode Curator is using at runtime.
+A [[Clirr|http://clirr.sourceforge.net/]] report is generated for each Curator module:
+* [[Curator Client Report|curator-client/clirr-report.html]]
+* [[Curator Framework Report|curator-framework/clirr-report.html]]
+* [[Curator Recipes Report|curator-recipes/clirr-report.html]]
+* [[Curator Async Report|curator-x-async/clirr-report.html]]
+* [[Curator Discovery Report|curator-x-discovery/clirr-report.html]]
+* [[Curator Discovery Server Report|curator-x-discovery-server/clirr-report.html]]
http://git-wip-us.apache.org/repos/asf/curator/blob/7d7cb9d6/src/site/confluence/zk-compatibility.confluence
----------------------------------------------------------------------
diff --git a/src/site/confluence/zk-compatibility.confluence b/src/site/confluence/zk-compatibility.confluence
new file mode 100644
index 0000000..4103bf2
--- /dev/null
+++ b/src/site/confluence/zk-compatibility.confluence
@@ -0,0 +1,48 @@
+h1. ZooKeeper Version Compatibility
+
+While ZooKeeper 3.5.x is still considered "beta" by the ZooKeeper development team, the reality is that it is
+used in production by many users. However, ZooKeeper 3.4.x is also used in production. Prior to Apache Curator
+4.0, both versions of ZooKeeper were supported via two versions of Apache Curator. Starting with Curator 4.0
+both versions of ZooKeeper are supported via the same Curator libraries.
+
+h2. ZooKeeper 3.5.x
+
+* Curator 4.0 has a hard dependency on ZooKeeper 3.5.x
+* If you are using ZooKeeper 3.5.x there's nothing additional to do \- just use Curator 4.0
+
+h2. ZooKeeper 3.4.x
+
+Curator 4.0 supports ZooKeeper 3.4.x ensembles in a soft\-compatibility mode. To use this mode
+you must exclude ZooKeeper when adding Curator to your dependency management tool.
+
+_Maven_
+
+{code}
+<dependency>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-recipes</artifactId>
+ <version>${curator-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ </exclusion>
+ </exclusions>
+</dependency>
+{code}
+
+_Gradle_
+
+{code}
+compile('org.apache.curator:curator-recipes:$curatorVersion') {
+ exclude('org.apache.zookeeper:zookeeper')
+}
+{code}
+
+You must add a dependency on ZooKeeper 3.4.x also.
+
+Curator will detect which ZooKeeper library is in use and automatically set ZooKeeper 3.4 compatibility
+mode as needed. In this mode, all features not supported by 3.4 are disabled. It is up to your
+application code to "do the right thing" and not use these features. Use the {{isZk34CompatibilityMode()}}
+method to determine which mode Curator is using at runtime.
+
http://git-wip-us.apache.org/repos/asf/curator/blob/7d7cb9d6/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index 97fb05c..85c4f36 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -85,7 +85,7 @@
</menu>
<menu name="Compatibility" inherit="top">
- <item name="ZooKeeper Versions" href="compatibility.html"/>
+ <item name="ZooKeeper Versions" href="zk-compatibility.html"/>
</menu>
<menu name="Low Level" inherit="top">
@@ -102,6 +102,7 @@
<item name="Source Code" href="source-repository.html"/>
<item name="Project Team" href="team-list.html"/>
<item name="Project Information" href="project-info.html"/>
+ <item name="API Compatibility" href="compatibility.html"/>
<item name="Javadoc" href="apidocs/index.html"/>
<item name="Wiki" href="https://cwiki.apache.org/confluence/display/CURATOR"/>
<item name="Releases" href="https://cwiki.apache.org/confluence/display/CURATOR/Releases"/>
@@ -110,7 +111,7 @@
<menu name="Extensions" inherit="top">
<item name="Service Discovery" href="curator-x-discovery/index.html"/>
<item name="Service Discovery Server" href="curator-x-discovery-server/index.html"/>
-\ </menu>
+ </menu>
<menu name="Community" inherit="top">
<item name="Submitting Pull Requests" href="https://cwiki.apache.org/confluence/display/CURATOR/Submitting+Pull+Requests"/>
[04/23] curator git commit: color scheme refresh
Posted by ra...@apache.org.
color scheme refresh
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/8a9f7a8a
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/8a9f7a8a
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/8a9f7a8a
Branch: refs/heads/master
Commit: 8a9f7a8a705a7b19fb7226a5aeb971f9ff931cce
Parents: a096cd8
Author: randgalt <ra...@apache.org>
Authored: Thu Jul 20 19:55:17 2017 -0500
Committer: randgalt <ra...@apache.org>
Committed: Thu Jul 20 19:55:17 2017 -0500
----------------------------------------------------------------------
src/site/resources/css/site.css | 43 +++++++++++++++++-------------------
1 file changed, 20 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/8a9f7a8a/src/site/resources/css/site.css
----------------------------------------------------------------------
diff --git a/src/site/resources/css/site.css b/src/site/resources/css/site.css
index 5f9beb9..84c4e5d 100644
--- a/src/site/resources/css/site.css
+++ b/src/site/resources/css/site.css
@@ -17,38 +17,35 @@
* under the License.
*/
-tt
-{
- background-color: #eee;
+tt {
+ background-color: #EEE;
}
-.well, .breadcrumb
-{
- background-color: #f5f5ff;
+.well, .breadcrumb {
+ background-color: #EDF1F6;
}
-a:link, a:visited, a:active
-{
- color: #0035AC;
+a:link, a:visited, a:active {
+ color: #316290;
}
-a:hover
-{
- color: #001F67;
+a:hover {
+ color: #001F67;
}
-.nav-list .active a:link, .nav-list .active a:visited, .nav-list .active a:active, .nav-list .active a:hover
-{
- background-color: #0035AC;
+.nav-list .active a:link, .nav-list .active a:visited, .nav-list .active a:active, .nav-list .active a:hover {
+ background-color: #316290;
}
-.nav-list li a:hover
-{
- background-color: #DDDDDD;
+.nav-list li a:hover {
+ background-color: #DDDDDD;
}
-.search-query
-{
- margin-top: 15px;
- width: 183px;
-}
\ No newline at end of file
+.search-query {
+ margin-top: 15px;
+ width: 85%;
+}
+
+#banner {
+ margin-bottom: 3px;
+}