30 Sep, 2013
7 commits
-
git-svn-id: https://svn.forgerock.org/opendj/trunk@9625 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
Moved the lastGeneratedChangeNumber to the ChangeNumberIndexDB implementation because it is the responsibility of the DB to manage such field (think of it like relational databases's sequence numbers). ReplicationServer.java: Moved lastGeneratedChangeNumber + relevant code to DraftCNDbHandler. Removed getNewChangeNumber(), replaced with TODO ChangeNumberIndexDB.getLastGeneratedChangeNumber() DraftCNDbHandler.java Moved lastGeneratedChangeNumber here and converted it to AtomicLong + moved relevant code here from ReplicationServer. In getMonitorData(), extracted methods, createChangeNumberAttribute() and getChangeNumber(). ChangeNumberIndexDB.java: Added nextChangeNumber() and getLastGeneratedChangeNumber(). ECLServerHandler.java: Consequence of the changes to ReplicationServer. git-svn-id: https://svn.forgerock.org/opendj/trunk@9624 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
* use a Maven WAR overlay to pull in CREST Servlet and Glassfish config files. git-svn-id: https://svn.forgerock.org/opendj/trunk@9623 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
Review CR-2386 Change is limited to MemoryBackend class : * added size limit support in handleSearch() method, throwing error with ResultCode.SIZE_LIMIT_EXCEEDED if limit is exceeded * refactored handleSearch to avoid duplicate code for SearchScope.SINGLE_LEVEL and SearchScope.WHOLE_SUBTREE, adding new private method searchWithSubordinates() Updated test class MemoryBackendTestCase * added tests for size limit for both SearchScope.SINGLE_LEVEL and SearchScope.WHOLE_SUBTREE * added test to ensure that we can get all entries from the memory backend. git-svn-id: https://svn.forgerock.org/opendj/trunk@9622 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
… should never be called this way in production, so I moved it back to tests. CSNGenerator.java: Moved newCSNs() to DbHandlerTest. CSNGeneratorTest.java: Renamed newCSNs() test to newCSN() DbHandlerTest.java: Moved newCSNs() here from CSNGenerator. DraftCNDbHandlerTest.java: Used DbHandlerTest.newCSNs(). git-svn-id: https://svn.forgerock.org/opendj/trunk@9621 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
ChangelogDB.java: Updated javadoc for getCSNAfter(). CSNGenerator.java Added newCSNs(int) to generate a certain number of CSNs in one go. It is very useful in tests. CSNGeneratorTest.java Added a test for newCSNs(int). ReplicationServer.java: In getChangelogDB(), weakened visibility from private to default for unit tests access. JEChangelogDB.java: In getOrCreateDbHandler(), weakened visibility from private to default for unit tests access. DbHandlerTest.java: Cleaned up the tests by relying on production code methods cleanups. Used CSNGenerator(.newCSNs(). Added newDbHandler(), testGenerateCursorFrom(). Renamed/inlined a few local variables. DraftCNDbHandlerTest.java: Cleaned up the tests by relying on production code methods cleanups. Used CSNGenerator(.newCSNs(). Added newDbHandler(). PendingChange.java, ExternalChangeLogTest.java: Renamed "changeNumber" to "csn". git-svn-id: https://svn.forgerock.org/opendj/trunk@9620 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
In parseJsonConfiguration(), removed an outdated comment (already implemented). git-svn-id: https://svn.forgerock.org/opendj/trunk@9619 41b1ffd8-f28e-4786-ab96-9950f0a78031
27 Sep, 2013
7 commits
-
* ensure that resources associated with an LDAP connection are only released at most once, when the client closes the connection. Previously resources were released when a connection error was detected as well * minor fix for ConnectionState where a "close" state transition is lost when closing is performed re-entrantly from within a ConnectionEventListener error notification. git-svn-id: https://svn.forgerock.org/opendj/trunk@9617 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
git-svn-id: https://svn.forgerock.org/opendj/trunk@9616 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
git-svn-id: https://svn.forgerock.org/opendj/trunk@9615 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
git-svn-id: https://svn.forgerock.org/opendj/trunk@9614 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
Review CR-2378 Main changes in AbstractConnection class: * where a single entry search / read method constructs a new search request, ensure that it specifies a size limit of 1 * where a single entry search / read method is passed in a search request, check to see if it has a size limit of 1. If not, then duplicate the search request and set the size limit to 1 * detect size limit exceeded errors when processing the results of a single entry search / read : it is then transformed into a client-side error To implement these changes : * took into account the server error ResultCode.SIZE_LIMIT_EXCEEDED * moved behavior for handling errors into SingleEntryHandler * refactored SingleEntryFuture to use internally a SingleEntryHandler * simplified searchSingleEntry method to use SingleEntryHandler * added a new message ERR_UNEXPECTED_SEARCH_RESULT_ENTRIES_NO_COUNT to handle case where there is too many entries but without the actual number of entries * and for tests - added several new tests testSingleEntrySearchXXX in AbstractAsynchronousConnectionTestCase to test single entry search behavior - added support for the client-provided handler in the internal class MockConnection of AbstractAsynchronousConnectionTestCase to better test behavior in test methods. Also added support code for creating single entry request * Added 2 new methods Requests#newSingleEntrySearchRequest to create single entry search requests * Added a new method SearchRequest#isSingleEntrySearch to test if a request correspond to a single entry search * Added a new test case class for search requests : SearchRequestTestCase git-svn-id: https://svn.forgerock.org/opendj/trunk@9613 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
Removed redundant code transforming Object arrays back and forth. git-svn-id: https://svn.forgerock.org/opendj/trunk@9612 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
GenerationIdTest.java: In testSingleRS(), called again ReplicationServer.remove() instead of ReplicationServerTestCase.remove() because the test does not expect the DB to be wiped out. Changed all protected keywords to private since it is never subclassed. Renamed testEntriesInDb() to countUpdatedEntriesInDb(). Removed useless try / catch and let the exceptions go up. Replaced uses of assertTrue() with the appropriate assert* method. Changed the return type of createAddMsg() to return the appropriate type. Extracted method assertNoMessageReceivedBadGenId(), waitForStableGenerationId(). ReplicationTestCase.java: In addTestEntriesToDB(), used varargs. Removed outdated openReplicationSession(). Removed useless try / catch and let the exceptions go up. ReplicationServerTest.java: Extracted method sendAndReceiveDeleteMsg() and newServerState(). Used Arrays.asList(). git-svn-id: https://svn.forgerock.org/opendj/trunk@9611 41b1ffd8-f28e-4786-ab96-9950f0a78031
26 Sep, 2013
10 commits
-
…annot be found in this JVM. CertAndKeyGen class was moved from sun.security.x509 to sun.security.tools.keytool in openjdk8. Now checking JVM version to figure out the path. CR-2376. git-svn-id: https://svn.forgerock.org/opendj/trunk@9610 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
Changes after review from Matt. ChangelogDB.java: Added removeDB(). Renamed clearDomain() to removeDomain(). In getCursorFrom(), never return a null Cursor anymore. Updated many javadocs. MessageHandler.java, ReplicationBackend.java: Removed null checks for cursor (consequence of the changes to ChangelogDB) ReplicationServerDomain.java, JEChangelogDB.java, JEReplicaDBCursor.java: Consequence of the changes to ChangelogDB. ReplicationServer.java: Added removeDb(). Removed getDbDirName(), superseded in usage by removeDb(). ReplicationTestCase.java, ReplicationServerTest.java: Consequence of the change to ReplicationServer. DbHandler.java, ReplicationDB.java: Renamed setCounterWindowSize() to setCounterRecordWindowSize() + updated javadoc. DbHandlerTest.java: Improved the tests. Added testGetCountNoCounterRecords() to assess code behaviour. Extracted method assertCount() CSNGenerator.java: Fixed ugly parameter name. git-svn-id: https://svn.forgerock.org/opendj/trunk@9609 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
git-svn-id: https://svn.forgerock.org/opendj/trunk@9608 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
Undoing the rushed r9606 because: - In buildAndPublishMissingChanges(), the parameter was used in the tests - There were unintended changes in this git-svn-id: https://svn.forgerock.org/opendj/trunk@9607 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
LDAPReplicationDomain.java: In buildAndPublishMissingChanges(), removed ReplicationBroker parameter and used broker field instead. *Test.java: Removed try / catch / fail test anti pattern. Inlined local variables. AssuredReplicationPluginTest.java: Extracted methods assertBlockedForLessThanTimeout() assertBlockedLongerThanTimeout(), Inlined sleep(). In getErrorsByServers(), improved the code. ReplicationServerTest.java: Split changelogChaining() test into changelogChaining0() and changelogChaining1() to match the previous double testing + then simplified the code. Extracted methods receiveReplicationMsgs(), assertOnlyTopologyMsgsReceived(). Used CSNGenerator. git-svn-id: https://svn.forgerock.org/opendj/trunk@9606 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
*Msg.java: Used DN.toNormalizedString() instead of DN.toString() for better perfs. git-svn-id: https://svn.forgerock.org/opendj/trunk@9605 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
…ble stack trace when handshake fails * make the connection close logic more tolerant of underlying Grizzly behavior, although the bug is unreproducible with the latest SDK + Grizzly 2.3.4. git-svn-id: https://svn.forgerock.org/opendj/trunk@9604 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
Fixed ConcurrentModificationException. Fixed wrong expected value (copy/paste was here). git-svn-id: https://svn.forgerock.org/opendj/trunk@9603 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
Factorized common code in tests: - Added inner class MonitorAssertions with fluent interface to help assert the monitor attribute values. - Extracted methods assertNoServerErrors(), assertServerErrorsSafeDataMode(), assertServerErrorsSafeReadMode(). git-svn-id: https://svn.forgerock.org/opendj/trunk@9602 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
String baseDn => DN baseDN The change mostly affects package org.opends.server.replication.protocol and dependent classes. ModifyCommonMsg.java: In getMods(), called decodeMods() ReplicationTestCase.java: Converted removeDomain(Entry) to removeDomain(Entry...). git-svn-id: https://svn.forgerock.org/opendj/trunk@9601 41b1ffd8-f28e-4786-ab96-9950f0a78031
25 Sep, 2013
3 commits
-
Extracted toServerState() method. Renamed getDbServerState() to getLatestServerState(). ReplicationDomainCfgDefn_fr.properties: Upgraded "property.replication-server.description" to match the latest english description. *.java: Consequence of renaming ReplicationServerDomain.getDbServerState(). git-svn-id: https://svn.forgerock.org/opendj/trunk@9600 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
Now the replication code uses HostPort class for comparisons instead of "host:port" Strings. Changed all the HostPort variable/parameter names to *Address instead of *URL. Left all the relevant String variable/parameter names to *URL. HostPort.java: Removed LocalAddress(String), not used anymore. Moved getLocalAddress() here from ReplicationServer. Created localAddress() static method. Extracted method toInetSocketAddress() and moved it here. ReplicationServer.java: Created converting method toHostPorts() + used it everywhere replicationServerUrls was accessed. Replaced getNormalizedLocalURL() and normalizeServerURL() with simply calling HostPort.localAddress() and HostPort.valueOf(). In getConnectedRSUrls(), changed return type from Set<String> to Set<HostPort>. In connect() and disconnectRemovedReplicationServers(), used HostPort as a parameter instead of String. ReplicationServerDomain.java: In stopReplicationServers(), used HostPort as a parameter instead of String. ReplicationServerHandler.java: Extracted method toServerAddressURL(). ReplicationBroker.java: Consequence of the change to HostPort. ReplSessionSecurity.java: In isSslEncryption() removed unused parameter. Used StaticUtils.close(). ReplicationServerConfiguration.xml, ReplicationServerCfgDefn.properties: Added precisions on how to specify the "replication-server" property. ReplicationServerDynamicConfTest.java, ReplServerFakeConfiguration.java: Updated because this test was failing. git-svn-id: https://svn.forgerock.org/opendj/trunk@9599 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
Review CR-2353 * Removed constraints on the mandatory presence of a PIN, to allow use of empty PIN. These contraints were implemented in several places : - configuration files : FileBasedKeyManagerProviderConfiguration.xml, PKCS11KeyManagerProviderConfiguration.xml - corresponding provider classes : FileBasedKeyManagerProvider.java, PKCS11KeyManagerProvider.java - setup tool : CertificateManager.java, InstallDS.java (for CLI), SecurityOptionsDialog.java (for GUI) * Removed corresponding admin messages that are no more used in FileBasedKeyManagerProviderCfgDefn.properties and PKCS11KeyManagerProviderCfgDefn.properties * Removed corresponding messages that are no more used in extension.properties and quicksetup.properties * Added management of issue JDK-6879539 that prevents usage of empty PIN. This issue occurs on JDK older than JDK7. * Modified unit tests according to new behavior : FileBasedKeyManagerProviderTestCase.java, CertificateManagerTestCase.java * Added a new utility method StaticUtils#stackTraceContainsCause to check if an exception contains a given cause. git-svn-id: https://svn.forgerock.org/opendj/trunk@9598 41b1ffd8-f28e-4786-ab96-9950f0a78031
24 Sep, 2013
8 commits
-
git-svn-id: https://svn.forgerock.org/opendj/trunk@9594 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
Changes after review from Matt. *.java: Changed terminology for easier reading: - First => Oldest - Last => Newest git-svn-id: https://svn.forgerock.org/opendj/trunk@9590 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
Changes after review from Matt. *.java: Changed terminology for easier reading: - First => Oldest - Last => Newest git-svn-id: https://svn.forgerock.org/opendj/trunk@9589 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
Silencing annoying warnings in Continuous Integration. git-svn-id: https://svn.forgerock.org/opendj/trunk@9588 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
Silencing annoying warnings in Continuous Integration. git-svn-id: https://svn.forgerock.org/opendj/trunk@9587 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
ReplicationTestCase.java Added remove(ReplicationServer...) and stop(ReplicationBroker...). *Test.java: Used the new methods from ReplicationTestCase. Used Arrays.fill(). Removed various redundant methods that had been extracted in the past: - GroupIdHandshakeTest.clear() - ReplicationServerFailoverTest.clear() - ExternalChangeLogTest.stop() - ReplicationServerTest.stop() - ReplicationServerTest.removeRsAndChangeLog() - ReplicationDomainTest.remove()) AssuredReplicationServerTest.java: Removed all the rs*Port fields, replaced by rsPorts. Removed all the fakeRd* fields, replaced by fakeRDs. Extracted methods disableService(), shutdown(), assertFakeDSReceivedAndAcked(), assertFakeRDNbReceivedUpdates(), assertFakeRSNbReceivedUpdates(), checkDSNothingReceivedOrSent(), assertContainsOnly(). Used more the checkDSSentAndAcked(), checkDSReceivedAndAcked(). Inlined on createFakeReplicationDomain(). Removed all sorts of assertNotNull() where the code could never be null. git-svn-id: https://svn.forgerock.org/opendj/trunk@9582 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
Changed after review from Matt. ChangelogDB.java: Removed setReplicationDBDirectory(), now set in JEChangelogDB constructor. Renamed getDBDirName() to getDBDirectoryName(). Improved javadocs. JEChangelogDB.java: Consequence of the changes to ChangelogDB. Renamed dbDirName to dbDirectoryName. Made 2 fields final. Added makeDir(). ReplicationServer.java: Consequence of the changes to ChangelogDB. git-svn-id: https://svn.forgerock.org/opendj/trunk@9581 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
HostPort.java: Improved javadocs. Improved host normalization for and used remote IP addresses for remote hosts (complies with code from ReplicationServer.java.disconnectRemovedReplicationServers()). Renamed normalizedHost() tpo normalizeHost(). Removed trimming for serverURLs. In valueOf(), added a special case to reject unbracketed IPV6 addresses. Extracted constant LOCALHOST to avoid typos. Reworked the code from isLocalAddress(), equals(), hashCode(). HostPortTest.java: Reworked some tests. Added new tests. git-svn-id: https://svn.forgerock.org/opendj/trunk@9580 41b1ffd8-f28e-4786-ab96-9950f0a78031
23 Sep, 2013
5 commits
-
git-svn-id: https://svn.forgerock.org/opendj/trunk@9579 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
LDAPURL.java: Weakened urlDecode() visibility from private to package to allow easy unit testing. git-svn-id: https://svn.forgerock.org/opendj/trunk@9578 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
Review CR-2344 NPE occurs in AdministrationConnector#createSelfSignedCertificateIfNeeded method. To avoid this, now attempt to create certificate only if initial setup has not been changed. * AdministrationConnector.java : - completed method createSelfSignedCertificateIfNeeded to add more checks to detect when initial setup has changed - added method hasDefaultConfigChanged to isolate the check * No unit test added, functional test to be added git-svn-id: https://svn.forgerock.org/opendj/trunk@9577 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
Let's make the build happier. git-svn-id: https://svn.forgerock.org/opendj/trunk@9576 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
Augmented HostPort class to support the use cases mentioned in OPENDJ-1134. Moved host splitting and port range validation to HostPort class. HostPort.java: Added valueOf() to parses a "host:port" URL + Added extractPort(), normalizePort(), normalizedHost(), removeExtraChars(). Moved isLocalAddress() code here from StaticUtils. Added normalizedHost field, toNormalizedString() and toString(String) + modified hashCode() and equals() to ensure stability of the results returned by hashCode() and equals(). Added allAddresses() to hide HostPort(int). Moved isEquivalentTo() code here from ReplicationBroker.isSameReplicationServerUrl(). HostPortTest.java: Added. StaticUtils.java: Moved isLocalAddress() and related code to the HostPort class. ReplicationBroker.java: Moved some isSameReplicationServerUrl() to HostPort as isEquivalentTo(). *.java: Used the new HostPort ctor everywhere. It simplified the code in many places and also helped remove duplicated code. ComputeBestServerTest.java: Added ports to serverURLs to ensure tests still pass. *Test.java: Removed the test anti-pattern try/catch/fail. git-svn-id: https://svn.forgerock.org/opendj/trunk@9575 41b1ffd8-f28e-4786-ab96-9950f0a78031