org.forgerock / org.forgerock.opendj

24 Sep, 2013

5 commits

1ada2672 LDAPURLTest.java: ... Browse Code »

Silencing annoying warnings in Continuous Integration.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9588 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-09-24 14:41:02 +0000

7f7612f4 HostPortTest.java: ... Browse Code »

Silencing annoying warnings in Continuous Integration.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9587 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-09-24 13:39:13 +0000

64328b5a Replication tests cleanup and consolidation. ... Browse Code »


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

2013-09-24 13:01:23 +0000

9e4bb783 OPENDJ-1116 Introduce abstraction for the changelog DB ... Browse Code »

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

2013-09-24 09:19:20 +0000

c7f19721 OPENDJ-1134 (CR-2338) Introduce a class in replication for encapsulating host+port combinations ... Browse Code »

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

2013-09-24 09:07:45 +0000

23 Sep, 2013

6 commits

a796020b Fix OPENDJ-1153: Upgrade OpenDJ SDK to Grizzly 2.3.6 ... Browse Code »
```
git-svn-id: https://svn.forgerock.org/opendj/trunk@9579 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
matthew
2013-09-23 16:12:25 +0000

2c3ea1a5 LDAPURLTest.java: ADDED ... Browse Code »

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

2013-09-23 11:31:04 +0000

2195127e Fix OPENDJ-737 - OpenDJ Administration Connector KeyStore Pin File must be defined and non empty ... Browse Code »

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

2013-09-23 10:29:02 +0000

3fa9e1af OPENDJ-1134 (CR-2338) Introduce a class in replication for encapsulating host+port combinations ... Browse Code »
```
Let's make the build happier.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9576 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
JnRouvignac
2013-09-23 09:24:32 +0000

fb30a900 OPENDJ-1134 (CR-2338) Introduce a class in replication for encapsulating host+port combinations ... Browse Code »

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

2013-09-23 08:17:27 +0000

a2594ae2 ComputeBestServerTest.java: ... Browse Code »

Refactored code to make it more readable.
Extracted several methods to reduce code duplication.
Inlined local variables.
Extracted constants.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9574 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-09-23 07:26:56 +0000

21 Sep, 2013

2 commits

741bf151 Move core messages to private package. ... Browse Code »
```
git-svn-id: https://svn.forgerock.org/opendj/trunk@9573 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
matthew
2013-09-21 23:05:02 +0000
5a4fc439 Move core messages to private package. ... Browse Code »
```
git-svn-id: https://svn.forgerock.org/opendj/trunk@9572 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
matthew
2013-09-21 22:56:58 +0000

20 Sep, 2013

7 commits

ac240976 Fix various FindBugs warnings. ... Browse Code »
```
git-svn-id: https://svn.forgerock.org/opendj/trunk@9571 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
matthew
2013-09-20 23:14:42 +0000

b6de1f5b Fix OPENDJ-1121: Closing a connection after closing the connectionfactory causes NPE ... Browse Code »

* in LDAPConnectionFactory protect transport and timeout checker while there are connections open
* in HeartBeatConnectionFactory protected scheduler while there are connections open
* enable unit test.


git-svn-id: https://svn.forgerock.org/opendj/trunk@9569 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-09-20 22:27:44 +0000

3622fe6a Unit test for OPENDJ-1121: Closing a connection after closing the connectionfactory causes NPE ... Browse Code »
```
git-svn-id: https://svn.forgerock.org/opendj/trunk@9568 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
matthew
2013-09-20 20:46:25 +0000
284cc402 Minor API cleanup: load-balancer algorithm constructors usage of generics was too restrictive. ... Browse Code »
```
git-svn-id: https://svn.forgerock.org/opendj/trunk@9566 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
matthew
2013-09-20 20:42:19 +0000
42283a79 One liner: avoid exposing QOS policies in config ref guide. ... Browse Code »
```
git-svn-id: https://svn.forgerock.org/opendj/trunk@9565 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
matthew
2013-09-20 20:25:01 +0000
fe5cfe25 Fix OPENDJ-1152: Provide the ability to debug leaked pooled connections ... Browse Code »
```
* fix build break on JDK6.


git-svn-id: https://svn.forgerock.org/opendj/trunk@9563 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
matthew
2013-09-20 20:15:17 +0000

d05cd646 Fix OPENDJ-1152: Provide the ability to debug leaked pooled connections ... Browse Code »

Added some low level debugging and instrumentation to the SDK in order to allow app developers to detect resource leaks such as leaking pooled connections. To enable it start the JVM with the following options: 

-Dorg.forgerock.opendj.debug=true        --- enable debug instrumentation, such as tracking leaked pooled connections 
-Dorg.forgerock.opendj.debug.stderr=true --- direct debug messages to stderr instead of to j.u.l Logger.


git-svn-id: https://svn.forgerock.org/opendj/trunk@9561 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-09-20 15:50:35 +0000

19 Sep, 2013

8 commits

f7fd2332 Add known issue tag for issue OPENDJ-1135 ... Browse Code »
```
git-svn-id: https://svn.forgerock.org/opendj/trunk@9559 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
csovant
2013-09-19 14:42:00 +0000

