Fix OPENDJ-324: Remove NDB backend implementation

Matthew Swift

19.26.2011 8cf662164d769f7b838b30c0ff13a3d59672b149

Fix OPENDJ-324: Remove NDB backend implementation

 opends/build.xml

@@ -165,23 +165,6 @@
  <property name="snmp.classes.dir"
            location="${classes.dir}/org/opends/server/snmp" />

  <!-- Condition properties for NDB Backend build. -->
  <condition property="ismysqldirpresent">
    <available file="${mysql.lib.dir}" type="dir" />
  </condition>
  <condition property="exclude.ndb.xml" value=""
             else="**/Ndb*">
             <available file="${mysql.lib.dir}" type="dir" />
  </condition>
  <condition property="exclude.ndb.src" value=""
             else="org/opends/server/backends/ndb/**,
                   org/opends/server/workflowelement/ndb/**">
             <available file="${mysql.lib.dir}" type="dir" />
  </condition>

  <!-- Property for excluding NDB Backend config. -->
  <property name="exclude.ndb.config" value="ndbconfig.ldif" />

  <!-- Create a package bundle containing the DSML library. -->
  <target name="dsml" depends="predsml,package"
       description="Build a Directory Server package bundle with DSML.">
@@ -309,23 +292,6 @@
            destJava="${msg.javagen.dir}/org/opends/messages/ServiceTagMessages.java">
    </genmsg>

    <antcall target="generatendbmessages" />

  </target>

  <!-- Generate NDB Backend messages if needed -->
  <target name="generatendbmessages" if="ismysqldirpresent">
    <typedef name="genmsg"
             classname="org.opends.build.tools.GenerateMessageFile" >
      <classpath>
        <fileset dir="${build.dir}/build-tools">
          <include name="*.jar" />
        </fileset>
      </classpath>
    </typedef>
    <genmsg sourceProps="${msg.prop.dir}/ndb.properties"
            destJava="${msg.javagen.dir}/org/opends/messages/NdbMessages.java">
    </genmsg>
  </target>

  <!-- Remove all dynamically-generated build files. -->
@@ -624,11 +590,8 @@
    <mkdir dir="${classes.dir}" />
    <mkdir dir="${build.lib.dir}" />

    <!-- Copy NDB Backend dependencies if necessary -->
    <antcall target="copyndbdeps" />

    <javac srcdir="${src.dir}:${admin.src.dir}:${msg.src.dir}:${msg.javagen.dir}:${ads.src.dir}:${quicksetup.src.dir}:${guitools.src.dir}"
         destdir="${classes.dir}" excludes="${exclude.ndb.src}" debug="on" debuglevel="${build.debuglevel}"
         destdir="${classes.dir}" debug="on" debuglevel="${build.debuglevel}"
         deprecation="true" fork="true"
         memoryInitialSize="${MEM}" memoryMaximumSize="${MEM}">
      <compilerarg value="-Xlint:all" />
@@ -794,13 +757,10 @@
    <!-- Regenerate configuration files if necessary -->
    <antcall target="compileadmin" />

    <!-- Copy NDB Backend dependencies if necessary -->
    <antcall target="copyndbdeps" />

    <!-- Recreate the classes directory and recompile into it. -->
    <mkdir dir="${classes.dir}" />
    <javac srcdir="${src.dir}:${msg.src.dir}:${msg.javagen.dir}:${admin.src.dir}:${ads.src.dir}:${quicksetup.src.dir}:${guitools.src.dir}"
         destdir="${classes.dir}" excludes="${exclude.ndb.src}"
         destdir="${classes.dir}"
         debug="on" debuglevel="${build.debuglevel}"
         deprecation="true" fork="true" memoryInitialSize="${MEM}"
         memoryMaximumSize="${MEM}">
@@ -1077,13 +1037,11 @@
    <fixcrlf srcDir="${scripts.dir}" destDir="${pdir}/lib" includes="_client-script.bat,_server-script.bat,_mixed-script.bat,_script-util.bat,setcp.bat" eol="crlf" />

    <copy todir="${pdir}/config">
      <fileset file="${config.dir}/*" excludes="${exclude.ndb.config}" />
      <fileset file="${config.dir}/*" />
    </copy>

    <antcall target="package-snmp" />

    <antcall target="packagendb" />

    <copy file="${pdir}/config/config.ldif"
         tofile="${pdir}/config/upgrade/config.ldif.${REVISION_NUMBER}" />

@@ -1399,7 +1357,7 @@
        <dirset dir="${quicksetup.classes.dir}" />
      </classpath>

      <packageset dir="${src.dir}" excludes="${exclude.ndb.src}" />
      <packageset dir="${src.dir}" />
      <packageset dir="${admin.src.dir}" />
      <packageset dir="${ads.src.dir}" />
      <packageset dir="${dsml.src.dir}" />
@@ -1565,11 +1523,8 @@
    <echo message="Performing partial rebuild (OpenDS zip package found)"/>
    <mkdir dir="${classes.dir}" />

    <!-- Copy NDB Backend dependencies if necessary -->
    <antcall target="copyndbdeps" />

    <javac srcdir="${src.dir}:${admin.src.dir}:${msg.src.dir}:${msg.javagen.dir}:${ads.src.dir}:${quicksetup.src.dir}:${guitools.src.dir}"
        destdir="${classes.dir}" excludes="${exclude.ndb.src}" debug="on" debuglevel="${build.debuglevel}"
        destdir="${classes.dir}" debug="on" debuglevel="${build.debuglevel}"
        deprecation="true" fork="true"
        memoryInitialSize="${MEM}" memoryMaximumSize="${MEM}">
      <compilerarg value="-Xlint:all" />
@@ -2271,7 +2226,6 @@
      <arg value="${ant.file}" />
      <arg value="-Dbuild.dir=${build.dir}" />
      <arg value="-quiet" />
      <arg value="-Dexclude.ndb.xml=${exclude.ndb.xml}" />
      <arg value="compileadminsubtask" />
      <env key="ANT_OPTS" value="-Xmx${MEM}" />
      <!-- Set classpath to workaround Apple JDK Xalan conflict -->
@@ -2291,7 +2245,7 @@

    <!-- Generate introspection API for core administration components. -->
    <xslt basedir="${admin.defn.dir}" destdir="${admin.src.dir}" includes="**/*Configuration.xml"
          excludes="${exclude.ndb.xml}" style="${admin.rules.dir}/metaMO.xsl">
          style="${admin.rules.dir}/metaMO.xsl">
      <regexpmapper handledirsep="true" from="^(.*)/([^/]+)Configuration\.xml$$" to="\1/meta/\2CfgDefn.java" />
      <param name="base-dir" expression="${admin.defn.dir}" />
      <classpath refid="xalan.class.path" />
