Replaced OpenDJ Server classes by equivalent SDK classes.

Jean-Noel Rouvignac

03.14.2014 4ee3bd2c336f6859ac5919aa749777ae1ce07783

Replaced OpenDJ Server classes by equivalent SDK classes.

DurationUnit.java, SizeUnit.java, DurationUnitTest.java, SizeUnitTest.java, StringPrepProfile.java: REMOVED

 opendj3-server-dev/src/server/org/opends/server/admin/DurationPropertyDefinition.java

@@ -24,16 +24,13 @@
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */

package org.opends.server.admin;



import static org.forgerock.util.Reject.*;

import java.util.EnumSet;

import org.forgerock.opendj.config.DurationUnit;

import static org.forgerock.util.Reject.*;

/**
 * Duration property definition.

 opendj3-server-dev/src/server/org/opends/server/admin/DurationUnit.java

File was deleted

 opendj3-server-dev/src/server/org/opends/server/admin/PropertyDefinitionUsageBuilder.java

@@ -26,15 +26,17 @@
 */
package org.opends.server.admin;

import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.util.Utils;

import java.text.NumberFormat;
import java.util.EnumSet;
import java.util.Set;
import java.util.TreeSet;

import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.opendj.config.DurationUnit;
import org.forgerock.opendj.config.SizeUnit;
import org.forgerock.util.Utils;

/**
 * A property definition visitor which can be used to generate syntax
 * usage information.

 opendj3-server-dev/src/server/org/opends/server/admin/SizePropertyDefinition.java

@@ -24,16 +24,13 @@
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */

package org.opends.server.admin;



import static org.forgerock.util.Reject.ifNull;

import java.util.EnumSet;

import org.forgerock.opendj.config.SizeUnit;

import static org.forgerock.util.Reject.*;

/**
 * Memory size property definition.

 opendj3-server-dev/src/server/org/opends/server/admin/SizeUnit.java

File was deleted

 opendj3-server-dev/src/server/org/opends/server/schema/CaseExactEqualityMatchingRule.java

@@ -36,7 +36,7 @@
import org.opends.server.util.ServerConstants;

import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.schema.StringPrepProfile.*;
import static com.forgerock.opendj.util.StringPrepProfile.*;

/**
 * This class defines the caseExactMatch matching rule defined in X.520 and

 opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRule.java

@@ -42,7 +42,7 @@

import static org.opends.messages.SchemaMessages.*;
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.schema.StringPrepProfile.*;
import static com.forgerock.opendj.util.StringPrepProfile.*;




 opendj3-server-dev/src/server/org/opends/server/schema/CaseExactOrderingMatchingRule.java

@@ -38,7 +38,7 @@
import org.opends.server.util.StaticUtils;

import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.schema.StringPrepProfile.*;
import static com.forgerock.opendj.util.StringPrepProfile.*;




 opendj3-server-dev/src/server/org/opends/server/schema/CaseExactSubstringMatchingRule.java

@@ -38,7 +38,7 @@
import org.opends.server.util.ServerConstants;

import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.schema.StringPrepProfile.*;
import static com.forgerock.opendj.util.StringPrepProfile.*;




 opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreEqualityMatchingRule.java

@@ -38,7 +38,7 @@
import org.opends.server.util.ServerConstants;

import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.schema.StringPrepProfile.*;
import static com.forgerock.opendj.util.StringPrepProfile.*;




 opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRule.java

@@ -40,7 +40,7 @@

import static org.opends.messages.SchemaMessages.*;
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.schema.StringPrepProfile.*;
import static com.forgerock.opendj.util.StringPrepProfile.*;

/**
 * This class implements the caseIgnoreIA5Match matching rule defined in RFC

 opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRule.java

@@ -42,7 +42,7 @@

import static org.opends.messages.SchemaMessages.*;
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.schema.StringPrepProfile.*;
import static com.forgerock.opendj.util.StringPrepProfile.*;




 opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreListEqualityMatchingRule.java

@@ -38,7 +38,7 @@
import org.opends.server.util.ServerConstants;

import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.schema.StringPrepProfile.*;
import static com.forgerock.opendj.util.StringPrepProfile.*;




 opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreListSubstringMatchingRule.java

@@ -38,7 +38,7 @@
import org.opends.server.util.ServerConstants;

import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.schema.StringPrepProfile.*;
import static com.forgerock.opendj.util.StringPrepProfile.*;




 opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreOrderingMatchingRule.java

@@ -38,7 +38,7 @@
import org.opends.server.util.StaticUtils;

import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.schema.StringPrepProfile.*;
import static com.forgerock.opendj.util.StringPrepProfile.*;




 opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreSubstringMatchingRule.java

@@ -38,7 +38,7 @@
import org.opends.server.util.ServerConstants;

import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.schema.StringPrepProfile.*;
import static com.forgerock.opendj.util.StringPrepProfile.*;




 opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRule.java

@@ -38,7 +38,7 @@
import org.opends.server.util.ServerConstants;

import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.schema.StringPrepProfile.*;
import static com.forgerock.opendj.util.StringPrepProfile.*;




 opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java

@@ -54,7 +54,7 @@

import static org.opends.messages.SchemaMessages.*;
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.schema.StringPrepProfile.*;
import static com.forgerock.opendj.util.StringPrepProfile.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;


 opendj3-server-dev/src/server/org/opends/server/schema/NumericStringEqualityMatchingRule.java

@@ -39,7 +39,7 @@

import static org.opends.messages.SchemaMessages.*;
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.schema.StringPrepProfile.*;
import static com.forgerock.opendj.util.StringPrepProfile.*;
import static org.opends.server.util.StaticUtils.*;

/**

 opendj3-server-dev/src/server/org/opends/server/schema/NumericStringOrderingMatchingRule.java

@@ -39,7 +39,7 @@

import static org.opends.messages.SchemaMessages.*;
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.schema.StringPrepProfile.*;
import static com.forgerock.opendj.util.StringPrepProfile.*;
import static org.opends.server.util.StaticUtils.*;

/**

 opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSubstringMatchingRule.java

@@ -41,7 +41,7 @@

import static org.opends.messages.SchemaMessages.*;
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.schema.StringPrepProfile.*;
import static com.forgerock.opendj.util.StringPrepProfile.*;
import static org.opends.server.util.StaticUtils.*;



 opendj3-server-dev/src/server/org/opends/server/schema/StringPrepProfile.java

File was deleted

 opendj3-server-dev/src/server/org/opends/server/schema/WordEqualityMatchingRule.java

@@ -26,8 +26,6 @@
 */
