diff --git a/.typos.toml b/.typos.toml
new file mode 100644
index 00000000000..9689b824124
--- /dev/null
+++ b/.typos.toml
@@ -0,0 +1,49 @@
+#
+# 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.
+#
+
+[default.extend-words]
+# abbr
+"aroun" = "aroun"
+"delet" = "delet"
+"dout" = "dout"
+"fied" = "fied"
+"fle" = "fle"
+"fo" = "fo"
+"hte" = "hte"
+"nd" = "nd"
+"nwe" = "nwe"
+"pn" = "pn"
+"strack" = "strack"
+"thr" = "thr"
+"ths" = "ths"
+"wew" = "wew"
+# keyword fp
+"atend" = "atend"
+"chec" = "chec"
+"clos" = "clos"
+"erro" = "erro"
+"infor" = "infor"
+"locahost" = "locahost"
+"leafs" = "leafs"
+"sceen" = "sceen"
+
+[files]
+extend-exclude = [
+ "zookeeper-server/src/test/java/org/apache/zookeeper/common/CertificatesToPlayWith.java",
+]
diff --git a/owaspSuppressions.xml b/owaspSuppressions.xml
index 9a18c5fb2bc..873f38df370 100644
--- a/owaspSuppressions.xml
+++ b/owaspSuppressions.xml
@@ -48,7 +48,7 @@
CVE-2019-3826
diff --git a/zookeeper-client/zookeeper-client-c/ChangeLog b/zookeeper-client/zookeeper-client-c/ChangeLog
index c85a6c0ad86..92b96f9f1e9 100644
--- a/zookeeper-client/zookeeper-client-c/ChangeLog
+++ b/zookeeper-client/zookeeper-client-c/ChangeLog
@@ -1,13 +1,13 @@
Release 2.1.1
2008-04-30 Andrew Kornev
- * changed the distributino package name to "c-client-src"
+ * changed the distributions package name to "c-client-src"
Release 2.1.0
2008-04-30 Andrew Kornev
* added the client latency diagnostics; the client prints a warning when the
- reponse latency exceeds 20ms
+ response latency exceeds 20ms
* modified logging format to report the znode path for which the zookeeper
operation is called
@@ -31,12 +31,12 @@ Release 1.1.3
* get_xid() is not thread-safe (xid initialization race condition
in the multi-threaded mode).
- * the I/O thread doesn’t automatically terminate on AUTH_FAILURE and
+ * the I/O thread doesn't automatically terminate on AUTH_FAILURE and
SESSION_EXPIRED events.
* all session events should be processed on the completion thread.
- * PING operation doesn’t atomically enqueue the completion and
+ * PING operation doesn�t atomically enqueue the completion and
send buffers like other operations do.
* corrected zookeeper_init() doxygen docs.
diff --git a/zookeeper-client/zookeeper-client-c/LICENSE b/zookeeper-client/zookeeper-client-c/LICENSE
index 7df01ad5534..c3e546da36c 100644
--- a/zookeeper-client/zookeeper-client-c/LICENSE
+++ b/zookeeper-client/zookeeper-client-c/LICENSE
@@ -285,7 +285,7 @@
* The implementation was written so as to conform with Netscapes SSL.
*
* This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to. The following conditions
+ * the following conditions are adhered to. The following conditions
* apply to all code found in this distribution, be it the RC4, RSA,
* lhash, DES, etc., code; not just the SSL code. The SSL documentation
* included with this distribution is covered by the same copyright terms
@@ -310,7 +310,7 @@
* must display the following acknowledgement:
* "This product includes cryptographic software written by
* Eric Young (eay@cryptsoft.com)"
- * The word 'cryptographic' can be left out if the rouines from the library
+ * The word 'cryptographic' can be left out if the routines from the library
* being used are not cryptographic related :-).
* 4. If you include any Windows specific code (or a derivative thereof) from
* the apps directory (application code) you must include an acknowledgement:
@@ -328,7 +328,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * The licence and distribution terms for any publically available version or
+ * The licence and distribution terms for any publicly available version or
* derivative of this code cannot be changed. i.e. this code cannot simply be
* copied and put under another distribution licence
* [including the GNU Public Licence.]
diff --git a/zookeeper-client/zookeeper-client-c/acinclude.m4 b/zookeeper-client/zookeeper-client-c/acinclude.m4
index 9734f215649..55061709180 100644
--- a/zookeeper-client/zookeeper-client-c/acinclude.m4
+++ b/zookeeper-client/zookeeper-client-c/acinclude.m4
@@ -10,7 +10,7 @@
# DX_???_FEATURE(ON|OFF) - control the default setting of a Doxygen feature.
# Supported features are 'DOXYGEN' itself, 'DOT' for generating graphics,
# 'HTML' for plain HTML, 'CHM' for compressed HTML help (for MS users), 'CHI'
-# for generating a seperate .chi file by the .chm file, and 'MAN', 'RTF',
+# for generating a separate .chi file by the .chm file, and 'MAN', 'RTF',
# 'XML', 'PDF' and 'PS' for the appropriate output formats. The environment
# variable DOXYGEN_PAPER_SIZE may be specified to override the default 'a4wide'
# paper size.
@@ -239,8 +239,8 @@ DX_ARG_ABLE(chm, [generate doxygen compressed HTML help documentation],
DX_ENV_APPEND(GENERATE_HTMLHELP, YES)],
[DX_ENV_APPEND(GENERATE_HTMLHELP, NO)])
-# Seperate CHI file generation.
-DX_ARG_ABLE(chi, [generate doxygen seperate compressed HTML help index file],
+# Separate CHI file generation.
+DX_ARG_ABLE(chi, [generate doxygen separate compressed HTML help index file],
[DX_CHECK_DEPEND(chm, 1)],
[DX_CLEAR_DEPEND(chm, 1)],
[],
diff --git a/zookeeper-client/zookeeper-client-c/include/zookeeper.h b/zookeeper-client/zookeeper-client-c/include/zookeeper.h
index 7d889f60557..044250a3098 100644
--- a/zookeeper-client/zookeeper-client-c/include/zookeeper.h
+++ b/zookeeper-client/zookeeper-client-c/include/zookeeper.h
@@ -108,7 +108,7 @@ enum ZOO_ERRORS {
ZBADARGUMENTS = -8, /*!< Invalid arguments */
ZINVALIDSTATE = -9, /*!< Invliad zhandle state */
ZNEWCONFIGNOQUORUM = -13, /*!< No quorum of new config is connected and
- up-to-date with the leader of last commmitted
+ up-to-date with the leader of last committed
config - try invoking reconfiguration after new
servers are connected and synced */
ZRECONFIGINPROGRESS = -14, /*!< Reconfiguration requested while another
@@ -697,7 +697,7 @@ ZOOAPI sasl_callback_t *zoo_sasl_make_basic_callbacks(const char *user,
* \return ZOK on success or one of the following errcodes on failure:
* ZBADARGUMENTS - invalid input parameters
* ZINVALIDSTATE - zhandle state is either ZOO_SESSION_EXPIRED_STATE or ZOO_AUTH_FAILED_STATE
- * ZSYSTEMERROR -- a system (OS) error occured; it's worth checking errno to get details
+ * ZSYSTEMERROR -- a system (OS) error occurred; it's worth checking errno to get details
*/
ZOOAPI int zoo_set_servers(zhandle_t *zh, const char *hosts);
@@ -1779,7 +1779,7 @@ typedef enum {
* \param wtype the watcher type to be removed
* \param watcher the watcher to be removed, if null all watches for that
* path (and watcher type) will be removed
- * \param watcherCtx the contex associated with the watcher to be removed
+ * \param watcherCtx the context associated with the watcher to be removed
* \param local whether the watches will be removed locally even if there is
* no server connection
* \return the return code for the function call.
@@ -1789,7 +1789,7 @@ typedef enum {
* or ZOO_AUTH_FAILED_STATE
* ZBADARGUMENTS - invalid input parameters
* ZMARSHALLINGERROR - failed to marshall a request; possibly, out of memory
- * ZSYSTEMERROR - a system error occured
+ * ZSYSTEMERROR - a system error occurred
*/
ZOOAPI int zoo_aremove_watches(zhandle_t *zh, const char *path,
ZooWatcherType wtype, watcher_fn watcher, void *watcherCtx, int local,
@@ -1810,7 +1810,7 @@ ZOOAPI int zoo_aremove_watches(zhandle_t *zh, const char *path,
* or ZOO_AUTH_FAILED_STATE
* ZBADARGUMENTS - invalid input parameters
* ZMARSHALLINGERROR - failed to marshall a request; possibly, out of memory
- * ZSYSTEMERROR - a system error occured
+ * ZSYSTEMERROR - a system error occurred
*/
ZOOAPI int zoo_remove_all_watches(zhandle_t *zh, const char *path,
ZooWatcherType wtype, int local);
@@ -1830,7 +1830,7 @@ ZOOAPI int zoo_remove_all_watches(zhandle_t *zh, const char *path,
* or ZOO_AUTH_FAILED_STATE
* ZBADARGUMENTS - invalid input parameters
* ZMARSHALLINGERROR - failed to marshall a request; possibly, out of memory
- * ZSYSTEMERROR - a system error occured
+ * ZSYSTEMERROR - a system error occurred
*/
ZOOAPI int zoo_aremove_all_watches(zhandle_t *zh, const char *path,
ZooWatcherType wtype, int local, void_completion_t *completion,
@@ -2434,7 +2434,7 @@ ZOOAPI int zoo_multi(zhandle_t *zh, int count, const zoo_op_t *ops, zoo_op_resul
* \param wtype the watcher type to be removed
* \param watcher the watcher to be removed, if null all watches for that
* path (and watcher type) will be removed
- * \param watcherCtx the contex associated with the watcher to be removed
+ * \param watcherCtx the context associated with the watcher to be removed
* \param local whether the watches will be removed locally even if there is
* no server connection
* \return the return code for the function call.
@@ -2444,7 +2444,7 @@ ZOOAPI int zoo_multi(zhandle_t *zh, int count, const zoo_op_t *ops, zoo_op_resul
* or ZOO_AUTH_FAILED_STATE
* ZBADARGUMENTS - invalid input parameters
* ZMARSHALLINGERROR - failed to marshall a request; possibly, out of memory
- * ZSYSTEMERROR - a system error occured
+ * ZSYSTEMERROR - a system error occurred
*/
ZOOAPI int zoo_remove_watches(zhandle_t *zh, const char *path,
ZooWatcherType wtype, watcher_fn watcher, void *watcherCtx, int local);
diff --git a/zookeeper-client/zookeeper-client-c/src/addrvec.h b/zookeeper-client/zookeeper-client-c/src/addrvec.h
index a12642908bb..2a9a8ad9117 100644
--- a/zookeeper-client/zookeeper-client-c/src/addrvec.h
+++ b/zookeeper-client/zookeeper-client-c/src/addrvec.h
@@ -74,7 +74,7 @@ int addrvec_grow(addrvec_t *avec, uint32_t grow_amount);
int addrvec_grow_default(addrvec_t *avec);
/**
- * Check if an addrvec contains the specificed sockaddr_storage value.
+ * Check if an addrvec contains the specified sockaddr_storage value.
* \returns 1 if it contains the value and 0 otherwise.
*/
int addrvec_contains(const addrvec_t *avec, const struct sockaddr_storage *addr);
diff --git a/zookeeper-client/zookeeper-client-c/src/hashtable/hashtable.c b/zookeeper-client/zookeeper-client-c/src/hashtable/hashtable.c
index caa5f6ccc03..bc94a59599b 100644
--- a/zookeeper-client/zookeeper-client-c/src/hashtable/hashtable.c
+++ b/zookeeper-client/zookeeper-client-c/src/hashtable/hashtable.c
@@ -70,7 +70,7 @@ hash(struct hashtable *h, void *k)
static int
hashtable_expand(struct hashtable *h)
{
- /* Double the size of the table to accomodate more entries */
+ /* Double the size of the table to accommodate more entries */
struct entry **newtable;
struct entry *e;
struct entry **pE;
diff --git a/zookeeper-client/zookeeper-client-c/src/mt_adaptor.c b/zookeeper-client/zookeeper-client-c/src/mt_adaptor.c
index 7292843c326..4e6e1b6bf29 100644
--- a/zookeeper-client/zookeeper-client-c/src/mt_adaptor.c
+++ b/zookeeper-client/zookeeper-client-c/src/mt_adaptor.c
@@ -121,7 +121,7 @@ int handle_error(zhandle_t* zh, SOCKET sock, char* message)
return -1;
}
-//--create socket pair for interupting selects.
+//--create socket pair for interrupting selects.
int create_socket_pair(zhandle_t* zh, SOCKET fds[2])
{
struct sockaddr_in inaddr;
diff --git a/zookeeper-client/zookeeper-client-c/src/recordio.c b/zookeeper-client/zookeeper-client-c/src/recordio.c
index 77fae28785f..52036f94e7a 100644
--- a/zookeeper-client/zookeeper-client-c/src/recordio.c
+++ b/zookeeper-client/zookeeper-client-c/src/recordio.c
@@ -145,7 +145,7 @@ int oa_serialize_buffer(struct oarchive *oa, const char *name,
return rc;
// this means a buffer of NUll
// with size of -1. This is
- // waht we use in java serialization for NULL
+ // what we use in java serialization for NULL
if (b->len == -1) {
return rc;
}
diff --git a/zookeeper-client/zookeeper-client-c/src/winport.c b/zookeeper-client/zookeeper-client-c/src/winport.c
index d40614c9131..8d8698ee6c5 100644
--- a/zookeeper-client/zookeeper-client-c/src/winport.c
+++ b/zookeeper-client/zookeeper-client-c/src/winport.c
@@ -83,7 +83,7 @@ int pthread_detach(pthread_t _thread)
}
void pthread_mutexattr_init(pthread_mutexattr_t* ignore){}
-void pthread_mutexattr_settype(pthread_mutexattr_t* ingore_attr, int ignore){}
+void pthread_mutexattr_settype(pthread_mutexattr_t* ignore_attr, int ignore){}
void pthread_mutexattr_destroy(pthread_mutexattr_t* ignore_attr){}
int
diff --git a/zookeeper-client/zookeeper-client-c/src/winport.h b/zookeeper-client/zookeeper-client-c/src/winport.h
index d216f7fd30d..e8f10ba046b 100644
--- a/zookeeper-client/zookeeper-client-c/src/winport.h
+++ b/zookeeper-client/zookeeper-client-c/src/winport.h
@@ -80,7 +80,7 @@ int pthread_join(pthread_t _thread, void** ignore);
int pthread_detach(pthread_t _thread);
void pthread_mutexattr_init(pthread_mutexattr_t* ignore);
-void pthread_mutexattr_settype(pthread_mutexattr_t* ingore_attr, int ignore);
+void pthread_mutexattr_settype(pthread_mutexattr_t* ignore_attr, int ignore);
void pthread_mutexattr_destroy(pthread_mutexattr_t* ignore_attr);
diff --git a/zookeeper-client/zookeeper-client-c/src/zookeeper.c b/zookeeper-client/zookeeper-client-c/src/zookeeper.c
index 3c64efbb658..a19144b5028 100644
--- a/zookeeper-client/zookeeper-client-c/src/zookeeper.c
+++ b/zookeeper-client/zookeeper-client-c/src/zookeeper.c
@@ -1571,7 +1571,7 @@ static int get_next_server_in_reconfig(zhandle_t *zh)
/**
* Cycle through our server list to the correct 'next' server. The 'next' server
* to connect to depends upon whether we're in a 'reconfig' mode or not. Reconfig
- * mode means we've upated the server list and are now trying to find a server
+ * mode means we've updated the server list and are now trying to find a server
* to connect to. Once we get connected, we are no longer in the reconfig mode.
* Similarly, if we try to connect to all the servers in the new configuration
* and failed, reconfig mode is set to false.
@@ -1622,7 +1622,7 @@ const char* zoo_get_current_server(zhandle_t* zh)
}
/**
- * deallocated the free_path only its beeen allocated
+ * deallocated the free_path only its been allocated
* and not equal to path
*/
void free_duplicate_path(const char *free_path, const char* path) {
@@ -5008,7 +5008,7 @@ const char* zerror(int c)
case ZINVALIDSTATE:
return "invalid zhandle state";
case ZNEWCONFIGNOQUORUM:
- return "no quorum of new config is connected and up-to-date with the leader of last commmitted config - try invoking reconfiguration after new servers are connected and synced";
+ return "no quorum of new config is connected and up-to-date with the leader of last committed config - try invoking reconfiguration after new servers are connected and synced";
case ZRECONFIGINPROGRESS:
return "Another reconfiguration is in progress -- concurrent reconfigs not supported (yet)";
case ZAPIERROR:
diff --git a/zookeeper-client/zookeeper-client-c/tests/TestClient.cc b/zookeeper-client/zookeeper-client-c/tests/TestClient.cc
index 80e4c928a51..8c79c01b038 100644
--- a/zookeeper-client/zookeeper-client-c/tests/TestClient.cc
+++ b/zookeeper-client/zookeeper-client-c/tests/TestClient.cc
@@ -1005,7 +1005,7 @@ class Zookeeper_simpleSystem : public CPPUNIT_NS::TestFixture
void testChroot() {
// the c client async callbacks do
// not callback with the path, so
- // we dont need to test taht for now
+ // we dont need to test that for now
// we should fix that though soon!
watchctx_t ctx, ctx_ch;
zhandle_t *zk, *zk_ch;
diff --git a/zookeeper-client/zookeeper-client-c/tests/TestOperations.cc b/zookeeper-client/zookeeper-client-c/tests/TestOperations.cc
index a36af8417e4..534c7599c1f 100644
--- a/zookeeper-client/zookeeper-client-c/tests/TestOperations.cc
+++ b/zookeeper-client/zookeeper-client-c/tests/TestOperations.cc
@@ -582,7 +582,7 @@ class Zookeeper_operations : public CPPUNIT_NS::TestFixture
CPPUNIT_ASSERT_EQUAL((int)ZCLOSING,res2.rc_);
}
- // ZOOKEEPER-2891: Invalid processing of zookeeper_close for mutli-request
+ // ZOOKEEPER-2891: Invalid processing of zookeeper_close for multi-request
// while there is a multi request waiting for being processed
// call zookeeper_close() from the main event loop
// assert the completion callback is called with status ZCLOSING
@@ -626,7 +626,7 @@ class Zookeeper_operations : public CPPUNIT_NS::TestFixture
CPPUNIT_ASSERT_EQUAL((int)ZCLOSING,res1.rc_);
}
- // ZOOKEEPER-2891: Invalid processing of zookeeper_close for mutli-request
+ // ZOOKEEPER-2891: Invalid processing of zookeeper_close for multi-request
// send some request #1 (not a multi request)
// then, while there is a multi request #2 waiting for being processed
// call zookeeper_close() from the completion callback of request #1
diff --git a/zookeeper-client/zookeeper-client-c/tests/TestWatchers.cc b/zookeeper-client/zookeeper-client-c/tests/TestWatchers.cc
index 0a269341c57..7947d6f1396 100644
--- a/zookeeper-client/zookeeper-client-c/tests/TestWatchers.cc
+++ b/zookeeper-client/zookeeper-client-c/tests/TestWatchers.cc
@@ -456,7 +456,7 @@ class Zookeeper_watchers : public CPPUNIT_NS::TestFixture
zh=zookeeper_init("localhost:2121",activeWatcher,10000,TEST_CLIENT_ID,
&watcher,0);
CPPUNIT_ASSERT(zh!=0);
- // wait till watcher proccessing has completed (the connection
+ // wait till watcher processing has completed (the connection
// established event)
CPPUNIT_ASSERT(ensureCondition(
deliveryTracker.isWatcherProcessingCompleted(),1000)<1000);
diff --git a/zookeeper-client/zookeeper-client-c/tests/ThreadingUtil.h b/zookeeper-client/zookeeper-client-c/tests/ThreadingUtil.h
index 9165412bc8b..45791fd2f59 100644
--- a/zookeeper-client/zookeeper-client-c/tests/ThreadingUtil.h
+++ b/zookeeper-client/zookeeper-client-c/tests/ThreadingUtil.h
@@ -38,7 +38,7 @@ class AtomicInt{
public:
explicit AtomicInt(int32_t init=0):v_(init){}
AtomicInt(const AtomicInt& other):v_(other){}
- // assigment
+ // assignment
AtomicInt& operator=(const AtomicInt& lhs){
atomic_fetch_store(&v_,lhs);
return *this;
diff --git a/zookeeper-client/zookeeper-client-c/tests/ZKMocks.h b/zookeeper-client/zookeeper-client-c/tests/ZKMocks.h
index a091f2fe8ca..d53a41628e7 100644
--- a/zookeeper-client/zookeeper-client-c/tests/ZKMocks.h
+++ b/zookeeper-client/zookeeper-client-c/tests/ZKMocks.h
@@ -443,7 +443,7 @@ class ZookeeperServer: public Mock_socket
void returnSessionExpired(){ sessionExpired=true; }
// this is a one shot trigger that gets reset back to false
- // next recv call will return 0 length, thus simulating a connecton loss
+ // next recv call will return 0 length, thus simulating a connection loss
volatile bool connectionLost;
void setConnectionLost() {connectionLost=true;}
diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/README.md b/zookeeper-contrib/zookeeper-contrib-loggraph/README.md
index aa845fc4b3b..a1b849a3349 100644
--- a/zookeeper-contrib/zookeeper-contrib-loggraph/README.md
+++ b/zookeeper-contrib/zookeeper-contrib-loggraph/README.md
@@ -44,7 +44,7 @@ To filter by time simply move the slider to the desired start time. The time win
Content filtering uses a adhoc filtering language, using prefix notation. The language looks somewhat similar to lisp. A statement in the language takes the form (op arg arg ....). A statement resolves to a boolean value. Statements can be nested.
### 4.1 - Filter arguments
-An argument can be a number, a string or a symbol. A number is any argument which starts with -, + or 0 to 9. If the number starts with 0x it is interpretted as hexadecimal. Otherwise it is interpretted as decimal. If the argument begins with a double-quote, (") it is interpretted as a string. Anything else is interpretted as a symbol.
+An argument can be a number, a string or a symbol. A number is any argument which starts with -, + or 0 to 9. If the number starts with 0x it is interpreted as hexadecimal. Otherwise it is interpreted as decimal. If the argument begins with a double-quote, (") it is interpreted as a string. Anything else is interpreted as a symbol.
### 4.2 - Filter symbols
The possible filter symbols are:
diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/Log4JSource.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/Log4JSource.java
index cbb65ea937a..b0071253d50 100644
--- a/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/Log4JSource.java
+++ b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/Log4JSource.java
@@ -289,7 +289,7 @@ private void init() throws IOException {
String line = in.readLine();
Matcher m = null;
- // if we have read data from the file, and it matchs the timep pattern
+ // if we have read data from the file, and it matches the timep pattern
if ((line != null) && (m = timep.matcher(line)).lookingAt()) {
starttime = timestampFromText(dateformat, m.group(1));
} else {
diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/g.raphael.js b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/g.raphael.js
index 8e94c36cc07..6957da63053 100644
--- a/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/g.raphael.js
+++ b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/g.raphael.js
@@ -58,7 +58,7 @@
};
Raphael.fn.g.finger = function (x, y, width, height, dir, ending, isPath) {
- // dir 0 for horisontal and 1 for vertical
+ // dir 0 for horizontal and 1 for vertical
if ((dir && !height) || (!dir && !width)) {
return isPath ? "" : this.path();
}
diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/loggraph.js b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/loggraph.js
index 87bb7d89da2..51d47795a8a 100644
--- a/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/loggraph.js
+++ b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/loggraph.js
@@ -99,7 +99,7 @@ LogGraph = function(canvas, status) {
/***
- * TODO: refactor these to load the data first, before handing to a draw funciton.
+ * TODO: refactor these to load the data first, before handing to a draw function.
* We shouldn't pass the async q into the drawing function
*/
this.showLogs = function() {
diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/loggraph.server.js b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/loggraph.server.js
index 0a74b5c24b8..0b63be7ac48 100644
--- a/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/loggraph.server.js
+++ b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/loggraph.server.js
@@ -250,8 +250,8 @@ LogGraph.ServerGraph.message = function(graph, src, srctime, dst, zxid) {
var ty = (this.src.y + this.dst.y)/2;
var t = paper.text(tx, ty, this.name);
- var gradiant = (this.dst.y - this.src.y)/(dstx - srcx);
- var angle = Math.atan(gradiant) * 57.2958;
+ var gradient = (this.dst.y - this.src.y)/(dstx - srcx);
+ var angle = Math.atan(gradient) * 57.2958;
t.rotate(angle, true);
var arrowl = paper.path("M" + dstx + " " + this.dst.y + " L" + (dstx - 10) +" " + this.dst.y);
diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/raphael.js b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/raphael.js
index 3740d0f02ad..1c5c48050b1 100644
--- a/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/raphael.js
+++ b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/raphael.js
@@ -3018,9 +3018,9 @@ Raphael = (function () {
};
break;
case "path":
- var pathes = path2curve(from[attr], to[attr]);
- from[attr] = pathes[0];
- var toPath = pathes[1];
+ var paths = path2curve(from[attr], to[attr]);
+ from[attr] = paths[0];
+ var toPath = paths[1];
diff[attr] = [];
for (var i = 0, ii = from[attr][length]; i < ii; i++) {
diff[attr][i] = [0];
diff --git a/zookeeper-contrib/zookeeper-contrib-monitoring/cacti/README b/zookeeper-contrib/zookeeper-contrib-monitoring/cacti/README
index 8188723e5e2..3beddb36e1a 100644
--- a/zookeeper-contrib/zookeeper-contrib-monitoring/cacti/README
+++ b/zookeeper-contrib/zookeeper-contrib-monitoring/cacti/README
@@ -29,7 +29,7 @@ WARNING: I have wrote these instructions while installing and configuring the pl
WARNING: I'm going to make the assumption that you know how to work with Cacti and how to setup Data Input Methods for custom scripts. I'm also going to assume that you have already installed Cacti and everything works as expected.
-You can extend the Cacti's data gathering functionality through external scripts. Cacti comes with a number of scripts out of the box wich are localted in the scripts/ directory.
+You can extend the Cacti's data gathering functionality through external scripts. Cacti comes with a number of scripts out of the box which are located in the scripts/ directory.
The check_zookeeper.py script can be used a custom data input method for Cacti.
diff --git a/zookeeper-contrib/zookeeper-contrib-monitoring/check_zookeeper.py b/zookeeper-contrib/zookeeper-contrib-monitoring/check_zookeeper.py
index 0a08e84a7cc..6badf190c11 100755
--- a/zookeeper-contrib/zookeeper-contrib-monitoring/check_zookeeper.py
+++ b/zookeeper-contrib/zookeeper-contrib-monitoring/check_zookeeper.py
@@ -19,7 +19,7 @@
Generic monitoring script that could be used with multiple platforms (Ganglia, Nagios, Cacti).
It requires ZooKeeper 3.4.0 or greater. The script needs the 'mntr' 4letter word
-command (patch ZOOKEEPER-744) that was now commited to the trunk.
+command (patch ZOOKEEPER-744) that was now committed to the trunk.
The script also works with ZooKeeper 3.3.x but in a limited way.
"""
diff --git a/zookeeper-contrib/zookeeper-contrib-monitoring/nagios/README.txt b/zookeeper-contrib/zookeeper-contrib-monitoring/nagios/README.txt
index 317ae14869b..27a12566ffa 100644
--- a/zookeeper-contrib/zookeeper-contrib-monitoring/nagios/README.txt
+++ b/zookeeper-contrib/zookeeper-contrib-monitoring/nagios/README.txt
@@ -39,7 +39,7 @@ $ cp zookeeper.cfg /etc/nagios-plugins/config
4. Create a virtual host in Nagios used for monitoring the cluster as a whole -OR- Create a hostgroup named 'zookeeper-servers' and add all the zookeeper cluster nodes.
-5. Define service checks like I have ilustrated bellow or just use the provided definitions.
+5. Define service checks like I have illustrated bellow or just use the provided definitions.
define service {
use generic-service
diff --git a/zookeeper-contrib/zookeeper-contrib-rest/SPEC.txt b/zookeeper-contrib/zookeeper-contrib-rest/SPEC.txt
index 8c5f70175a6..3b25bb2df9a 100644
--- a/zookeeper-contrib/zookeeper-contrib-rest/SPEC.txt
+++ b/zookeeper-contrib/zookeeper-contrib-rest/SPEC.txt
@@ -39,7 +39,7 @@ that are easy and familiar to program against, and deployed as part of
the language runtime. Thus, for simple CRUD clients, an HTTP gateway
would be a less cumbersome interface than the ZooKeeper library.
-This document describes a gatway for using HTTP to interact with a
+This document describes a gateway for using HTTP to interact with a
ZooKeeper repository.
Binding ZooKeeper to HTTP
@@ -72,7 +72,7 @@ best practice.
Root
----
-The following examples assume that the ZooKeeper znode heirarchy is
+The following examples assume that the ZooKeeper znode hierarchy is
bound to the root of the HTTP servers namespace. This may not be the
case in practice however, the gateway may bind to some prefix, for
example the URL for accessing /a/b/c may be:
@@ -128,14 +128,14 @@ a new session.
If the session creation is successful, then a 201 code will be returned.
-A session is just an UUID that you can pass around as a parameter and
-the REST server will foward your request on the attached persistent
+A session is just a UUID that you can pass around as a parameter and
+the REST server will forward your request on the attached persistent
connection.
Keeping a session alive
-----------------------
-To keep a session alive you must send hearbeat requests:
+To keep a session alive you must send heartbeat requests:
PUT /sessions/v1/ HTTP/1.1
diff --git a/zookeeper-contrib/zookeeper-contrib-rest/src/main/java/org/apache/zookeeper/server/jersey/resources/ZNodeResource.java b/zookeeper-contrib/zookeeper-contrib-rest/src/main/java/org/apache/zookeeper/server/jersey/resources/ZNodeResource.java
index 77371eab53d..84eaca819e2 100644
--- a/zookeeper-contrib/zookeeper-contrib-rest/src/main/java/org/apache/zookeeper/server/jersey/resources/ZNodeResource.java
+++ b/zookeeper-contrib/zookeeper-contrib-rest/src/main/java/org/apache/zookeeper/server/jersey/resources/ZNodeResource.java
@@ -307,7 +307,7 @@ public Response createZNode(
throw new WebApplicationException(Response.status(
Response.Status.BAD_REQUEST).entity(
new ZError(ui.getRequestUri().toString(), path
- + " bad operaton " + op)).build());
+ + " bad operation " + op)).build());
}
if (setNull.equals("true")) {
@@ -358,7 +358,7 @@ public Response createZNodeAsOctet(@PathParam("path") String path,
throw new WebApplicationException(Response.status(
Response.Status.BAD_REQUEST).entity(
new ZError(ui.getRequestUri().toString(), path
- + " bad operaton " + op)).build());
+ + " bad operation " + op)).build());
}
if (setNull.equals("true")) {
diff --git a/zookeeper-contrib/zookeeper-contrib-zkfuse/src/blockingqueue.h b/zookeeper-contrib/zookeeper-contrib-zkfuse/src/blockingqueue.h
index 4677290d7b6..aad10c29839 100644
--- a/zookeeper-contrib/zookeeper-contrib-zkfuse/src/blockingqueue.h
+++ b/zookeeper-contrib/zookeeper-contrib-zkfuse/src/blockingqueue.h
@@ -50,7 +50,7 @@ class BlockingQueue {
* \brief Retrieves and removes the head of this queue, waiting if
* \brief no elements are present in this queue.
*
- * @param timeout how long to wait until an element becomes availabe,
+ * @param timeout how long to wait until an element becomes available,
* in milliseconds; if 0
then wait forever
* @param timedOut if not NULL then set to true whether this function timed out
* @return the element from the queue
diff --git a/zookeeper-contrib/zookeeper-contrib-zkfuse/src/doxygen.cfg b/zookeeper-contrib/zookeeper-contrib-zkfuse/src/doxygen.cfg
index 308b09450a4..da384f1b33a 100644
--- a/zookeeper-contrib/zookeeper-contrib-zkfuse/src/doxygen.cfg
+++ b/zookeeper-contrib/zookeeper-contrib-zkfuse/src/doxygen.cfg
@@ -401,7 +401,7 @@ SHOW_DIRECTORIES = YES
# version control system). Doxygen will invoke the program by executing (via
# popen()) the command , where is the value of
# the FILE_VERSION_FILTER tag, and is the name of an input file
-# provided by doxygen. Whatever the progam writes to standard output
+# provided by doxygen. Whatever the program writes to standard output
# is used as the file version. See the manual for examples.
FILE_VERSION_FILTER =
diff --git a/zookeeper-contrib/zookeeper-contrib-zkfuse/src/event.h b/zookeeper-contrib/zookeeper-contrib-zkfuse/src/event.h
index 936ecc60453..f218be6e7b6 100644
--- a/zookeeper-contrib/zookeeper-contrib-zkfuse/src/event.h
+++ b/zookeeper-contrib/zookeeper-contrib-zkfuse/src/event.h
@@ -183,7 +183,7 @@ class GenericEvent {
* \brief Constructor.
*
* @param type the type of this event
- * @param eventWarpper the wrapper around event's data
+ * @param eventWrapper the wrapper around event's data
*/
GenericEvent(int type, AbstractEventWrapper *eventWrapper) :
m_type(type), m_eventWrapper(eventWrapper) {
diff --git a/zookeeper-contrib/zookeeper-contrib-zkfuse/src/thread.h b/zookeeper-contrib/zookeeper-contrib-zkfuse/src/thread.h
index 0ed12d7f645..c647a3d51ae 100644
--- a/zookeeper-contrib/zookeeper-contrib-zkfuse/src/thread.h
+++ b/zookeeper-contrib/zookeeper-contrib-zkfuse/src/thread.h
@@ -41,7 +41,7 @@ class Thread {
void Create(void* ctx, ThreadFunc func);
void Join() {
- //avoid SEGFAULT because of unitialized mThread
+ //avoid SEGFAULT because of initialized mThread
//in case Create(...) was never called
if (_func != NULL) {
pthread_join(mThread, 0);
diff --git a/zookeeper-contrib/zookeeper-contrib-zkfuse/src/zkadapter.cc b/zookeeper-contrib/zookeeper-contrib-zkfuse/src/zkadapter.cc
index 7f02fa33b72..55f72396829 100644
--- a/zookeeper-contrib/zookeeper-contrib-zkfuse/src/zkadapter.cc
+++ b/zookeeper-contrib/zookeeper-contrib-zkfuse/src/zkadapter.cc
@@ -505,7 +505,7 @@ ZooKeeperAdapter::verifyConnection() throw(ZooKeeperException)
if (m_state != AS_CONNECTING) {
LOG_TRACE( LOG,
"yes. Checking if allowed to auto-reconnect..." );
- //...not in progres, so check if we can reconnect
+ //...not in progress, so check if we can reconnect
if (!m_zkConfig.getAutoReconnect()) {
//...too bad, disallowed :(
LOG_TRACE( LOG, "no. Sorry." );
diff --git a/zookeeper-contrib/zookeeper-contrib-zkfuse/src/zkadapter.h b/zookeeper-contrib/zookeeper-contrib-zkfuse/src/zkadapter.h
index 8d4d1d57f0a..13c12da32de 100644
--- a/zookeeper-contrib/zookeeper-contrib-zkfuse/src/zkadapter.h
+++ b/zookeeper-contrib/zookeeper-contrib-zkfuse/src/zkadapter.h
@@ -160,7 +160,7 @@ class ZooKeeperConfig
const int m_leaseTimeout;
/**
- * True if this adapater should attempt to autoreconnect in case
+ * True if this adapter should attempt to autoreconnect in case
* the current session has been dropped.
*/
const bool m_autoReconnect;
@@ -616,7 +616,7 @@ class ZooKeeperAdapter
/**
* Returns the remaining connect timeout. The timeout resets
- * to {@link #m_connectTimeout} on a successfull connection to the ZK.
+ * to {@link #m_connectTimeout} on a successfulconnection to the ZK.
*
* @return the remaining connect timeout, in milliseconds
*/
diff --git a/zookeeper-contrib/zookeeper-contrib-zkfuse/src/zkfuse.cc b/zookeeper-contrib/zookeeper-contrib-zkfuse/src/zkfuse.cc
index 6a8216885fa..cfe552c349c 100644
--- a/zookeeper-contrib/zookeeper-contrib-zkfuse/src/zkfuse.cc
+++ b/zookeeper-contrib/zookeeper-contrib-zkfuse/src/zkfuse.cc
@@ -320,7 +320,7 @@ enum ZkFuseNameType {
*/
ZkFuseNameRegType = 1,
/**
- ZkFuse path is synthesized and identifies the chidlren part of a
+ ZkFuse path is synthesized and identifies the children part of a
ZooKeeper node, i.e. Posix directory semantics is expected.
*/
ZkFuseNameDirType = 2
@@ -707,7 +707,7 @@ class ZkFuseHandleManager : boost::noncopyable
ZkFuseHandleManagerFactory - factory for ZkFuseHandleManager.
This is the only way to create a ZkFuseHandleManager instance.
- to make sure that _thisWeakPtr of the instance is intialized
+ to make sure that _thisWeakPtr of the instance is initialized
after the instance is created.
*/
class ZkFuseHandleManagerFactory
@@ -1354,7 +1354,7 @@ class ZkFuseFile : boost::noncopyable
*/
uint32_t version;
/**
- Acces time in milliseconds.
+ Access time in milliseconds.
*/
uint64_t atime;
/**
@@ -1535,7 +1535,7 @@ class ZkFuseFile : boost::noncopyable
/**
Remove a ZkFuse directory.
- If force is true, then the ZooKeeper node and its decendants
+ If force is true, then the ZooKeeper node and its descendants
will be deleted.
If force is false, then this method implements the semantics
@@ -1614,7 +1614,7 @@ class ZkFuseFile : boost::noncopyable
the ZooKeeper node has no data.
- If the ZkFuse regular file represents the data part of the
ZooKeeper node which is presented as a ZkFuse regular file,
- the ZooKeeper node and its decendants are deleted.
+ the ZooKeeper node and its descendants are deleted.
Returns -EISDIR if the ZkFuse regular file cannot be deleted
because ZkFuse consider it to be a directory.
@@ -1711,7 +1711,7 @@ class ZkFuseFile : boost::noncopyable
Get attributes without accessing metadata.
The atime and mtime returned does not take into consideration
- overrides present in a matadata file.
+ overrides present in a metadata file.
\return 0 if successful, otherwise negative errno.
\param stbuf return attributes here.
@@ -1836,7 +1836,7 @@ class ZkFuseFile : boost::noncopyable
a client is trying to open the path. \see _refCount.
Sets deleted to true. \see _deleted.
Sets number of currently directory opens to zero. \see _openDirCount.
- Invalidate cach for children information and data.
+ Invalidate cache for children information and data.
\param manager the ZkFuseHandleManager instance who is creating this
ZkFuseFile instance.
@@ -2909,7 +2909,7 @@ class ZkFuseFile : boost::noncopyable
/**
Remove a ZkFuse directory.
- If force is true, then the ZooKeeper node and its decendants
+ If force is true, then the ZooKeeper node and its descendants
will be deleted.
If force is false, then this method implements the semantics
@@ -2956,7 +2956,7 @@ class ZkFuseFile : boost::noncopyable
the ZooKeeper node has no data.
- If the ZkFuse regular file represents the data part of the
ZooKeeper node which is presented as a ZkFuse regular file,
- the ZooKeeper node and its decendants are deleted.
+ the ZooKeeper node and its descendants are deleted.
Returns -EISDIR if the ZkFuse regular file cannot be deleted
because ZkFuse consider it to be a directory.
@@ -3043,7 +3043,7 @@ ZkFuseHandleManager::allocate(const std::string & path, bool & newFile)
/* Not really supposed to invoke the new ZkFuseFile instance
* because this method is not supposed to invoke ZkFuseFile
* methods that while holding _mutex. However, it is safe
- * to do without casuing deadlock because these methods
+ * to do without causing deadlock because these methods
* are known not to invoke other methods, especially one
* that invoke this ZkFuseHandleManager instance.
*/
diff --git a/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/close_deadlock_test.py b/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/close_deadlock_test.py
index 921d2cc4b05..b56d44eecce 100644
--- a/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/close_deadlock_test.py
+++ b/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/close_deadlock_test.py
@@ -26,7 +26,7 @@ class CloseDeadlockTest(zktestbase.TestBase):
https://issues.apache.org/jira/browse/ZOOKEEPER-763
zookeeper.close blocks on waiting for all completions to
- finish. Previously it was doing so while holding teh GIL, stopping
+ finish. Previously it was doing so while holding the GIL, stopping
any completions from actually continuing.
This test is a failure if it does not exit within a few seconds.
diff --git a/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/create_test.py b/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/create_test.py
index 8ab80f9565a..29f63a9ffb4 100755
--- a/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/create_test.py
+++ b/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/create_test.py
@@ -59,7 +59,7 @@ def test_sync_create_existing(self):
def test_exception_paths(self):
"""
- Make sure common exceptions due to API misuse are correctly propogated
+ Make sure common exceptions due to API misuse are correctly propagated
"""
self.assertRaises(zookeeper.BadArgumentsException,
zookeeper.create,
diff --git a/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/get_set_test.py b/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/get_set_test.py
index b77b3b22165..226e8c183ff 100755
--- a/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/get_set_test.py
+++ b/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/get_set_test.py
@@ -70,7 +70,7 @@ def test_sync_getset(self):
def test_stat_deleted_node(self):
"""
Test for a bug that surfaced when trying to build a
- stat object from a non-existant node.
+ stat object from a non-existent node.
"""
self.ensureDeleted("/zk-python-test-deleteme")
diff --git a/zookeeper-contrib/zookeeper-contrib-zktreeutil/README.txt b/zookeeper-contrib/zookeeper-contrib-zktreeutil/README.txt
index 8250498bf57..6a7ef63dacb 100644
--- a/zookeeper-contrib/zookeeper-contrib-zktreeutil/README.txt
+++ b/zookeeper-contrib/zookeeper-contrib-zktreeutil/README.txt
@@ -26,7 +26,7 @@ UPDATE: Make the incremental changes into the live ZK-tree from saved XML, essen
lly after running the diff.
DUMP: Dumps the ZK-tree on the standard output device reading either from live ZK
-server or XML file. Like export, ZK-subtree can be dumped with optionaly
+server or XML file. Like export, ZK-subtree can be dumped with optionally
providing the path to the ZK-subtree, and till a certain depth of the (sub)tree.
The exported ZK data into XML file can be shortened by only keeping the static ZK
diff --git a/zookeeper-contrib/zookeeper-contrib-zktreeutil/src/ZkAdaptor.cc b/zookeeper-contrib/zookeeper-contrib-zktreeutil/src/ZkAdaptor.cc
index 199b1ed6976..c1f65916a37 100644
--- a/zookeeper-contrib/zookeeper-contrib-zktreeutil/src/ZkAdaptor.cc
+++ b/zookeeper-contrib/zookeeper-contrib-zktreeutil/src/ZkAdaptor.cc
@@ -500,7 +500,7 @@ namespace zktreeutil
0,
buffer, &len, stat );
} while (rc != ZOK && rh.handleRC(rc));
- if (rc != ZOK) // checl return code
+ if (rc != ZOK) // check return code
{
std::cerr << "[zktreeutil] Error in fetching value of " << path << std::endl;
throw ZooKeeperException( string("Unable to get data of node ") + path, rc );
diff --git a/zookeeper-contrib/zookeeper-contrib-zktreeutil/src/ZkAdaptor.h b/zookeeper-contrib/zookeeper-contrib-zktreeutil/src/ZkAdaptor.h
index 91e63e0ac8f..ffefb28a7da 100644
--- a/zookeeper-contrib/zookeeper-contrib-zktreeutil/src/ZkAdaptor.h
+++ b/zookeeper-contrib/zookeeper-contrib-zktreeutil/src/ZkAdaptor.h
@@ -164,7 +164,7 @@ namespace zktreeutil
const int m_leaseTimeout;
/**
- * True if this adapater should attempt to autoreconnect in case
+ * True if this adapter should attempt to autoreconnect in case
* the current session has been dropped.
*/
const bool m_autoReconnect;
diff --git a/zookeeper-contrib/zookeeper-contrib-zktreeutil/src/ZkTreeUtil.h b/zookeeper-contrib/zookeeper-contrib-zktreeutil/src/ZkTreeUtil.h
index 2fac401f785..872bebecbdf 100644
--- a/zookeeper-contrib/zookeeper-contrib-zktreeutil/src/ZkTreeUtil.h
+++ b/zookeeper-contrib/zookeeper-contrib-zktreeutil/src/ZkTreeUtil.h
@@ -271,7 +271,7 @@ namespace zktreeutil
private:
ZkTreeNodeSptr zkRootSptr_; // ZK tree root node
- bool loaded_; // Falg indicating whether ZK tree loaded into memory
+ bool loaded_; // Flag indicating whether ZK tree loaded into memory
string sslParams_; // Comma separated parameters to initiate SSL connection
};
}
diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/TODO b/zookeeper-contrib/zookeeper-contrib-zooinspector/TODO
index 404d5c9c699..eb6e1a15042 100644
--- a/zookeeper-contrib/zookeeper-contrib-zooinspector/TODO
+++ b/zookeeper-contrib/zookeeper-contrib-zooinspector/TODO
@@ -10,7 +10,7 @@
http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html
-- Rename classes to avoid redundand "ZooInspector" prefix.
+- Rename classes to avoid redundant "ZooInspector" prefix.
- Ant build file has hard coded log4j dependency. (ZK will move to maven anyways...)
diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/com/nitido/utils/toaster/Toaster.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/com/nitido/utils/toaster/Toaster.java
index 2888caff998..126fd65c64c 100644
--- a/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/com/nitido/utils/toaster/Toaster.java
+++ b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/com/nitido/utils/toaster/Toaster.java
@@ -142,7 +142,7 @@ class SingleToaster extends javax.swing.JWindow
/***
- * Simple costructor that initialized components...
+ * Simple constructor that initialized components...
*/
public SingleToaster()
{
diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeSelectionListener.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeSelectionListener.java
index a39edd55dc9..3f977b4c035 100644
--- a/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeSelectionListener.java
+++ b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeSelectionListener.java
@@ -18,7 +18,7 @@
package org.apache.zookeeper.inspector.gui.nodeviewer;
/**
- * An interface to be implented by any component that needs notification when a new element
+ * An interface to be implement by any component that needs notification when a new element
* is selected in the UI JTree representing the set of available ZNodes.
*/
public interface NodeSelectionListener {
diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeViewerMetaData.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeViewerMetaData.java
index 6a369c51d0e..4523740daf5 100644
--- a/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeViewerMetaData.java
+++ b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeViewerMetaData.java
@@ -167,17 +167,17 @@ protected void done() {
private String formatValByKeyType(String key, String value) {
if(key==null) return value;
- String formatedVal=value;
+ String formattedVal=value;
switch (key){
case "Ephemeral Owner":
try{
- formatedVal = String.format("0x%x", Long.parseLong(value));
+ formattedVal = String.format("0x%x", Long.parseLong(value));
}catch (NumberFormatException e){
LoggerFactory.getLogger().warn("parse {}'s value {} to hex fail",key,value,e);
}
break;
}
- return formatedVal;
+ return formattedVal;
}
};
worker.execute();
diff --git a/zookeeper-docs/src/main/resources/markdown/releasenotes.md b/zookeeper-docs/src/main/resources/markdown/releasenotes.md
index e32614df065..a27b6ffdd12 100644
--- a/zookeeper-docs/src/main/resources/markdown/releasenotes.md
+++ b/zookeeper-docs/src/main/resources/markdown/releasenotes.md
@@ -184,7 +184,7 @@ Version 2.2.1 code, documentation, binaries, etc... are still accessible on [Sou
|[ZOOKEEPER-189](https://issues.apache.org/jira/browse/ZOOKEEPER-189)|forrest build not validated xml of input documents|
|[ZOOKEEPER-188](https://issues.apache.org/jira/browse/ZOOKEEPER-188)|Check that election port is present for all servers|
|[ZOOKEEPER-185](https://issues.apache.org/jira/browse/ZOOKEEPER-185)|Improved version of FLETest|
-|[ZOOKEEPER-184](https://issues.apache.org/jira/browse/ZOOKEEPER-184)|tests: An explicit include derective is needed for the usage of memcpy functions|
+|[ZOOKEEPER-184](https://issues.apache.org/jira/browse/ZOOKEEPER-184)|tests: An explicit include directive is needed for the usage of memcpy functions|
|[ZOOKEEPER-183](https://issues.apache.org/jira/browse/ZOOKEEPER-183)|Array subscript is above array bounds in od_completion, src/cli.c.|
|[ZOOKEEPER-182](https://issues.apache.org/jira/browse/ZOOKEEPER-182)|zookeeper_init accepts empty host-port string and returns valid pointer to zhandle_t.|
|[ZOOKEEPER-17](https://issues.apache.org/jira/browse/ZOOKEEPER-17)|zookeeper_init doc needs clarification|
@@ -228,7 +228,7 @@ Version 2.2.1 code, documentation, binaries, etc... are still accessible on [Sou
|[ZOOKEEPER-56](https://issues.apache.org/jira/browse/ZOOKEEPER-56)|Add clover support to build.xml.|
|[ZOOKEEPER-75](https://issues.apache.org/jira/browse/ZOOKEEPER-75)|register the ZooKeeper mailing lists with nabble.com|
|[ZOOKEEPER-54](https://issues.apache.org/jira/browse/ZOOKEEPER-54)|remove sleeps in the tests.|
-|[ZOOKEEPER-55](https://issues.apache.org/jira/browse/ZOOKEEPER-55)|build.xml failes to retrieve a release number from SVN and the ant target "dist" fails|
+|[ZOOKEEPER-55](https://issues.apache.org/jira/browse/ZOOKEEPER-55)|build.xml fails to retrieve a release number from SVN and the ant target "dist" fails|
|[ZOOKEEPER-89](https://issues.apache.org/jira/browse/ZOOKEEPER-89)|invoke WhenOwnerListener.whenNotOwner when the ZK connection fails|
|[ZOOKEEPER-90](https://issues.apache.org/jira/browse/ZOOKEEPER-90)|invoke WhenOwnerListener.whenNotOwner when the ZK session expires and the znode is the leader|
|[ZOOKEEPER-82](https://issues.apache.org/jira/browse/ZOOKEEPER-82)|Make the ZooKeeperServer more DI friendly.|
diff --git a/zookeeper-docs/src/main/resources/markdown/zookeeperAdmin.md b/zookeeper-docs/src/main/resources/markdown/zookeeperAdmin.md
index e571652e497..4b7fd0954f3 100644
--- a/zookeeper-docs/src/main/resources/markdown/zookeeperAdmin.md
+++ b/zookeeper-docs/src/main/resources/markdown/zookeeperAdmin.md
@@ -1211,7 +1211,7 @@ property, when available, is noted below.
The default value is false.
* *serializeLastProcessedZxid.enabled*
- (Jave system property: **zookeeper.serializeLastProcessedZxid.enabled**)
+ (Java system property: **zookeeper.serializeLastProcessedZxid.enabled**)
**New in 3.9.0:**
If enabled, ZooKeeper serializes the lastProcessedZxid when snapshot and deserializes it
when restore. Defaults to true. Needs to be enabled for performing snapshot and restore
diff --git a/zookeeper-jute/src/main/java/org/apache/jute/compiler/JFile.java b/zookeeper-jute/src/main/java/org/apache/jute/compiler/JFile.java
index 1d5ed4144fc..d5fb051dd3e 100644
--- a/zookeeper-jute/src/main/java/org/apache/jute/compiler/JFile.java
+++ b/zookeeper-jute/src/main/java/org/apache/jute/compiler/JFile.java
@@ -81,7 +81,7 @@ public void genCode(String language, File outputDirectory)
outputDirectory);
gen.genCode();
} else {
- throw new IOException("Cannnot recognize language:" + language);
+ throw new IOException("Cannot recognize language:" + language);
}
}
}
diff --git a/zookeeper-jute/src/main/java/org/apache/jute/compiler/JRecord.java b/zookeeper-jute/src/main/java/org/apache/jute/compiler/JRecord.java
index c26e249102f..618b4c50bb0 100644
--- a/zookeeper-jute/src/main/java/org/apache/jute/compiler/JRecord.java
+++ b/zookeeper-jute/src/main/java/org/apache/jute/compiler/JRecord.java
@@ -407,7 +407,7 @@ public void genJavaCode(File outputDirectory) throws IOException {
if (!pkgdir.exists()) {
// create the pkg directory
if (!pkgdir.mkdirs()) {
- throw new IOException("Cannnot create directory: " + pkgpath);
+ throw new IOException("Cannot create directory: " + pkgpath);
}
} else if (!pkgdir.isDirectory()) {
throw new IOException(pkgpath + " is not a directory.");
@@ -580,7 +580,7 @@ public void genCsharpCode(File outputDirectory) throws IOException {
if (!outputDirectory.exists()) {
// create the pkg directory
if (!outputDirectory.mkdirs()) {
- throw new IOException("Cannnot create directory: " + outputDirectory);
+ throw new IOException("Cannot create directory: " + outputDirectory);
}
} else if (!outputDirectory.isDirectory()) {
throw new IOException(outputDirectory + " is not a directory.");
diff --git a/zookeeper-jute/src/main/java/org/apache/jute/compiler/package.html b/zookeeper-jute/src/main/java/org/apache/jute/compiler/package.html
index 03bdb1bbb01..7eb07105851 100644
--- a/zookeeper-jute/src/main/java/org/apache/jute/compiler/package.html
+++ b/zookeeper-jute/src/main/java/org/apache/jute/compiler/package.html
@@ -24,7 +24,7 @@
This package contains classes needed for code generation
from the hadoop record compiler. CppGenerator and JavaGenerator
are the main entry points from the parser. There are classes
- corrsponding to every primitive type and compound type
+ corresponding to every primitive type and compound type
included in Hadoop record I/O syntax.