From 3734ea108c4e68691b9b969370d740404764b5a7 Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Fri, 24 Jun 2011 09:21:09 +0000
Subject: [PATCH] Fix OPENDJ-215: Config reference duration syntax and aci syntax pages not found
---
opends/resource/admin/config-guide/duration-syntax.html | 24 ++++++++++++++++++++++++
opends/src/server/org/opends/server/admin/doc/ConfigGuideGeneration.java | 8 ++++----
2 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/opends/resource/admin/config-guide/duration-syntax.html b/opends/resource/admin/config-guide/duration-syntax.html
new file mode 100644
index 0000000..fbdaa0b
--- /dev/null
+++ b/opends/resource/admin/config-guide/duration-syntax.html
@@ -0,0 +1,24 @@
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+<title>OpenDJ - Duration Syntax</title>
+<link rel="stylesheet" type="text/css" href="opends-config.css">
+</head>
+<body>
+<div style="font-size:11px;margin-top:-10px;margin-bottom:-10px; text-align:right"><a href="index.html" target="_top">Configuration Reference Home</a></div>
+<h2>Duration Syntax</h2>
+<p>Durations are specified with positive integers and unit specifiers. Unit specifiers include the following.</p>
+<ul>
+<li><tt>ms</tt> - milliseconds</li>
+<li><tt>s</tt> - seconds</li>
+<li><tt>m</tt> - minutes</li>
+<li><tt>h</tt> - hours</li>
+<li><tt>d</tt> - days</li>
+<li><tt>w</tt> - weeks</li>
+</ul>
+<p>An duration of 1 week is specified as <tt>1w</tt>. A duration of 1 week, 1 day, 1 hour, 1 minute, and 1 second is specified as <tt>1w1d1h1m1s</tt>.</p>
+<p>The value -1 is reserved for unlimited durations. An unlimited duration is generally specified with the string <tt>unlimited</tt>.</p>
+<p>Not all properties taking a duration allow all unit specifiers. For example, milliseconds are not allowed if durations smaller than one second are not permitted.</p>
+<p>Some properties taking a duration also require minimum or maximum durations.</p>
+</body>
+</html>
diff --git a/opends/src/server/org/opends/server/admin/doc/ConfigGuideGeneration.java b/opends/src/server/org/opends/server/admin/doc/ConfigGuideGeneration.java
index 2773e63..72a4dea 100644
--- a/opends/src/server/org/opends/server/admin/doc/ConfigGuideGeneration.java
+++ b/opends/src/server/org/opends/server/admin/doc/ConfigGuideGeneration.java
@@ -83,7 +83,7 @@
private final static String ACI_SYNTAX_REL_URL =
"/doc/admin-guide/OpenDJ-Admin-Guide.html#chap-privileges-acis";
private final static String DURATION_SYNTAX_REL_URL =
- "/404.html";
+ "duration-syntax.html";
private final String CSS_FILE = "opends-config.css";
private final String MAIN_FILE = "index.html";
@@ -142,15 +142,15 @@
OpenDJWiki = "http://wikis.forgerock.org/confluence/display/OPENDJ";
}
- aciSyntaxPage = OpenDJHome + ACI_SYNTAX_REL_URL;
- durationSyntaxPage = OpenDJHome + DURATION_SYNTAX_REL_URL; // TODO: missing
-
OpenDJHome = properties.getProperty("OpenDJHome");
if (OpenDJHome == null) {
// Default is current OpenDJ project home
OpenDJHome = "http://opendj.forgerock.org";
}
+ aciSyntaxPage = OpenDJHome + ACI_SYNTAX_REL_URL;
+ durationSyntaxPage = DURATION_SYNTAX_REL_URL;
+
ConfigGuideGeneration myGen = new ConfigGuideGeneration();
myGen.generate();
}
--
Gitblit v1.10.0