From b5c2c2145e4049b490075c8a0568d06a72d9e210 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Thu, 23 May 2013 08:10:24 +0000
Subject: [PATCH] CR-1720 OPENDJ-835 Upgrade should add HTTP Connection Handler to config.ldif OPENDJ-914 Upgrade should add Based HTTP Access Logger to config.ldif - HTTP connection handler and the based HTTP access logger are now added to upgrade. - The http-config.json is added to the config file during upgrade. - Simplified UpgradeTasks.java - Added new messages. - Fixed javadoc for unit test.
---
opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/Upgrade.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 49 insertions(+), 2 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/Upgrade.java b/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/Upgrade.java
index 9b4413c..dd67572 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/Upgrade.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/Upgrade.java
@@ -225,6 +225,55 @@
+ "PBKDF2PasswordStorageScheme",
"ds-cfg-enabled: true"));
+ register("2.5.0.8613",
+ addConfigFile("http-config.json"),
+ addConfigEntry(INFO_UPGRADE_TASK_8613_SUMMARY.get(),
+ "dn: cn=HTTP Connection Handler,cn=Connection Handlers,cn=config",
+ "changetype: add",
+ "objectClass: ds-cfg-http-connection-handler",
+ "objectClass: ds-cfg-connection-handler",
+ "objectClass: top",
+ "ds-cfg-listen-port: 8080",
+ "cn: HTTP Connection Handler",
+ "ds-cfg-max-blocked-write-time-limit: 2 minutes",
+ "ds-cfg-ssl-client-auth-policy: optional",
+ "ds-cfg-use-tcp-keep-alive: true",
+ "ds-cfg-max-request-size: 5 megabytes",
+ "ds-cfg-use-tcp-no-delay: true",
+ "ds-cfg-allow-tcp-reuse-address: true",
+ "ds-cfg-accept-backlog: 128",
+ "ds-cfg-authentication-required: true",
+ "ds-cfg-buffer-size: 4096 bytes",
+ "ds-cfg-config-file: config/http-config.json",
+ "ds-cfg-listen-address: 0.0.0.0",
+ "ds-cfg-java-class: " +
+ "org.opends.server.protocols.http.HTTPConnectionHandler",
+ "ds-cfg-keep-stats: true",
+ "ds-cfg-ssl-cert-nickname: server-cert",
+ "ds-cfg-use-ssl: false",
+ "ds-cfg-enabled: false"));
+
+ register("2.5.0.8832", addConfigEntry(INFO_UPGRADE_TASK_8832_SUMMARY.get(),
+ "dn: cn=File-Based HTTP Access Logger,cn=Loggers,cn=config",
+ "changetype: add",
+ "objectClass: ds-cfg-file-based-http-access-log-publisher",
+ "objectClass: top",
+ "objectClass: ds-cfg-http-access-log-publisher",
+ "objectClass: ds-cfg-log-publisher",
+ "cn: File-Based HTTP Access Logger",
+ "ds-cfg-java-class: " +
+ "org.opends.server.loggers.TextHTTPAccessLogPublisher",
+ "ds-cfg-asynchronous: true",
+ "ds-cfg-log-file: logs/http-access",
+ "ds-cfg-rotation-policy: " +
+ "cn=24 Hours Time Limit Rotation Policy," +
+ "cn=Log Rotation Policies,cn=config",
+ "ds-cfg-rotation-policy: " +
+ "cn=Size Limit Rotation Policy,cn=Log Rotation Policies,cn=config",
+ "ds-cfg-retention-policy: " +
+ "cn=File Count Retention Policy,cn=Log Retention Policies,cn=config",
+ "ds-cfg-log-file-permissions: 640",
+ "ds-cfg-enabled: false"));
/*
* All upgrades will refresh the server configuration schema and generate
* a new upgrade folder.
@@ -237,8 +286,6 @@
/*register("2.5.0.8657",
rebuildAllIndexes(Message.raw("This is fake Rebuild Task")));*/
- // FIXME: HTTP connection handler and access logger when complete.
-
// @formatter:on
}
--
Gitblit v1.10.0