b1eb1e54 Tried fixing random failures for ECLReplicationServerFullTest() in Jenkins. ... Browse Code »

ExternalChangeLogTest.java:
Reverted the @Test annotation added in r9543.
Used different backendId and baseDN from other tests to avoid clashing tests in concurrent test runs.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9557 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-09-19 13:44:26 +0000

b2f1e558 Left over from r9478 ... Browse Code »

JEChangelogDB.java:
In getCursorFrom(), renamed local variable "it" to "cursor".

git-svn-id: https://svn.forgerock.org/opendj/trunk@9556 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-09-19 13:06:33 +0000

63386a49 * Fixed failing test : ConnectionFactoryProviderTest unable to read truststore f… ... Browse Code »

…ile when execution path contains whitespace (which is the case when running on Jenkins)
* Avoid reading twice the value of trustStorePathArg and keyStorePathArg in getConnectionFactory method

git-svn-id: https://svn.forgerock.org/opendj/trunk@9555 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-09-19 13:06:22 +0000

bd3b5c00 OPENDJ-1149 (CR-2334) Passwords should not be held in memory for the lifetime of a client connection ... Browse Code »


Note this change does not cater for:
- the bind operations where the password is used to authenticate. The password is held in memory for as long as it takes to complete the bind operation (and the OS flushing the network packets, etc.)
- REST operations where the web container (and the OS network stack) holds a HTTPServletRequest object for as long as it takes to process the request.


AuthenticationInfo.java:
Removed simplePassword and saslCredentials fields + getters (never used) to ensure they are not held for the lifetime of an LDAP connection.
In few methods, reversed conditions to ensure accessed variables are all directly put under a null check.

CollectClientConnectionsFilter.java
Wiped out the password ASAP, even though this is a bit pointless since the password is held by the web container for the lifetime of a REST call, either in the headers or via HTTP basic authentication.

*.java:
Consequence of the changes to AuthenticationInfo ctors.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9554 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-09-19 13:04:58 +0000

048e14f5 ECLServerHandler.java: ... Browse Code »

In findCookie(), reverted an if statement to use an early exit in case of error. It improves readability by making this code consistent with the other code in this method.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9553 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-09-19 10:57:42 +0000

47378ea8 Fix OPENDJ-734 - NPE when attempting SSL connect with client certs ... Browse Code »

Review CR-1243

NPE happens when no trust password is given.

* ConnectionFactoryProvider.java : 
  - test for null value before converting to charArray
  - fixed a unrelated copy-paste error (using trustStorePathArg instead of keyStorePathArg)

* Added a test class ConnectionFactoryProviderTest.java to check behavior in case no trust password is given
* Added a dummy-trustore in test resources, as this is needed for correct behavior of tested method getConnectionFactory


git-svn-id: https://svn.forgerock.org/opendj/trunk@9552 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-09-19 10:32:50 +0000

1679f6af OPENDJ-1116 Introduce abstraction for the changelog DB ... Browse Code »

In replication converted the use of String for baseDN to use actual DNs.

LDAPReplicationDomain.java:
Used getBaseDNString() instead of getBaseDN() in String context. It will use toNormalizedString() instead of using toString() which is safer.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9551 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-09-19 10:32:34 +0000

18 Sep, 2013

6 commits

0e9e1dd6 Fix OPENDJ-1058 – HeartbeatConnectionFactory does not actively shutdown dead connections ... Browse Code »
```
* update Rest2LDAP documentation due to new configuration options.


git-svn-id: https://svn.forgerock.org/opendj/trunk@9549 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
matthew
2013-09-18 16:20:14 +0000
f3e59db3 Fix OPENDJ-1058 – HeartbeatConnectionFactory does not actively shutdown dead connections ... Browse Code »
```
See code review CR-2269 for more details.


git-svn-id: https://svn.forgerock.org/opendj/trunk@9548 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
matthew
2013-09-18 16:05:59 +0000

c62be59c OPENDJ-1116 Introduce abstraction for the changelog DB ... Browse Code »

Removed ReplicationServer.disableEligibility() stateful method and instead passed this list down as parameter in the methods that require it which is 1- cleaner and 2- safer with regards to concurrent programming (Particularly in ECLServerHandler).
In ECLServerHandler.initialize(), called refreshEligibleCSN() to remove duplicate code.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9547 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-09-18 15:30:01 +0000

