Changes to 'refs/tags/spacewalk-web-1.6.8-1'
by aparsons
Tag 'spacewalk-web-1.6.8-1' created by Aron Parsons <aparsons(a)redhat.com> at 2011-08-04 22:29 +0000
Tagging package [spacewalk-web] version [1.6.8-1] in directory [web/].
Changes since spacewalk-java-1.6.14-1:
Aron Parsons (1):
Automatic commit of package [spacewalk-web] release [1.6.8-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
---
12 years, 9 months
Changes to 'refs/tags/spacewalk-java-1.6.14-1'
by aparsons
Tag 'spacewalk-java-1.6.14-1' created by Aron Parsons <aparsons(a)redhat.com> at 2011-08-04 22:29 +0000
Tagging package [spacewalk-java] version [1.6.14-1] in directory [java/].
Changes since spacecmd-1.6.2-1:
Aron Parsons (2):
add support for custom messages in the header, footer and login pages
Automatic commit of package [spacewalk-java] release [1.6.14-1].
---
java/code/webapp/WEB-INF/includes/footer.jsp | 6 ++--
java/code/webapp/WEB-INF/includes/header.jsp | 5 +++
java/code/webapp/WEB-INF/pages/common/login.jsp | 20 +++++++++-----
java/code/webapp/WEB-INF/pages/common/relogin.jsp | 31 ++++++++++++++--------
java/spacewalk-java.spec | 6 +++-
rel-eng/packages/spacewalk-java | 2 -
web/conf/rhn_web.conf | 10 +++++++
7 files changed, 58 insertions(+), 22 deletions(-)
---
12 years, 9 months
3 commits - java/code java/spacewalk-java.spec rel-eng/packages web/conf web/spacewalk-web.spec
by aparsons
java/code/webapp/WEB-INF/includes/footer.jsp | 6 ++--
java/code/webapp/WEB-INF/includes/header.jsp | 5 +++
java/code/webapp/WEB-INF/pages/common/login.jsp | 20 +++++++++-----
java/code/webapp/WEB-INF/pages/common/relogin.jsp | 31 ++++++++++++++--------
java/spacewalk-java.spec | 6 +++-
rel-eng/packages/spacewalk-java | 2 -
rel-eng/packages/spacewalk-web | 2 -
web/conf/rhn_web.conf | 10 +++++++
web/spacewalk-web.spec | 6 +++-
9 files changed, 64 insertions(+), 24 deletions(-)
New commits:
commit 674ff02e991ec2f1ba2511bbb23ea0b38cf812dc
Author: Aron Parsons <aparsons(a)redhat.com>
Date: Thu Aug 4 18:29:24 2011 -0400
Automatic commit of package [spacewalk-web] release [1.6.8-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 2e343f6..366d1f2 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.6.7-1 web/
+1.6.8-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index cbe6425..1f82ed5 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 1.6.7
+Version: 1.6.8
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -257,6 +257,10 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Thu Aug 04 2011 Aron Parsons <aparsons(a)redhat.com> 1.6.8-1
+- add support for custom messages in the header, footer and login pages
+ (aparsons(a)redhat.com)
+
* Fri Jul 29 2011 Miroslav Suchý 1.6.7-1
- Revert "adding tomcat require to spacewalk-base-minimal"
commit 28a804be07f49707378a1edeb81bd63f65b6e2ce
Author: Aron Parsons <aparsons(a)redhat.com>
Date: Thu Aug 4 18:29:12 2011 -0400
Automatic commit of package [spacewalk-java] release [1.6.14-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index f51f716..95f9566 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.13
+Version: 1.6.14
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -546,6 +546,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Aug 04 2011 Aron Parsons <aparsons(a)redhat.com> 1.6.14-1
+- add support for custom messages in the header, footer and login pages
+ (aparsons(a)redhat.com)
+
* Thu Aug 04 2011 Tomas Lestach <tlestach(a)redhat.com> 1.6.13-1
- remove unused ChannelEditor method (tlestach(a)redhat.com)
- remove unused OvalServlet method (tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index f478fe0..673583f 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.6.13-1 java/
+1.6.14-1 java/
commit b9a0b5d94bf9b5c14cd84822f3c502c2204f515d
Author: Aron Parsons <aparsons(a)redhat.com>
Date: Thu Aug 4 18:28:16 2011 -0400
add support for custom messages in the header, footer and login pages
the following variables can be configured in /etc/rhn/rhn.conf:
web.custom_header
web.custom_footer
web.login_banner
Long lines can be wrapped using \ to break the lines and HTML is OK
diff --git a/java/code/webapp/WEB-INF/includes/footer.jsp b/java/code/webapp/WEB-INF/includes/footer.jsp
index cb2cac7..a94a925 100644
--- a/java/code/webapp/WEB-INF/includes/footer.jsp
+++ b/java/code/webapp/WEB-INF/includes/footer.jsp
@@ -9,8 +9,10 @@
: <a href="http://www.redhat.com/">redhat.com</a>
<div style="color: black"><bean:message key="footer.jsp.release" arg0="/rhn/help/dispatcher/release_notes" arg1="${rhn:getConfig('web.version')}" /></div>
<p><%@ include file="/WEB-INF/pages/common/fragments/bugzilla.jspf" %></p>
-
-
+ <c:set var="custom_footer" scope="page" value="${rhn:getConfig('web.custom_footer')}" />
+ <c:if test="${! empty custom_footer}">
+ <p><c:out value="${custom_footer}" escapeXml="false"/></p>
+ </c:if>
</div>
<%--
Render Javascript here so we can be sure that all of
diff --git a/java/code/webapp/WEB-INF/includes/header.jsp b/java/code/webapp/WEB-INF/includes/header.jsp
index 8cac47c..24a4e25 100644
--- a/java/code/webapp/WEB-INF/includes/header.jsp
+++ b/java/code/webapp/WEB-INF/includes/header.jsp
@@ -4,6 +4,11 @@
<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<!-- header.jsp -->
+<c:set var="custom_header" scope="page" value="${rhn:getConfig('web.custom_header')}" />
+<c:if test="${! empty custom_header}">
+ <center><p><c:out value="${custom_header}" escapeXml="false"/></p></center>
+</c:if>
+
<rhn:require acl="user_authenticated()">
<div id="utility">
<div id="utilityLinks">
diff --git a/java/code/webapp/WEB-INF/pages/common/login.jsp b/java/code/webapp/WEB-INF/pages/common/login.jsp
index cd7ea40..21e36aa 100644
--- a/java/code/webapp/WEB-INF/pages/common/login.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/login.jsp
@@ -26,14 +26,20 @@
</c:if>
<div id="contentRight">
- <h1 id="rhn_welcome3"><span><bean:message key="login.jsp.welcomemessage"/></span></h1>
-
- <p><bean:message key="login.jsp.satbody1"/></p>
- <p><bean:message key="login.jsp.satbody2"/></p>
- <p><bean:message key="login.jsp.satbody3"/></p>
- <p><bean:message key="login.jsp.satbody4"/></p>
-
+ <c:set var="login_banner" scope="page" value="${rhn:getConfig('web.login_banner')}" />
+ <c:choose>
+ <c:when test="${! empty login_banner}">
+ <p><c:out value="${login_banner}" escapeXml="false"/></p>
+ </c:when>
+ <c:otherwise>
+ <h1 id="rhn_welcome3"><span><bean:message key="login.jsp.welcomemessage"/></span></h1>
+ <p><bean:message key="login.jsp.satbody1"/></p>
+ <p><bean:message key="login.jsp.satbody2"/></p>
+ <p><bean:message key="login.jsp.satbody3"/></p>
+ <p><bean:message key="login.jsp.satbody4"/></p>
+ </c:otherwise>
+ </c:choose>
</div> <!-- end contentRight -->
</body>
</html>
diff --git a/java/code/webapp/WEB-INF/pages/common/relogin.jsp b/java/code/webapp/WEB-INF/pages/common/relogin.jsp
index a0aa272..bd69089 100644
--- a/java/code/webapp/WEB-INF/pages/common/relogin.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/relogin.jsp
@@ -13,17 +13,26 @@
<c:if test="${requestScope.hasExpired != 'true'}">
<h1><bean:message key="relogin.jsp.pleasesignin"/></h1>
- <div class="clearBox">
- <div class="clearBoxInner">
- <div class="clearBoxBody">
- <html:form action="/ReLoginSubmit">
- <rhn:csrf />
- <%@ include file="/WEB-INF/pages/common/fragments/login_form.jspf" %>
- <html:hidden property="url_bounce" />
- </html:form>
- </div><!-- end clearBoxBody -->
- </div><!-- end clearBoxInner -->
- </div><!-- end clearBox -->
+ <div id="contentLeft">
+ <div class="clearBox">
+ <div class="clearBoxInner">
+ <div class="clearBoxBody">
+ <html:form action="/ReLoginSubmit">
+ <rhn:csrf />
+ <%@ include file="/WEB-INF/pages/common/fragments/login_form.jspf" %>
+ <html:hidden property="url_bounce" />
+ </html:form>
+ </div><!-- end clearBoxBody -->
+ </div><!-- end clearBoxInner -->
+ </div><!-- end clearBox -->
+ </div> <!-- end contentLeft -->
+
+ <div id="contentRight">
+ <c:set var="login_banner" scope="page" value="${rhn:getConfig('web.login_banner')}" />
+ <c:if test="${! empty login_banner}">
+ <p><c:out value="${login_banner}" escapeXml="false"/></p>
+ </c:if>
+ </div> <!-- end contentRight -->
</c:if>
</rhn:require>
diff --git a/web/conf/rhn_web.conf b/web/conf/rhn_web.conf
index 6d4af4e..c62bc68 100644
--- a/web/conf/rhn_web.conf
+++ b/web/conf/rhn_web.conf
@@ -322,3 +322,13 @@ web.non_expirable_package_urls =
# allow users to chat with spacewalk members on IRC via the web
web.chat_enabled = 0
+
+# text to be displayed in the header of every page
+web.custom_header =
+
+# text to be displayed in the footer of every page
+web.custom_footer =
+
+# text to be displayed on the login page
+# (join long lines with \, HTML is okay to use)
+web.login_banner =
12 years, 9 months
Changes to 'refs/tags/spacecmd-1.6.2-1'
by aparsons
Tag 'spacecmd-1.6.2-1' created by Aron Parsons <aparsons(a)redhat.com> at 2011-08-04 21:58 +0000
Tagging package [spacecmd] version [1.6.2-1] in directory [spacecmd/].
Changes since spacewalk-java-1.6.13-1:
Aron Parsons (1):
Automatic commit of package [spacecmd] release [1.6.2-1].
Satoru SATOH (3):
add api module to spacecmd
add utility routines for new 'api' module
Enable new 'api' module
---
rel-eng/packages/spacecmd | 2
spacecmd/spacecmd.spec | 7 ++-
spacecmd/src/lib/api.py | 95 +++++++++++++++++++++++++++++++++++++++++++
spacecmd/src/lib/shell.py | 2
spacecmd/src/lib/utils.py | 101 ++++++++++++++++++++++++++++++++++++++++++++++
5 files changed, 204 insertions(+), 3 deletions(-)
---
12 years, 9 months
4 commits - rel-eng/packages spacecmd/spacecmd.spec spacecmd/src
by aparsons
rel-eng/packages/spacecmd | 2
spacecmd/spacecmd.spec | 7 ++-
spacecmd/src/lib/api.py | 95 +++++++++++++++++++++++++++++++++++++++++++
spacecmd/src/lib/shell.py | 2
spacecmd/src/lib/utils.py | 101 ++++++++++++++++++++++++++++++++++++++++++++++
5 files changed, 204 insertions(+), 3 deletions(-)
New commits:
commit 71ebdded59d86aeacd56fd7ac5e7a0e8bcebf8dd
Author: Aron Parsons <aparsons(a)redhat.com>
Date: Thu Aug 4 17:58:14 2011 -0400
Automatic commit of package [spacecmd] release [1.6.2-1].
diff --git a/rel-eng/packages/spacecmd b/rel-eng/packages/spacecmd
index 754cc38..c8593e3 100644
--- a/rel-eng/packages/spacecmd
+++ b/rel-eng/packages/spacecmd
@@ -1 +1 @@
-1.6.1-1 spacecmd/
+1.6.2-1 spacecmd/
diff --git a/spacecmd/spacecmd.spec b/spacecmd/spacecmd.spec
index 84bb3b8..26e26e0 100644
--- a/spacecmd/spacecmd.spec
+++ b/spacecmd/spacecmd.spec
@@ -4,7 +4,7 @@
%endif
Name: spacecmd
-Version: 1.6.1
+Version: 1.6.2
Release: 1%{?dist}
Summary: Command-line interface to Spacewalk and Satellite servers
@@ -61,6 +61,11 @@ touch %{buildroot}/%{python_sitelib}/spacecmd/__init__.py
%doc %{_mandir}/man1/spacecmd.1.gz
%changelog
+* Thu Aug 04 2011 Aron Parsons <aparsons(a)redhat.com> 1.6.2-1
+- Enable new 'api' module (satoru.satoh(a)gmail.com)
+- add utility routines for new 'api' module (satoru.satoh(a)gmail.com)
+- add api module to spacecmd (satoru.satoh(a)gmail.com)
+
* Fri Jul 22 2011 Jan Pazdziora 1.6.1-1
- We only support version 14 and newer of Fedora, removing conditions for old
versions.
commit 54d2ca9555e706656779bf2ff6cfc077ae376435
Author: Satoru SATOH <satoru.satoh(a)gmail.com>
Date: Fri Jul 29 18:33:48 2011 +0900
Enable new 'api' module
This is the last one to enable new 'api' module in spacecmd.
Signed-Off-By: Satoru SATOH <ssato(a)redhat.com>
diff --git a/spacecmd/src/lib/shell.py b/spacecmd/src/lib/shell.py
index 08d0898..1025048 100644
--- a/spacecmd/src/lib/shell.py
+++ b/spacecmd/src/lib/shell.py
@@ -29,7 +29,7 @@ class SpacewalkShell(Cmd):
'custominfo', 'distribution', 'errata',
'filepreservation', 'group', 'kickstart',
'misc', 'org', 'package', 'repo', 'report', 'schedule',
- 'snippet', 'softwarechannel', 'ssm',
+ 'snippet', 'softwarechannel', 'ssm', 'api',
'system', 'user', 'utils' ]
# a SyntaxError is thrown if we don't wrap this in an 'exec'
commit 5c80e1a30082b2e2e2a6f61ada670f4c91c19955
Author: Satoru SATOH <satoru.satoh(a)gmail.com>
Date: Fri Jul 29 18:28:33 2011 +0900
add utility routines for new 'api' module
This patch adds some utility routines needed for new 'api' module in
spacecmd.
Its all doctests look OK as far as I tested. Here is a test log:
$ PYTHONPATH=spacecmd/src/lib nosetests --with-doctest -vv \
> spacecmd/src/lib/utils.py
Doctest: utils.parse_api_args ... ok
Doctest: utils.parse_list_str ... ok
Doctest: utils.parse_str ... ok
----------------------------------------------------------------------
Ran 3 tests in 0.020s
OK
$
Signed-Off-By: Satoru SATOH <ssato(a)redhat.com>
diff --git a/spacecmd/src/lib/utils.py b/spacecmd/src/lib/utils.py
index 3768647..a8fd5ee 100644
--- a/spacecmd/src/lib/utils.py
+++ b/spacecmd/src/lib/utils.py
@@ -26,6 +26,12 @@ from optparse import OptionParser
from tempfile import mkstemp
from textwrap import wrap
+try:
+ import json
+except ImportError:
+ import simplejson as json # python < 2.6
+
+
__EDITORS = ['vim', 'vi', 'nano', 'emacs']
def parse_arguments(args, options = []):
@@ -462,4 +468,99 @@ def read_file(filename):
return contents
+
+def parse_str(s, type_to=None):
+ """
+ Similar to 'read :: Read a => String -> a' in Haskell.
+
+ >>> parse_str('1234567', int)
+ 1234567
+ >>> parse_str('1234567')
+ 1234567
+ >>> parse_str('abcXYZ012')
+ 'abcXYZ012'
+ >>> d = dict(channelLabel="foo-i386-5")
+ >>> d = parse_str('{"channelLabel": "foo-i386-5"}')
+ >>> assert d["channelLabel"] == 'foo-i386-5'
+
+ """
+ try:
+ if type_to is not None and isinstance(type_to, type):
+ return type_to(s)
+
+ elif re.match(r'[1-9]\d*', s):
+ return int(s)
+
+ elif re.match(r'{.*}', s):
+ return json.loads(s) # retry with json module
+
+ else:
+ return str(s)
+
+ except ValueError:
+ return str(s)
+
+
+def parse_list_str(list_s, sep=","):
+ """
+ simple parser for a list of items separated with "," (comma) or given
+ separator chars.
+
+ >>> assert parse_list_str("") == []
+ >>> assert parse_list_str("a,b") == ["a", "b"]
+ >>> assert parse_list_str("a,b,") == ["a", "b"]
+ >>> assert parse_list_str("a:b:", ":") == ["a", "b"]
+ """
+ return [p for p in list_s.split(sep) if p]
+
+
+def parse_api_args(args, sep=','):
+ """
+ Simple JSON-like expression parser.
+
+ :param args: a list of strings may be separated with sep, and each
+ string represents parameters passed to API later.
+ :type args: `str`
+
+ :param sep: A char to separate paramters in `args`
+ :type sep: `str`
+
+ :rtype: rpc arg objects, [arg] :: [string]
+
+ >>> parse_api_args('')
+ []
+ >>> parse_api_args('1234567')
+ [1234567]
+ >>> parse_api_args('abcXYZ012')
+ ['abcXYZ012']
+
+ >>> assert parse_api_args('{"channelLabel": "foo-i386-5"}')[0]["channelLabel"] == "foo-i386-5"
+
+ >>> (i, s, d) = parse_api_args('1234567,abcXYZ012,{"channelLabel": "foo-i386-5"}')
+ >>> assert i == 1234567
+ >>> assert s == "abcXYZ012"
+ >>> assert d["channelLabel"] == "foo-i386-5"
+
+ >>> (i, s, d) = parse_api_args('[1234567,"abcXYZ012",{"channelLabel": "foo-i386-5"}]')
+ >>> assert i == 1234567
+ >>> assert s == "abcXYZ012"
+ >>> assert d["channelLabel"] == "foo-i386-5"
+ """
+ if not args:
+ return []
+
+ try:
+ x = json.loads(args)
+ ret = isinstance(x, list) and x or [x]
+
+ except ValueError:
+ ret = [parse_str(a) for a in parse_list_str(args, sep)]
+
+ return ret
+
+
+def json_dump(obj, fp, indent=2, **kwargs):
+ json.dump(obj, fp, ensure_ascii=False, indent=indent, **kwargs)
+
+
# vim:ts=4:expandtab:
commit 05ba31a7e3b4aec724316d8ce70725e977a10b3f
Author: Satoru SATOH <satoru.satoh(a)gmail.com>
Date: Fri Jul 29 18:20:04 2011 +0900
add api module to spacecmd
This patch adds 'api' module into spacecmd.
Signed-Off-By: Satoru SATOH <ssato(a)redhat.com>
diff --git a/spacecmd/src/lib/api.py b/spacecmd/src/lib/api.py
new file mode 100644
index 0000000..0c1d05c
--- /dev/null
+++ b/spacecmd/src/lib/api.py
@@ -0,0 +1,95 @@
+#
+# Licensed under the GNU General Public License Version 3
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Copyright 2011 Satoru SATOH <ssato(a)redhat.com>
+#
+
+from optparse import Option
+from spacecmd.utils import *
+
+import sys
+import logging
+
+
+def help_api(self):
+ print 'api: call RHN API with arguements directly'
+ print '''usage: api [options] API_STRING
+
+options:
+ -A, --args Arguments for the API other than session id in comma separated
+ strings or JSON expression
+ -F, --format Output format
+ -o, --output Output file
+
+examples:
+ api api.getApiCallList
+ api --args "sysgroup_A" systemgroup.listSystems
+ api -A "rhel-i386-server-5,2011-04-01,2011-05-01" -F "%(name)s" \\
+ channel.software.listAllPackages
+'''
+
+
+def do_api(self, args):
+ options = [ Option('-A', '--args', default=''),
+ Option('-F', '--format', default=''),
+ Option('-o', '--output', default='') ]
+
+ (args, options) = parse_arguments(args, options)
+
+ if not args:
+ self.help_api()
+ return
+
+ api_name = args[0]
+ api_args = parse_api_args(options.args)
+
+ if options.output:
+ try:
+ output = open(options.output, "w")
+ except IOError:
+ logging.warn("Could not open to write: " + options.output)
+ logging.info("Fallback output to stdout")
+
+ output = sys.stdout
+ else:
+ output = sys.stdout
+
+ api = getattr(self.client, api_name, None)
+
+ if not callable(api):
+ logging.warn("No such API: " + api_name)
+ return
+
+ try:
+ res = api(self.session, *api_args)
+
+ if not isinstance(res, list):
+ res = [res]
+
+ if options.format:
+ for r in res:
+ output.write(options.format % r + "\n")
+ else:
+ json_dump(res, output, indent=2)
+
+ output == sys.stdout or output.close()
+
+ except:
+ output == sys.stdout or output.close()
+
+
+# vim:ts=4:expandtab:
12 years, 9 months
Changes to 'refs/tags/spacewalk-java-1.6.13-1'
by Tomas Lestach
Tag 'spacewalk-java-1.6.13-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2011-08-04 20:01 +0000
Tagging package [spacewalk-java] version [1.6.13-1] in directory [java/].
Changes since spacewalk-java-1.6.12-1:
Tomas Lestach (10):
fix PMD BooleanInstantiation rule break
fix PMD BrokenNullCheck
remove unused HibernateFactory method
reuse unused copyKickstartCommands method
remove unused Server method
remove unused Token method
remove unused SystemEntitlementsSubmitAction method
remove unused OvalServlet method
remove unused ChannelEditor method
Automatic commit of package [spacewalk-java] release [1.6.13-1].
---
java/code/src/com/redhat/rhn/common/hibernate/HibernateFactory.java | 5 --
java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java | 11 ----
java/code/src/com/redhat/rhn/domain/server/Server.java | 6 --
java/code/src/com/redhat/rhn/domain/token/Token.java | 12 -----
java/code/src/com/redhat/rhn/frontend/action/LoginAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/LoginSetupAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/YourRhnAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/configuration/overview/Overview.java | 2
java/code/src/com/redhat/rhn/frontend/action/kickstart/BaseKickstartScriptAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/kickstart/EditPackagesAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java | 16 ++----
java/code/src/com/redhat/rhn/frontend/action/satellite/GeneralConfigAction.java | 5 --
java/code/src/com/redhat/rhn/frontend/action/satellite/MonitoringConfigAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/systems/OverviewAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/SystemEntitlementsSubmitAction.java | 23 ---------
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsEditAction.java | 6 +-
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java | 4 -
java/code/src/com/redhat/rhn/frontend/action/user/AssignedGroupsSetupAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/user/ChannelManagementPermsSetupAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/user/ChannelPermsSetupAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/user/CreateUserSetupAction.java | 4 -
java/code/src/com/redhat/rhn/frontend/action/user/UserEditSetupAction.java | 4 -
java/code/src/com/redhat/rhn/frontend/servlets/OvalServlet.java | 24 ----------
java/code/src/com/redhat/rhn/frontend/struts/RhnUnpagedListAction.java | 11 +---
java/code/src/com/redhat/rhn/manager/channel/ChannelEditor.java | 18 -------
java/code/src/com/redhat/rhn/manager/kickstart/BaseKickstartScriptCommand.java | 5 --
java/code/src/org/cobbler/Network.java | 5 +-
java/spacewalk-java.spec | 13 +++++
rel-eng/packages/spacewalk-java | 2
29 files changed, 50 insertions(+), 147 deletions(-)
---
12 years, 9 months
10 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/code/src/com/redhat/rhn/common/hibernate/HibernateFactory.java | 5 --
java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java | 11 ----
java/code/src/com/redhat/rhn/domain/server/Server.java | 6 --
java/code/src/com/redhat/rhn/domain/token/Token.java | 12 -----
java/code/src/com/redhat/rhn/frontend/action/LoginAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/LoginSetupAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/YourRhnAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/configuration/overview/Overview.java | 2
java/code/src/com/redhat/rhn/frontend/action/kickstart/BaseKickstartScriptAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/kickstart/EditPackagesAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java | 16 ++----
java/code/src/com/redhat/rhn/frontend/action/satellite/GeneralConfigAction.java | 5 --
java/code/src/com/redhat/rhn/frontend/action/satellite/MonitoringConfigAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/systems/OverviewAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/SystemEntitlementsSubmitAction.java | 23 ---------
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsEditAction.java | 6 +-
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java | 4 -
java/code/src/com/redhat/rhn/frontend/action/user/AssignedGroupsSetupAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/user/ChannelManagementPermsSetupAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/user/ChannelPermsSetupAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/user/CreateUserSetupAction.java | 4 -
java/code/src/com/redhat/rhn/frontend/action/user/UserEditSetupAction.java | 4 -
java/code/src/com/redhat/rhn/frontend/servlets/OvalServlet.java | 24 ----------
java/code/src/com/redhat/rhn/frontend/struts/RhnUnpagedListAction.java | 11 +---
java/code/src/com/redhat/rhn/manager/channel/ChannelEditor.java | 18 -------
java/code/src/com/redhat/rhn/manager/kickstart/BaseKickstartScriptCommand.java | 5 --
java/code/src/org/cobbler/Network.java | 5 +-
java/spacewalk-java.spec | 13 +++++
rel-eng/packages/spacewalk-java | 2
29 files changed, 50 insertions(+), 147 deletions(-)
New commits:
commit 4ce7b97fde42ff3f3f5cfdd9f107f722fb188502
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Aug 4 22:01:36 2011 +0200
Automatic commit of package [spacewalk-java] release [1.6.13-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 0565d8c..f51f716 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.12
+Version: 1.6.13
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -546,6 +546,17 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Aug 04 2011 Tomas Lestach <tlestach(a)redhat.com> 1.6.13-1
+- remove unused ChannelEditor method (tlestach(a)redhat.com)
+- remove unused OvalServlet method (tlestach(a)redhat.com)
+- remove unused SystemEntitlementsSubmitAction method (tlestach(a)redhat.com)
+- remove unused Token method (tlestach(a)redhat.com)
+- remove unused Server method (tlestach(a)redhat.com)
+- reuse unused copyKickstartCommands method (tlestach(a)redhat.com)
+- remove unused HibernateFactory method (tlestach(a)redhat.com)
+- fix PMD BrokenNullCheck (tlestach(a)redhat.com)
+- fix PMD BooleanInstantiation rule break (tlestach(a)redhat.com)
+
* Thu Aug 04 2011 Simon Lukasik <slukasik(a)redhat.com> 1.6.12-1
- 727984 - include static mappings for 6ComputeNode (slukasik(a)redhat.com)
- 725889 - show only channels for which the user has entitlements
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 4f480ec..f478fe0 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.6.12-1 java/
+1.6.13-1 java/
commit 8f5e5a7ebce5c367af546025ac8cbb5ba4fa265b
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Aug 4 21:50:38 2011 +0200
remove unused ChannelEditor method
diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelEditor.java b/java/code/src/com/redhat/rhn/manager/channel/ChannelEditor.java
index 2f778dc..891f39f 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/ChannelEditor.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelEditor.java
@@ -125,24 +125,6 @@ public class ChannelEditor {
}
/**
- * Private Helper method to convert an object to a Long. We need this since the list of
- * package ids could either contain Longs (if we were called from java code) or Integers
- * (if we were called from Xml-Rpc).
- * @param number An object to be converted (itr.next() from the list)
- * @return Returns a Long object or null if the object is neither a Long nor an Integer
- */
- private Long convertObjectToLong(Object number) {
- if (number instanceof Long) {
- return (Long) number;
- }
- else if (number instanceof Integer) {
- Integer integer = (Integer) number;
- return new Long(integer.longValue());
- }
- return null;
- }
-
- /**
* Calls the rhn_channel.update_channel stored proc
* @param channel The channel to update
*/
commit b5dc98196ebe360c432236d7941461046b47dd75
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Aug 4 21:47:14 2011 +0200
remove unused OvalServlet method
diff --git a/java/code/src/com/redhat/rhn/frontend/servlets/OvalServlet.java b/java/code/src/com/redhat/rhn/frontend/servlets/OvalServlet.java
index bd82658..5ed1a88 100644
--- a/java/code/src/com/redhat/rhn/frontend/servlets/OvalServlet.java
+++ b/java/code/src/com/redhat/rhn/frontend/servlets/OvalServlet.java
@@ -14,9 +14,6 @@
*/
package com.redhat.rhn.frontend.servlets;
-import com.redhat.rhn.common.db.datasource.DataResult;
-import com.redhat.rhn.common.db.datasource.ModeFactory;
-import com.redhat.rhn.common.db.datasource.SelectMode;
import com.redhat.rhn.common.util.OvalFileAggregator;
import com.redhat.rhn.domain.errata.Errata;
import com.redhat.rhn.domain.errata.ErrataFactory;
@@ -33,11 +30,9 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
-import java.util.Map;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
@@ -264,23 +259,4 @@ public class OvalServlet extends HttpServlet {
return retval;
}
-
- private List screenHiddenErratum(List erratum) {
- List retval = new LinkedList();
- if (erratum == null || erratum.size() == 0) {
- return retval;
- }
- SelectMode isErrataHidden =
- ModeFactory.getMode("Errata_queries", "is_errata_hidden");
- Map params = new HashMap(1);
- for (Iterator iter = erratum.iterator(); iter.hasNext();) {
- Errata e = (Errata) iter.next();
- params.put("errata_id", e.getId());
- DataResult result = isErrataHidden.execute(params);
- if (result.size() == 0) {
- retval.add(e);
- }
- }
- return retval;
- }
}
commit a37b572905da542201a912b08074c528409221fc
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Aug 4 21:44:37 2011 +0200
remove unused SystemEntitlementsSubmitAction method
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/SystemEntitlementsSubmitAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/SystemEntitlementsSubmitAction.java
index 78dada0..8c8e8d0 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/SystemEntitlementsSubmitAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/SystemEntitlementsSubmitAction.java
@@ -538,29 +538,6 @@ public class SystemEntitlementsSubmitAction extends
return new ActionMessage("system_entitlements.emptyselectionerror");
}
- /**
- * Used for debug purposes to print out all the error mesages....
- * @param msgs
- * @return
- */
- private ActionMessages dumpMessages(ActionMessages msgs) {
- Object [] args = new Object[]{String.valueOf(1), String.valueOf(0)};
- addToMessage(msgs, "system_entitlements.setToManagementEntitled.success", args);
- addToMessage(msgs, "system_entitlements.setToManagementEntitled.failure", args);
- addToMessage(msgs, "system_entitlements.setToUpdateEntitled.success", args);
- addToMessage(msgs, "system_entitlements.setToUpdateEntitled.failure", args);
- addToMessage(msgs, "system_entitlements.unentitle.success", args);
- addToMessage(msgs, "system_entitlements.unentitle.failure", args);
- addToMessage(msgs, "system_entitlements.provisioning.success", args);
- addToMessage(msgs, "system_entitlements.provisioning.notEnoughSlots", args);
- addToMessage(msgs, "system_entitlements.provisioning.noManagement", args);
- addToMessage(msgs, "system_entitlements.monitoring.success", args);
- addToMessage(msgs, "system_entitlements.monitoring.notEnoughSlots", args);
- addToMessage(msgs, "system_entitlements.monitoring.noManagement", args);
-
- return msgs;
- }
-
private void addToMessage(ActionMessages msgs, String key, Object[] args) {
ActionMessage temp = new ActionMessage(key, args);
msgs.add(ActionMessages.GLOBAL_MESSAGE, temp);
commit e532368aac228b6f44ba17114b16f924a8aea69d
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Aug 4 21:43:08 2011 +0200
remove unused Token method
diff --git a/java/code/src/com/redhat/rhn/domain/token/Token.java b/java/code/src/com/redhat/rhn/domain/token/Token.java
index 10248d0..e17358b 100644
--- a/java/code/src/com/redhat/rhn/domain/token/Token.java
+++ b/java/code/src/com/redhat/rhn/domain/token/Token.java
@@ -14,7 +14,6 @@
*/
package com.redhat.rhn.domain.token;
-import com.redhat.rhn.common.security.PermissionException;
import com.redhat.rhn.domain.Identifiable;
import com.redhat.rhn.domain.channel.Channel;
import com.redhat.rhn.domain.config.ConfigChannel;
@@ -24,7 +23,6 @@ import com.redhat.rhn.domain.rhnpackage.PackageArch;
import com.redhat.rhn.domain.rhnpackage.PackageName;
import com.redhat.rhn.domain.server.ManagedServerGroup;
import com.redhat.rhn.domain.server.Server;
-import com.redhat.rhn.domain.server.ServerConstants;
import com.redhat.rhn.domain.server.ServerGroup;
import com.redhat.rhn.domain.server.ServerGroupType;
import com.redhat.rhn.domain.user.User;
@@ -495,16 +493,6 @@ public class Token implements Identifiable {
return getConfigChannels();
}
- private void checkProvisioning() {
- if (!getEntitlements().contains(ServerConstants.
- getServerGroupTypeProvisioningEntitled())) {
- String msg = String.format("The activation key '%s' needs" +
- " provisioning capabilities to be able to facilitate " +
- " the config channel functionality", this);
- throw new PermissionException(msg);
- }
- }
-
/**
* Removes all the config channels associated to this activation key.
*/
commit e689c8707615aab78187c9c2dd955fd8fb05b3fb
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Aug 4 21:42:41 2011 +0200
remove unused Server method
diff --git a/java/code/src/com/redhat/rhn/domain/server/Server.java b/java/code/src/com/redhat/rhn/domain/server/Server.java
index a06fced..ea7d7ed 100644
--- a/java/code/src/com/redhat/rhn/domain/server/Server.java
+++ b/java/code/src/com/redhat/rhn/domain/server/Server.java
@@ -1390,10 +1390,6 @@ public class Server extends BaseDomainHelper implements Identifiable {
hasEntitlement(EntitlementManager.VIRTUALIZATION_PLATFORM);
}
- private boolean hasGuests() {
- return getGuests().size() > 0;
- }
-
/**
*
* @return the virtual guests
commit d96a0ca199add984bd8aea6fb345c3b33ca9495b
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Aug 4 21:58:26 2011 +0200
reuse unused copyKickstartCommands method
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
index cfad157..18e370a 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
@@ -1119,14 +1119,7 @@ public class KickstartData {
cloned.setOrg(this.getOrg());
cloned.setChildChannels(new HashSet(this.getChildChannels()));
cloned.setPartitionData(getPartitionData());
- if (this.getCommands() != null) {
- Iterator i = this.getCommands().iterator();
- while (i.hasNext()) {
- KickstartCommand cmd = (KickstartCommand) i.next();
- KickstartCommand clonedCmd = cmd.deepCopy(cloned);
- cloned.addCommand(clonedCmd);
- }
- }
+ copyKickstartCommands(getCommands(), cloned);
// Gotta remember to create a new HashSet with
// the other objects. Otherwise hibernate will
@@ -1186,7 +1179,7 @@ public class KickstartData {
}
// Helper method to copy KickstartCommands
- private static void copyKickstartCommands(Set commands, KickstartData cloned) {
+ private static void copyKickstartCommands(Collection commands, KickstartData cloned) {
if (commands != null) {
Iterator i = commands.iterator();
while (i.hasNext()) {
commit 3ce02c23f7f6406b8c9c526e4575e242ff5311d2
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Aug 4 21:57:50 2011 +0200
remove unused HibernateFactory method
diff --git a/java/code/src/com/redhat/rhn/common/hibernate/HibernateFactory.java b/java/code/src/com/redhat/rhn/common/hibernate/HibernateFactory.java
index c1fed0e..dbf4cf9 100644
--- a/java/code/src/com/redhat/rhn/common/hibernate/HibernateFactory.java
+++ b/java/code/src/com/redhat/rhn/common/hibernate/HibernateFactory.java
@@ -382,11 +382,6 @@ public abstract class HibernateFactory {
return retval;
}
- private void throwRuntimeException(String msg, HibernateException he) {
- getLogger().error(msg, he);
- throw new HibernateRuntimeException(msg, he);
- }
-
/**
* Util to reload an object using Hibernate
* @param obj to be reloaded
commit f00699a4c155daa1838013230d960b9c5c3a498d
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Aug 4 20:34:54 2011 +0200
fix PMD BrokenNullCheck
adressing:
[Basic Rules.BrokenNullCheck] - Method call on object which may be null
diff --git a/java/code/src/org/cobbler/Network.java b/java/code/src/org/cobbler/Network.java
index e52b6eb..44f1494 100644
--- a/java/code/src/org/cobbler/Network.java
+++ b/java/code/src/org/cobbler/Network.java
@@ -61,8 +61,9 @@ public class Network {
}
private void addToMap(Map<String, Object> inet, String key, Object value) {
- if (value != null || (value instanceof String &&
- !StringUtils.isBlank((String)value))) {
+ // do not put null values and empty strings
+ if (value != null && (!(value instanceof String) ||
+ !StringUtils.isBlank((String)value))) {
inet.put(key, value);
}
}
commit 4b9116c69aaaf6bee27e7d59482acf740e1b6aad
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Aug 4 20:07:55 2011 +0200
fix PMD BooleanInstantiation rule break
addressing:
[Basic Rules.BooleanInstantiation] - Avoid instantiating Boolean objects; reference Boolean.TRUE or Boolean.FALSE or call Boolean.valueOf() instead.
diff --git a/java/code/src/com/redhat/rhn/domain/server/Server.java b/java/code/src/com/redhat/rhn/domain/server/Server.java
index 2e3c071..a06fced 100644
--- a/java/code/src/com/redhat/rhn/domain/server/Server.java
+++ b/java/code/src/com/redhat/rhn/domain/server/Server.java
@@ -358,7 +358,7 @@ public class Server extends BaseDomainHelper implements Identifiable {
networkInterfaces = new HashSet();
customDataValues = new HashSet();
- ignoreEntitlementsForMigration = new Boolean(Boolean.FALSE);
+ ignoreEntitlementsForMigration = Boolean.FALSE;
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/action/LoginAction.java b/java/code/src/com/redhat/rhn/frontend/action/LoginAction.java
index f25d5f0..026e26f 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/LoginAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/LoginAction.java
@@ -73,7 +73,7 @@ public class LoginAction extends RhnAction {
if (CertificateManager.getInstance().isSatelliteCertExpired()) {
addMessage(request, "satellite.expired");
- request.setAttribute(LoginSetupAction.HAS_EXPIRED, new Boolean(true));
+ request.setAttribute(LoginSetupAction.HAS_EXPIRED, Boolean.TRUE);
return mapping.findForward("failure");
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/LoginSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/LoginSetupAction.java
index 50b636a..48f4978 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/LoginSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/LoginSetupAction.java
@@ -46,7 +46,7 @@ public class LoginSetupAction extends RhnAction {
CertificateManager man = CertificateManager.getInstance();
if (man.isSatelliteCertExpired()) {
addMessage(request, "satellite.expired");
- request.setAttribute(HAS_EXPIRED, new Boolean(true));
+ request.setAttribute(HAS_EXPIRED, Boolean.TRUE);
return mapping.findForward("default");
}
else if (man.isSatelliteCertInGracePeriod()) {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/YourRhnAction.java b/java/code/src/com/redhat/rhn/frontend/action/YourRhnAction.java
index 5573075..737109b 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/YourRhnAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/YourRhnAction.java
@@ -119,7 +119,7 @@ public class YourRhnAction extends RhnAction {
request.setAttribute(key, "y");
}
}
- request.setAttribute(ANY_LISTS_SELECTED, new Boolean(anyListsSelected));
+ request.setAttribute(ANY_LISTS_SELECTED, Boolean.valueOf(anyListsSelected));
request.setAttribute("legends", "yourrhn");
return mapping.findForward("default");
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/overview/Overview.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/overview/Overview.java
index 5a2d4ee..21995f1 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/configuration/overview/Overview.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/overview/Overview.java
@@ -51,7 +51,7 @@ public class Overview extends RhnAction {
Map summary = manager.getOverviewSummary(user);
request.setAttribute("summary", summary);
- request.setAttribute("is_admin", new Boolean(AclManager
+ request.setAttribute("is_admin", Boolean.valueOf(AclManager
.hasAcl("org_entitlement(sw_mgr_enterprise); user_role(org_admin)",
request, null)));
request.setAttribute("recentFiles", manager.getRecentlyModifiedConfigFiles(user,
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/BaseKickstartScriptAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/BaseKickstartScriptAction.java
index 6e7b83f..ba54031 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/BaseKickstartScriptAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/BaseKickstartScriptAction.java
@@ -50,7 +50,7 @@ public abstract class BaseKickstartScriptAction extends BaseKickstartEditAction
DynaActionForm form,
BaseKickstartCommand cmd) {
String chroot = "Y";
- Boolean b = new Boolean(true);
+ Boolean b = Boolean.TRUE;
Boolean template = false;
if (form.get(TEMPLATE) != null) {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/EditPackagesAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/EditPackagesAction.java
index e802c0f..4d57f96 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/EditPackagesAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/EditPackagesAction.java
@@ -148,7 +148,7 @@ public class EditPackagesAction extends RhnAction {
String newPackages = form.getString(PACKAGE_LIST);
if (newPackages != null && newPackages.length() > 0) {
- Boolean first = new Boolean(true);
+ Boolean first = Boolean.TRUE;
for (StringTokenizer strtok = new StringTokenizer(newPackages, "\n");
strtok.hasMoreTokens();) {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java
index 4b6ed44..64935a4 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java
@@ -36,7 +36,6 @@ import com.redhat.rhn.manager.kickstart.cobbler.CobblerProfileCommand;
import com.redhat.rhn.manager.kickstart.cobbler.CobblerProfileEditCommand;
import com.redhat.rhn.manager.kickstart.cobbler.CobblerXMLRPCHelper;
-import org.apache.commons.lang.BooleanUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -220,16 +219,11 @@ public class KickstartDetailsEditAction extends BaseKickstartEditAction {
cmd.setLabel(form.getString(LABEL));
- cmd.setActive(new
- Boolean(BooleanUtils.toBoolean((Boolean) form.get(ACTIVE))));
- cmd.setIsOrgDefault(new
- Boolean(BooleanUtils.toBoolean((Boolean) form.get(ORG_DEFAULT))));
- cmd.getKickstartData().setPostLog(
- BooleanUtils.toBoolean((Boolean) form.get(POST_LOG)));
- cmd.getKickstartData().setPreLog(
- BooleanUtils.toBoolean((Boolean) form.get(PRE_LOG)));
- cmd.getKickstartData().setKsCfg(
- BooleanUtils.toBoolean((Boolean) form.get(KS_CFG)));
+ cmd.setActive((Boolean) form.get(ACTIVE));
+ cmd.setIsOrgDefault((Boolean) form.get(ORG_DEFAULT));
+ cmd.getKickstartData().setPostLog((Boolean) form.get(POST_LOG));
+ cmd.getKickstartData().setPreLog((Boolean) form.get(PRE_LOG));
+ cmd.getKickstartData().setKsCfg((Boolean) form.get(KS_CFG));
processCobblerFormValues(cmd.getKickstartData(), form, ctx.getLoggedInUser());
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 85d2453..372667d 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
@@ -150,9 +150,8 @@ public class GeneralConfigAction extends BaseConfigAction {
String configKey = (String) i.next();
if (BOOLEAN_CONFIGS.contains(configKey)) {
- boolean configValue = Config.get().getBoolean(configKey);
- form.set(translateFormPropertyName(configKey),
- new Boolean(configValue));
+ Boolean configValue = Config.get().getBoolean(configKey);
+ form.set(translateFormPropertyName(configKey), configValue);
}
else {
String configValue = Config.get().getString(configKey);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/MonitoringConfigAction.java b/java/code/src/com/redhat/rhn/frontend/action/satellite/MonitoringConfigAction.java
index 7d893d4..eb709b8 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/satellite/MonitoringConfigAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/MonitoringConfigAction.java
@@ -141,7 +141,7 @@ public class MonitoringConfigAction extends BaseConfigAction {
}
else {
form.set(IS_MONITORING_SCOUT,
- new Boolean(Config.get().getBoolean(
+ Boolean.valueOf(Config.get().getBoolean(
ConfigDefaults.WEB_IS_MONITORING_SCOUT)));
// form.set(MDOM, IDN.toUnicode((String) form.get(MDOM)));
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/OverviewAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/OverviewAction.java
index 723b8f3..551e8e4 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/OverviewAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/OverviewAction.java
@@ -108,8 +108,7 @@ public class OverviewAction extends RhnListAction {
}
//Get the user preference from the database (groups or systems)
- Boolean groups = new Boolean(user.getShowSystemGroupList()
- .equals("Y"));
+ Boolean groups = user.getShowSystemGroupList().equals("Y");
request.setAttribute("groups", groups.toString());
ActionForward forward;
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsEditAction.java
index a2f765f..aeceed7 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsEditAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsEditAction.java
@@ -329,7 +329,7 @@ public class SystemDetailsEditAction extends RhnAction {
if (s.getBaseEntitlement() != null) {
daForm.set(BASE_ENTITLEMENT, s.getBaseEntitlement().getLabel());
request.setAttribute(BASE_ENTITLEMENT_PERMANENT,
- new Boolean(s.getBaseEntitlement().isPermanent()));
+ Boolean.valueOf(s.getBaseEntitlement().isPermanent()));
}
else {
daForm.set(BASE_ENTITLEMENT, "none");
@@ -347,11 +347,11 @@ public class SystemDetailsEditAction extends RhnAction {
}
daForm.set(UserServerPreferenceId.RECEIVE_NOTIFICATIONS,
- new Boolean(UserManager.lookupUserServerPreferenceValue(
+ Boolean.valueOf(UserManager.lookupUserServerPreferenceValue(
user, s, UserServerPreferenceId.RECEIVE_NOTIFICATIONS)));
daForm.set(UserServerPreferenceId.INCLUDE_IN_DAILY_SUMMARY,
- new Boolean(UserManager.lookupUserServerPreferenceValue(
+ Boolean.valueOf(UserManager.lookupUserServerPreferenceValue(
user, s, UserServerPreferenceId.INCLUDE_IN_DAILY_SUMMARY)));
daForm.set(AUTO_UPDATE,
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java
index 2e03bce..f244c60 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java
@@ -117,8 +117,8 @@ public class SystemOverviewAction extends RhnAction {
SdcHelper.ssmCheck(request, sid, user);
- request.setAttribute("unentitled", new Boolean(s.getEntitlements().isEmpty()));
- request.setAttribute("systemInactive", new Boolean(s.isInactive()));
+ request.setAttribute("unentitled", Boolean.valueOf(s.getEntitlements().isEmpty()));
+ request.setAttribute("systemInactive", Boolean.valueOf(s.isInactive()));
request.setAttribute("criticalErrataCount", criticalErrataCount);
request.setAttribute("nonCriticalErrataCount", nonCriticalErrataCount);
request.setAttribute("upgradablePackagesCount", upgradablePackagesCount);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/AssignedGroupsSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/user/AssignedGroupsSetupAction.java
index 2c6c792..90e75ba 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/user/AssignedGroupsSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/user/AssignedGroupsSetupAction.java
@@ -92,7 +92,7 @@ public class AssignedGroupsSetupAction extends RhnListAction {
request.getRequestURI());
request.setAttribute("user", user);
request.setAttribute("userIsOrgAdmin",
- new Boolean(user.hasRole(RoleFactory.ORG_ADMIN)));
+ Boolean.valueOf(user.hasRole(RoleFactory.ORG_ADMIN)));
diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/ChannelManagementPermsSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/user/ChannelManagementPermsSetupAction.java
index 9a77e90..4939113 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/user/ChannelManagementPermsSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/user/ChannelManagementPermsSetupAction.java
@@ -77,7 +77,7 @@ public class ChannelManagementPermsSetupAction extends RhnListAction {
request.setAttribute("user", user);
request.setAttribute("role", "manage");
request.setAttribute("userIsChannelAdmin",
- new Boolean(user.hasRole(RoleFactory.CHANNEL_ADMIN)));
+ Boolean.valueOf(user.hasRole(RoleFactory.CHANNEL_ADMIN)));
form.set("selectedChannels", selectedChannels.toArray(new String[0]));
return mapping.findForward("default");
diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/ChannelPermsSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/user/ChannelPermsSetupAction.java
index 44c51ee..e7cbc87 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/user/ChannelPermsSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/user/ChannelPermsSetupAction.java
@@ -82,7 +82,7 @@ public class ChannelPermsSetupAction extends RhnListAction {
request.setAttribute("user", user);
request.setAttribute("role", "subscribe");
request.setAttribute("userIsChannelAdmin",
- new Boolean(user.hasRole(RoleFactory.CHANNEL_ADMIN)));
+ Boolean.valueOf(user.hasRole(RoleFactory.CHANNEL_ADMIN)));
form.set("selectedChannels", selectedChannels.toArray(new String[0]));
return mapping.findForward("default");
diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/CreateUserSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/user/CreateUserSetupAction.java
index e4f0be0..249efef 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/user/CreateUserSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/user/CreateUserSetupAction.java
@@ -57,8 +57,8 @@ public class CreateUserSetupAction extends BaseUserSetupAction {
if (!RhnValidationHelper.getFailedValidation(request)) {
form.set("country", "US");
- form.set("contact_email", new Boolean(true));
- form.set("contact_partner", new Boolean(true));
+ form.set("contact_email", Boolean.TRUE);
+ form.set("contact_partner", Boolean.TRUE);
form.set("prefix",
LocalizationService.getInstance().getMessage("user prefix Mr."));
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/UserEditSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/user/UserEditSetupAction.java
index 62e4dfc..10e29ff 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/user/UserEditSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/user/UserEditSetupAction.java
@@ -102,14 +102,14 @@ public class UserEditSetupAction extends RhnAction {
// SETUP Prefix list
request.setAttribute("availablePrefixes", UserActionHelper.getPrefixes());
- request.setAttribute("self", new Boolean(loggedInUser.equals(targetUser)));
+ request.setAttribute("self", Boolean.valueOf(loggedInUser.equals(targetUser)));
//Should we display the pam checkbox?
String pamAuthService = Config.get().getString(
ConfigDefaults.WEB_PAM_AUTH_SERVICE);
if (pamAuthService != null && pamAuthService.trim().length() > 0) {
request.setAttribute("displaypam", "true");
- form.set("usepam", new Boolean(targetUser.getUsePamAuthentication()));
+ form.set("usepam", Boolean.valueOf(targetUser.getUsePamAuthentication()));
}
// Keep the new list tag happy:
diff --git a/java/code/src/com/redhat/rhn/frontend/struts/RhnUnpagedListAction.java b/java/code/src/com/redhat/rhn/frontend/struts/RhnUnpagedListAction.java
index 5448c87..f86997a 100644
--- a/java/code/src/com/redhat/rhn/frontend/struts/RhnUnpagedListAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/struts/RhnUnpagedListAction.java
@@ -18,6 +18,8 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.common.BadParameterException;
import com.redhat.rhn.frontend.listview.ListControl;
+import org.apache.commons.lang.StringUtils;
+
import javax.servlet.ServletRequest;
/**
@@ -43,14 +45,7 @@ public class RhnUnpagedListAction extends RhnAction {
}
String filterData = request.getParameter(RequestContext.FILTER_STRING);
-
- if (filterData != null && !filterData.equals("")) {
- request.setAttribute("isFiltered", new Boolean(true));
- }
- else {
- request.setAttribute("isFiltered", new Boolean(false));
- }
-
+ request.setAttribute("isFiltered", Boolean.valueOf(!StringUtils.isEmpty(filterData)));
lc.setFilterData(filterData);
}
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/BaseKickstartScriptCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/BaseKickstartScriptCommand.java
index fd24e99..0ae0ba6 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/BaseKickstartScriptCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/BaseKickstartScriptCommand.java
@@ -143,9 +143,6 @@ public class BaseKickstartScriptCommand extends BaseKickstartCommand {
* should be checked
*/
public Boolean getNoChrootVal() {
- if (this.script.getChroot().equals("Y")) {
- return new Boolean(false);
- }
- return new Boolean(true);
+ return Boolean.valueOf(!this.script.getChroot().equals("Y"));
}
}
12 years, 9 months
Changes to 'refs/tags/spacewalk-java-1.6.12-1'
by Šimon Lukašík
Tag 'spacewalk-java-1.6.12-1' created by Simon Lukasik <slukasik(a)redhat.com> at 2011-08-04 18:52 +0000
Tagging package [spacewalk-java] version [1.6.12-1] in directory [java/].
Changes since yum-rhn-plugin-1.6.6-1:
Simon Lukasik (4):
listRedHatBaseChannelsByVersion() was never used, removing
725889 - show only channels for which the user has entitlements
727984 - include static mappings for 6ComputeNode
Automatic commit of package [spacewalk-java] release [1.6.12-1].
---
java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml | 11 ++++
java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java | 24 +++-------
java/code/src/com/redhat/rhn/domain/channel/ChannelVersion.java | 1
java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddRedHatErrataAction.java | 6 +-
java/spacewalk-java.spec | 9 +++
rel-eng/packages/spacewalk-java | 2
6 files changed, 32 insertions(+), 21 deletions(-)
---
12 years, 9 months
java/spacewalk-java.spec rel-eng/packages
by Šimon Lukašík
java/spacewalk-java.spec | 9 ++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 5676f4e2206a52fc23fe7e119fd71f3963325ea5
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Thu Aug 4 20:52:20 2011 +0200
Automatic commit of package [spacewalk-java] release [1.6.12-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 51d2f32..0565d8c 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.11
+Version: 1.6.12
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -546,6 +546,13 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Aug 04 2011 Simon Lukasik <slukasik(a)redhat.com> 1.6.12-1
+- 727984 - include static mappings for 6ComputeNode (slukasik(a)redhat.com)
+- 725889 - show only channels for which the user has entitlements
+ (slukasik(a)redhat.com)
+- listRedHatBaseChannelsByVersion() was never used, removing
+ (slukasik(a)redhat.com)
+
* Thu Aug 04 2011 Jan Pazdziora 1.6.11-1
- 508936 - rhn-actions-control honor the allowed-actions/scripts/run for remote
commands (mmello(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 701b7d6..4f480ec 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.6.11-1 java/
+1.6.12-1 java/
12 years, 9 months
3 commits - java/code
by Šimon Lukašík
java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml | 11 ++++
java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java | 24 +++-------
java/code/src/com/redhat/rhn/domain/channel/ChannelVersion.java | 1
java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddRedHatErrataAction.java | 6 +-
4 files changed, 23 insertions(+), 19 deletions(-)
New commits:
commit be452cb6eac8b08fcdc7c906f9eefc04346c8019
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Wed Aug 3 23:42:49 2011 +0200
727984 - include static mappings for 6ComputeNode
diff --git a/java/code/src/com/redhat/rhn/domain/channel/ChannelVersion.java b/java/code/src/com/redhat/rhn/domain/channel/ChannelVersion.java
index c7d4381..9fc75c6 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/ChannelVersion.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/ChannelVersion.java
@@ -51,6 +51,7 @@ public class ChannelVersion {
DIST_CHANNEL_MAP_TO_CHANNEL_VERSION.put("6Client", ChannelVersion.RHEL6);
DIST_CHANNEL_MAP_TO_CHANNEL_VERSION.put("6Server", ChannelVersion.RHEL6);
DIST_CHANNEL_MAP_TO_CHANNEL_VERSION.put("6Workstation", ChannelVersion.RHEL6);
+ DIST_CHANNEL_MAP_TO_CHANNEL_VERSION.put("6ComputeNode", ChannelVersion.RHEL6);
DIST_CHANNEL_MAP_TO_CHANNEL_VERSION.put("5Client", ChannelVersion.RHEL5);
DIST_CHANNEL_MAP_TO_CHANNEL_VERSION.put("5Server", ChannelVersion.RHEL5);
commit b2d20c51accb488bf1dac575ac5d6fefd0af3dd5
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Wed Aug 3 23:25:21 2011 +0200
725889 - show only channels for which the user has entitlements
diff --git a/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml b/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
index 02fa661..8b95f58 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
@@ -141,6 +141,17 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
</query>
+ <sql-query name="Channel.findRedHatBaseChannelsByUserId">
+ <![CDATA[SELECT {c.*}
+ FROM rhnChannel {c}
+ INNER JOIN rhnUserChannel uc ON uc.channel_id = c.id
+ LEFT OUTER JOIN rhnChannelCloned c_1_ ON c.id = c_1_.id
+ WHERE c.org_id is null
+ AND c.parent_channel is null
+ AND uc.user_id = :userId]]>
+ <return alias="c" class="com.redhat.rhn.domain.channel.Channel" />
+ </sql-query>
+
<sql-query name="Channel.findCustomBaseChannels">
<![CDATA[SELECT {c.*}
FROM rhnUserChannel uc,
diff --git a/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java b/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
index 6b74144..24467c3 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
@@ -935,6 +935,19 @@ public class ChannelFactory extends HibernateFactory {
return singleton.listObjectsByNamedQuery("Channel.findRedHatBaseChannels", params);
}
+
+ /**
+ * List all accessible Red Hat base channels for a given user
+ * @param user logged in user
+ * @return list of Red Hat base channels
+ */
+ public static List<Channel> listRedHatBaseChannels(User user) {
+ Map params = new HashMap();
+ params.put("userId", user.getId());
+ return singleton.listObjectsByNamedQuery(
+ "Channel.findRedHatBaseChannelsByUserId", params);
+ }
+
/**
* Lookup the original channel of a cloned channel
* @param chan the channel to find the original of
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddRedHatErrataAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddRedHatErrataAction.java
index e338089..1da4526 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddRedHatErrataAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddRedHatErrataAction.java
@@ -163,7 +163,7 @@ public class AddRedHatErrataAction extends RhnListAction {
}
}
- List<Channel> channelSet = findChannelsByVersion(selectedVersionStr);
+ List<Channel> channelSet = findChannelsByVersion(user, selectedVersionStr);
channelList = new ArrayList();
if (channelSet != null) {
sortChannelsAndChildify(channelSet, channelList, user, selectedChannelStr);
@@ -275,12 +275,12 @@ public class AddRedHatErrataAction extends RhnListAction {
}
- private List findChannelsByVersion(String version) {
+ private List findChannelsByVersion(User user, String version) {
if (version == null) {
return null;
}
- List<Channel> channels = ChannelFactory.listRedHatBaseChannels();
+ List<Channel> channels = ChannelFactory.listRedHatBaseChannels(user);
List toReturn = new ArrayList();
for (Channel chan : channels) {
for (DistChannelMap map : chan.getDistChannelMaps()) {
commit bf213f33d61149847589486eff81e17fff9e3e13
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Wed Aug 3 21:29:44 2011 +0200
listRedHatBaseChannelsByVersion() was never used, removing
diff --git a/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java b/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
index af68449..6b74144 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
@@ -26,7 +26,6 @@ import com.redhat.rhn.domain.kickstart.KickstartableTree;
import com.redhat.rhn.domain.org.Org;
import com.redhat.rhn.domain.rhnpackage.Package;
import com.redhat.rhn.domain.user.User;
-import com.redhat.rhn.manager.channel.ChannelManager;
import org.apache.log4j.Logger;
import org.hibernate.Criteria;
@@ -36,13 +35,11 @@ import org.hibernate.criterion.CriteriaSpecification;
import org.hibernate.criterion.Projections;
import org.hibernate.criterion.Restrictions;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Set;
/**
* ChannelFactory
@@ -938,24 +935,6 @@ public class ChannelFactory extends HibernateFactory {
return singleton.listObjectsByNamedQuery("Channel.findRedHatBaseChannels", params);
}
-
- /**
- * Lookup a List of redhat base channels with a given ChannelVersion
- * @param version the version string to find
- * @return The List of Channels
- */
- public static List<Channel> listRedHatBaseChannelsByVersion(ChannelVersion version) {
- List<Channel> toReturn = new ArrayList();
- List<Channel> channels = listRedHatBaseChannels();
- for (Channel chan : channels) {
- Set versions = ChannelManager.getChannelVersions(chan);
- if (versions.contains(version)) {
- toReturn.add(chan);
- }
- }
- return toReturn;
- }
-
/**
* Lookup the original channel of a cloned channel
* @param chan the channel to find the original of
12 years, 9 months