Fix issue OPENDJ-396: Remove support for ServiceTags

Ludovic Poitou

05.40.2012 ab028056236301245e180e124e8f04bcfc9313a6

Fix issue OPENDJ-396: Remove support for ServiceTags

 opends/build.xml

@@ -23,7 +23,7 @@
 !
 !
 !      Copyright 2006-2010 Sun Microsystems, Inc.
 !      Portions Copyright 2011 ForgeRock AS
 !      Portions Copyright 2011-2012 ForgeRock AS
 ! -->

<project name="Directory Server" basedir="." default="package">
@@ -288,9 +288,6 @@
    <genmsg sourceProps="${msg.prop.dir}/runtime_information.properties"
            destJava="${msg.javagen.dir}/org/opends/messages/RuntimeMessages.java">
    </genmsg>
    <genmsg sourceProps="${msg.prop.dir}/servicetag.properties"
            destJava="${msg.javagen.dir}/org/opends/messages/ServiceTagMessages.java">
    </genmsg>

  </target>

@@ -925,7 +922,6 @@
    <mkdir dir="${pdir}/config/messages"                             />
    <mkdir dir="${pdir}/config/MakeLDIF"                             />
    <mkdir dir="${pdir}/config/snmp/security"                        />
    <mkdir dir="${pdir}/config/servicetag"                           />
    <mkdir dir="${pdir}/db"                                          />
    <mkdir dir="${pdir}/import-tmp"                                  />
    <mkdir dir="${pdir}/changelogDb"                                 />
@@ -1065,10 +1061,6 @@
      <fileset dir="${resource.dir}/schema" />
    </copy>

    <copy todir="${pdir}/config/servicetag">
      <fileset dir="${resource.dir}/servicetag" />
    </copy>

    <copy todir="${pdir}/config/messages">
      <fileset dir="${resource.dir}/messages" />
    </copy>

 opends/resource/servicetag/opends.uuids.properties

File was deleted

 opends/src/messages/messages/servicetag.properties

File was deleted

 opends/src/messages/messages/servicetag_de.properties

File was deleted

 opends/src/messages/messages/servicetag_es.properties

File was deleted

 opends/src/messages/messages/servicetag_fr.properties

File was deleted

 opends/src/messages/messages/servicetag_ja.properties

File was deleted

 opends/src/messages/messages/servicetag_ko.properties

File was deleted

 opends/src/messages/messages/servicetag_zh_CN.properties

File was deleted

 opends/src/messages/messages/servicetag_zh_TW.properties

File was deleted

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

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

package org.opends.messages;
@@ -159,8 +159,9 @@

  /**
   * The category used for messages associated with the Servicetag registration.
   * No longer used.
   * SERVICETAG(0x01400000),
   */
  SERVICETAG(0x01400000),

  /**
   * The category that will be used for messages associated with

 opends/src/server/org/opends/server/core/DirectoryServer.java

@@ -87,7 +87,6 @@
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalConnectionHandler;
import org.opends.server.schema.*;
import org.opends.server.servicetag.ServiceTagRegistration;
import org.opends.server.tools.ConfigureWindowsService;
import org.opends.server.types.*;
import org.opends.server.util.*;
@@ -102,7 +101,7 @@
 * and shutdown processes and coordinates activities between all other
 * components.
 */
public class DirectoryServer
public final class DirectoryServer
       implements AlertGenerator
{
  /**
@@ -638,11 +637,6 @@
  // mode is 'manual'.
  private WorkflowElementConfigManager workflowElementConfigManager;

  // The ServiceTag Registration service for the Directory Server.
  // The Registration is used to create and register a ServiceTag
  // if it does not exist in the common servicetag registry.
  private ServiceTagRegistration serviceTagRegistry;

  /**
   * The default timeout used to start the server in detach mode.
   */
@@ -9523,19 +9517,6 @@
      System.exit(1);
    }

    try {
        theDirectoryServer.serviceTagRegistry =
                ServiceTagRegistration.getRegistrationService();
        theDirectoryServer.serviceTagRegistry.registerServiceTags("Server");
    }
    catch(Exception ex) {
        // ServiceTags Registration errors do not prevent the server to
        // start. WARNING logged in debug mode
        if (debugEnabled()) {
           TRACER.debugCaught(DebugLogLevel.WARNING, ex);
      }
    }

    try
    {
      theDirectoryServer.startServer();

 opends/src/server/org/opends/server/servicetag/Registry.java

File was deleted

 opends/src/server/org/opends/server/servicetag/ServiceTag.java

File was deleted

 opends/src/server/org/opends/server/servicetag/ServiceTagAlreadyExistsException.java

File was deleted

 opends/src/server/org/opends/server/servicetag/ServiceTagDefinition.java

File was deleted

 opends/src/server/org/opends/server/servicetag/ServiceTagDoesNotExistException.java

File was deleted

 opends/src/server/org/opends/server/servicetag/ServiceTagException.java

File was deleted

 opends/src/server/org/opends/server/servicetag/ServiceTagRegistration.java

File was deleted

 opends/src/server/org/opends/server/servicetag/SwordFishIDParser.java

File was deleted

 opends/src/server/org/opends/server/servicetag/SwordFishIdConfiguration.java

File was deleted

 opends/src/server/org/opends/server/servicetag/SystemEnvironment.java

File was deleted

 opends/src/server/org/opends/server/servicetag/Util.java

File was deleted

 opends/src/server/org/opends/server/servicetag/package-info.java

File was deleted