java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 3 ++-
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 1 +
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
rel-eng/packages/spacewalk-web | 2 +-
web/conf/rhn_web.conf | 2 +-
web/html/nav/styles | 1 +
web/spacewalk-web.spec | 5 ++++-
8 files changed, 15 insertions(+), 6 deletions(-)
New commits:
commit 159daa2f89fea7caeab13b64d1abf71918fb1d8d
Author: Aron Parsons <aparsons(a)redhat.com>
Date: Thu Dec 23 12:43:25 2010 -0500
Automatic commit of package [spacewalk-web] release [1.3.18-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 779eb4e..3a485f7 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.3.17-1 web/
+1.3.18-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 2b25e83..2bdcf23 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.3.17
+Version: 1.3.18
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -255,6 +255,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Thu Dec 23 2010 Aron Parsons <aparsons(a)redhat.com> 1.3.18-1
+- bump API version number for recent API changes (aparsons(a)redhat.com)
+
* Thu Dec 23 2010 Jan Pazdziora 1.3.17-1
- Since ssm_channel_change_conf is gone, ssm_channel_change_conf_provider is
not used anymore, removing.
commit bac948a6af823bf36275d22a05819ffa6af70411
Author: Aron Parsons <aparsons(a)redhat.com>
Date: Thu Dec 23 12:42:41 2010 -0500
Automatic commit of package [spacewalk-java] release [1.3.33-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 6741550..1f55fc9 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.3.32
+Version: 1.3.33
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -456,6 +456,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Dec 23 2010 Aron Parsons <aparsons(a)redhat.com> 1.3.33-1
+- add package ID to array returned by system.listPackages API call
+
* Wed Dec 22 2010 Tomas Lestach <tlestach(a)redhat.com> 1.3.32-1
- 640928 - convert List<Integer> serverIds to List<Long>
(tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index c955716..717afff 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.3.32-1 java/
+1.3.33-1 java/
commit 6942adf3af22be062f338b20bc366d31c1d9a138
Author: Aron Parsons <aparsons(a)redhat.com>
Date: Thu Dec 23 12:39:39 2010 -0500
bump API version number for recent API changes
diff --git a/web/conf/rhn_web.conf b/web/conf/rhn_web.conf
index d277424..dfa59a4 100644
--- a/web/conf/rhn_web.conf
+++ b/web/conf/rhn_web.conf
@@ -225,7 +225,7 @@ web.config_delim_end = |}
web.version = 1.3 nightly
# the version of API
-web.apiversion = 10.15
+web.apiversion = 10.16
# maximum size for a config file
web.maximum_config_file_size = 131072
diff --git a/web/html/nav/styles b/web/html/nav/styles
new file mode 120000
index 0000000..dbfef52
--- /dev/null
+++ b/web/html/nav/styles
@@ -0,0 +1 @@
+/home/spacewalk/spacewalk/branding/styles
\ No newline at end of file
commit ceccae97e862eed4bd2ea9470a5974fe59f09bb3
Author: Aron Parsons <aparsons(a)redhat.com>
Date: Thu Dec 23 12:39:01 2010 -0500
add package ID to array returned by system.listPackages API call
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
index c9a1b3b..baa5bd3 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
@@ -1322,7 +1322,8 @@ SELECT PN.name,
PE.release,
coalesce(PE.epoch, ' ') as epoch,
PA.name as arch,
- SP.installtime
+ SP.installtime,
+ PN.id
FROM rhnServerPackage SP inner join
rhnPackageName PN on PN.id = SP.name_id inner join
rhnPackageEVR PE on PE.id = SP.evr_id left join
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 7e40a89..b6e8566 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
@@ -1191,6 +1191,7 @@ public class SystemHandler extends BaseHandler {
* @xmlrpc.returntype
* #array()
* #struct("package")
+ * #prop("int", "id")
* #prop("string", "name")
* #prop("string", "version")
* #prop("string", "release")