b9fc7381 OPENDJ-1116 Introduce abstraction for the changelog DB ... Browse Code »


In replication converted the use of String for baseDN to use actual DNs.

By looking at the code, I am a bit afraid that some paths in the code were doing DN.equals(String) or vice-versa. Problem is that the current changes might change the behaviour of these paths. One example I spotted is in LDAPReplicationDomain.isSolveConflict().


LDAPReplicationDomain.java:
Removed fields serverId and baseDn already held in parent class + Used getServerId(), getBaseDN() and getBaseDNString() + moved getBaseDN() to ReplicationDomain.

ReplicationDomain.java:
Moved getBaseDN() here from LDAPReplicationDomain.


ReplicationServer.java:
In getECLChangeNumberLimits(), removed unnecessary code parsing a String. Now, the code will not throw a DirectoryException when the cookie cannot be parsed. I do not think this is a problem since the result of the parsing was never used anyway.

ReplicationBroker.java:
In performPhaseOneHandshake(), used StaticUtils.close().
In performECLPhaseTwoHandshake(), changed return type to void.

*.java:
Converted baseDNs from String type to DN type.
Renamed a few getBaseDn() to getBaseDN().

*Test.java:
Removed useless try / catch / fail test anti patterns.
Changed some fake DNs to have DN-valid syntaxes.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9546 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-09-18 15:17:14 +0000

af8acb29 DN.java: ... Browse Code »

Checkstyle mi amor

git-svn-id: https://svn.forgerock.org/opendj/trunk@9545 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-09-18 09:36:40 +0000

e228711d DN.java: ... Browse Code »

In toNormalizedString(), complemented the javadoc.
Comments => javadocs.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9544 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-09-18 08:15:31 +0000

17 Sep, 2013

6 commits

b98aa755 ExternalChangeLogTest.java: ... Browse Code »

Attempt at fixing random failures for ECLReplicationServerFullTest() in Jenkins.
It fails because a search finds an additional entry with "targetDN: uid=eclafterchangelogtrim1,o=test" which obviously comes from ECLAfterChangelogTrim() method.
It looks like this methods are run in parallel, but ReplicationTestCase (ExternalChangeLogTest superclass) specifies to run tests sequentially.
I am trying to duplicate this annotation in ExternalChangeLogTest in the hope Jenkins will obey it.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9543 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-09-17 13:30:09 +0000

ddfa2db7 OPENDJ-1116 Introduce abstraction for the changelog DB ... Browse Code »

Investigating ExternalChangeLogTest.ECLReplicationServerFullTest(), I found a bug introduced by r9538.
In DraftCNDBCursor(long) ctor, when returning null, the code did not release the readLock anymore. Previously, it threw an exception that was caught, then released the readLock and rethrown.
Problem is there was an underlying bug in the previous code too: when the DB was already closed, the readLock would not be released at all.

Now by introducing the cursorHeld local variable, the readLock is appropriately released in the finally clause when no cursor is held at all.
Also fixed the code in DraftCNDBCursor().

git-svn-id: https://svn.forgerock.org/opendj/trunk@9542 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-09-17 13:02:22 +0000

ced8d59f Fix typos in error cases ... Browse Code »
```
git-svn-id: https://svn.forgerock.org/opendj/trunk@9541 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
cjr
2013-09-17 12:59:23 +0000

1a548b72 ReplicationServer.java: ... Browse Code »

Added a debug statement to help diagnose a ClassCastException in ReplicationServerTest.windowProbeTest().

git-svn-id: https://svn.forgerock.org/opendj/trunk@9540 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-09-17 09:41:37 +0000

98ea90c5 Checkstyle you are the love of my life! ... Browse Code »
```
git-svn-id: https://svn.forgerock.org/opendj/trunk@9539 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
JnRouvignac
2013-09-17 09:14:34 +0000

cb8a57ec OPENDJ-1116 Introduce abstraction for the changelog DB ... Browse Code »

Fixed nightly test org.opends.server.replication.server.ExternalChangeLogTest#ECLReplicationServerFullTest14 broken by r9505.

r9505 allowed code to throw ChangelogException and removed several useless catch(), in particular, a catch was removed from DraftCNDbHandler's methods getPreviousCookie(), getCSN(), getBaseDN() which were predecessors of getRecord().
Older code was throwing an exception, then catching it and returning null in some places while in other places, the exception was allowed to propagate.
The final change removed the unnecessary exception throwing and swallowing where it was useless. The exception is now thrown again where it is useful.


DraftCNDB.java:
In DraftCNDBCursor(long) ctor, removed throwing the exception and return an empty cursor instead.

DraftCNDbIterator.java:
In DraftCNDbIterator() ctor, throw an exception when the cursor is empty.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9538 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-09-17 08:46:28 +0000