org.forgerock / org.forgerock.opendj

03 Dec, 2013

1 commit

4271a061 OPENDJ-1217 Servers not synchronized after a conflicting replace on multi-valued… ... Browse Code »

… attribute on 2 different servers


Fixed regression introduced in r9788 by introducing a similar behaviour as what the code was doing before.

Replica 1 was trying to read a change done on itself and send it to replica 2, but failed to do so.
Hence replica 2 did not receive this UpdateMsg and as a consequence could not resolve it.

Previous code was trying to cursor to a specific CSN in the DB. It could not find it, hence tried to move after it in the DB, but could not do it because the end of the DB was reached. Previous was throwing an exception there, later catching it and then returning an empty cursor.
Newer code removed the useless catch block which let the exception fail this process.
The fix removed throwing the exception and instead returned an empty cursor.



ReplicationDB.java:
In ctor, do not throw an exception, but return an empty cursor instead (Previous code was throwing an exception, catching and ignoring it, then returning an empty cursor).

MessageHandler.java:
Prevented a NullPointerException from being thrown, then caught and ignored.


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

2013-12-03 10:58:27 +0000

02 Dec, 2013

21 commits

76b672e4 OpenDJ 3 : config framework ... Browse Code »

Reducing compilation errors in org.opends.server.admin packages
 
* Simple changes in org.opends.server.admin.server package
 and org.opends.server.api package
** use i18n classes
** use Validator class from SDK 
** remove API annotation

* Add stub classes DirectoryEnvironmentConfig and Embeddedutils

* Migrate generation of DynamicConstant class from ant to maven
** add new directory src/main/java-templates to hold source template
** add maven plugins to generate revision number, timestamp and 
  parse version number

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

2013-12-02 17:23:23 +0000

f1e0be4d One liner fix to OPENDJ-1226 : Upgrade should only consider .ldif files under config/schema. ... Browse Code »

Make sure we filter config/schema files like when reading it, considering only .ldif files.

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

2013-12-02 17:12:20 +0000

64d4c04e Fix for OPENDJ-1228, Concatenated schema may contain more than valid schema, pos… ... Browse Code »

…sibly leading to further issues.
Make sure we only consider *.ldif files when handling schemas under config/schema

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

2013-12-02 16:37:03 +0000

186d2ac4 Renamed ds-cfg-compute-changenumber to ds-cfg-compute-change-number. ... Browse Code »
```
git-svn-id: https://svn.forgerock.org/opendj/trunk@9882 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
JnRouvignac
2013-12-02 14:18:01 +0000

d91db94c OPENDJ-1174 (CR-2631) Transfer responsibility for populating the ChangeNumberIndexDB to ChangelogDB ... Browse Code »


Hooked the ChangeNumberIndexer thread into our code base.
Managed thread lifecycle.
Added configuration to turn it on / off.
Removed code that builds the ChangeNumberIndexDB from ECLServerHandler.


ChangeNumberIndexer.java:
Added clear() + doClear field for unit tests
Used thread safe versions of MultiDomainServerState.
In run(), merged all the try blocks to factorize the catch blocks + supported doClear + fixed a bug with the mediumConsistencyRUV.
In removeCursor(), closed the cursors.
Added removeAllCursors(), getPrecedingCSN().
Renamed crossDomainDBCursor to nextChangeForInsertDBCursor and newCompositeDBCursor() to resetNextChangeForInsertDBCursor().
Changed newCursors from ConcurrentMap<CSN, DN> to ConcurrentMap<Pair<DN, Integer>, CSN> to ensure minimum memory consumption.

JEChangelogDB.java:
Removed dbDirectoryName field.
Added config, cnIndexer fields.
Changed ctor to accept ReplicationServerCfg.
In initializeDB(), shutdownDB(), clearDB(), publishUpdateMsg() took appropriate actions with the cnIndexer thread.
Added setComputeChangeNumber().
In getCursorFrom(), accept null parameter.
In setPurgeDelay(), also call it on the cnIndexDB.


MultiDomainServerState.java:
Made implementation to be fully thread safe.
Changed list from Map to ConcurrentMap + removed synchrnoized blocks.
Renamed update(DN, ServerState) to replace(DN, ServerState).
Added new version of update(DN, ServerState).

ECLServerHandler.java:
Removed assignNewChangeNumberAndStore() that builds the ChangeNumberIndexDB + adapted the code that was using this method.
Used MultiDomainServerState.replace().


ReplicationServerConfiguration.xml, ReplicationServerCfgDefn.properties:
Added ds-cfg-compute-changenumber.

ExternalChangelogDomainConfiguration.xml, ExternalChangelogDomainCfgDefn.properties:
Updated description

ReplicationServer.java:
In applyConfigurationChange(), handled computeChangenumber config.
Used MultiDomainServerState.replace().

ChangelogDB.java:
Added setComputeChangeNumber().

ReplServerFakeConfiguration.java:
Added isComputeChangenumber() and setComputeChangenumber().


ExternalChangeLogTest.java:
Adapted the code to the use of the ChangeNumberIndexer thread.

JEChangeNumberIndexDB.java:
Extracted runPurge() from run().


ReplicationDbEnv.java
Code cleanup.


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

2013-12-02 14:01:32 +0000

34aee712 CSN.java, CSNGenerator.java: ... Browse Code »
```
Updated javadoc.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9880 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
JnRouvignac
2013-12-02 13:48:07 +0000
3431120a Front-port fix for OPENDJ-1079 for OpenDJ 3: OpenDJ UpgradeCli adds HTTP connect… ... Browse Code »
```
…ion handler, which breaks Tomcat6 when OpenDJ is an embeddedDS


git-svn-id: https://svn.forgerock.org/opendj/trunk@9879 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
matthew
2013-12-02 13:11:24 +0000

999aa775 Fix OPENDJ-1079: OpenDJ UpgradeCli adds HTTP connection handler, which breaks To… ... Browse Code »

…mcat6 when OpenDJ is an embeddedDS

* refine the class loading exception handling.



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

2013-12-02 13:04:03 +0000

6dc55f73 Fixed unit test. ... Browse Code »
```
git-svn-id: https://svn.forgerock.org/opendj/trunk@9877 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
violette
2013-12-02 12:46:27 +0000