@@ -2305,7 +2259,7 @@

    <!-- Generate client API for core administration components. -->
    <xslt basedir="${admin.defn.dir}" destdir="${admin.src.dir}" includes="**/*Configuration.xml"
          excludes="${exclude.ndb.xml}" style="${admin.rules.dir}/clientMO.xsl">
          style="${admin.rules.dir}/clientMO.xsl">
      <regexpmapper handledirsep="true" from="^(.*)/([^/]+)Configuration\.xml$$" to="\1/client/\2CfgClient.java" />
      <param name="base-dir" expression="${admin.defn.dir}" />
      <classpath refid="xalan.class.path" />
@@ -2319,7 +2273,7 @@

    <!-- Generate server API for core administration components. -->
    <xslt basedir="${admin.defn.dir}" destdir="${admin.src.dir}" includes="**/*Configuration.xml"
          excludes="${exclude.ndb.xml}" style="${admin.rules.dir}/serverMO.xsl">
          style="${admin.rules.dir}/serverMO.xsl">
      <regexpmapper handledirsep="true" from="^(.*)/([^/]+)Configuration\.xml$$" to="\1/server/\2Cfg.java" />
      <param name="base-dir" expression="${admin.defn.dir}" />
      <classpath refid="xalan.class.path" />
@@ -2334,7 +2288,7 @@
    <!-- Generate LDAP profile for core administration components. -->
    <mkdir dir="${classes.dir}" />
    <xslt basedir="${admin.defn.dir}" destdir="${classes.dir}/admin/profiles/ldap" includes="**/*Configuration.xml"
          excludes="${exclude.ndb.xml}" style="${admin.rules.dir}/ldapMOProfile.xsl">
          style="${admin.rules.dir}/ldapMOProfile.xsl">
      <regexpmapper handledirsep="true" from="^(.*)/([^/]+)Configuration\.xml$$" to="\1/meta/\2CfgDefn.properties" />
      <param name="base-dir" expression="${admin.defn.dir}" />
      <classpath refid="xalan.class.path" />
