Checkpoint for OPENDJ-1343 Migrate dsconfig

Violette Roche-Montane

29.45.2014 edb7e3bef7ac720d08dea8576a2e8047016d8b2d

Checkpoint for OPENDJ-1343 Migrate dsconfig

** RootDSEBackend.java
- Added fullVendorVersion to staticDSEAttributes.

** TestCaseUtils.java / DsconfigLdapConnectionTestCase.java / DsconfigOptionsTestCase.java
- Replaced DSConfig import.

** bin/dsconfig scripts
- Replaced DSConfig class call.

** 00-core.ldif
- Added new attribute type fullVendorVersion.

 opendj3-server-dev/resource/bin/dsconfig

@@ -23,11 +23,11 @@
#
#
#      Copyright 2006-2008 Sun Microsystems, Inc.
#      Portions Copyright 2011 ForgeRock AS
#      Portions Copyright 2011-2014 ForgeRock AS


# This script may be used to perform configuration operations on the server.
OPENDJ_INVOKE_CLASS="org.opends.server.tools.dsconfig.DSConfig"
OPENDJ_INVOKE_CLASS="org.forgerock.opendj.config.dsconfig.DSConfig"
export OPENDJ_INVOKE_CLASS

SCRIPT_NAME="dsconfig"

 opendj3-server-dev/resource/bin/dsconfig.bat

@@ -23,11 +23,11 @@
rem
rem
rem      Copyright 2006-2008 Sun Microsystems, Inc.
rem      Portions Copyright 2011 ForgeRock AS
rem      Portions Copyright 2011-2014 ForgeRock AS

setlocal

set OPENDJ_INVOKE_CLASS="org.opends.server.tools.dsconfig.DSConfig"
set OPENDJ_INVOKE_CLASS="org.forgerock.opendj.config.dsconfig.DSConfig"
set SCRIPT_NAME=dsconfig
for %%i in (%~sf0) do call "%%~dPsi\..\lib\_client-script.bat" %*


 opendj3-server-dev/resource/schema/00-core.ldif

@@ -532,6 +532,9 @@
  EQUALITY caseIgnoreIA5Match 
  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
  X-ORIGIN 'RFC 2985' )
attributeTypes: ( 1.3.6.1.4.1.36733.2.1.1.136 NAME 'fullVendorVersion'
  EQUALITY 1.3.6.1.4.1.1466.109.114.1 SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
  SINGLE-VALUE NO-USER-MODIFICATION USAGE dSAOperation X-ORIGIN 'OpenDJ Directory Server' )
objectClasses: ( 2.5.6.0 NAME 'top' ABSTRACT MUST objectClass
  X-ORIGIN 'RFC 4512' )
objectClasses: ( 2.5.6.1 NAME 'alias' SUP top STRUCTURAL MUST aliasedObjectName

 opendj3-server-dev/src/server/org/opends/server/backends/RootDSEBackend.java

@@ -62,6 +62,7 @@
import org.opends.server.core.SearchOperation;
import org.opends.server.core.WorkflowTopologyNode;
import org.opends.server.types.*;
import org.opends.server.util.BuildVersion;
import org.opends.server.util.LDIFWriter;

import static org.opends.messages.BackendMessages.*;
@@ -265,7 +266,9 @@
                                 ATTR_VENDOR_VERSION_LC,
                                 DirectoryServer.getVersionString()));


    staticDSEAttributes.add(createAttribute("fullVendorVersion",
                                 "fullvendorversion",
                                 BuildVersion.binaryVersion().toString()));

    // Construct the set of objectclasses to include in the root DSE entry.
    dseObjectClasses = new HashMap<ObjectClass,String>(2);

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java

@@ -36,6 +36,8 @@
import java.util.logging.Logger;

import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.config.ConfigurationFramework;
import org.forgerock.opendj.config.dsconfig.DSConfig;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.io.ASN1;
import org.forgerock.opendj.io.ASN1Reader;
@@ -63,7 +65,6 @@
import org.opends.server.protocols.ldap.LDAPMessage;
import org.opends.server.protocols.ldap.LDAPReader;
import org.opends.server.tools.LDAPModify;
import org.opends.server.tools.dsconfig.DSConfig;
import org.opends.server.types.*;
import org.opends.server.types.FilePermission;
import org.opends.server.util.BuildVersion;
@@ -464,6 +465,11 @@
      config.setConfigClass(ConfigFileHandler.class);
      config.setConfigFile(new File(testConfigDir, "config.ldif"));

      /** Initialize the configuration framework for DSConfig. */
      ConfigurationFramework.getInstance()
          .initialize(testInstallRoot.getAbsolutePath(),
              testInstanceRoot.getAbsolutePath());
      
      AccessLogger.getInstance().addLogPublisher(
          (AccessLogPublisher) TextAccessLogPublisher
              .getStartupTextAccessPublisher(ACCESS_TEXT_WRITER, false));

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/dsconfig/DsconfigLdapConnectionTestCase.java

@@ -29,6 +29,7 @@
import java.io.File;
import java.io.FileWriter;

import org.forgerock.opendj.config.dsconfig.DSConfig;
import org.opends.server.DirectoryServerTestCase;
import org.opends.server.TestCaseUtils;
import org.opends.server.core.DirectoryServer;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/dsconfig/DsconfigOptionsTestCase.java

@@ -24,6 +24,7 @@
 */
package org.opends.server.tools.dsconfig;

import org.forgerock.opendj.config.dsconfig.DSConfig;
import org.opends.server.DirectoryServerTestCase;
import org.opends.server.TestCaseUtils;
import org.testng.annotations.AfterClass;