mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Mark Craig
10.32.2016 7958209259d5dff1b57301ab099446eec19b5067
OPENDJ-3276 Add HTTP-related components to inheritance view of config ref

This patch causes the config ref inheritance view to show:

* Core Server > HTTP Endpoint and children
* Security > HTTP Authorization Mechanism and children

It also updates some links that have changed to use HTTPS instead of HTTP.
3 files modified
10 ■■■■ changed files
opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/HTTPAuthorizationMechanismConfiguration.xml 2 ●●●●● patch | view | raw | blame | history
opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/HTTPEndpointConfiguration.xml 2 ●●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/admin/doc/ConfigGuideGeneration.java 6 ●●●● patch | view | raw | blame | history
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>
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>
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;