34091311 Fix OPENDJ-1079: OpenDJ UpgradeCli adds HTTP connection handler, which breaks To… ... Browse Code »

…mcat6 when OpenDJ is an embeddedDS

* avoid initializing classes during class property value validation as this causes dependencies to be loaded which may be missing in the case where the component is disabled. The class will be fully loaded later if the component is enabled (verified with HTTP connection handler)
* prevent class loading errors from causing the server initialization to hang
* attempt to catch and propagate class loading errors up the stack. They are still not displayed in any logs (OPENDJ-1227).



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

2013-12-02 12:30:51 +0000

0d7a5f10 OpenDJ 3 : config framework ... Browse Code »

Reducing compilation errors in org.opends.server.admin packages : 
 all classes in package org.opends.server.admin.condition compile
 
* Simple changes in org.opends.server.admin.condition package
** use Validator class from SDK 
** remove API annotation

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

2013-12-02 11:21:17 +0000

fe0293ea OpenDJ 3 : config framework ... Browse Code »

Reducing compilation errors in org.opends.server.admin packages : 
 all classes in package org.opends.server.admin.client.spi compile
 
* Simple changes in org.opends.server.admin.client.spi package
** replace Message class by LocalizableMessage
** remove API annotation

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

2013-12-02 11:15:22 +0000

ff814a7a OpenDJ 3 : config framework ... Browse Code »

Reducing compilation errors in org.opends.server.admin packages : 
 all classes but one in package org.opends.server.admin.client.ldap compile
 
* Simple changes in org.opends.server.admin.client.ldap package
** replace Message class by LocalizableMessage
** use Validator class from SDK
** other minor changes

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

2013-12-02 11:13:30 +0000

2074d370 OpenDJ 3 : config framework ... Browse Code »

Reducing compilation errors in org.opends.server.admin packages : 
 all classes in package org.opends.server.admin.client compile
 
* Simple changes in org.opends.server.admin.client package
** replace Message class by LocalizableMessage
** use Validator class from SDK
** other minor changes

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

2013-12-02 11:07:17 +0000

8f4a1e26 Fix bad comment wrapping. ... Browse Code »
```
git-svn-id: https://svn.forgerock.org/opendj/trunk@9871 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
matthew
2013-12-02 10:48:06 +0000

8534e176 OpenDJ 3 : config framework ... Browse Code »

Reducing compilation errors in org.opends.server.admin packages
 
* Simple changes in org.opends.server.admin package
** replace Message class by LocalizableMessage
** use Validator class from SDK

* Add stub methods in DirectoryServer and Aci classes to satisfy dependencies

* Remove log level prefix from properties names in admin.properties file

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

2013-12-02 10:47:18 +0000

0b2027bf Upgrade to JE 5.0.97. ... Browse Code »
```
git-svn-id: https://svn.forgerock.org/opendj/trunk@9869 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
matthew
2013-12-02 10:27:05 +0000