@@ -2342,7 +2296,7 @@

    <!-- Generate CLI profile for core administration components. -->
    <xslt basedir="${admin.defn.dir}" destdir="${classes.dir}/admin/profiles/cli" includes="**/*Configuration.xml"
          excludes="${exclude.ndb.xml}" style="${admin.rules.dir}/cliMOProfile.xsl">
          style="${admin.rules.dir}/cliMOProfile.xsl">
      <regexpmapper handledirsep="true" from="^(.*)/([^/]+)Configuration\.xml$$" to="\1/meta/\2CfgDefn.properties" />
      <param name="base-dir" expression="${admin.defn.dir}" />
      <classpath refid="xalan.class.path" />
@@ -2350,7 +2304,7 @@

    <!-- Generate I18N messages for core administration components. -->
    <xslt basedir="${admin.defn.dir}" destdir="${classes.dir}/admin/messages" includes="**/*Configuration.xml"
          excludes="${exclude.ndb.xml}" style="${admin.rules.dir}/messagesMO.xsl">
          style="${admin.rules.dir}/messagesMO.xsl">
      <regexpmapper handledirsep="true" from="^(.*)/([^/]+)Configuration\.xml$$" to="\1/meta/\2CfgDefn.properties" />
      <param name="base-dir" expression="${admin.defn.dir}" />
      <classpath refid="xalan.class.path" />
@@ -2360,7 +2314,7 @@
    <tempfile property="admin.temp.dir" destDir="${build.dir}" prefix="tmp" />
    <mkdir dir="${admin.temp.dir}" />
    <xslt basedir="${admin.defn.dir}" destdir="${admin.temp.dir}" extension=".manifest" includes="**/*Configuration.xml"
          excludes="${exclude.ndb.xml}" style="${admin.rules.dir}/manifestMO.xsl">
          style="${admin.rules.dir}/manifestMO.xsl">
      <classpath refid="xalan.class.path" />
    </xslt>
    <concat destfile="${classes.dir}/admin/core.manifest">
@@ -2595,28 +2549,5 @@
  </target>

  <import file="build-svr4.xml"/>

  <!-- Copy NDB Backend dependencies to build lib directory -->
  <target name="copyndbdeps" if="ismysqldirpresent"
    description="Internal target to copy NDB Backend dependencies">
    <!-- Blanket copy of all jars found at mysql.lib location -->
    <copy todir="${build.lib.dir}">
      <fileset file="${mysql.lib.dir}/*.jar" />
    </copy>
  </target>

  <!-- Package NDB Backend with Directory Server distribution -->
  <target name="packagendb" if="ismysqldirpresent"
    description="Internal target to package NDB Backend dependencies">
    <echo message="Packaging with NDB Backend dependencies"/>
    <copy todir="${pdir}/lib">
      <fileset file="${mysql.lib.dir}/*.jar" />
    </copy>
    <!-- Concat NDB Backend config entry to default config -->
    <concat destfile="${pdir}/config/config.ldif" append="true">
        <filelist dir="${config.dir}" files="ndbconfig.ldif"/>
    </concat>
  </target>

  <import file="build-pkg.xml"/>
