svn commit: r20542 - /dev/curator/4.0.0/
Author: randgalt Date: Mon Jul 24 05:22:44 2017 New Revision: 20542 Log: canceled Removed: dev/curator/4.0.0/
[4/5] curator git commit: [maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/8d52ecbc Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/8d52ecbc Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/8d52ecbc Branch: refs/heads/CURATOR-427 Commit: 8d52ecbc5ae712a891c3567a0f12818aad3edddb Parents: 0cc62d6 Author: randgaltAuthored: Sun Jul 23 14:15:57 2017 -0500 Committer: randgalt Committed: Sun Jul 23 14:15:57 2017 -0500 -- curator-client/pom.xml | 4 ++-- curator-examples/pom.xml | 2 +- curator-framework/pom.xml | 4 ++-- curator-recipes/pom.xml| 4 ++-- curator-test-zk34/pom.xml | 2 +- curator-test/pom.xml | 4 ++-- curator-x-async/pom.xml| 2 +- curator-x-discovery-server/pom.xml | 4 ++-- curator-x-discovery/pom.xml| 4 ++-- pom.xml| 4 ++-- 10 files changed, 17 insertions(+), 17 deletions(-) -- http://git-wip-us.apache.org/repos/asf/curator/blob/8d52ecbc/curator-client/pom.xml -- diff --git a/curator-client/pom.xml b/curator-client/pom.xml index 58c69aa..e824b58 100644 --- a/curator-client/pom.xml +++ b/curator-client/pom.xml @@ -23,11 +23,11 @@ org.apache.curator apache-curator -4.0.0 +4.0.1-SNAPSHOT curator-client -4.0.0 +4.0.1-SNAPSHOT bundle Curator Client http://git-wip-us.apache.org/repos/asf/curator/blob/8d52ecbc/curator-examples/pom.xml -- diff --git a/curator-examples/pom.xml b/curator-examples/pom.xml index d583d1e..5fb2b91 100644 --- a/curator-examples/pom.xml +++ b/curator-examples/pom.xml @@ -24,7 +24,7 @@ org.apache.curator apache-curator -4.0.0 +4.0.1-SNAPSHOT curator-examples http://git-wip-us.apache.org/repos/asf/curator/blob/8d52ecbc/curator-framework/pom.xml -- diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml index 27acf00..6d90764 100644 --- a/curator-framework/pom.xml +++ b/curator-framework/pom.xml @@ -24,11 +24,11 @@ org.apache.curator apache-curator -4.0.0 +4.0.1-SNAPSHOT curator-framework -4.0.0 +4.0.1-SNAPSHOT bundle Curator Framework http://git-wip-us.apache.org/repos/asf/curator/blob/8d52ecbc/curator-recipes/pom.xml -- diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml index d9b4469..6b01716 100644 --- a/curator-recipes/pom.xml +++ b/curator-recipes/pom.xml @@ -24,11 +24,11 @@ org.apache.curator apache-curator -4.0.0 +4.0.1-SNAPSHOT curator-recipes -4.0.0 +4.0.1-SNAPSHOT bundle Curator Recipes http://git-wip-us.apache.org/repos/asf/curator/blob/8d52ecbc/curator-test-zk34/pom.xml -- diff --git a/curator-test-zk34/pom.xml b/curator-test-zk34/pom.xml index 58ca0da..aea4133 100644 --- a/curator-test-zk34/pom.xml +++ b/curator-test-zk34/pom.xml @@ -3,7 +3,7 @@ apache-curator org.apache.curator -4.0.0 +4.0.1-SNAPSHOT 4.0.0 http://git-wip-us.apache.org/repos/asf/curator/blob/8d52ecbc/curator-test/pom.xml -- diff --git a/curator-test/pom.xml b/curator-test/pom.xml index d3280d5..9d42ea8 100644 --- a/curator-test/pom.xml +++ b/curator-test/pom.xml @@ -24,11 +24,11 @@ org.apache.curator apache-curator -4.0.0 +4.0.1-SNAPSHOT curator-test -4.0.0 +4.0.1-SNAPSHOT Curator Testing Unit testing utilities. http://git-wip-us.apache.org/repos/asf/curator/blob/8d52ecbc/curator-x-async/pom.xml -- diff --git a/curator-x-async/pom.xml b/curator-x-async/pom.xml index 795c2f7..5fc6569 100644 --- a/curator-x-async/pom.xml +++ b/curator-x-async/pom.xml @@ -3,7 +3,7 @@ org.apache.curator apache-curator -4.0.0 +4.0.1-SNAPSHOT 4.0.0 http://git-wip-us.apache.org/repos/asf/curator/blob/8d52ecbc/curator-x-discovery-server/pom.xml -- diff --git a/curator-x-discovery-server/pom.xml b/curator-x-discovery-server/pom.xml index b9785a1..d4d8b6e 100644 ---
[5/5] curator git commit: Removed Classic connection handling as it's old, hard to maintain, forces us to run tests twice and isn't even what users expect.
Removed Classic connection handling as it's old, hard to maintain, forces us to run tests twice and isn't even what users expect. Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/15eb063f Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/15eb063f Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/15eb063f Branch: refs/heads/CURATOR-427 Commit: 15eb063fa22569e797f850fb8d60a0949f52fbf5 Parents: 8d52ecb Author: randgaltAuthored: Sun Jul 23 23:56:20 2017 -0500 Committer: randgalt Committed: Sun Jul 23 23:56:20 2017 -0500 -- .../apache/curator/CuratorZookeeperClient.java | 8 +- .../ClassicConnectionHandlingPolicy.java| 88 .../StandardConnectionHandlingPolicy.java | 3 - .../java/org/apache/curator/TestEnsurePath.java | 6 +- .../framework/CuratorFrameworkFactory.java | 7 +- .../imps/ClassicInternalConnectionHandler.java | 70 .../framework/imps/CuratorFrameworkImpl.java| 3 +- .../imps/TestEnabledSessionExpiredState.java| 6 -- .../curator/framework/imps/TestFramework.java | 10 +-- .../curator/framework/schema/TestSchema.java| 6 -- ...estResetConnectionWithBackgroundFailure.java | 5 -- .../recipes/cache/BaseTestTreeCache.java| 2 +- .../framework/recipes/cache/TestTreeCache.java | 2 + .../apache/curator/test/BaseClassForTests.java | 27 +- 14 files changed, 16 insertions(+), 227 deletions(-) -- http://git-wip-us.apache.org/repos/asf/curator/blob/15eb063f/curator-client/src/main/java/org/apache/curator/CuratorZookeeperClient.java -- diff --git a/curator-client/src/main/java/org/apache/curator/CuratorZookeeperClient.java b/curator-client/src/main/java/org/apache/curator/CuratorZookeeperClient.java index 7549c29..b7bb33a 100644 --- a/curator-client/src/main/java/org/apache/curator/CuratorZookeeperClient.java +++ b/curator-client/src/main/java/org/apache/curator/CuratorZookeeperClient.java @@ -20,8 +20,8 @@ package org.apache.curator; import com.google.common.base.Preconditions; -import org.apache.curator.connection.ClassicConnectionHandlingPolicy; import org.apache.curator.connection.ConnectionHandlingPolicy; +import org.apache.curator.connection.StandardConnectionHandlingPolicy; import org.apache.curator.drivers.OperationTrace; import org.apache.curator.drivers.TracerDriver; import org.apache.curator.ensemble.EnsembleProvider; @@ -66,7 +66,7 @@ public class CuratorZookeeperClient implements Closeable */ public CuratorZookeeperClient(String connectString, int sessionTimeoutMs, int connectionTimeoutMs, Watcher watcher, RetryPolicy retryPolicy) { -this(new DefaultZookeeperFactory(), new FixedEnsembleProvider(connectString), sessionTimeoutMs, connectionTimeoutMs, watcher, retryPolicy, false, new ClassicConnectionHandlingPolicy()); +this(new DefaultZookeeperFactory(), new FixedEnsembleProvider(connectString), sessionTimeoutMs, connectionTimeoutMs, watcher, retryPolicy, false, new StandardConnectionHandlingPolicy()); } /** @@ -78,7 +78,7 @@ public class CuratorZookeeperClient implements Closeable */ public CuratorZookeeperClient(EnsembleProvider ensembleProvider, int sessionTimeoutMs, int connectionTimeoutMs, Watcher watcher, RetryPolicy retryPolicy) { -this(new DefaultZookeeperFactory(), ensembleProvider, sessionTimeoutMs, connectionTimeoutMs, watcher, retryPolicy, false, new ClassicConnectionHandlingPolicy()); +this(new DefaultZookeeperFactory(), ensembleProvider, sessionTimeoutMs, connectionTimeoutMs, watcher, retryPolicy, false, new StandardConnectionHandlingPolicy()); } /** @@ -95,7 +95,7 @@ public class CuratorZookeeperClient implements Closeable */ public CuratorZookeeperClient(ZookeeperFactory zookeeperFactory, EnsembleProvider ensembleProvider, int sessionTimeoutMs, int connectionTimeoutMs, Watcher watcher, RetryPolicy retryPolicy, boolean canBeReadOnly) { -this(zookeeperFactory, ensembleProvider, sessionTimeoutMs, connectionTimeoutMs, watcher, retryPolicy, canBeReadOnly, new ClassicConnectionHandlingPolicy()); +this(zookeeperFactory, ensembleProvider, sessionTimeoutMs, connectionTimeoutMs, watcher, retryPolicy, canBeReadOnly, new StandardConnectionHandlingPolicy()); } /** http://git-wip-us.apache.org/repos/asf/curator/blob/15eb063f/curator-client/src/main/java/org/apache/curator/connection/ClassicConnectionHandlingPolicy.java -- diff --git a/curator-client/src/main/java/org/apache/curator/connection/ClassicConnectionHandlingPolicy.java
svn commit: r20529 - in /dev/curator/4.0.0: ./ apache-curator-4.0.0-source-release.zip apache-curator-4.0.0-source-release.zip.asc apache-curator-4.0.0-source-release.zip.md5 apache-curator-4.0.0-sour
Author: randgalt Date: Sun Jul 23 19:25:03 2017 New Revision: 20529 Log: Apache Curator 4.0.0 candidate 2 Added: dev/curator/4.0.0/ dev/curator/4.0.0/apache-curator-4.0.0-source-release.zip (with props) dev/curator/4.0.0/apache-curator-4.0.0-source-release.zip.asc dev/curator/4.0.0/apache-curator-4.0.0-source-release.zip.md5 dev/curator/4.0.0/apache-curator-4.0.0-source-release.zip.sha1 Added: dev/curator/4.0.0/apache-curator-4.0.0-source-release.zip == Binary file - no diff available. Propchange: dev/curator/4.0.0/apache-curator-4.0.0-source-release.zip -- svn:mime-type = application/octet-stream Added: dev/curator/4.0.0/apache-curator-4.0.0-source-release.zip.asc == --- dev/curator/4.0.0/apache-curator-4.0.0-source-release.zip.asc (added) +++ dev/curator/4.0.0/apache-curator-4.0.0-source-release.zip.asc Sun Jul 23 19:25:03 2017 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQIcBAABAgAGBQJZdPYLAAoJEJbwkU+I6SakrLwQAM3WoGDXf+FMl+6nr8IBeULd +myOBSMCPlqga/v1w6LIwwSE9yKq94LJpQE91AO6Ia/jahnZo5htqpkXRizwPDC0m +So+Cz4fkSM5uCxX42vXX/uGt2+I5NbNr27GclxZjumf5uA76P9vXhAARnACr1X4z +Nn80G7Qxic4u5+Z4J894mPCLw5x1EZ6sGsippbABsYdfdMIP0ymTKAI1HKmF/spR +RQES8buHYZVORggzvNZs7Rg2JbdWprU8HdaYeTaNLVFxA47EIf7PCYMGn4+6q4Ir +LYhvquGdiZ6DQ3cmRwcGX5vyFpdBYdePuyy3hiM4xT5d2Zdr2DQ7CdH+BDaztDBl +tNWvAVfqb6IZyywSnrI6iv2jrTGoGbLj2257l6OdcaS9jFfR+f25+ODrN3TkZYrB +8Komd7QwJXe8s5avIZyfCB0hoB5u/E7jax4GqLrCsEo5NE5Rv55NP7SMErRF4hzl +7I1dH25cap9L2XYrTBRu4LLOb8kgOL27ROuSXJreJypCnnzRZrcTE0m7u2uDHRxw +sMXMGz/fkJ3guSBKAEqVWiIJysiNtqlBp6GGxQxVmxNJYTWV4A8usU+YShORSH0K +J/KPLnLtNBhL3O+06L0qhuhqAMDPX/B51zul9YVC59lO0f3MovG3SvuUiyj9L9em +mZSE2H/3qqlkhWahnqov +=So27 +-END PGP SIGNATURE- Added: dev/curator/4.0.0/apache-curator-4.0.0-source-release.zip.md5 == --- dev/curator/4.0.0/apache-curator-4.0.0-source-release.zip.md5 (added) +++ dev/curator/4.0.0/apache-curator-4.0.0-source-release.zip.md5 Sun Jul 23 19:25:03 2017 @@ -0,0 +1 @@ +f99b42b3c222ff6cd269db5073c4b284 \ No newline at end of file Added: dev/curator/4.0.0/apache-curator-4.0.0-source-release.zip.sha1 == --- dev/curator/4.0.0/apache-curator-4.0.0-source-release.zip.sha1 (added) +++ dev/curator/4.0.0/apache-curator-4.0.0-source-release.zip.sha1 Sun Jul 23 19:25:03 2017 @@ -0,0 +1 @@ +d4f00424b7441c5fbef8918fbf6e88c70dd24a8a \ No newline at end of file
[curator] Git Push Summary
Repository: curator Updated Tags: refs/tags/apache-curator-4.0.0 [deleted] fac0e9ffa
[3/4] curator git commit: ressurected old KillSession.java for backward compatibilty
ressurected old KillSession.java for backward compatibilty Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/c05b6ca6 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/c05b6ca6 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/c05b6ca6 Branch: refs/heads/master Commit: c05b6ca646f756d2670243e09f3605c786dbdc75 Parents: 171a200 Author: randgaltAuthored: Sun Jul 23 14:10:57 2017 -0500 Committer: randgalt Committed: Sun Jul 23 14:10:57 2017 -0500 -- .../org/apache/curator/test/KillSession.java| 67 1 file changed, 67 insertions(+) -- http://git-wip-us.apache.org/repos/asf/curator/blob/c05b6ca6/curator-test/src/main/java/org/apache/curator/test/KillSession.java -- diff --git a/curator-test/src/main/java/org/apache/curator/test/KillSession.java b/curator-test/src/main/java/org/apache/curator/test/KillSession.java new file mode 100644 index 000..ce2b7e6 --- /dev/null +++ b/curator-test/src/main/java/org/apache/curator/test/KillSession.java @@ -0,0 +1,67 @@ +/** + * 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.test; + +import org.apache.zookeeper.ZooKeeper; + +/** + * + * Utility to simulate a ZK session dying. + * + */ +public class KillSession +{ +/** + * Kill the given ZK session + * + * @param client the client to kill + * @since 3.0.0 + */ +public static void kill(ZooKeeper client) +{ +client.getTestable().injectSessionExpiration(); +} + +/** + * Kill the given ZK session + * + * @param client the client to kill + * @param connectString server connection string + * @throws Exception errors + * @deprecated use {@link #kill(ZooKeeper)} instead + */ +public static void kill(ZooKeeper client, String connectString) throws Exception +{ +kill(client); +} + +/** + * Kill the given ZK session + * + * @param client the client to kill + * @param connectString server connection string + * @param maxMs max time ms to wait for kill + * @throws Exception errors + * @deprecated use {@link #kill(ZooKeeper)} instead + */ +public static void kill(ZooKeeper client, String connectString, int maxMs) throws Exception +{ +kill(client); +} +}
svn commit: r20528 - /dev/curator/4.0.0/
Author: randgalt Date: Sun Jul 23 19:06:34 2017 New Revision: 20528 Log: current release is canceled Removed: dev/curator/4.0.0/
svn commit: r20526 - in /dev/curator: 2.12.0/ 3.3.0/ 4.0.0/
Author: randgalt Date: Sun Jul 23 12:33:45 2017 New Revision: 20526 Log: Apache Curator 4.0.0 Added: dev/curator/4.0.0/ dev/curator/4.0.0/apache-curator-4.0.0-source-release.zip (with props) dev/curator/4.0.0/apache-curator-4.0.0-source-release.zip.asc dev/curator/4.0.0/apache-curator-4.0.0-source-release.zip.md5 dev/curator/4.0.0/apache-curator-4.0.0-source-release.zip.sha1 Removed: dev/curator/2.12.0/ dev/curator/3.3.0/ Added: dev/curator/4.0.0/apache-curator-4.0.0-source-release.zip == Binary file - no diff available. Propchange: dev/curator/4.0.0/apache-curator-4.0.0-source-release.zip -- svn:mime-type = application/octet-stream Added: dev/curator/4.0.0/apache-curator-4.0.0-source-release.zip.asc == --- dev/curator/4.0.0/apache-curator-4.0.0-source-release.zip.asc (added) +++ dev/curator/4.0.0/apache-curator-4.0.0-source-release.zip.asc Sun Jul 23 12:33:45 2017 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQIcBAABAgAGBQJZdJKqAAoJEJbwkU+I6SakPmAQAKPwPuHanhHSm52daLPe76Wq +4LiPt7xooqTFWwNdKOaGkwkiyyo2yxBGWEnt5cwGr5ko+sQt/Jx1ALZWboiJMf35 +lhE+OIqhGuxKU4YK8otRs5w8L24+F9UoThrc1BU5XfN/3S+cdMzT6QeWbRyUATOz +r9rsIA6TjUakscsKy8+ST1886MzTwF0UgSDFAeaWOu8LisWXFnBCSjNHaCzNbK3e +QsLFs5721ehSgJ/sbU11Ei5E5Zk2VhwmKwWj+MqRfA2IvuZm1f6Le1yi5GRpMwZ0 +I54JXHol300iptdtXyopwlIRWZJcgrExPFUvyjhuIfkoVWMt0Sblkmb6BrvUv0XG +zqplRWAmVsBNqirWnbekHzfQUFEphfz6z7OEzi2WimQXjgaEeJFrAcWcFYEipYok +MCl97l0Dao+ce/Dh2oz8JrqcR1k+/Q4ulLgv0UNlyXa7zoBJYH7SEzDKzvROYCnj +AITbVvi6WP2oQrx4a31TBuqJhBxQdqjHZLmSg/NuPvP7Qc3bD8W4pkInTotJJhXZ +KjcZ62xyxPAUG/iPem+3qW0NKG220mQoxpBgTwK1k4HcUafHSvkq/xdzCkP3OMZ3 +lE1Ofvw8fhQzuYG4ojg+gDb1UJRCIzmFO2qgGFNK/E5K5zmC4by4gxyti59OKBff +jO9aUPzNz65Ec1HZEA/B +=dEsX +-END PGP SIGNATURE- Added: dev/curator/4.0.0/apache-curator-4.0.0-source-release.zip.md5 == --- dev/curator/4.0.0/apache-curator-4.0.0-source-release.zip.md5 (added) +++ dev/curator/4.0.0/apache-curator-4.0.0-source-release.zip.md5 Sun Jul 23 12:33:45 2017 @@ -0,0 +1 @@ +ea874b3d01a46525667b37b234f59cfa \ No newline at end of file Added: dev/curator/4.0.0/apache-curator-4.0.0-source-release.zip.sha1 == --- dev/curator/4.0.0/apache-curator-4.0.0-source-release.zip.sha1 (added) +++ dev/curator/4.0.0/apache-curator-4.0.0-source-release.zip.sha1 Sun Jul 23 12:33:45 2017 @@ -0,0 +1 @@ +ea114cfd928215e92693aceff5c82b9d7371f3a8 \ No newline at end of file
svn commit: r1802723 - in /curator/site/trunk/private/staging: ./ apidocs/ apidocs/async/ apidocs/async/class-use/ apidocs/cache/ apidocs/cache/class-use/ apidocs/discovery/ apidocs/discovery/class-us
Author: randgalt Date: Sun Jul 23 12:31:06 2017 New Revision: 1802723 URL: http://svn.apache.org/viewvc?rev=1802723=rev Log: Staging website for Curator version 4.0.0 [This commit notification would consist of 52 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
[curator] Git Push Summary
Repository: curator Updated Tags: refs/tags/apache-curator-4.0.0 [created] fac0e9ffa
curator git commit: Have to use hard version for curator-test to work around maven release plugin bug
Repository: curator Updated Branches: refs/heads/master b26410d53 -> 171a20066 Have to use hard version for curator-test to work around maven release plugin bug Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/171a2006 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/171a2006 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/171a2006 Branch: refs/heads/master Commit: 171a200664614d0abb72027c4200150dfa4d2564 Parents: b26410d Author: randgaltAuthored: Sun Jul 23 07:06:57 2017 -0500 Committer: randgalt Committed: Sun Jul 23 07:06:57 2017 -0500 -- curator-test-zk34/pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/curator/blob/171a2006/curator-test-zk34/pom.xml -- diff --git a/curator-test-zk34/pom.xml b/curator-test-zk34/pom.xml index 3ec50cc..6fb1808 100644 --- a/curator-test-zk34/pom.xml +++ b/curator-test-zk34/pom.xml @@ -15,7 +15,6 @@ 3.4.8 -2.12.0 @@ -50,7 +49,7 @@ org.apache.curator curator-test -${curator-2-version} +2.12.0 org.apache.zookeeper