c9de255e build.xml: ... Browse Code »

In "prepare-release" target, implemented the check on the URL used for buildings documentation.


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

2013-12-02 09:58:41 +0000

6a2e79db CR-2635 Second fix for OpenDJ-1196. As an issue was find by Christophe when temp… ... Browse Code »

…late 02-config was deleted, added a check on template existence before copying it.
- Added i18n/path in messages.
- Added message ouput for post upgrade task.
- Moved temp file creation as it leaves .temp files in schema folder when upgrade fails.

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

2013-12-02 09:34:32 +0000

fae36711 build.xml: ... Browse Code »

With ivy "resolve" target, separated jar depencencies into "source", "javadoc", "test" and "compile" directories under "lib" directory.


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

2013-12-02 09:33:17 +0000

58cdd045 Added "prepare-release" build target, made b2.6 depend on the latest from b2.6-sdk ... Browse Code »



build.xml:
Added targets "prepare-release", "check-no-snapshot-dependencies" and "resolve-snapshots-separately".

ivy.xml:
Now depends on the latest from b2.6-sdk.




Sample output on failure:
------------------------------------------------------------------------
branches/b2.6 $ ant prepare-release
Buildfile: /opendj2/branches/b2.6/build.xml
Trying to override old definition of task javac

clean-lib:

check-ivy-installed:

download-ivy:

install-ivy:

resolve-snapshots-separately:
[ivy:retrieve] ...
[ivy:retrieve]  23 artifacts copied, 0 already retrieved (9038kB/30ms)

check-no-snapshot-dependencies:

BUILD FAILED
/opendj2/branches/b2.6/build.xml:2775: The project must not depend on snapshot dependencies. Found: opendj-ldap-sdk-2.6.5-SNAPSHOT.jar;opendj-rest2ldap-2.6.5-SNAPSHOT.jar;opendj-rest2ldap-servlet-2.6.5-SNAPSHOT.jar;opendj-server2x-adapter-2.6.5-SNAPSHOT.jar
------------------------------------------------------------------------




Sample output on success:
------------------------------------------------------------------------
[ivy:retrieve]  23 artifacts copied, 0 already retrieved (9038kB/28ms)

check-no-snapshot-dependencies:
     [echo] OK.

prepare-release:
     [echo] 
     [echo] Previous checks succeeded.
     [echo] 
     [echo] Please:
     [echo] 1- Check the archive has no build number
     [echo] 2- Check the archive contains the license
     [echo] 3- Run the tests
     [echo] 4- Check that documentation refers to forgerock.com instead of forgerock.org
     [echo]     
------------------------------------------------------------------------


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

2013-12-02 08:59:46 +0000

29 Nov, 2013

4 commits

a9386f95 Fixing the build. ... Browse Code »

LDAPReplicationDomain.java:
In parseFractionalConfig(), added back the null checks on the Iterator because some client code passes in null.

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

2013-11-29 14:52:55 +0000

5acb3d03 Fixing the build. ... Browse Code »

LDAPReplicationDomain.java:
Removed private modifier that was added too eagerly.

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

2013-11-29 10:12:08 +0000

d817f92d LDAPReplicationDomain.java: ... Browse Code »

Added missing spaces in exception messages.
Extracted methods getExpandedNames() and needsExpanding() from getIncludedAttributes().

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

2013-11-29 09:58:46 +0000

