java/buildconf/apidoc/docbook/macros.txt |
9 ++++
java/buildconf/apidoc/html/macros.txt |
8 ++++
java/buildconf/apidoc/jsp/macros.txt |
8 ++++
java/buildconf/apidoc/singlepage/macros.txt |
8 ++++
java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java |
20 ++++------
5 files changed, 41 insertions(+), 12 deletions(-)
New commits:
commit bdf70d4f2adae79682013c26650c17f73a9b61b8
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Jun 1 19:46:49 2012 +0200
811470 - apidoc: use array_desc to remove empty list bullets
diff --git
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java
index e8ef194..620049c 100644
---
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java
+++
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java
@@ -111,15 +111,14 @@ public class ActivationKeyHandler extends BaseHandler {
* default.")
* @xmlrpc.param #param_desc("int", "usageLimit", "If
unlimited usage is desired,
* use the create API that does not include the parameter.")
- * @xmlrpc.param #array()
- * #item_desc("string", "Add-on entitlement label to associate with
the key.")
+ * @xmlrpc.param #array_desc("string", "Add-on entitlement label to
associate with the key.")
* #options()
* #item("monitoring_entitled")
* #item("provisioning_entitled")
* #item("virtualization_host")
* #item("virtualization_host_platform")
* #options_end()
- * #array_end()
+ * #array_desc_end()
* @xmlrpc.param #param("boolean", "universalDefault")
* @xmlrpc.returntype string - The new activation key.
*/
@@ -221,15 +220,14 @@ public class ActivationKeyHandler extends BaseHandler {
* @xmlrpc.param #param("string", "description")
* @xmlrpc.param #param_desc("string", "baseChannelLabel",
"Leave empty to accept
* default.")
- * @xmlrpc.param #array()
- * #item_desc("string", "Add-on entitlement label to associate with
the key.")
+ * @xmlrpc.param #array_desc("string", "Add-on entitlement label to
associate with the key.")
* #options()
* #item("monitoring_entitled")
* #item("provisioning_entitled")
* #item("virtualization_host")
* #item("virtualization_host_platform")
* #options_end()
- * #array_end()
+ * #array_desc_end()
* @xmlrpc.param #param("boolean", "universalDefault")
* @xmlrpc.returntype string - The new activation key.
*/
@@ -388,15 +386,14 @@ public class ActivationKeyHandler extends BaseHandler {
* virtualization_host, virtualization_host_platform)
* @xmlrpc.param #param("string", "sessionKey")
* @xmlrpc.param #param("string", "key")
- * @xmlrpc.param #array()
- * #item_desc("string", "entitlement label")
+ * @xmlrpc.param #array_desc("string", "entitlement label")
* #options()
* #item("monitoring_entitled")
* #item("provisioning_entitled")
* #item("virtualization_host")
* #item("virtualization_host_platform")
* #options_end()
- * #array_end()
+ * #array_desc_end()
* @xmlrpc.returntype #return_int_success()
*/
public int addEntitlements(String sessionKey, String key, List entitlements) {
@@ -422,15 +419,14 @@ public class ActivationKeyHandler extends BaseHandler {
* provisioning_entitled, virtualization_host, virtualization_host_platform)
* @xmlrpc.param #param("string", "sessionKey")
* @xmlrpc.param #param("string", "key")
- * @xmlrpc.param #array()
- * #item_desc("string", "entitlement label")
+ * @xmlrpc.param #array_desc("string", "entitlement label")
* #options()
* #item("monitoring_entitled")
* #item("provisioning_entitled")
* #item("virtualization_host")
* #item("virtualization_host_platform")
* #options_end()
- * #array_end()
+ * #array_desc_end()
* @xmlrpc.returntype #return_int_success()
*/
public int removeEntitlements(String sessionKey, String key, List entitlements) {
commit 16e3c9cf4b8bb1733c887ccd75e7f31711bffff9
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Jun 1 19:14:35 2012 +0200
811470 - new macro: array_desc
Used to denote an array parameter, its type and description.
diff --git a/java/buildconf/apidoc/docbook/macros.txt
b/java/buildconf/apidoc/docbook/macros.txt
index f5ff91c..644b909 100644
--- a/java/buildconf/apidoc/docbook/macros.txt
+++ b/java/buildconf/apidoc/docbook/macros.txt
@@ -50,6 +50,15 @@
</itemizedlist>
</listitem>
#end
+#macro(array_desc $type $desc)
+<listitem>
+ <para>array $type - $desc</para>
+ <itemizedlist spacing="compact">
+#end
+#macro(array_desc_end)
+ </itemizedlist>
+</listitem>
+#end
#macro(array_single $type $desc)
<listitem>
<para>array:</para>
diff --git a/java/buildconf/apidoc/html/macros.txt
b/java/buildconf/apidoc/html/macros.txt
index f7a70d2..ce797c4 100644
--- a/java/buildconf/apidoc/html/macros.txt
+++ b/java/buildconf/apidoc/html/macros.txt
@@ -47,6 +47,14 @@ array:
#macro(array_end)
</li></ul>
#end
+#macro(array_desc $type $desc)
+array:
+ <ul>
+ <li>$type - $desc
+#end
+#macro(array_desc_end)
+</li></ul>
+#end
#macro(array_single $type $desc)
array:
<ul>
diff --git a/java/buildconf/apidoc/jsp/macros.txt b/java/buildconf/apidoc/jsp/macros.txt
index f7a70d2..ce797c4 100644
--- a/java/buildconf/apidoc/jsp/macros.txt
+++ b/java/buildconf/apidoc/jsp/macros.txt
@@ -47,6 +47,14 @@ array:
#macro(array_end)
</li></ul>
#end
+#macro(array_desc $type $desc)
+array:
+ <ul>
+ <li>$type - $desc
+#end
+#macro(array_desc_end)
+</li></ul>
+#end
#macro(array_single $type $desc)
array:
<ul>
diff --git a/java/buildconf/apidoc/singlepage/macros.txt
b/java/buildconf/apidoc/singlepage/macros.txt
index f7a70d2..ce797c4 100644
--- a/java/buildconf/apidoc/singlepage/macros.txt
+++ b/java/buildconf/apidoc/singlepage/macros.txt
@@ -47,6 +47,14 @@ array:
#macro(array_end)
</li></ul>
#end
+#macro(array_desc $type $desc)
+array:
+ <ul>
+ <li>$type - $desc
+#end
+#macro(array_desc_end)
+</li></ul>
+#end
#macro(array_single $type $desc)
array:
<ul>