[Spacewalk-devel] web.apiversion

Tue, 02 Nov 2010 00:55:51 -0700

Can we please increment web.apiversion (in file web/conf/rhn_web.conf) each time we add/modify new api call? Thx 
Mirek


-------- Original Message --------
Subject: 2 commits - java/code
Date: Mon,  1 Nov 2010 17:33:18 +0000 (UTC)
From: Tomas Lestach <tlest...@fedoraproject.org>
Reply-To: Mailing list for spacewalk commits. <spacewalk-comm...@lists.fedorahosted.org> 
To: spacewalk-comm...@lists.fedorahosted.org
java/code/src/com/redhat/rhn/frontend/action/satellite/GeneralConfigAction.java | 2 -
java/code/src/com/redhat/rhn/frontend/action/satellite/test/GeneralConfigActionTest.java | 5 ++-
java/code/src/com/redhat/rhn/frontend/xmlrpc/satellite/SatelliteHandler.java | 15 +++++++++- 
 3 files changed, 19 insertions(+), 3 deletions(-)

New commits:
commit c0d9adde56a3d17f4eb5bed1b2516798d60b984d
Author: Tomas Lestach <tlest...@redhat.com>
Date:   Mon Nov 1 18:31:07 2010 +0100

    647099 - introducing satellite.isMonitoringEnabled API
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/satellite/SatelliteHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/satellite/SatelliteHandler.java 
index 4deaf4c..1daa33e 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/satellite/SatelliteHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/satellite/SatelliteHandler.java 
@@ -14,6 +14,7 @@
  */
 package com.redhat.rhn.frontend.xmlrpc.satellite;

+import com.redhat.rhn.common.conf.ConfigDefaults;
 import com.redhat.rhn.domain.channel.ChannelFamily;
 import com.redhat.rhn.domain.channel.ChannelFamilyFactory;
 import com.redhat.rhn.domain.entitlement.Entitlement;
@@ -158,5 +159,17 @@ public class SatelliteHandler extends BaseHandler {
         return CertificateFactory.lookupNewestCertificate().getExpires();
     }

-
+    /**
+     * Indicates if monitoring is enabled on the satellite
+     * @param sessionKey session of the logged in user
+     * @return True if monitoring is enabled
+     *
+     * @xmlrpc.doc Indicates if monitoring is enabled on the satellite
+     * @xmlrpc.param #param("string", "sessionKey")
+ * @xmlrpc.returntype #param("boolean", "True if monitoring is enabled") 
+     */
+    public boolean isMonitoringEnabled(String sessionKey) {
+        getLoggedInUser(sessionKey);
+        return ConfigDefaults.get().isMonitoringBackend();
+    }
 }


commit 6eb4da56285f4d81b0436e8e66f405b1d40123e2
Author: Tomas Lestach <tlest...@redhat.com>
Date:   Mon Nov 1 18:03:18 2010 +0100
replace web.is_monitoring_backend with ConfigDefaults.WEB_IS_MONITORING_BACKEND
diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/GeneralConfigAction.java b/java/code/src/com/redhat/rhn/frontend/action/satellite/GeneralConfigAction.java 
index b36775a..c655c69 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/satellite/GeneralConfigAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/GeneralConfigAction.java @@ -60,7 +60,7 @@ public class GeneralConfigAction extends BaseConfigAction {
private static final String[] BOOLEAN_CONFIG_ARRAY = {"web.ssl_available", 
         "web.enable_solaris_support", ConfigDefaults.DISCONNECTED,
-            "web.is_monitoring_backend"};
+            ConfigDefaults.WEB_IS_MONITORING_BACKEND};

     private static final List COMBO_LIST = new LinkedList();
     static {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/test/GeneralConfigActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/satellite/test/GeneralConfigActionTest.java 
index 5471f2b..07e3d31 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/satellite/test/GeneralConfigActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/test/GeneralConfigActionTest.java 
@@ -15,6 +15,7 @@
 package com.redhat.rhn.frontend.action.satellite.test;

 import com.redhat.rhn.common.conf.Config;
+import com.redhat.rhn.common.conf.ConfigDefaults;
 import com.redhat.rhn.domain.role.RoleFactory;
 import com.redhat.rhn.frontend.action.satellite.GeneralConfigAction;
 import com.redhat.rhn.frontend.struts.RhnAction;
@@ -31,7 +32,9 @@ import java.util.Map;
  * @version $Rev: 1 $
  */
 public class GeneralConfigActionTest extends RhnMockStrutsTestCase {
- private static final String TEST_CONFIG_BOOLEAN = "web.is_monitoring_backend"; 
+    private static final String TEST_CONFIG_BOOLEAN =
+        ConfigDefaults.WEB_IS_MONITORING_BACKEND;
+
     public void testTestValue() {

         assertTrue(GeneralConfigAction.ALLOWED_CONFIGS.


_______________________________________________
spacewalk-commits mailing list
spacewalk-comm...@lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/spacewalk-commits

_______________________________________________
Spacewalk-devel mailing list
Spacewalk-devel@redhat.com
https://www.redhat.com/mailman/listinfo/spacewalk-devel

Reply via email to