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 2013/03/27 02:11:19 UTC
[24/52] [abbrv] git commit: wip
wip
Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/05b50eec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/05b50eec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/05b50eec
Branch: refs/heads/master
Commit: 05b50eec609110e30729d459a5d2e6231423f12c
Parents: e6e5986
Author: Jordan Zimmerman <jo...@jordanzimmerman.com>
Authored: Sun Mar 10 10:35:27 2013 -0700
Committer: Jordan Zimmerman <jo...@jordanzimmerman.com>
Committed: Sun Mar 10 10:35:27 2013 -0700
----------------------------------------------------------------------
curator-client/src/site/site.xml | 4 ----
curator-examples/src/site/site.xml | 4 ----
.../src/site/confluence/index.confluence | 1 -
curator-framework/src/site/site.xml | 4 ----
curator-recipes/src/site/site.xml | 4 ----
curator-x-discovery-server/src/site/site.xml | 4 ----
curator-x-discovery/src/site/site.xml | 4 ----
src/site/confluence/errors.confluence | 14 +++++++-------
src/site/confluence/index.confluence | 2 +-
src/site/site.xml | 2 +-
10 files changed, 9 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/05b50eec/curator-client/src/site/site.xml
----------------------------------------------------------------------
diff --git a/curator-client/src/site/site.xml b/curator-client/src/site/site.xml
index becd75d..428408c 100644
--- a/curator-client/src/site/site.xml
+++ b/curator-client/src/site/site.xml
@@ -19,9 +19,5 @@
<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>
- <breadcrumbs>
- <item name="Home" href="../index.html"/>
- <item name="Client" href="index.html"/>
- </breadcrumbs>
</body>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/05b50eec/curator-examples/src/site/site.xml
----------------------------------------------------------------------
diff --git a/curator-examples/src/site/site.xml b/curator-examples/src/site/site.xml
index 380f43f..6a4d2d9 100644
--- a/curator-examples/src/site/site.xml
+++ b/curator-examples/src/site/site.xml
@@ -19,9 +19,5 @@
<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>
- <breadcrumbs>
- <item name="Home" href="../index.html"/>
- <item name="Examples" href="index.html"/>
- </breadcrumbs>
</body>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/05b50eec/curator-framework/src/site/confluence/index.confluence
----------------------------------------------------------------------
diff --git a/curator-framework/src/site/confluence/index.confluence b/curator-framework/src/site/confluence/index.confluence
index 1a63c15..072acff 100644
--- a/curator-framework/src/site/confluence/index.confluence
+++ b/curator-framework/src/site/confluence/index.confluence
@@ -1,6 +1,5 @@
h1. Framework
-h2. Introducing Curator Framework
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. Some of the features are:
http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/05b50eec/curator-framework/src/site/site.xml
----------------------------------------------------------------------
diff --git a/curator-framework/src/site/site.xml b/curator-framework/src/site/site.xml
index cc3fdc0..4e191ae 100644
--- a/curator-framework/src/site/site.xml
+++ b/curator-framework/src/site/site.xml
@@ -19,9 +19,5 @@
<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>
- <breadcrumbs>
- <item name="Home" href="../index.html"/>
- <item name="Framework" href="index.html"/>
- </breadcrumbs>
</body>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/05b50eec/curator-recipes/src/site/site.xml
----------------------------------------------------------------------
diff --git a/curator-recipes/src/site/site.xml b/curator-recipes/src/site/site.xml
index 3122b7f..89077dc 100644
--- a/curator-recipes/src/site/site.xml
+++ b/curator-recipes/src/site/site.xml
@@ -19,9 +19,5 @@
<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>
- <breadcrumbs>
- <item name="Home" href="../index.html"/>
- <item name="Recipes" href="index.html"/>
- </breadcrumbs>
</body>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/05b50eec/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 28a4cbf..7949346 100644
--- a/curator-x-discovery-server/src/site/site.xml
+++ b/curator-x-discovery-server/src/site/site.xml
@@ -19,9 +19,5 @@
<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>
- <breadcrumbs>
- <item name="Home" href="../index.html"/>
- <item name="Service Discovery Server" href="index.html"/>
- </breadcrumbs>
</body>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/05b50eec/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 0ac7c0e..acad691 100644
--- a/curator-x-discovery/src/site/site.xml
+++ b/curator-x-discovery/src/site/site.xml
@@ -19,9 +19,5 @@
<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>
- <breadcrumbs>
- <item name="Home" href="../index.html"/>
- <item name="Service Discovery" href="index.html"/>
- </breadcrumbs>
</body>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/05b50eec/src/site/confluence/errors.confluence
----------------------------------------------------------------------
diff --git a/src/site/confluence/errors.confluence b/src/site/confluence/errors.confluence
index 1a27bf8..24639fb 100644
--- a/src/site/confluence/errors.confluence
+++ b/src/site/confluence/errors.confluence
@@ -20,15 +20,15 @@ h2. Notifications
Curator exposes several listenable interfaces for clients to monitor the state of the ZooKeeper connection.
{{ConnectionStateListener}} is called when there are connection disruptions. Clients can monitor these changes and take
-appropriate action. There are three possible state changes:
+appropriate action. These are the possible state changes:
-|SUSPENDED|There has been a loss of connection. Leaders, locks, etc. should suspend until the connection is re-established. If the connection times-out you will receive a LOST notice|
-|RECONNECTED</td>
-|A suspended connection has been re-established</td>
-|LOST|The connection is confirmed to be lost. Close any locks, leaders, etc. and attempt to re-create them. NOTE: it is possible to get a RECONNECTED state after this but you should still consider any locks, etc. as dirty/unstable|
-|READ_ONLY|The connection has gone into read-only mode. This can only happen if you pass true for CuratorFrameworkFactory.Builder.canBeReadOnly(). See the ZooKeeper doc regarding read only connections: <a href="http://wiki.apache.org/hadoop/ZooKeeper/GSoCReadOnlyMode">http://wiki.apache.org/hadoop/ZooKeeper/GSoCReadOnlyMode</a>. The connection will remain in read only mode until another state change is sent.|
+|CONNECTED|Sent for the first successful connection to the server. NOTE: You will only get one of these messages for any CuratorFramework instance.|
+|SUSPENDED|There has been a loss of connection. Leaders, locks, etc. should suspend until the connection is re-established. If the connection times-out you will receive a LOST notice.|
+|RECONNECTED|A suspended or lost connection has been re-established.|
+|LOST|The connection is confirmed to be lost. Close any locks, leaders, etc. and attempt to re-create them. NOTE: it is possible to get a RECONNECTED state after this but you should still consider any locks, etc. as dirty/unstable.|
+|READ_ONLY|The connection has gone into read-only mode. This can only happen if you pass true for CuratorFrameworkFactory.Builder.canBeReadOnly(). See the ZooKeeper doc regarding read only connections: [[http://wiki.apache.org/hadoop/ZooKeeper/GSoCReadOnlyMode]]. The connection will remain in read only mode until another state change is sent.|
-{{UnhandledErrorListener}} is called when a background task, etc. catch an exception. In general, Curator users shouldn't care
+{{UnhandledErrorListener}} is called when a background task, etc. catches an exception. In general, Curator users shouldn't care
about these as they are logged. However, you can listen for them if you choose.
h2. Recipes
http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/05b50eec/src/site/confluence/index.confluence
----------------------------------------------------------------------
diff --git a/src/site/confluence/index.confluence b/src/site/confluence/index.confluence
index d420ac6..9babfe3 100644
--- a/src/site/confluence/index.confluence
+++ b/src/site/confluence/index.confluence
@@ -4,7 +4,7 @@ h2. What is Curator?
Curator _n ˈkyoor͝ˌātər_: a keeper or custodian of a museum or other collection - A ZooKeeper Keeper.
-Curator is a set of Java libraries that make using [[http://zookeeper.apache.org|Apache ZooKeeper]] much easier.
+Curator is a set of Java libraries that make using [[Apache ZooKeeper|http://zookeeper.apache.org]] much easier.
h2. Getting Started
http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/05b50eec/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index 108e68d..abefa2f 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -78,7 +78,7 @@
</menu>
<footer>
- <div class="row span12">
+ <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.