java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 28 ++++++++--
java/spacewalk-java.spec | 7 ++
rel-eng/packages/spacewalk-java | 2
3 files changed, 31 insertions(+), 6 deletions(-)
New commits:
commit 1503bde7a43dd46a46e3b48902e5a909f7ed5df7
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Jan 11 16:54:09 2013 +0100
Automatic commit of package [spacewalk-java] release [1.9.40-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 31754d5..912d550 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.9.39
+Version: 1.9.40
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -659,6 +659,11 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri Jan 11 2013 Tomas Lestach <tlestach(a)redhat.com> 1.9.40-1
+- introduce new synchronous system.deleteSystem API
+- fix typos
+- make the system.deleteSystems API doc more precise
+
* Wed Jan 09 2013 Tomas Lestach <tlestach(a)redhat.com> 1.9.39-1
- 868884 - fix the 'Replace Existing Subscriptions' SSM config channel option
- 868884 - subscribe only to selected config channels via SSM
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 0b5553f..5085f3f 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.9.39-1 java/
+1.9.40-1 java/
commit 2dc430f8854dfd84e07b50f44184508962d5d8b2
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Jan 11 14:45:15 2013 +0100
introduce new synchronous system.deleteSystem API
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 102d0a2..4ebd5ec 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
@@ -1531,7 +1531,27 @@ public class SystemHandler extends BaseHandler {
return 1;
}
+ /**
+ * Delete a system given its server id synchronously
+ * @param sessionKey The sessionKey containing the logged in user
+ * @param serverId The id of the server in question
+ * @return 1 on success
+ * @throws FaultException A FaultException is thrown if:
+ * - The server corresponding to the sid cannot be found
+ * @xmlrpc.doc Delete a system given its server id synchronously
+ * @xmlrpc.param #param("string", "sessionKey")
+ * @xmlrpc.param #param("int", "serverId")
+ * @xmlrpc.returntype #return_int_success()
+ */
+ public int deleteSystem(String sessionKey, Integer serverId)
+ throws FaultException {
+ User loggedInUser = getLoggedInUser(sessionKey);
+ Server server = lookupServer(loggedInUser, serverId);
+
+ SystemManager.deleteServer(loggedInUser, server.getId());
+ return 1;
+ }
/**
* Get the addresses and hostname for a given server
commit addf8a669fa81ab817cee76d2af8d8e84c189af3
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Jan 11 14:43:22 2013 +0100
fix typos
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 7755851..102d0a2 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
@@ -1487,7 +1487,7 @@ public class SystemHandler extends BaseHandler {
/**
- * Delete a system given its cilent certificate.
+ * Delete a system given its client certificate.
*
* @param clientCert client certificate of the system.
* @return 1 on success
@@ -1495,7 +1495,7 @@ public class SystemHandler extends BaseHandler {
* - The server corresponding to the sid cannot be found
* @throws MethodInvalidParamException thrown if certificate is invalid.
* @since 10.10
- * @xmlrpc.doc Delete a system given its cilent certificate.
+ * @xmlrpc.doc Delete a system given its client certificate.
* @xmlrpc.param #param_desc("string", "systemid", "systemid
file")
* @xmlrpc.returntype #return_int_success()
*/
commit 31622fc3d1a59815f10f9d915858d98a54f4023b
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Jan 11 14:20:56 2013 +0100
make the system.deleteSystems API doc more precise
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 2b11135..7755851 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
@@ -1429,7 +1429,7 @@ public class SystemHandler extends BaseHandler {
}
/**
- * Delete systems given a list of system ids.
+ * Delete systems given a list of system ids asynchronously.
* This call queues the systems for deletion
* @param sessionKey The sessionKey containing the logged in user
* @param systemIds A list of systems ids to delete
@@ -1438,7 +1438,7 @@ public class SystemHandler extends BaseHandler {
* @throws FaultException A FaultException is thrown if the server corresponding to
* sid cannot be found.
*
- * @xmlrpc.doc Delete systems given a list of system ids.
+ * @xmlrpc.doc Delete systems given a list of system ids asynchronously.
* @xmlrpc.param #param("string", "sessionKey")
* @xmlrpc.param #array_single("int", "serverId")
* @xmlrpc.returntype #return_int_success()