From 7958209259d5dff1b57301ab099446eec19b5067 Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Thu, 17 Nov 2016 16:40:39 +0000
Subject: [PATCH] OPENDJ-3276 Add HTTP-related components to inheritance view of config ref
---
opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/HTTPEndpointConfiguration.xml | 2 ++
opendj-server-legacy/src/main/java/org/opends/server/admin/doc/ConfigGuideGeneration.java | 6 +++---
opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/HTTPAuthorizationMechanismConfiguration.xml | 2 ++
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/HTTPAuthorizationMechanismConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/HTTPAuthorizationMechanismConfiguration.xml
index a171253..0130dde 100644
--- a/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/HTTPAuthorizationMechanismConfiguration.xml
+++ b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/HTTPAuthorizationMechanismConfiguration.xml
@@ -23,6 +23,8 @@
is used to define HTTP authorization mechanism.
</adm:synopsis>
+ <adm:tag name="security" />
+
<adm:profile name="ldap">
<ldap:object-class>
<ldap:name>ds-cfg-http-authorization-mechanism</ldap:name>
diff --git a/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/HTTPEndpointConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/HTTPEndpointConfiguration.xml
index 8731c5b..c8cb5c2 100644
--- a/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/HTTPEndpointConfiguration.xml
+++ b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/HTTPEndpointConfiguration.xml
@@ -23,6 +23,8 @@
is used to define HTTP endpoint.
</adm:synopsis>
+ <adm:tag name="core-server" />
+
<adm:profile name="ldap">
<ldap:object-class>
<ldap:name>ds-cfg-http-endpoint</ldap:name>
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/doc/ConfigGuideGeneration.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/doc/ConfigGuideGeneration.java
index 16a007d..fb9bb3c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/doc/ConfigGuideGeneration.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/doc/ConfigGuideGeneration.java
@@ -87,7 +87,7 @@
private final String WELCOME_FILE = "welcome.html";
private final String MAINTOP_FILE = "maintop.html";
private final String INDEX_FILE = "index.html";
- private final String FAVICON = "http://forgerock.org/favicon.ico";
+ private final String FAVICON = "https://forgerock.org/favicon.ico";
private static final String CONFIG_GUIDE_DIR = "opendj_config_guide";
private final String MAIN_FRAME = "mainFrame";
@@ -132,13 +132,13 @@
OpenDJWiki = properties.getProperty("OpenDJWiki");
if (OpenDJWiki == null) {
// Default is current wiki
- OpenDJWiki = "http://wikis.forgerock.org/confluence/display/OPENDJ";
+ OpenDJWiki = "https://wikis.forgerock.org/confluence/display/OPENDJ";
}
OpenDJHome = properties.getProperty("OpenDJHome");
if (OpenDJHome == null) {
// Default is current OpenDJ project home
- OpenDJHome = "http://opendj.forgerock.org";
+ OpenDJHome = "https://opendj.forgerock.org";
}
aciSyntaxPage = OpenDJHome + ACI_SYNTAX_REL_URL;
--
Gitblit v1.10.0