From ab028056236301245e180e124e8f04bcfc9313a6 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Thu, 05 Jan 2012 17:40:21 +0000
Subject: [PATCH] Fix issue OPENDJ-396: Remove support for ServiceTags
---
opends/src/server/org/opends/server/core/DirectoryServer.java | 21 +--------------------
1 files changed, 1 insertions(+), 20 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/DirectoryServer.java b/opends/src/server/org/opends/server/core/DirectoryServer.java
index c881545..fb15896 100644
--- a/opends/src/server/org/opends/server/core/DirectoryServer.java
+++ b/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();
--
Gitblit v1.10.0