</project>

 opends/resource/config/ndbconfig.ldif

File was deleted

 opends/resource/schema/02-config.ldif

@@ -2341,50 +2341,6 @@
  NAME 'ds-cfg-collation'
  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
  X-ORIGIN 'OpenDS Directory Server' )
attributeTypes: ( 1.3.6.1.4.1.26027.1.1.501
  NAME 'ds-cfg-ndb-connect-string'
  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
  SINGLE-VALUE
  X-ORIGIN 'OpenDS Directory Server' )
attributeTypes: ( 1.3.6.1.4.1.26027.1.1.502
  NAME 'ds-cfg-ndb-thread-count'
  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
  SINGLE-VALUE
  X-ORIGIN 'OpenDS Directory Server' )
attributeTypes: ( 1.3.6.1.4.1.26027.1.1.503
  NAME 'ds-cfg-ndb-num-connections'
  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
  SINGLE-VALUE
  X-ORIGIN 'OpenDS Directory Server' )
attributeTypes: ( 1.3.6.1.4.1.26027.1.1.504
  NAME 'ds-cfg-sql-user'
  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
  SINGLE-VALUE
  X-ORIGIN 'OpenDS Directory Server' )
attributeTypes: ( 1.3.6.1.4.1.26027.1.1.505
  NAME 'ds-cfg-sql-passwd'
  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
  SINGLE-VALUE
  X-ORIGIN 'OpenDS Directory Server' )
attributeTypes: ( 1.3.6.1.4.1.26027.1.1.506
  NAME 'ds-cfg-ndb-dbname'
  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
  SINGLE-VALUE
  X-ORIGIN 'OpenDS Directory Server' )
attributeTypes: ( 1.3.6.1.4.1.26027.1.1.507
  NAME 'ds-cfg-ndb-attr-len'
  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
  SINGLE-VALUE
  X-ORIGIN 'OpenDS Directory Server' )
attributeTypes: ( 1.3.6.1.4.1.26027.1.1.508
  NAME 'ds-cfg-ndb-attr-blob'
  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
  X-ORIGIN 'OpenDS Directory Server' )
attributeTypes: ( 1.3.6.1.4.1.26027.1.1.509
  NAME 'ds-cfg-sql-connect-string'
  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
  SINGLE-VALUE
  X-ORIGIN 'OpenDS Directory Server' )
attributeTypes: ( 1.3.6.1.4.1.26027.1.1.511
  NAME 'ds-cfg-quality-of-protection'
  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
@@ -4401,33 +4357,6 @@
  MUST ( ds-cfg-matching-rule-type $
        ds-cfg-collation )
  X-ORIGIN 'OpenDS Directory Server' )
objectClasses: ( 1.3.6.1.4.1.26027.1.2.196
  NAME 'ds-cfg-ndb-backend'
  SUP ds-cfg-backend
  STRUCTURAL
  MUST ( ds-cfg-ndb-connect-string $
         ds-cfg-sql-connect-string $
         ds-cfg-ndb-dbname )
  MAY ( ds-cfg-sql-user $
        ds-cfg-sql-passwd $
        ds-cfg-ndb-attr-len $
        ds-cfg-ndb-attr-blob $
        ds-cfg-ndb-thread-count $
        ds-cfg-ndb-num-connections $
        ds-cfg-deadlock-retry-limit $
        ds-cfg-import-thread-count $
        ds-cfg-import-queue-size $
        ds-cfg-index-entry-limit )
  X-ORIGIN 'OpenDS Directory Server' )
objectClasses: ( 1.3.6.1.4.1.26027.1.2.197
  NAME 'ds-cfg-ndb-index'
  SUP top
  STRUCTURAL
  MUST ( ds-cfg-attribute )
  MAY ( ds-cfg-index-type $
        ds-cfg-index-entry-limit $
        ds-cfg-substring-length )
  X-ORIGIN 'OpenDS Directory Server' )