package org.opends.server.schema;



import java.util.Collection;
import java.util.Collections;

@@ -38,9 +36,7 @@
import org.opends.server.util.ServerConstants;

import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.schema.StringPrepProfile.*;


import static com.forgerock.opendj.util.StringPrepProfile.*;

/**
 * This class implements the wordMatch matching rule defined in X.520.  That

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

@@ -24,18 +24,18 @@
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */

package org.opends.server.admin;

import static org.testng.Assert.*;

import org.opends.server.TestCaseUtils;
import org.forgerock.opendj.config.DurationUnit;
import org.opends.server.DirectoryServerTestCase;
import org.opends.server.TestCaseUtils;
import org.opends.server.admin.std.meta.RootCfgDefn;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;

import static org.testng.Assert.*;

/**
 * DurationPropertyDefinition Tester.
 */
@@ -69,7 +69,7 @@
  @Test
  public void testLowerLimit1() {
    DurationPropertyDefinition.Builder builder = createTestBuilder();
    builder.setLowerLimit((long) 1);
    builder.setLowerLimit(1);
    DurationPropertyDefinition spd = buildTestDefinition(builder);
    assertEquals(spd.getLowerLimit(), 1);
  }
@@ -156,7 +156,7 @@
  @Test
  public void testUpperLimit1() {
    DurationPropertyDefinition.Builder builder = createTestBuilder();
    builder.setLowerLimit((long) 1);
    builder.setLowerLimit(1);
    DurationPropertyDefinition spd = buildTestDefinition(builder);
    assertEquals(spd.getLowerLimit(), 1);
  }
@@ -334,11 +334,13 @@

    PropertyDefinitionVisitor<Boolean, Void> v = new PropertyDefinitionVisitor<Boolean, Void>() {

      @Override
      public Boolean visitDuration(DurationPropertyDefinition d,
          Void o) {
        return true;
      }

      @Override
      public Boolean visitUnknown(PropertyDefinition d, Void o)
          throws PropertyException {
        return false;
@@ -390,6 +392,7 @@
    DurationPropertyDefinition.Builder builder = createTestBuilder();
    builder.setAllowUnlimited(true);
    builder.setDefaultBehaviorProvider(new DefaultBehaviorProvider<Long>() {
      @Override
      public <R, P> R accept(DefaultBehaviorProviderVisitor<Long, R, P> v, P p) {
        return null;
      }

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

File was deleted

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

File was deleted