6 commits - java/code

Milan Zazrivec mzazrive at fedoraproject.org
Mon Jun 4 18:38:42 UTC 2012


 java/code/src/com/redhat/rhn/frontend/xmlrpc/distchannel/DistChannelHandler.java                |    2 
 java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java              |   10 +--
 java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java |    4 -
 java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java                          |   26 +++++-----
 4 files changed, 20 insertions(+), 22 deletions(-)

New commits:
commit 5144d8b23360bc9f2094c19e3b377ebd455e72f8
Author: Milan Zazrivec <mzazrivec at redhat.com>
Date:   Mon Jun 4 20:36:49 2012 +0200

    811470 - fix apidoc for system.listLatestAvailablePackage()

diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
index df662fd..2f7257a 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
@@ -1055,19 +1055,21 @@ public class SystemHandler extends BaseHandler {
      * @xmlrpc.param #array_single("int", "serverId")
      * @xmlrpc.param #param("string", "packageName")
      * @xmlrpc.returntype
-     *      #array()
-     *        #prop_desc("int", "id", "server ID")
-     *        #prop_desc("string", "name", "server name")
-     *        #struct("package")
-     *          #prop("int", "id")
-     *          #prop("string", "name")
-     *          #prop("string", "version")
-     *          #prop("string", "release")
-     *          #prop("string", "epoch")
-     *          #prop("string", "arch")
+     *     #array()
+     *         #struct("system")
+     *             #prop_desc("int", "id", "server ID")
+     *             #prop_desc("string", "name", "server name")
+     *             #prop_desc("struct", "package", "package structure")
+     *                 #struct("package")
+     *                     #prop("int", "id")
+     *                     #prop("string", "name")
+     *                     #prop("string", "version")
+     *                     #prop("string", "release")
+     *                     #prop("string", "epoch")
+     *                     #prop("string", "arch")
+     *                #struct_end()
      *        #struct_end()
-     *      #array_end()
-     *
+     *    #array_end()
      */
     public List listLatestAvailablePackage(String sessionKey, List<Integer> systemIds,
             String name) throws FaultException {


commit cd7d326f523899eea9a7d3891d46f1c276f36893
Author: Milan Zazrivec <mzazrivec at redhat.com>
Date:   Mon Jun 4 20:16:11 2012 +0200

    811470 - fix apidoc for kickstart.profile.system.checkRemoteCommands()

diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java
index 5b0044b..d45786e 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java
@@ -128,7 +128,7 @@ public class SystemDetailsHandler extends BaseHandler {
     * @xmlrpc.doc Check the remote commands status flag for a kickstart profile.
     * @xmlrpc.param #session_key()
     * @xmlrpc.param #param_desc("string", "ksLabel","the kickstart profile label")
-    * @xmlrpc.returntype #prop_desc("boolean", "enabled", "true if remote
+    * @xmlrpc.returntype #param_desc("boolean", "enabled", "true if remote
     * commands support is enabled; otherwise, false")
     */
     public boolean checkRemoteCommands(String sessionKey, String ksLabel) {


commit eadc117f6dd8733f719fb665e174d9d40f424fe0
Author: Milan Zazrivec <mzazrivec at redhat.com>
Date:   Mon Jun 4 20:13:37 2012 +0200

    811470 - fix apidoc of kickstart.profile.system.checkConfigManagement()

diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java
index 0cd3182..5b0044b 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java
@@ -61,7 +61,7 @@ public class SystemDetailsHandler extends BaseHandler {
       * @xmlrpc.doc Check the configuration management status for a kickstart profile.
       * @xmlrpc.param #session_key()
       * @xmlrpc.param #param_desc("string", "ksLabel","the kickstart profile label")
-      * @xmlrpc.returntype #prop_desc("boolean", "enabled", "true if configuration
+      * @xmlrpc.returntype #param_desc("boolean", "enabled", "true if configuration
       * management is enabled; otherwise, false")
       */
     public boolean checkConfigManagement(String sessionKey, String ksLabel) {


commit c97f20ef8d30c6dccdd4330d15733a7b05a89283
Author: Milan Zazrivec <mzazrivec at redhat.com>
Date:   Mon Jun 4 20:07:26 2012 +0200

    811470 - fix apidoc for kickstart.profile.getKickstartTree()

diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
index 4c4aae1..d696f91 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
@@ -87,7 +87,7 @@ public class ProfileHandler extends BaseHandler {
      * @xmlrpc.param #param_desc("string", "kslabel", "Label of kickstart
      * profile to be changed.")
      * @xmlrpc.returntype
-     *     #prop_desc("string", "kstreeLabel", "Label of the kickstart tree.")
+     *     #param_desc("string", "kstreeLabel", "Label of the kickstart tree.")
      */
     public String getKickstartTree(String sessionKey, String kslabel) {
 


commit 26b82e03690d2d3a882594088c763cff2eac8344
Author: Milan Zazrivec <mzazrivec at redhat.com>
Date:   Mon Jun 4 20:00:07 2012 +0200

    811470 - fix apidoc for kickstart.profile.comparePackages()

diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
index 27b0bcd..4c4aae1 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
@@ -928,14 +928,10 @@ public class ProfileHandler extends BaseHandler {
      *  #struct("Comparison Info")
      *      #prop_desc("array", "kickstartLabel1", "Actual label of the first kickstart
      *                 profile is the key into the struct")
-     *          #array()
-     *              #prop("string", "package name")
-     *          #array_end()
+     *          #array_single("string", "package name")
      *      #prop_desc("array", "kickstartLabel2", "Actual label of the second kickstart
      *                 profile is the key into the struct")
-     *          #array()
-     *              #prop("string", "package name")
-     *          #array_end()
+     *          #array_single("string", "package name")
      *  #struct_end()
      */
     public Map<String, Set<String>> comparePackages(String sessionKey,


commit 57605abb6d82f2e1a726193582d84f9600cc61d3
Author: Milan Zazrivec <mzazrivec at redhat.com>
Date:   Mon Jun 4 19:42:51 2012 +0200

    811470 - fix apidoc for distchannel.listDefaultMaps()

diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/distchannel/DistChannelHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/distchannel/DistChannelHandler.java
index c8553eb..b251a2b 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/distchannel/DistChannelHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/distchannel/DistChannelHandler.java
@@ -43,7 +43,7 @@ public class DistChannelHandler extends BaseHandler {
      * @xmlrpc.param #session_key()
      * @xmlrpc.returntype
      *   #array("dist channel map")
-     *      @DistChannelMapSerializer
+     *      $DistChannelMapSerializer
      *   #array_end()
      */
     public Object[] listDefaultMaps(String sessionKey) {




More information about the spacewalk-commits mailing list