objectClasses: ( 1.3.6.1.4.1.26027.1.2.950
  NAME 'ds-mon-branch'
  SUP top

 opends/src/admin/defn/org/opends/server/admin/std/NdbBackendConfiguration.xml

File was deleted

 opends/src/admin/defn/org/opends/server/admin/std/NdbIndexConfiguration.xml

File was deleted

 opends/src/messages/messages/ndb.properties

File was deleted

 opends/src/messages/messages/ndb_de.properties

File was deleted

 opends/src/messages/messages/ndb_es.properties

File was deleted

 opends/src/messages/messages/ndb_fr.properties

File was deleted

 opends/src/messages/messages/ndb_ja.properties

File was deleted

 opends/src/messages/messages/ndb_ko.properties

File was deleted

 opends/src/messages/messages/ndb_pl.properties

File was deleted

 opends/src/messages/messages/ndb_zh_CN.properties

File was deleted

 opends/src/messages/messages/ndb_zh_TW.properties

File was deleted

 opends/src/messages/src/org/opends/messages/Category.java

@@ -23,6 +23,7 @@
 *
 *
 *      Copyright 2007-2009 Sun Microsystems, Inc.
 *      Portions copyright 2011 ForgeRock AS.
 */

package org.opends.messages;
@@ -162,11 +163,6 @@
  SERVICETAG(0x01400000),

  /**
   * The category used for messages associated with the NDB backend.
   */
  NDB(0x01500000),

  /**
   * The category that will be used for messages associated with
   * third-party (including user-defined) modules.
   */

 opends/src/server/org/opends/server/backends/ndb/AbstractTransaction.java

File was deleted

 opends/src/server/org/opends/server/backends/ndb/BackendImpl.java

File was deleted

 opends/src/server/org/opends/server/backends/ndb/DatabaseContainer.java

File was deleted

 opends/src/server/org/opends/server/backends/ndb/EntryContainer.java

File was deleted

 opends/src/server/org/opends/server/backends/ndb/ExportJob.java

File was deleted

 opends/src/server/org/opends/server/backends/ndb/IndexFilter.java

File was deleted

 opends/src/server/org/opends/server/backends/ndb/NDBException.java

File was deleted

 opends/src/server/org/opends/server/backends/ndb/OperationContainer.java

File was deleted

 opends/src/server/org/opends/server/backends/ndb/RootContainer.java

File was deleted

 opends/src/server/org/opends/server/backends/ndb/importLDIF/DNContext.java

File was deleted

 opends/src/server/org/opends/server/backends/ndb/importLDIF/Importer.java

File was deleted

 opends/src/server/org/opends/server/backends/ndb/importLDIF/WorkElement.java

File was deleted

 opends/src/server/org/opends/server/backends/ndb/importLDIF/WorkThread.java

File was deleted

 opends/src/server/org/opends/server/backends/ndb/importLDIF/package-info.java

File was deleted

 opends/src/server/org/opends/server/backends/ndb/package-info.java

File was deleted

 opends/src/server/org/opends/server/workflowelement/ndb/NDBAddOperation.java

File was deleted

 opends/src/server/org/opends/server/workflowelement/ndb/NDBBindOperation.java

File was deleted

 opends/src/server/org/opends/server/workflowelement/ndb/NDBCompareOperation.java

File was deleted

 opends/src/server/org/opends/server/workflowelement/ndb/NDBDeleteOperation.java

File was deleted

 opends/src/server/org/opends/server/workflowelement/ndb/NDBModifyDNOperation.java

File was deleted

 opends/src/server/org/opends/server/workflowelement/ndb/NDBModifyOperation.java

File was deleted

 opends/src/server/org/opends/server/workflowelement/ndb/NDBSearchOperation.java

File was deleted

 opends/src/server/org/opends/server/workflowelement/ndb/NDBWorkflowElement.java

File was deleted

 opends/src/server/org/opends/server/workflowelement/ndb/package-info.java

File was deleted