f69416cc Fix OPENDJ-877: ldifsearch.bat is not working ... Browse Code »
```
* applied suggested fix.


git-svn-id: https://svn.forgerock.org/opendj/trunk@9858 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
matthew
2013-11-29 08:29:45 +0000

28 Nov, 2013

7 commits

ac1c864e Code cleanup. ... Browse Code »

ExternalChangeLogTest.java:
In searchOnChangelog(), added the parameters expectedNbEntries and testName + added a loop that tries during 1s to get the expected number of entries + moved assert on nb of returned entries here + moved calls to debugAndWriteEntries() here.
Removed now unnecessary calls to Thread.sleep().
Added assertSuccessful(LDAPMessage).
Reduced scope for variables of type SearchResultDoneProtocolOp or SearchResultEntryProtocolOp + removed now useless statements making use of them.
In ECLCompatWriteReadAllOps(), removed useless calls to toLowercase().
Used Assertions.assertThat().

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

2013-11-28 15:36:10 +0000

929f76c8 Final fix for OPENDJ-1195: Realign the SDK developer guide with the SDK trunk on… ... Browse Code »

…ce the new Maven module and package layout has been validated

* include classpath in opendj-ldap-toolkit manifest so that it does not need to be manually specified when running / compiling samples
* update dev guide to reflect changes to module layout, svn location
* replaced hard-coded values in the dev guide with pom properties where possible to improve maintainability.


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

2013-11-28 15:20:37 +0000

59460a81 Initial work towards OPENDJ-1195: Realign the SDK developer guide with the SDK t… ... Browse Code »

…runk once the new Maven module and package layout has been validated

* Minor improvements to example and toolkit download sections.



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

2013-11-28 15:17:09 +0000

c8f50662 OpenDJ 3 : config framework ... Browse Code »

At this point, all classes generated from xml definitons 
compile.

* Fix import in serverMO.xsl

* Add some server classes to satisfy missing dependencies 
  for generated classes
 * ConfigException and other exceptions it depends on
 * AddressMask class
 * ConfigChangeResult 

* Add stubs of some server classes to satisfy missing
  dependencies for generated classes
 * DirectoryServer
 * Aci  


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

2013-11-28 15:04:58 +0000

7ea230fd Initial work towards OPENDJ-1195: Realign the SDK developer guide with the SDK t… ... Browse Code »

…runk once the new Maven module and package layout has been validated

* fix dependencies.



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

2013-11-28 14:33:38 +0000

625b9927 Code cleanup ... Browse Code »

Added toString() for debuggging.
Added or completed javadocs.
Fixed a little bug in test code.

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

2013-11-28 14:26:13 +0000

f2ca29b5 Test case added for OPENDJ-1200 ... Browse Code »
```
git-svn-id: https://svn.forgerock.org/opendj/trunk@9851 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
violette
2013-11-28 13:44:11 +0000

27 Nov, 2013

7 commits

ef9ef417 Initial work towards OPENDJ-1195: Realign the SDK developer guide with the SDK t… ... Browse Code »

…runk once the new Maven module and package layout has been validated

* move all classes to public org.* package so that they get Javadoc, except for GrizzlyTransportProvider.



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

2013-11-27 21:13:01 +0000

092688ff Initial work towards OPENDJ-1195: Realign the SDK developer guide with the SDK t… ... Browse Code »

…runk once the new Maven module and package layout has been validated

* fix grizzly module site generation
* add links for sub-module Javadoc
* add link for server 2x adapter
* clean up examples site.



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

2013-11-27 18:45:57 +0000

8cb332c0 OpenDJ 3 : config framework ... Browse Code »

* add admin classes from opendj server, with original package names 



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

2013-11-27 17:42:48 +0000

dd1e7493 OpenDJ 3 : config framework ... Browse Code »

* add core admin definitions (xml files)
* add XSL files to transform definitions in java classes
* add properties files for messages : admin and protocol



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

2013-11-27 17:31:22 +0000

3b42881b Initial work towards OPENDJ-1195: Realign the SDK developer guide with the SDK t… ... Browse Code »

…runk once the new Maven module and package layout has been validated

* sigh - looks like properties are not allowed in repository URLs.


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

2013-11-27 17:28:52 +0000

a69a2a1a Initial work towards OPENDJ-1195: Realign the SDK developer guide with the SDK t… ... Browse Code »

…runk once the new Maven module and package layout has been validated

* convert opendj-ldap-sdk module into a Maven group (pom + only dependencies)
* kept old opendj-ldap-sdk site as primary "About" page in order to avoid breaking bookmarks and links. The opendj-core module's site is hidden
* remove all sub-module site.xml files and instead inherit menus from parent
* switch SDK Javadoc URLs to point at opendj-core Javadoc since opendj-ldap-sdk Javadoc is stale
* add simple place holder index.xml.vm site pages for most sub-modules
* change how we document getting the binaries: instead reference the dependencies report. Although slight less helpful to the reader, at least the links won't become stale.


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

2013-11-27 17:19:28 +0000

492e4348 OpenDJ 3 : config framework ... Browse Code »

* create opendj-admin module : common module for both admin clients and the server
* basic structure and pom.xml file



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

2013-11-27 16:53:40 +0000