2 commits - java/build.xml java/code java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/build.xml | 33 ++++++++++++++++++++++++++-------
java/code/webapp/WEB-INF/web.xml | 1 +
java/spacewalk-java.spec | 10 +++++++++-
rel-eng/packages/spacewalk-java | 2 +-
4 files changed, 37 insertions(+), 9 deletions(-)
New commits:
commit ce51e49f7fd9690e5a9e9502f80639109742d563
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Nov 9 01:33:17 2011 +0100
Automatic commit of package [spacewalk-java] release [1.6.75-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 6752302..e0d4790 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.6.74
+Version: 1.6.75
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -557,6 +557,14 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Nov 09 2011 Tomas Lestach <tlestach(a)redhat.com> 1.6.75-1
+- precompile also apidoc jsp pages (tlestach(a)redhat.com)
+- 682845 - fix channel.software.listUserRepos API doc (tlestach(a)redhat.com)
+- 682845 - fix channel.software.getRepoSyncCronExpression API doc
+ (tlestach(a)redhat.com)
+- example with usage of xmlrpclib.DateTime is presented twice, remove one
+ (msuchy(a)redhat.com)
+
* Mon Nov 07 2011 Tomas Lestach <tlestach(a)redhat.com> 1.6.74-1
- 680489 - fix system.provisioning.snapshot.addTagToSnapshot API doc
(tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 6b5e996..6255e88 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.6.74-1 java/
+1.6.75-1 java/
commit c4f9c6555bcb9efd7bb9ea521d9e83663974c8b3
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Nov 8 23:36:07 2011 +0100
precompile also apidoc jsp pages
to prevent compiling them during runtime and cause troubles, when upgrading
diff --git a/java/build.xml b/java/build.xml
index 614bf79..b8c683b 100644
--- a/java/build.xml
+++ b/java/build.xml
@@ -621,6 +621,7 @@ delete from rhnChannel where label like 'ChannelLabel%';
<target name="jspcompile" depends="pack,unwar-webapp"
description="precompile jsp's">
<mkdir dir="${build.dir}/jsp-temp" />
+ <mkdir dir="${build.dir}/apidoc-temp" />
<mkdir dir="${build.dir}/webapp/rhnjava/WEB-INF/classes" />
<jasper2
validateXml="false"
@@ -628,6 +629,12 @@ delete from rhnChannel where label like 'ChannelLabel%';
uriroot="${build.dir}/webapp/rhnjava"
webXmlFragment="${build.dir}/webapp/generated_web.xml"
outputDir="${build.dir}/jsp-temp" />
+ <jasper2
+ validateXml="false"
+ verbose="2"
+ uriroot="${prefix}${webapp-dir}/rhn"
+ webXmlFragment="${build.dir}/webapp/generated_apidoc.xml"
+ outputDir="${build.dir}/apidoc-temp" />
<javac destdir="${build.dir}/webapp/rhnjava/WEB-INF/classes"
debug="off" optimize="on"
source="1.5"
@@ -637,6 +644,7 @@ delete from rhnChannel where label like 'ChannelLabel%';
memoryMaximumSize="512m"
classpathref="alljars">
<src path="${build.dir}/jsp-temp"/>
+ <src path="${build.dir}/apidoc-temp"/>
</javac>
<loadfile property="jspc.web.fragment"
srcfile="${build.dir}/webapp/generated_web.xml" />
@@ -644,6 +652,12 @@ delete from rhnChannel where label like 'ChannelLabel%';
<replacefilter token="<!-- add precompiled jsp servlets -->"
value="${jspc.web.fragment}"/>
</replace>
+ <loadfile property="jspc.web.fragment.apidoc"
+ srcfile="${build.dir}/webapp/generated_apidoc.xml" />
+ <replace file="${build.dir}/webapp/rhnjava/WEB-INF/web.xml">
+ <replacefilter token="<!-- add generated apidoc -->"
+ value="${jspc.web.fragment.apidoc}"/>
+ </replace>
<delete file="${rhn.war}"/>
<jar basedir="${build.dir}/webapp/rhnjava"
destfile="${rhn.war}"
@@ -802,17 +816,14 @@ delete from rhnChannel where label like 'ChannelLabel%';
</target>
- <target name="install"
- depends="init-install,init,compile-notests,pack,apidoc-jsp,jspcompile"
- description="Install the webapp to the directory specified by $prefix">
+ <target name="apidoc-install"
+ depends="apidoc-jsp"
+ description="Copies apidoc to the target directory">
+
<delete dir="${prefix}${webapp-dir}/rhn" />
- <delete dir="${prefix}/usr/share/rhn/lib" />
<mkdir dir="${prefix}${webapp-dir}/rhn" />
<mkdir dir="${prefix}${webapp-dir}/rhn/apidoc" />
<mkdir dir="${prefix}${webapp-dir}/rhn/apidoc/handlers" />
- <mkdir dir="${prefix}/usr/share/rhn/lib" />
- <unjar src="${rhn.war}" dest="${prefix}${webapp-dir}/rhn" />
-
<!--
- copy the apidocs to the right place
-->
@@ -831,6 +842,14 @@ delete from rhnChannel where label like 'ChannelLabel%';
<copy toDir="${prefix}${webapp-dir}rhn/apidoc/handlers/">
<fileset dir="${report.dir}/apidocs/jsp/handlers/" />
</copy>
+ </target>
+
+ <target name="install"
+ depends="init-install,init,compile-notests,pack,apidoc-jsp,apidoc-install,jspcompile"
+ description="Install the webapp to the directory specified by $prefix">
+ <delete dir="${prefix}/usr/share/rhn/lib" />
+ <mkdir dir="${prefix}/usr/share/rhn/lib" />
+ <unjar src="${rhn.war}" dest="${prefix}${webapp-dir}/rhn" />
<!--
- copy the jar that contains our code to /usr/share/rhn/lib to be shared
diff --git a/java/code/webapp/WEB-INF/web.xml b/java/code/webapp/WEB-INF/web.xml
index 4c612fa..5cbd4d3 100644
--- a/java/code/webapp/WEB-INF/web.xml
+++ b/java/code/webapp/WEB-INF/web.xml
@@ -226,6 +226,7 @@
</servlet>
<!-- add precompiled jsp servlets -->
+ <!-- add generated apidoc -->
<!--
=======================================
12 years, 7 months
2 commits - java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 2d6277a6d7dab86d5f1f66a5c85b68d1d0740e81
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Nov 8 11:28:54 2011 +0100
682845 - fix channel.software.listUserRepos API doc
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
index 8046296..cb69b56 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
@@ -2346,7 +2346,6 @@ public class ChannelSoftwareHandler extends BaseHandler {
* #prop_desc("long","id", "ID of the repo")
* #prop_desc("string","label", "label of the repo")
* #prop_desc("string","sourceUrl", "URL of the repo")
- * "date format follows YYYY-MM-DD HH24:MI:SS")
* #struct_end()
* #array_end()
**/
commit 99662732afd876e7ba78c15a4b0376e06f93d27e
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Nov 8 11:18:04 2011 +0100
682845 - fix channel.software.getRepoSyncCronExpression API doc
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
index 773a807..8046296 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
@@ -2691,7 +2691,7 @@ public class ChannelSoftwareHandler extends BaseHandler {
* @xmlrpc.doc Returns repo synchronization cron expression
* @xmlrpc.param #session_key()
* @xmlrpc.param #param_desc("string", "channelLabel", "channel label")
- * @xmlrpc.return cron expression
+ * @xmlrpc.returntype string cron expression
*/
public String getRepoSyncCronExpression(String sessionKey, String channelLabel) {
User loggedInUser = getLoggedInUser(sessionKey);
12 years, 7 months
Changes to 'refs/tags/rhn-client-tools-1.6.34-1'
by Miroslav Suchý
Tag 'rhn-client-tools-1.6.34-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-11-07 15:23 +0000
Tagging package [rhn-client-tools] version [1.6.34-1] in directory [client/rhel/rhn-client-tools/].
Changes since spacewalk-java-1.6.74-1:
Miroslav Suchý (6):
example with usage of xmlrpclib.DateTime is presented twice, remove one
correctly check for unicode type
correctly assign converted unicode string
751760 - use attribute value, which our ancestor use
call parent's constructor
Automatic commit of package [rhn-client-tools] release [1.6.34-1].
---
client/rhel/rhn-client-tools/rhn-client-tools.spec | 8 ++
client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py | 29 +++++-----
java/buildconf/apidoc/jsp/scripts.txt | 26 --------
rel-eng/packages/rhn-client-tools | 2
4 files changed, 23 insertions(+), 42 deletions(-)
---
12 years, 7 months
5 commits - client/rhel rel-eng/packages
by Miroslav Suchý
client/rhel/rhn-client-tools/rhn-client-tools.spec | 8 ++
client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py | 29 +++++-----
rel-eng/packages/rhn-client-tools | 2
3 files changed, 23 insertions(+), 16 deletions(-)
New commits:
commit 0f6e3d306c7f2eccf4acfa7938e23fa60e237c4e
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Nov 7 16:23:29 2011 +0100
Automatic commit of package [rhn-client-tools] release [1.6.34-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 4a53ca7..f25299c 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -4,7 +4,7 @@ Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL: https://fedorahosted.org/spacewalk
Name: rhn-client-tools
-Version: 1.6.33
+Version: 1.6.34
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -334,6 +334,12 @@ make -f Makefile.rhn-client-tools test
%endif
%changelog
+* Mon Nov 07 2011 Miroslav Suchý 1.6.34-1
+- call parent's constructor
+- 751760 - use attribute value, which our ancestor use
+- correctly assign converted unicode string
+- correctly check for unicode type
+
* Thu Nov 03 2011 Miroslav Suchý 1.6.33-1
- 595837 - add missing import
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index 4c0ebcf..2bbe3bc 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-1.6.33-1 client/rhel/rhn-client-tools/
+1.6.34-1 client/rhel/rhn-client-tools/
commit 0ee65f354828854ee3a1e5149b8ea9b085a6c3b7
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Nov 7 16:21:03 2011 +0100
call parent's constructor
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py b/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py
index 9b30e80..e1c5198 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py
@@ -80,8 +80,8 @@ class RpmRemoveError(Error):
Raise when we can't remove a package for some reason
(failed deps, etc)"""
def __init__(self, args):
+ Error.__init__(self, "")
self.args = args
- self.value = ""
for key in self.args.keys():
if not isinstance(self.args[key], unicode):
self.args[key] = unicode(self.args[key], 'utf-8')
@@ -208,7 +208,7 @@ class PasswordMaxLengthError(NoLogError):
class InsuffMgmntEntsError(RhnServerException):
def __init__(self, msg ):
- self.value = self.changeExplanation(msg)
+ RhnServerException.__init__(self, self.changeExplanation(msg))
def __repr__(self):
return self.value
commit 1bdc55b83a00d48bb263ba7d4f9c13d3b0ddbb1e
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Nov 7 16:15:02 2011 +0100
751760 - use attribute value, which our ancestor use
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py b/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py
index 027636c..9b30e80 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py
@@ -28,12 +28,13 @@ class Error(YumBaseError):
def __init__(self, errmsg):
if not isinstance(errmsg, unicode):
errmsg = unicode(errmsg, 'utf-8')
- self.errmsg = self.premsg + errmsg
+ YumBaseError.__init__(self, errmsg)
+ self.value = self.premsg + errmsg
self.log = up2dateLog.initLog()
def __repr__(self):
- self.log.log_me(self.errmsg)
- return self.errmsg
+ self.log.log_me(self.value)
+ return self.value
class RpmError(Error):
"""rpm itself raised an error condition"""
@@ -80,24 +81,24 @@ class RpmRemoveError(Error):
(failed deps, etc)"""
def __init__(self, args):
self.args = args
- self.errmsg = ""
+ self.value = ""
for key in self.args.keys():
if not isinstance(self.args[key], unicode):
self.args[key] = unicode(self.args[key], 'utf-8')
- self.errmsg = self.errmsg + "%s failed because of %s\n" % (
+ self.value = self.value + "%s failed because of %s\n" % (
key, self.args[key])
self.data = self.args
def __repr__(self):
- return self.errmsg
+ return self.value
class NoLogError(Error):
def __init__(self, msg):
if not isinstance(msg, unicode):
msg = unicode(msg, 'utf-8')
- self.errmsg = self.premsg + msg
+ self.value = self.premsg + msg
def __repr__(self):
- return self.errmsg
+ return self.value
class AbuseError(Error):
pass
@@ -134,13 +135,13 @@ class RhnUuidUniquenessError(NoLogError, RhnServerException):
class ServerCapabilityError(Error):
def __init__(self, msg, errorlist=None):
- self.errmsg = msg
+ Error.__init__(self, msg)
self.errorlist = []
if errorlist:
self.errorlist=errorlist
def __repr__(self):
- return self.errmsg
+ return self.value
class NoChannelsError(NoLogError):
pass
@@ -207,10 +208,10 @@ class PasswordMaxLengthError(NoLogError):
class InsuffMgmntEntsError(RhnServerException):
def __init__(self, msg ):
- self.errmsg = self.changeExplanation(msg)
+ self.value = self.changeExplanation(msg)
def __repr__(self):
- return self.errmsg
+ return self.value
def changeExplanation(self, msg):
newExpln = _("""
commit 8fc0f72a24fad043e44e55c14fe15a9bafabe24f
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Nov 7 16:09:19 2011 +0100
correctly assign converted unicode string
this got wrong in commit eb22791ceca8f07bfe598c1c820c74378c586d00
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py b/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py
index 3661aab..027636c 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py
@@ -93,7 +93,7 @@ class RpmRemoveError(Error):
class NoLogError(Error):
def __init__(self, msg):
if not isinstance(msg, unicode):
- errmsg = unicode(msg, 'utf-8')
+ msg = unicode(msg, 'utf-8')
self.errmsg = self.premsg + msg
def __repr__(self):
commit 37f69d75813700640c9dcb176ce332deb4f1a12d
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Nov 7 16:06:52 2011 +0100
correctly check for unicode type
this got wrong in commit eb22791ceca8f07bfe598c1c820c74378c586d00
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py b/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py
index 41021be..3661aab 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py
@@ -82,7 +82,7 @@ class RpmRemoveError(Error):
self.args = args
self.errmsg = ""
for key in self.args.keys():
- if not isinstance(errmsg, self.args[key]):
+ if not isinstance(self.args[key], unicode):
self.args[key] = unicode(self.args[key], 'utf-8')
self.errmsg = self.errmsg + "%s failed because of %s\n" % (
key, self.args[key])
12 years, 7 months
java/buildconf
by Miroslav Suchý
java/buildconf/apidoc/jsp/scripts.txt | 26 --------------------------
1 file changed, 26 deletions(-)
New commits:
commit 2b232d0639aae66e7c7d2562447241c635583ad9
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Nov 7 14:16:13 2011 +0100
example with usage of xmlrpclib.DateTime is presented twice, remove one
diff --git a/java/buildconf/apidoc/jsp/scripts.txt b/java/buildconf/apidoc/jsp/scripts.txt
index 0ec0a01..d84a013 100644
--- a/java/buildconf/apidoc/jsp/scripts.txt
+++ b/java/buildconf/apidoc/jsp/scripts.txt
@@ -84,32 +84,6 @@ earliest_occurrence)<br />
client.auth.logout(key)<br />
</code>
<p />
-Following code show how to use date-time parameters. This code will schedule
-immediatelly installation of package rhnlib-2.5.22.9.el6.noarch to system with
-id 1000000001.
-<p />
-
-<code>
-#!/usr/bin/python<br />
-from datetime import datetime<br />
-import time<br />
-import xmlrpclib<br />
-<br />
-SATELLITE_URL = "http://satellite.example.com/rpc/api"<br />
-SATELLITE_LOGIN = "username"<br />
-SATELLITE_PASSWORD = "password"<br />
-<br />
-client = xmlrpclib.Server(SATELLITE_URL, verbose=0)<br />
-<br />
-key = client.auth.login(SATELLITE_LOGIN, SATELLITE_PASSWORD)<br />
-package_list = client.packages.findByNvrea(key, 'rhnlib', '2.5.22', '9.el6', '', 'noarch')<br />
-today = datetime.today()<br />
-earliest_occurrence = xmlrpclib.DateTime(today)<br />
-client.system.schedulePackageInstall(key, 1000000001, package_list[0]['id'],
-earliest_occurrence)<br />
-<br />
-client.auth.logout(key)<br />
-</code>
<hr />
For more examples visit the <a href="https://fedorahosted.org/spacewalk/">Spacewalk community page</a>.
12 years, 7 months
Changes to 'refs/tags/spacewalk-java-1.6.74-1'
by Tomas Lestach
Tag 'spacewalk-java-1.6.74-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2011-11-07 13:03 +0000
Tagging package [spacewalk-java] version [1.6.74-1] in directory [java/].
Changes since spacewalk-java-1.6.73-1:
Simon Lukasik (1):
734799 - Correct API documentation
Tomas Lestach (6):
delete redundant comments
fix system.createSystemRecord API doc return type
680489 - fix system.tagLatestSnapshot API doc return type
680489 - fix system.deleteTagFromSnapshot API doc return type
680489 - fix system.provisioning.snapshot.addTagToSnapshot API doc
Automatic commit of package [spacewalk-java] release [1.6.74-1].
---
java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java | 13 +++++-
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 21 +---------
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/provisioning/snapshot/SnapshotHandler.java | 6 +-
java/spacewalk-java.spec | 13 +++++-
rel-eng/packages/spacewalk-java | 2
5 files changed, 30 insertions(+), 25 deletions(-)
---
12 years, 7 months
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 13 ++++++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 13 insertions(+), 2 deletions(-)
New commits:
commit 9d1d5bf3ffc67ef142f18debb06c09cce0fa661b
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Nov 7 14:03:04 2011 +0100
Automatic commit of package [spacewalk-java] release [1.6.74-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 85d440c..6752302 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.6.73
+Version: 1.6.74
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -557,6 +557,17 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Nov 07 2011 Tomas Lestach <tlestach(a)redhat.com> 1.6.74-1
+- 680489 - fix system.provisioning.snapshot.addTagToSnapshot API doc
+ (tlestach(a)redhat.com)
+- 680489 - fix system.deleteTagFromSnapshot API doc return type
+ (tlestach(a)redhat.com)
+- 680489 - fix system.tagLatestSnapshot API doc return type
+ (tlestach(a)redhat.com)
+- fix system.createSystemRecord API doc return type (tlestach(a)redhat.com)
+- delete redundant comments (tlestach(a)redhat.com)
+- 734799 - Correct API documentation (slukasik(a)redhat.com)
+
* Sat Nov 05 2011 Simon Lukasik <slukasik(a)redhat.com> 1.6.73-1
- 725050 - fix activationkey.[gs]etDetails apidoc (slukasik(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index b4f74b8..6b5e996 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.6.73-1 java/
+1.6.74-1 java/
12 years, 7 months
5 commits - java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 21 +---------
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/provisioning/snapshot/SnapshotHandler.java | 6 +-
2 files changed, 6 insertions(+), 21 deletions(-)
New commits:
commit 73f746ef3bf67aafe7e6073b6dc713d5fe0e604b
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Nov 7 13:59:38 2011 +0100
680489 - fix system.provisioning.snapshot.addTagToSnapshot API doc
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/provisioning/snapshot/SnapshotHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/provisioning/snapshot/SnapshotHandler.java
index 849b8b2..cc84c93 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/provisioning/snapshot/SnapshotHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/provisioning/snapshot/SnapshotHandler.java
@@ -273,9 +273,9 @@ public class SnapshotHandler extends BaseHandler {
* @return 1 on success
*
* @xmlrpc.doc Adds tag to snapshot
- * @xmlrpc.param sessionKey #session_key()
- * @xmlrpc.param snapId #param_desc("int", "snapshotId", "Id of the snapshot")
- * @xmlrpc.param tagName #param_desc("string", "tag", "Name of the snapshot tag")
+ * @xmlrpc.param #session_key()
+ * @xmlrpc.param #param_desc("int", "snapshotId", "Id of the snapshot")
+ * @xmlrpc.param #param_desc("string", "tag", "Name of the snapshot tag")
* @xmlrpc.returntype #return_int_success()
*/
public int addTagToSnapshot(String sessionKey, Integer snapId, String tagName) {
commit b126410f773f43bc26018b131bea3d445fc81383
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Nov 7 13:58:19 2011 +0100
680489 - fix system.deleteTagFromSnapshot API doc return type
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 205c83a..e00609c 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
@@ -4911,7 +4911,7 @@ public class SystemHandler extends BaseHandler {
* @xmlrpc.param #param("string", "sessionKey")
* @xmlrpc.param #param("int", "serverId")
* @xmlrpc.param #param("string", "tagName")
- * @xmlrpc.return int - #return_int_success()
+ * @xmlrpc.returntype #return_int_success()
*/
public int deleteTagFromSnapshot(String sessionKey, Integer serverId, String tagName) {
User loggedInUser = getLoggedInUser(sessionKey);
commit aacc42d1fad47213a56037fcd20e3b53a6151795
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Nov 7 13:56:40 2011 +0100
680489 - fix system.tagLatestSnapshot API doc return type
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 a897085..205c83a 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
@@ -4879,7 +4879,7 @@ public class SystemHandler extends BaseHandler {
* @xmlrpc.param #param("string", "sessionKey")
* @xmlrpc.param #param("int", "serverId")
* @xmlrpc.param #param("string", "tagName")
- * @xmlrpc.return int - #return_int_success()
+ * @xmlrpc.returntype #return_int_success()
*/
public int tagLatestSnapshot(String sessionKey, Integer serverId, String tagName) {
User loggedInUser = getLoggedInUser(sessionKey);
commit ed4b735e43f27ea5be79e57dfc9cfa67f6263b9f
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Nov 7 13:55:17 2011 +0100
fix system.createSystemRecord API doc return type
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 4ac4809..a897085 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
@@ -4473,7 +4473,7 @@ public class SystemHandler extends BaseHandler {
* @xmlrpc.param #param("string", "sessionKey")
* @xmlrpc.param #param("int", "serverId")
* @xmlrpc.param #param("string", "ksLabel")
- * @xmlrpc.returntype int - #return_int_success()
+ * @xmlrpc.returntype #return_int_success()
*/
public int createSystemRecord(String sessionKey, Integer serverId, String ksLabel) {
User loggedInUser = getLoggedInUser(sessionKey);
commit c9a379fa49df2fdae887d65b254b83df143fbc3e
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Nov 7 13:53:31 2011 +0100
delete redundant comments
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 90de1d3..4ac4809 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
@@ -4749,21 +4749,6 @@ public class SystemHandler extends BaseHandler {
}
/**
- * Creates a cobbler system record
- * @param sessionKey session
- * @param serverId the host system id
- * @param ksLabel identifies the kickstart profile
- *
- * @return int - 1 on success, exception thrown otherwise.
- *
- * @xmlrpc.doc Creates a cobbler system record with the specified kickstart label
- * @xmlrpc.param #param("string", "sessionKey")
- * @xmlrpc.param #param("int", "serverId")
- * @xmlrpc.param #param("string", "ksLabel")
- * @xmlrpc.returntype int - #return_int_success()
- */
-
- /**
* Converts the given list of systems to use the flex entitlement.
* @param sessionKey session
* @param serverIds list of server ids whom
12 years, 7 months
java/code
by Šimon Lukašík
java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java | 13 ++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
New commits:
commit 57c29d046229d4a49545c3e216d060f2fdef5bca
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Mon Nov 7 10:22:24 2011 +0100
734799 - Correct API documentation
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java
index 4a388eb..299037c 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java
@@ -104,6 +104,15 @@ public class ConfigChannelHandler extends BaseHandler {
* @param filePath The configuration file path.
* @param revisions List of configuration file revisions to delete.
* @return 1 if deletion succeeds, errors out otherwise.
+ *
+ * @xmlrpc.doc Delete specified revisions of a given configuration file
+ * @xmlrpc.param #session_key()
+ * @xmlrpc.param #param_desc("string", "channelLabel",
+ * "Label of config channel to lookup on.")
+ * @xmlrpc.param #param_desc("string", "filePath",
+ * "Configuration file path.")
+ * @xmlrpc.param #array_single("int", "List of revisions to delete")
+ * @xmlrpc.returntype #return_int_success()
*/
public int deleteFileRevisions(String sessionKey, String configChannelLabel,
String filePath, List<Integer> revisions) {
@@ -134,8 +143,8 @@ public class ConfigChannelHandler extends BaseHandler {
* @xmlrpc.param #session_key()
* @xmlrpc.param #param_desc("string", "channelLabel",
* "label of config channel to lookup on")
- * @xmlrpc.param
- * #param_desc("string", "config file path to examine")
+ * @xmlrpc.param #param_desc("string", "filePath",
+ * "config file path to examine")
* @xmlrpc.returntype
* #array()
* $ConfigRevisionSerializer
12 years, 7 months
Changes to 'refs/tags/spacewalk-java-1.6.73-1'
by Šimon Lukašík
Tag 'spacewalk-java-1.6.73-1' created by Simon Lukasik <slukasik(a)redhat.com> at 2011-11-05 16:12 +0000
Tagging package [spacewalk-java] version [1.6.73-1] in directory [java/].
Changes since spacewalk-java-1.6.72-1:
Milan Zazrivec (7):
679335 - store osa-dispatcher jabber password in DB
679335 - remove osa-dispatcher login credentials from rhn.conf
Automatic commit of package [spacewalk-schema] release [1.6.27-1].
Automatic commit of package [spacewalk-backend] release [1.6.38-1].
Automatic commit of package [spacewalk-setup] release [1.6.2-1].
Automatic commit of package [osad] release [5.10.25-1].
Automatic commit of package [spacewalk-config] release [1.6.4-1].
Simon Lukasik (2):
725050 - fix activationkey.[gs]etDetails apidoc
Automatic commit of package [spacewalk-java] release [1.6.73-1].
---
backend/common/rhnConfig.py | 2
backend/spacewalk-backend.spec | 5 +
client/tools/osad/osad.spec | 5 +
client/tools/osad/rhn-conf/rhn_osa-dispatcher.conf | 2
client/tools/osad/src/osa_dispatcher.py | 39 +++++++---
java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java | 1
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ActivationKeySerializer.java | 1
java/spacewalk-java.spec | 5 +
rel-eng/packages/osad | 2
rel-eng/packages/spacewalk-backend | 2
rel-eng/packages/spacewalk-config | 2
rel-eng/packages/spacewalk-java | 2
rel-eng/packages/spacewalk-schema | 2
rel-eng/packages/spacewalk-setup | 2
schema/spacewalk/common/tables/rhnPushDispatcher.sql | 1
schema/spacewalk/spacewalk-schema.spec | 5 +
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/124-rhnPushDispatcher.sql.oracle | 1
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/124-rhnPushDispatcher.sql.postgresql | 3
spacewalk/config/spacewalk-config.spec | 5 +
spacewalk/config/var/lib/rhn/rhn-satellite-prep/etc/rhn/rhn.conf | 6 -
spacewalk/setup/bin/spacewalk-setup | 23 -----
spacewalk/setup/spacewalk-setup.spec | 5 +
22 files changed, 65 insertions(+), 56 deletions(-)
---
12 years, 7 months