From 56a5c36ca69f6940eb8b2964483b78f3547c08f9 Mon Sep 17 00:00:00 2001
From: coulbeck <coulbeck@localhost>
Date: Mon, 17 Sep 2007 22:13:18 +0000
Subject: [PATCH] Spelling of 'occurred'.
---
opendj-sdk/opends/src/messages/messages/tools.properties | 12 +++---
opendj-sdk/opends/src/messages/messages/replication.properties | 22 +++++-----
opendj-sdk/opends/src/messages/messages/quicksetup.properties | 3 -
opendj-sdk/opends/src/messages/messages/plugin.properties | 8 ++--
opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java | 2
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java | 46 +++++++++++-----------
opendj-sdk/opends/src/server/org/opends/server/core/KeyManagerProviderConfigManager.java | 7 ++-
7 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/opendj-sdk/opends/src/messages/messages/plugin.properties b/opendj-sdk/opends/src/messages/messages/plugin.properties
index 2dfd85e..d71f062 100644
--- a/opendj-sdk/opends/src/messages/messages/plugin.properties
+++ b/opendj-sdk/opends/src/messages/messages/plugin.properties
@@ -318,12 +318,12 @@
SEVERE_ERR_PLUGIN_REFERINT_INVALID_PLUGIN_TYPE_81=An attempt was made to \
register the Referential Integrity plugin to be invoked as a %s plugin. This \
plugin type is not allowed for this plugin
-SEVERE_ERR_PLUGIN_REFERENT_CREATE_LOGFILE_82=An error occured during \
+SEVERE_ERR_PLUGIN_REFERENT_CREATE_LOGFILE_82=An error occurred during \
Referential Integity plugin initialization because log file creation \
failed: %s
-SEVERE_ERR_PLUGIN_REFERENT_CLOSE_LOGFILE_83=An error occured closing the \
+SEVERE_ERR_PLUGIN_REFERENT_CLOSE_LOGFILE_83=An error occurred closing the \
Referential Integrity plugin update logile: %s
-SEVERE_ERR_PLUGIN_REFERENT_REPLACE_LOGFILE_84=An error occured replacing the \
+SEVERE_ERR_PLUGIN_REFERENT_REPLACE_LOGFILE_84=An error occurred replacing the \
Referential Integrity plugin update logile: %s
INFO_PLUGIN_REFERENT_LOGFILE_CHANGE_REQUIRES_RESTART_85=The file name that \
the Referential Integrity plugin logs changes to during background \
@@ -346,7 +346,7 @@
Integrity plugin failed to decode a entry DN from the update log: %s
INFO_PLUGIN_REFERENT_SEARCH_NO_SUCH_OBJECT_92=The Referential Integrity \
plugin failed when performing a search because the base DN %s does not exist
-SEVERE_ERR_PLUGIN_REFERENT_INVALID_ATTRIBUTE_SYNTAX_93=An error occured \
+SEVERE_ERR_PLUGIN_REFERENT_INVALID_ATTRIBUTE_SYNTAX_93=An error occurred \
in the Referential Integrity plugin while attempting to configure the \
attribute type %s which has a syntax OID of %s. A Referential Integrity \
attribute type must have a syntax OID of either \
diff --git a/opendj-sdk/opends/src/messages/messages/quicksetup.properties b/opendj-sdk/opends/src/messages/messages/quicksetup.properties
index 1d35119..14c722d 100644
--- a/opendj-sdk/opends/src/messages/messages/quicksetup.properties
+++ b/opendj-sdk/opends/src/messages/messages/quicksetup.properties
@@ -416,7 +416,7 @@
before this upgrade. A copy of the original installation files will be kept \
in <i>%s</i>.
INFO_ERROR_UPGRADE_MIGRATION_SCHEMA=Schema Migration Error
-INFO_ERROR_UPGRADE_MIGRATION_UNEXPECTED=An unexpected error occured while \
+INFO_ERROR_UPGRADE_MIGRATION_UNEXPECTED=An unexpected error occurred while \
processing entry <b>%s</b>.
INFO_ERROR_UPGRADED_SERVER_STARTS_WITH_ERRORS=The upgraded server starts with \
errors: %s
@@ -1187,4 +1187,3 @@
INFO_ZIP_FILES_DESCRIPTION=OpenDS Installation Package (.zip)
SEVERE_ERR_COULD_NOT_FIND_REPLICATIONID=Could not find a remote peer to \
initialize the contents of local base DN: %s.
-
\ No newline at end of file
diff --git a/opendj-sdk/opends/src/messages/messages/replication.properties b/opendj-sdk/opends/src/messages/messages/replication.properties
index 177234b..e6226a9 100644
--- a/opendj-sdk/opends/src/messages/messages/replication.properties
+++ b/opendj-sdk/opends/src/messages/messages/replication.properties
@@ -194,13 +194,13 @@
replication server port could not be stopped : %s
DEBUG_REPLICATION_PORT_IOEXCEPTION_72=An IOException was caught while \
listening on the replication port
-SEVERE_ERR_SEARCHING_GENERATION_ID_73=An unexpected error %s occured when \
+SEVERE_ERR_SEARCHING_GENERATION_ID_73=An unexpected error %s occurred when \
searching for generation id for domain : %s
-SEVERE_ERR_SEARCHING_DOMAIN_BACKEND_74=An unexpected error occured when \
+SEVERE_ERR_SEARCHING_DOMAIN_BACKEND_74=An unexpected error occurred when \
searching for the backend of the domain : %s
-SEVERE_ERR_LOADING_GENERATION_ID_75=An unexpected error occured when \
+SEVERE_ERR_LOADING_GENERATION_ID_75=An unexpected error occurred when \
searching in %s for the generation ID : %s
-SEVERE_ERR_UPDATING_GENERATION_ID_76=An unexpected error %s occured \
+SEVERE_ERR_UPDATING_GENERATION_ID_76=An unexpected error %s occurred \
when updating generation ID for the domain : %s
NOTICE_BAD_GENERATION_ID_77=On suffix %s. server %s presented generation ID=%s \
when expected generation ID=%s. Consequently, replication is degraded for that server
@@ -216,21 +216,21 @@
SEVERE_ERR_INIT_EXPORT_NOT_SUPPORTED_83= Initialization cannot be done because \
export is not supported by the backend %s
SEVERE_ERR_INIT_CANNOT_LOCK_BACKEND_84= Initialization cannot be done because \
-the following error occured while locking the backend %s : %s
+the following error occurred while locking the backend %s : %s
NOTICE_EXCEPTION_RESTARTING_SESSION_85=Caught Exception during reinitialization of \
communication on domain %s : %s
SEVERE_ERR_EXCEPTION_LISTENING_86=Replication server caught exception while \
listening for client connections %s
SEVERE_ERR_ERROR_CLEARING_DB_87=While clearing the database %s , the following \
error happened: %s
- NOTICE_ERR_ROUTING_TO_SERVER_88=Protocol error : a replication server is not expected \
- to be the destination of a message of type %s
- SEVERE_ERR_CHECK_CREATE_REPL_BACKEND_FAILED_89=An unexpected error occured when \
+NOTICE_ERR_ROUTING_TO_SERVER_88=Protocol error : a replication server is not expected \
+ to be the destination of a message of type %s
+SEVERE_ERR_CHECK_CREATE_REPL_BACKEND_FAILED_89=An unexpected error occurred when \
testing existence or creating the replication backend : %s
- SEVERE_ERR_DELETE_REPL_BACKEND_FAILED_90=An unexpected error occured when \
+SEVERE_ERR_DELETE_REPL_BACKEND_FAILED_90=An unexpected error occurred when \
deleting the replication backend : %s
- SEVERE_ERR_EXPORT_CANNOT_WRITE_ENTRY_TO_LDIF_91=An error occured when \
+SEVERE_ERR_EXPORT_CANNOT_WRITE_ENTRY_TO_LDIF_91=An error occurred when \
exporting to LDIF the entry %s : %s
-SEVERE_ERR_BACKEND_CANNOT_CREATE_LDIF_WRITER_92 =An error occured when \
+SEVERE_ERR_BACKEND_CANNOT_CREATE_LDIF_WRITER_92 =An error occurred when \
creating the LDIF writer to export backend : %s
\ No newline at end of file
diff --git a/opendj-sdk/opends/src/messages/messages/tools.properties b/opendj-sdk/opends/src/messages/messages/tools.properties
index ea401c7..ce886d3 100644
--- a/opendj-sdk/opends/src/messages/messages/tools.properties
+++ b/opendj-sdk/opends/src/messages/messages/tools.properties
@@ -1857,7 +1857,7 @@
semicolon is not followed by an integer. The semicolon will be assumed to be \
part of the value and not a delimiter to separate the value from its relative \
weight
-FATAL_ERR_INITIALIZE_SERVER_ROOT_1293=An unexpected error occured \
+FATAL_ERR_INITIALIZE_SERVER_ROOT_1293=An unexpected error occurred \
attempting to set the server's root directory to %s: %s
SEVERE_ERR_LDAP_CONN_MUTUALLY_EXCLUSIVE_ARGUMENTS_1294=ERROR: You may not \
provide both the %s and the %s arguments
@@ -1933,7 +1933,7 @@
to debug
INFO_DESCRIPTION_DBTEST_SKIP_DECODE_1334=Do not try to decode the JE data to \
their appropriate types
-MILD_ERR_DBTEST_DECODE_FAIL_1335=An error occured while decoding data: %s
+MILD_ERR_DBTEST_DECODE_FAIL_1335=An error occurred while decoding data: %s
INFO_DESCRIPTION_DBTEST_SUBCMD_LIST_INDEX_STATUS_1336=List the status of \
indexes in a entry container
INFO_DESCRIPTION_DBTEST_MAX_KEY_VALUE_1337=Only show records with keys that \
@@ -1959,9 +1959,9 @@
containers are configured with the requested base DN %s in backend %s
SEVERE_ERR_DBTEST_NO_DATABASE_CONTAINERS_FOR_NAME_1349=No database container \
exists with the requested name %s in entry container %s and backend %s
-SEVERE_ERR_DBTEST_ERROR_INITIALIZING_BACKEND_1350=An unexpected error occured \
+SEVERE_ERR_DBTEST_ERROR_INITIALIZING_BACKEND_1350=An unexpected error occurred \
while attempting to initialize the JE backend %s: %s
-SEVERE_ERR_DBTEST_ERROR_READING_DATABASE_1351=An unexpected error occured \
+SEVERE_ERR_DBTEST_ERROR_READING_DATABASE_1351=An unexpected error occurred \
while attempting to read and/or decode records from the database: %s
SEVERE_ERR_DBTEST_DECODE_BASE_DN_1352=Unable to decode base DN string "%s" as \
a valid distinguished name: %s
@@ -1982,7 +1982,7 @@
attempting to acquire a shared lock for backend %s: %s. This generally \
means that some other process has exclusive access to this backend (e.g., a \
restore or an LDIF import)
-SEVERE_ERR_DBTEST_CANNOT_DECODE_KEY_1364=An error occured while decoding the \
+SEVERE_ERR_DBTEST_CANNOT_DECODE_KEY_1364=An error occurred while decoding the \
min/max key value %s: %s. Values prefixed with "0x" will be decoded as raw \
bytes in hex. When dumping the DN2ID database, the value must be a valid \
distinguished name. When dumping the ID2Entry database, the value will be \
@@ -1995,7 +1995,7 @@
INFO_LABEL_DBTEST_INDEX_VALUE_1369=Indexed Value
INFO_LABEL_DBTEST_INDEX_ENTRY_ID_LIST_1370=Entry ID List
INFO_LABEL_DBTEST_VLV_INDEX_LAST_SORT_KEYS_1371=Last Sort Keys
-SEVERE_ERR_DBTEST_CANNOT_DECODE_SIZE_1372=An error occured while parsing the \
+SEVERE_ERR_DBTEST_CANNOT_DECODE_SIZE_1372=An error occurred while parsing the \
min/max data size %s as a integer: %s
SEVERE_ERR_CONFIGDS_CANNOT_ENABLE_ADS_TRUST_STORE_1373=An error occurred while \
attempting to enable the ADS trust store: %s
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/KeyManagerProviderConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/KeyManagerProviderConfigManager.java
index e15adc5..8c75e7a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/KeyManagerProviderConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/KeyManagerProviderConfigManager.java
@@ -370,9 +370,10 @@
* @return The possibly initialized key manager provider.
*
* @throws InitializationException If the provided configuration is not
- * acceptable, or if a problem occured while
- * attempting to initialize the key manager
- * provider using that configuration.
+ * acceptable, or if a problem occurred
+ * while attempting to initialize the key
+ * manager provider using that
+ * configuration.
*/
private KeyManagerProvider loadProvider(String className,
KeyManagerCfg configuration,
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java
index dd0c799..f4ee8ba 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java
@@ -2585,7 +2585,7 @@
* Export the entries from the backend.
* The ieContext must have been set before calling.
*
- * @throws DirectoryException when an error occured
+ * @throws DirectoryException when an error occurred
*/
protected void exportBackend()
throws DirectoryException
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java
index 4b100b5..8305c3d 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java
@@ -90,7 +90,7 @@
* - testSingleRS : test generation ID setting with different servers and one
* Replication server.
*
- * - testMultiRS : tests generation ID propagatoion with more than one
+ * - testMultiRS : tests generation ID propagatoion with more than one
* Replication server.
*
*/
@@ -102,7 +102,7 @@
private static final String baseDnStr = "dc=example,dc=com";
private static final String baseSnStr = "genidcom";
-
+
private static final int WINDOW_SIZE = 10;
private static final int CHANGELOG_QUEUE_SIZE = 100;
private static final short server1ID = 1;
@@ -407,11 +407,11 @@
/**
* Creates a new replicationServer.
* @param changelogId The serverID of the replicationServer to create.
- * @param all Specifies whether to coonect the created replication
+ * @param all Specifies whether to coonect the created replication
* server to the other replication servers in the test.
* @return The new created replication server.
*/
- private ReplicationServer createReplicationServer(short changelogId,
+ private ReplicationServer createReplicationServer(short changelogId,
boolean all, String suffix)
{
SortedSet<String> servers = null;
@@ -512,7 +512,7 @@
try
{
// suffix synchronized
- String synchroServerStringDN = "cn=" + baseSnStr + ", cn=domains," +
+ String synchroServerStringDN = "cn=" + baseSnStr + ", cn=domains," +
synchroPluginStringDN;
if (synchroServerEntry != null)
{
@@ -587,7 +587,7 @@
catch(Exception e)
{
fail("Exception raised in readGenId", e);
- }
+ }
return genId;
}
@@ -697,7 +697,7 @@
}
/**
- * SingleRS tests basic features of generationID
+ * SingleRS tests basic features of generationID
* with one single Replication Server.
*
* @throws Exception
@@ -736,7 +736,7 @@
assertEquals(genId,-1);
debugInfo(testCase + " Expect genId to be set in memory on the replication " +
- " server side even if not wrote on disk/db since no change occured.");
+ " server side even if not wrote on disk/db since no change occurred.");
rgenId = replServer1.getGenerationId(baseDn);
assertEquals(rgenId, 3211313L);
@@ -754,7 +754,7 @@
this.addTestEntriesToDB(updatedEntries);
connectToReplServer(changelog1ID);
- // Test that the generationId is written in the DB in the
+ // Test that the generationId is written in the DB in the
// root entry on the replica side
genId = readGenId();
assertTrue(genId != -1);
@@ -772,7 +772,7 @@
try
{
broker2 = openReplicationSession(baseDn,
- server2ID, 100, getChangelogPort(changelog1ID),
+ server2ID, 100, getChangelogPort(changelog1ID),
1000, !emptyOldChanges, genId+1);
}
catch(SocketException se)
@@ -813,7 +813,7 @@
* Test : generationID persistence in Replication server
* Shutdown/Restart Replication Server and redo connections
* with valid and invalid generationId
- * Check : same expected connections results
+ * Check : same expected connections results
*/
// The changes from broker2 should be ignored
@@ -879,10 +879,10 @@
catch(SocketException se)
{
fail("Broker connection is expected to be accepted.");
- }
+ }
/*
- *
+ *
* FIXME Should clearJEBackend() regenerate generationId and do a start
* against ReplicationServer ?
*/
@@ -919,7 +919,7 @@
assertTrue(genId != -1, "DS is expected to have a new genID computed " +
" after on-line import but genId=" + genId);
- rgenId = replServer1.getGenerationId(baseDn);
+ rgenId = replServer1.getGenerationId(baseDn);
assertEquals(genId, rgenId, "DS and replServer are expected to have same genId.");
assertTrue(!replServer1.getReplicationCache(baseDn, false).
@@ -982,7 +982,7 @@
fail("No update message is supposed to be received by degraded broker3"+ msg);
} catch(SocketTimeoutException e) { /* expected */ }
- debugInfo("broker2 is publishing a change, " +
+ debugInfo("broker2 is publishing a change, " +
"replServer1 expected to ignore this change.");
broker2.publish(createAddMsg());
try
@@ -990,7 +990,7 @@
ReplicationMessage msg = broker3.receive();
fail("No update message is supposed to be received by degraded broker3"+ msg);
} catch(SocketTimeoutException e) { /* expected */ }
-
+
// In S1 launch the total update to initialize S2
addTask(taskInitRemoteS2, ResultCode.SUCCESS, null);
@@ -1035,14 +1035,14 @@
}
catch(Exception e)
{
- fail(testCase + " Exception:"+ e.getMessage() + " " +
+ fail(testCase + " Exception:"+ e.getMessage() + " " +
stackTraceToSingleLineString(e));
}
}
/**
/**
- * SingleRS tests basic features of generationID
+ * SingleRS tests basic features of generationID
* with more than one Replication Server.
* The following test focus on:
* - genId checking accross multiple starting RS (replication servers)
@@ -1081,7 +1081,7 @@
Thread.sleep(1000);
debugInfo("Expect genId to be unset(-1) in all servers since no server is " +
- " connected and no change ever occured");
+ " connected and no change ever occurred");
assertEquals(replServer1.getGenerationId(baseDn), -1, " in replServer1");
assertEquals(replServer2.getGenerationId(baseDn), -1, " in replServer2");
assertEquals(replServer3.getGenerationId(baseDn), -1, " in replServer3");
@@ -1095,7 +1095,7 @@
debugInfo("Expect genIds to be set in all servers based on the added entries.");
genId = readGenId();
- assertTrue(genId != -1);
+ assertTrue(genId != -1);
assertEquals(replServer1.getGenerationId(baseDn), genId);
assertEquals(replServer2.getGenerationId(baseDn), genId);
assertEquals(replServer3.getGenerationId(baseDn), genId);
@@ -1104,7 +1104,7 @@
try
{
broker2 = openReplicationSession(baseDn,
- server2ID, 100, getChangelogPort(changelog3ID),
+ server2ID, 100, getChangelogPort(changelog3ID),
1000, !emptyOldChanges, genId);
Thread.sleep(1000);
}
@@ -1130,7 +1130,7 @@
{
long badgenId=1;
broker3 = openReplicationSession(baseDn,
- server3ID, 100, getChangelogPort(changelog1ID),
+ server3ID, 100, getChangelogPort(changelog1ID),
1000, !emptyOldChanges, badgenId);
Thread.sleep(1000);
}
@@ -1165,7 +1165,7 @@
addTask(taskReset, ResultCode.SUCCESS, null);
waitTaskState(taskReset, TaskState.COMPLETED_SUCCESSFULLY, null);
Thread.sleep(500);
-
+
debugInfo("Verifying that all replservers genIds have been reset.");
genId = readGenId();
assertEquals(replServer2.getGenerationId(baseDn), genId);
--
Gitblit v1.10.0