2 commits - client/rhel rel-eng/packages
by Tomas Lestach
client/rhel/rhn-client-tools/po/aln.po | 2 +-
client/rhel/rhn-client-tools/po/ar.po | 2 +-
client/rhel/rhn-client-tools/po/as.po | 2 +-
client/rhel/rhn-client-tools/po/ast.po | 2 +-
client/rhel/rhn-client-tools/po/bg.po | 2 +-
client/rhel/rhn-client-tools/po/bn.po | 2 +-
client/rhel/rhn-client-tools/po/bn_BD.po | 2 +-
client/rhel/rhn-client-tools/po/bn_IN.po | 2 +-
client/rhel/rhn-client-tools/po/bs.po | 2 +-
client/rhel/rhn-client-tools/po/ca.po | 2 +-
client/rhel/rhn-client-tools/po/cs.po | 2 +-
client/rhel/rhn-client-tools/po/cy.po | 2 +-
client/rhel/rhn-client-tools/po/da.po | 2 +-
client/rhel/rhn-client-tools/po/de.po | 2 +-
client/rhel/rhn-client-tools/po/el.po | 2 +-
client/rhel/rhn-client-tools/po/en_GB.po | 2 +-
client/rhel/rhn-client-tools/po/es.po | 2 +-
client/rhel/rhn-client-tools/po/et.po | 2 +-
client/rhel/rhn-client-tools/po/eu.po | 2 +-
client/rhel/rhn-client-tools/po/fa.po | 2 +-
client/rhel/rhn-client-tools/po/fa_IR.po | 2 +-
client/rhel/rhn-client-tools/po/fi.po | 2 +-
client/rhel/rhn-client-tools/po/fr.po | 2 +-
client/rhel/rhn-client-tools/po/gu.po | 2 +-
client/rhel/rhn-client-tools/po/he.po | 2 +-
client/rhel/rhn-client-tools/po/hi.po | 2 +-
client/rhel/rhn-client-tools/po/hr.po | 2 +-
client/rhel/rhn-client-tools/po/hu.po | 2 +-
client/rhel/rhn-client-tools/po/hy.po | 2 +-
client/rhel/rhn-client-tools/po/id.po | 2 +-
client/rhel/rhn-client-tools/po/is.po | 2 +-
client/rhel/rhn-client-tools/po/it.po | 2 +-
client/rhel/rhn-client-tools/po/ja.po | 2 +-
client/rhel/rhn-client-tools/po/ja_JP.po | 2 +-
client/rhel/rhn-client-tools/po/ka.po | 2 +-
client/rhel/rhn-client-tools/po/kn.po | 2 +-
client/rhel/rhn-client-tools/po/ko.po | 2 +-
client/rhel/rhn-client-tools/po/ku.po | 2 +-
client/rhel/rhn-client-tools/po/lo.po | 2 +-
client/rhel/rhn-client-tools/po/lt.po | 2 +-
client/rhel/rhn-client-tools/po/lv.po | 2 +-
client/rhel/rhn-client-tools/po/mk.po | 2 +-
client/rhel/rhn-client-tools/po/ml.po | 2 +-
client/rhel/rhn-client-tools/po/mr.po | 2 +-
client/rhel/rhn-client-tools/po/ms.po | 2 +-
client/rhel/rhn-client-tools/po/my.po | 2 +-
client/rhel/rhn-client-tools/po/nb.po | 2 +-
client/rhel/rhn-client-tools/po/nl.po | 2 +-
client/rhel/rhn-client-tools/po/nn.po | 2 +-
client/rhel/rhn-client-tools/po/no.po | 2 +-
client/rhel/rhn-client-tools/po/or.po | 2 +-
client/rhel/rhn-client-tools/po/pa.po | 2 +-
client/rhel/rhn-client-tools/po/pl.po | 2 +-
client/rhel/rhn-client-tools/po/pt.po | 2 +-
client/rhel/rhn-client-tools/po/pt_BR.po | 2 +-
client/rhel/rhn-client-tools/po/rhn-client-tools.pot | 2 +-
client/rhel/rhn-client-tools/po/ro.po | 2 +-
client/rhel/rhn-client-tools/po/ru.po | 2 +-
client/rhel/rhn-client-tools/po/si.po | 2 +-
client/rhel/rhn-client-tools/po/sk.po | 2 +-
client/rhel/rhn-client-tools/po/sl.po | 2 +-
client/rhel/rhn-client-tools/po/sq.po | 2 +-
client/rhel/rhn-client-tools/po/sr.po | 2 +-
client/rhel/rhn-client-tools/po/sr(a)Latn.po | 2 +-
client/rhel/rhn-client-tools/po/sv.po | 2 +-
client/rhel/rhn-client-tools/po/ta.po | 2 +-
client/rhel/rhn-client-tools/po/te.po | 2 +-
client/rhel/rhn-client-tools/po/tg.po | 2 +-
client/rhel/rhn-client-tools/po/tr.po | 2 +-
client/rhel/rhn-client-tools/po/uk.po | 2 +-
client/rhel/rhn-client-tools/po/ur.po | 2 +-
client/rhel/rhn-client-tools/po/vi.po | 2 +-
client/rhel/rhn-client-tools/po/zh_CN.GB2312.po | 2 +-
client/rhel/rhn-client-tools/po/zh_CN.po | 2 +-
client/rhel/rhn-client-tools/po/zh_TW.Big5.po | 2 +-
client/rhel/rhn-client-tools/po/zh_TW.po | 2 +-
client/rhel/rhn-client-tools/rhn-client-tools.spec | 5 ++++-
client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py | 2 +-
rel-eng/packages/rhn-client-tools | 2 +-
79 files changed, 82 insertions(+), 79 deletions(-)
New commits:
commit 48eea652b4f66acd0ed4263e89b5cd0d0f80826a
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Aug 29 17:15:40 2013 +0200
Automatic commit of package [rhn-client-tools] release [2.1.5-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index f7456a7..7970c74 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: 2.1.4
+Version: 2.1.5
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -357,6 +357,9 @@ make -f Makefile.rhn-client-tools test
%endif
%changelog
+* Thu Aug 29 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.5-1
+- fix source string typo
+
* Wed Aug 28 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.4-1
- No firstboot modules on RHEL 7 and later
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index 8d9dbac..c9d04d6 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-2.1.4-1 client/rhel/rhn-client-tools/
+2.1.5-1 client/rhel/rhn-client-tools/
commit 02744b078afc3c3645d64b33dadded6138c2fee8
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Aug 29 17:14:55 2013 +0200
fix source string typo
See Kbase articlefor more details -> See Kbase article for more details
diff --git a/client/rhel/rhn-client-tools/po/aln.po b/client/rhel/rhn-client-tools/po/aln.po
index af7aaf4..e29f8d3 100644
--- a/client/rhel/rhn-client-tools/po/aln.po
+++ b/client/rhel/rhn-client-tools/po/aln.po
@@ -762,7 +762,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/ar.po b/client/rhel/rhn-client-tools/po/ar.po
index 3c6361b..a5220e7 100644
--- a/client/rhel/rhn-client-tools/po/ar.po
+++ b/client/rhel/rhn-client-tools/po/ar.po
@@ -782,7 +782,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/as.po b/client/rhel/rhn-client-tools/po/as.po
index 478ed4c..75e6134 100644
--- a/client/rhel/rhn-client-tools/po/as.po
+++ b/client/rhel/rhn-client-tools/po/as.po
@@ -858,7 +858,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/ast.po b/client/rhel/rhn-client-tools/po/ast.po
index c025ad9..fb894a0 100644
--- a/client/rhel/rhn-client-tools/po/ast.po
+++ b/client/rhel/rhn-client-tools/po/ast.po
@@ -763,7 +763,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/bg.po b/client/rhel/rhn-client-tools/po/bg.po
index b11406b..ae7cdac 100644
--- a/client/rhel/rhn-client-tools/po/bg.po
+++ b/client/rhel/rhn-client-tools/po/bg.po
@@ -858,7 +858,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/bn.po b/client/rhel/rhn-client-tools/po/bn.po
index af90e66..cb87c96 100644
--- a/client/rhel/rhn-client-tools/po/bn.po
+++ b/client/rhel/rhn-client-tools/po/bn.po
@@ -830,7 +830,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/bn_BD.po b/client/rhel/rhn-client-tools/po/bn_BD.po
index 046a185..bd23519 100644
--- a/client/rhel/rhn-client-tools/po/bn_BD.po
+++ b/client/rhel/rhn-client-tools/po/bn_BD.po
@@ -762,7 +762,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/bn_IN.po b/client/rhel/rhn-client-tools/po/bn_IN.po
index 5706260..a9ccc72 100644
--- a/client/rhel/rhn-client-tools/po/bn_IN.po
+++ b/client/rhel/rhn-client-tools/po/bn_IN.po
@@ -860,7 +860,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/bs.po b/client/rhel/rhn-client-tools/po/bs.po
index 8b61753..70c225e 100644
--- a/client/rhel/rhn-client-tools/po/bs.po
+++ b/client/rhel/rhn-client-tools/po/bs.po
@@ -764,7 +764,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/ca.po b/client/rhel/rhn-client-tools/po/ca.po
index 5a1972a..9c1f7c0 100644
--- a/client/rhel/rhn-client-tools/po/ca.po
+++ b/client/rhel/rhn-client-tools/po/ca.po
@@ -791,7 +791,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/cs.po b/client/rhel/rhn-client-tools/po/cs.po
index e6f15b4..f79332f 100644
--- a/client/rhel/rhn-client-tools/po/cs.po
+++ b/client/rhel/rhn-client-tools/po/cs.po
@@ -836,7 +836,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/cy.po b/client/rhel/rhn-client-tools/po/cy.po
index f197993..57e20c1 100644
--- a/client/rhel/rhn-client-tools/po/cy.po
+++ b/client/rhel/rhn-client-tools/po/cy.po
@@ -784,7 +784,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/da.po b/client/rhel/rhn-client-tools/po/da.po
index c40cc3b..89037c1 100644
--- a/client/rhel/rhn-client-tools/po/da.po
+++ b/client/rhel/rhn-client-tools/po/da.po
@@ -789,7 +789,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/de.po b/client/rhel/rhn-client-tools/po/de.po
index e2fa697..dcf9346 100644
--- a/client/rhel/rhn-client-tools/po/de.po
+++ b/client/rhel/rhn-client-tools/po/de.po
@@ -883,7 +883,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/el.po b/client/rhel/rhn-client-tools/po/el.po
index 2d58b25..fbceb23 100644
--- a/client/rhel/rhn-client-tools/po/el.po
+++ b/client/rhel/rhn-client-tools/po/el.po
@@ -768,7 +768,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/en_GB.po b/client/rhel/rhn-client-tools/po/en_GB.po
index 3b11400..0ea81e6 100644
--- a/client/rhel/rhn-client-tools/po/en_GB.po
+++ b/client/rhel/rhn-client-tools/po/en_GB.po
@@ -764,7 +764,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/es.po b/client/rhel/rhn-client-tools/po/es.po
index 3d1530e..bdb803a 100644
--- a/client/rhel/rhn-client-tools/po/es.po
+++ b/client/rhel/rhn-client-tools/po/es.po
@@ -891,7 +891,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
"Advertencia: si un producto instalado en este sistema no aparece en la "
diff --git a/client/rhel/rhn-client-tools/po/et.po b/client/rhel/rhn-client-tools/po/et.po
index 4cbb993b..4811f7b 100644
--- a/client/rhel/rhn-client-tools/po/et.po
+++ b/client/rhel/rhn-client-tools/po/et.po
@@ -782,7 +782,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/eu.po b/client/rhel/rhn-client-tools/po/eu.po
index 7d708a7..45d6f35 100644
--- a/client/rhel/rhn-client-tools/po/eu.po
+++ b/client/rhel/rhn-client-tools/po/eu.po
@@ -764,7 +764,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/fa.po b/client/rhel/rhn-client-tools/po/fa.po
index 7f0722f..d0ea4c3 100644
--- a/client/rhel/rhn-client-tools/po/fa.po
+++ b/client/rhel/rhn-client-tools/po/fa.po
@@ -764,7 +764,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/fa_IR.po b/client/rhel/rhn-client-tools/po/fa_IR.po
index ddbe304..d693b37 100644
--- a/client/rhel/rhn-client-tools/po/fa_IR.po
+++ b/client/rhel/rhn-client-tools/po/fa_IR.po
@@ -762,7 +762,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/fi.po b/client/rhel/rhn-client-tools/po/fi.po
index 9d7d013..a348163 100644
--- a/client/rhel/rhn-client-tools/po/fi.po
+++ b/client/rhel/rhn-client-tools/po/fi.po
@@ -792,7 +792,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/fr.po b/client/rhel/rhn-client-tools/po/fr.po
index 860b7ee..182cb3e 100644
--- a/client/rhel/rhn-client-tools/po/fr.po
+++ b/client/rhel/rhn-client-tools/po/fr.po
@@ -892,7 +892,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/gu.po b/client/rhel/rhn-client-tools/po/gu.po
index 1016567..c256300 100644
--- a/client/rhel/rhn-client-tools/po/gu.po
+++ b/client/rhel/rhn-client-tools/po/gu.po
@@ -845,7 +845,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/he.po b/client/rhel/rhn-client-tools/po/he.po
index 10c8b9f..37e0eed 100644
--- a/client/rhel/rhn-client-tools/po/he.po
+++ b/client/rhel/rhn-client-tools/po/he.po
@@ -763,7 +763,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/hi.po b/client/rhel/rhn-client-tools/po/hi.po
index 92412ae..2ead216 100644
--- a/client/rhel/rhn-client-tools/po/hi.po
+++ b/client/rhel/rhn-client-tools/po/hi.po
@@ -841,7 +841,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/hr.po b/client/rhel/rhn-client-tools/po/hr.po
index a23b45c..df91719 100644
--- a/client/rhel/rhn-client-tools/po/hr.po
+++ b/client/rhel/rhn-client-tools/po/hr.po
@@ -851,7 +851,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/hu.po b/client/rhel/rhn-client-tools/po/hu.po
index fb1cc42..24e44da 100644
--- a/client/rhel/rhn-client-tools/po/hu.po
+++ b/client/rhel/rhn-client-tools/po/hu.po
@@ -791,7 +791,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/hy.po b/client/rhel/rhn-client-tools/po/hy.po
index 7df28c3..7014218 100644
--- a/client/rhel/rhn-client-tools/po/hy.po
+++ b/client/rhel/rhn-client-tools/po/hy.po
@@ -762,7 +762,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/id.po b/client/rhel/rhn-client-tools/po/id.po
index 4448b87..12f7491 100644
--- a/client/rhel/rhn-client-tools/po/id.po
+++ b/client/rhel/rhn-client-tools/po/id.po
@@ -764,7 +764,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/is.po b/client/rhel/rhn-client-tools/po/is.po
index 9fc4831..18808f5 100644
--- a/client/rhel/rhn-client-tools/po/is.po
+++ b/client/rhel/rhn-client-tools/po/is.po
@@ -785,7 +785,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/it.po b/client/rhel/rhn-client-tools/po/it.po
index 7620209..6ded8f5 100644
--- a/client/rhel/rhn-client-tools/po/it.po
+++ b/client/rhel/rhn-client-tools/po/it.po
@@ -892,7 +892,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/ja.po b/client/rhel/rhn-client-tools/po/ja.po
index 2b60838..80a26a7 100644
--- a/client/rhel/rhn-client-tools/po/ja.po
+++ b/client/rhel/rhn-client-tools/po/ja.po
@@ -864,7 +864,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/ja_JP.po b/client/rhel/rhn-client-tools/po/ja_JP.po
index a089a76..25d2499 100644
--- a/client/rhel/rhn-client-tools/po/ja_JP.po
+++ b/client/rhel/rhn-client-tools/po/ja_JP.po
@@ -762,7 +762,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/ka.po b/client/rhel/rhn-client-tools/po/ka.po
index 4affe22..fb93d9d 100644
--- a/client/rhel/rhn-client-tools/po/ka.po
+++ b/client/rhel/rhn-client-tools/po/ka.po
@@ -770,7 +770,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/kn.po b/client/rhel/rhn-client-tools/po/kn.po
index e36a581..bfe9133 100644
--- a/client/rhel/rhn-client-tools/po/kn.po
+++ b/client/rhel/rhn-client-tools/po/kn.po
@@ -861,7 +861,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/ko.po b/client/rhel/rhn-client-tools/po/ko.po
index 7aaca32..6cdfd5d 100644
--- a/client/rhel/rhn-client-tools/po/ko.po
+++ b/client/rhel/rhn-client-tools/po/ko.po
@@ -852,7 +852,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/ku.po b/client/rhel/rhn-client-tools/po/ku.po
index 1721575..d0e1733 100644
--- a/client/rhel/rhn-client-tools/po/ku.po
+++ b/client/rhel/rhn-client-tools/po/ku.po
@@ -762,7 +762,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/lo.po b/client/rhel/rhn-client-tools/po/lo.po
index 6666451..63b6bbb 100644
--- a/client/rhel/rhn-client-tools/po/lo.po
+++ b/client/rhel/rhn-client-tools/po/lo.po
@@ -762,7 +762,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/lt.po b/client/rhel/rhn-client-tools/po/lt.po
index 656ae69..0480fa1 100644
--- a/client/rhel/rhn-client-tools/po/lt.po
+++ b/client/rhel/rhn-client-tools/po/lt.po
@@ -764,7 +764,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/lv.po b/client/rhel/rhn-client-tools/po/lv.po
index ca1b0da..bb907ca 100644
--- a/client/rhel/rhn-client-tools/po/lv.po
+++ b/client/rhel/rhn-client-tools/po/lv.po
@@ -765,7 +765,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/mk.po b/client/rhel/rhn-client-tools/po/mk.po
index 66d9e8d..3843f57 100644
--- a/client/rhel/rhn-client-tools/po/mk.po
+++ b/client/rhel/rhn-client-tools/po/mk.po
@@ -791,7 +791,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/ml.po b/client/rhel/rhn-client-tools/po/ml.po
index 02eaaae..ddae9a4 100644
--- a/client/rhel/rhn-client-tools/po/ml.po
+++ b/client/rhel/rhn-client-tools/po/ml.po
@@ -844,7 +844,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/mr.po b/client/rhel/rhn-client-tools/po/mr.po
index 2058e80..b639bb6 100644
--- a/client/rhel/rhn-client-tools/po/mr.po
+++ b/client/rhel/rhn-client-tools/po/mr.po
@@ -846,7 +846,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/ms.po b/client/rhel/rhn-client-tools/po/ms.po
index 5398b42..0b0a611 100644
--- a/client/rhel/rhn-client-tools/po/ms.po
+++ b/client/rhel/rhn-client-tools/po/ms.po
@@ -768,7 +768,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/my.po b/client/rhel/rhn-client-tools/po/my.po
index c7a8df9..f888c0d 100644
--- a/client/rhel/rhn-client-tools/po/my.po
+++ b/client/rhel/rhn-client-tools/po/my.po
@@ -762,7 +762,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/nb.po b/client/rhel/rhn-client-tools/po/nb.po
index d90ada0..4c1492c 100644
--- a/client/rhel/rhn-client-tools/po/nb.po
+++ b/client/rhel/rhn-client-tools/po/nb.po
@@ -788,7 +788,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/nl.po b/client/rhel/rhn-client-tools/po/nl.po
index 6d8b5c7..c310f5f 100644
--- a/client/rhel/rhn-client-tools/po/nl.po
+++ b/client/rhel/rhn-client-tools/po/nl.po
@@ -814,7 +814,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/nn.po b/client/rhel/rhn-client-tools/po/nn.po
index f2826ba..14e864d 100644
--- a/client/rhel/rhn-client-tools/po/nn.po
+++ b/client/rhel/rhn-client-tools/po/nn.po
@@ -762,7 +762,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/no.po b/client/rhel/rhn-client-tools/po/no.po
index 9fdc547..3799260 100644
--- a/client/rhel/rhn-client-tools/po/no.po
+++ b/client/rhel/rhn-client-tools/po/no.po
@@ -785,7 +785,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/or.po b/client/rhel/rhn-client-tools/po/or.po
index a560e46..a903c98 100644
--- a/client/rhel/rhn-client-tools/po/or.po
+++ b/client/rhel/rhn-client-tools/po/or.po
@@ -848,7 +848,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/pa.po b/client/rhel/rhn-client-tools/po/pa.po
index 959201c..145a2a5 100644
--- a/client/rhel/rhn-client-tools/po/pa.po
+++ b/client/rhel/rhn-client-tools/po/pa.po
@@ -843,7 +843,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/pl.po b/client/rhel/rhn-client-tools/po/pl.po
index b4ec337..33d8e69 100644
--- a/client/rhel/rhn-client-tools/po/pl.po
+++ b/client/rhel/rhn-client-tools/po/pl.po
@@ -791,7 +791,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/pt.po b/client/rhel/rhn-client-tools/po/pt.po
index ae4abc4..03dc375 100644
--- a/client/rhel/rhn-client-tools/po/pt.po
+++ b/client/rhel/rhn-client-tools/po/pt.po
@@ -850,7 +850,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/pt_BR.po b/client/rhel/rhn-client-tools/po/pt_BR.po
index 8820974..56bc075 100644
--- a/client/rhel/rhn-client-tools/po/pt_BR.po
+++ b/client/rhel/rhn-client-tools/po/pt_BR.po
@@ -875,7 +875,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/rhn-client-tools.pot b/client/rhel/rhn-client-tools/po/rhn-client-tools.pot
index 54ed372..0026683 100644
--- a/client/rhel/rhn-client-tools/po/rhn-client-tools.pot
+++ b/client/rhel/rhn-client-tools/po/rhn-client-tools.pot
@@ -762,7 +762,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/ro.po b/client/rhel/rhn-client-tools/po/ro.po
index d194e63..455201c 100644
--- a/client/rhel/rhn-client-tools/po/ro.po
+++ b/client/rhel/rhn-client-tools/po/ro.po
@@ -771,7 +771,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/ru.po b/client/rhel/rhn-client-tools/po/ru.po
index cc31440..421c51f 100644
--- a/client/rhel/rhn-client-tools/po/ru.po
+++ b/client/rhel/rhn-client-tools/po/ru.po
@@ -857,7 +857,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/si.po b/client/rhel/rhn-client-tools/po/si.po
index 3c699c4..811d657 100644
--- a/client/rhel/rhn-client-tools/po/si.po
+++ b/client/rhel/rhn-client-tools/po/si.po
@@ -837,7 +837,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/sk.po b/client/rhel/rhn-client-tools/po/sk.po
index b0c3f63..d1049e0 100644
--- a/client/rhel/rhn-client-tools/po/sk.po
+++ b/client/rhel/rhn-client-tools/po/sk.po
@@ -786,7 +786,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/sl.po b/client/rhel/rhn-client-tools/po/sl.po
index 4a8dc18..5db5db9 100644
--- a/client/rhel/rhn-client-tools/po/sl.po
+++ b/client/rhel/rhn-client-tools/po/sl.po
@@ -780,7 +780,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/sq.po b/client/rhel/rhn-client-tools/po/sq.po
index 14d5ddc..b027656 100644
--- a/client/rhel/rhn-client-tools/po/sq.po
+++ b/client/rhel/rhn-client-tools/po/sq.po
@@ -763,7 +763,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/sr.po b/client/rhel/rhn-client-tools/po/sr.po
index 053f0d7..7c6c5ec 100644
--- a/client/rhel/rhn-client-tools/po/sr.po
+++ b/client/rhel/rhn-client-tools/po/sr.po
@@ -780,7 +780,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/sr(a)Latn.po b/client/rhel/rhn-client-tools/po/sr(a)Latn.po
index 027ecc7..75e53de 100644
--- a/client/rhel/rhn-client-tools/po/sr(a)Latn.po
+++ b/client/rhel/rhn-client-tools/po/sr(a)Latn.po
@@ -763,7 +763,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/sv.po b/client/rhel/rhn-client-tools/po/sv.po
index 9c4d7c7..1bb9fbc 100644
--- a/client/rhel/rhn-client-tools/po/sv.po
+++ b/client/rhel/rhn-client-tools/po/sv.po
@@ -865,7 +865,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/ta.po b/client/rhel/rhn-client-tools/po/ta.po
index 41e4c7d..107738a 100644
--- a/client/rhel/rhn-client-tools/po/ta.po
+++ b/client/rhel/rhn-client-tools/po/ta.po
@@ -849,7 +849,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/te.po b/client/rhel/rhn-client-tools/po/te.po
index c9c6d01..8252ae8 100644
--- a/client/rhel/rhn-client-tools/po/te.po
+++ b/client/rhel/rhn-client-tools/po/te.po
@@ -839,7 +839,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/tg.po b/client/rhel/rhn-client-tools/po/tg.po
index 9163563..07e57cb 100644
--- a/client/rhel/rhn-client-tools/po/tg.po
+++ b/client/rhel/rhn-client-tools/po/tg.po
@@ -762,7 +762,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/tr.po b/client/rhel/rhn-client-tools/po/tr.po
index 0887d38..e9b50aa 100644
--- a/client/rhel/rhn-client-tools/po/tr.po
+++ b/client/rhel/rhn-client-tools/po/tr.po
@@ -789,7 +789,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/uk.po b/client/rhel/rhn-client-tools/po/uk.po
index 7377e62..b0ed6bf 100644
--- a/client/rhel/rhn-client-tools/po/uk.po
+++ b/client/rhel/rhn-client-tools/po/uk.po
@@ -868,7 +868,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
" Попередження: якщо встановленого продукту немає у наведеному вище списку, "
diff --git a/client/rhel/rhn-client-tools/po/ur.po b/client/rhel/rhn-client-tools/po/ur.po
index 2627951..81fc7b6 100644
--- a/client/rhel/rhn-client-tools/po/ur.po
+++ b/client/rhel/rhn-client-tools/po/ur.po
@@ -763,7 +763,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/vi.po b/client/rhel/rhn-client-tools/po/vi.po
index 2923a80..d635b12 100644
--- a/client/rhel/rhn-client-tools/po/vi.po
+++ b/client/rhel/rhn-client-tools/po/vi.po
@@ -763,7 +763,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/zh_CN.GB2312.po b/client/rhel/rhn-client-tools/po/zh_CN.GB2312.po
index 15102d9..2a8063a 100644
--- a/client/rhel/rhn-client-tools/po/zh_CN.GB2312.po
+++ b/client/rhel/rhn-client-tools/po/zh_CN.GB2312.po
@@ -765,7 +765,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/zh_CN.po b/client/rhel/rhn-client-tools/po/zh_CN.po
index 3bdfbc1..b9215b5 100644
--- a/client/rhel/rhn-client-tools/po/zh_CN.po
+++ b/client/rhel/rhn-client-tools/po/zh_CN.po
@@ -822,7 +822,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/zh_TW.Big5.po b/client/rhel/rhn-client-tools/po/zh_TW.Big5.po
index 0594b7d..1364442 100644
--- a/client/rhel/rhn-client-tools/po/zh_TW.Big5.po
+++ b/client/rhel/rhn-client-tools/po/zh_TW.Big5.po
@@ -808,7 +808,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/po/zh_TW.po b/client/rhel/rhn-client-tools/po/zh_TW.po
index 79d2e22..cf1e06c 100644
--- a/client/rhel/rhn-client-tools/po/zh_TW.po
+++ b/client/rhel/rhn-client-tools/po/zh_TW.po
@@ -820,7 +820,7 @@ msgid ""
"Warning: Only installed product listed above will receive updates and "
"support. If you would like to receive updates for additional products, "
"please login to your satellite web interface and subscribe this system to "
-"the appropriate software channels. See Kbase articlefor more details. "
+"the appropriate software channels. See Kbase article for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)"
msgstr ""
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
index 1b86b1f..23f41fd 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
@@ -175,7 +175,7 @@ CHANNELS_SAT_WARNING = _("Warning: Only installed product listed above will r
"to receive updates for additional products, please "
"login to your satellite web interface "
"and subscribe this system to the appropriate "
- "software channels. See Kbase article"
+ "software channels. See Kbase article "
"for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)")
YUM_PLUGIN_WARNING = _("Warning: yum-rhn-plugin is not present, could not enable it.\n"
10 years, 8 months
5 commits - java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/CreateProfileAction.java | 3 ++-
java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp | 2 +-
java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp | 2 +-
java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp | 2 +-
java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp | 2 +-
5 files changed, 6 insertions(+), 5 deletions(-)
New commits:
commit 758d777840b6edee5b75db9337abb17d51ed63ef
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Aug 29 16:30:09 2013 +0200
855845 - escaping server name for ssm package verify
diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp
index 6bee9f6..06618a6 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp
@@ -30,7 +30,7 @@
<rl:column headerkey="actions.jsp.system" bound="false"
sortattr="name" sortable="true">
- ${current.system_name}
+ <c:out value="${current.system_name}" escapeXml="true" />
</rl:column>
<rl:column headerkey="ssm.package.verify.schedule.packages" bound="false"
commit 54dc07101c79e5b4064a56a1a9d001d39d13425e
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Aug 29 16:29:36 2013 +0200
855845 - escaping server name for ssm package upgrade
diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp
index 4911626..d5d923f 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp
@@ -35,7 +35,7 @@
<rl:column headerkey="actions.jsp.system" bound="false"
sortattr="name" sortable="true">
- ${current.server_name}
+ <c:out value="${current.server_name}" escapeXml="true" />
</rl:column>
<rl:column headerkey="ssm.package.upgrade.schedule.packages" bound="false"
commit b6881794ba60bee990117e3e129a7947d0031f3f
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Aug 29 16:27:57 2013 +0200
855845 - escaping server name for ssm package removal
diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp
index d3776f9..02ed6bf 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp
@@ -30,7 +30,7 @@
<rl:column headerkey="actions.jsp.system" bound="false"
sortattr="name" sortable="true">
- ${current.system_name}
+ <c:out value="${current.system_name}" escapeXml="true" />
</rl:column>
<rl:column headerkey="ssm.package.remove.schedule.packages" bound="false"
commit 14e43df0ae4a0b3020e5fa8860739823740c442f
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Aug 29 16:26:43 2013 +0200
855845 - escaping server name for ssm package list
diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp
index 92622fc..5d24fce 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp
@@ -33,7 +33,7 @@
<rl:column headerkey="actions.jsp.system" bound="false"
sortattr="name" sortable="true">
- ${current.name}
+ <c:out value="${current.name}" escapeXml="true" />
</rl:column>
</rl:list>
commit 6de86a3b5a1f350c8f13921f421b3116ea236d40
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Aug 29 16:20:25 2013 +0200
855845 - escaping server name for /rhn/systems/details/packages/profiles/ShowProfiles.do
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/CreateProfileAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/CreateProfileAction.java
index a54d3e0..501203d 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/CreateProfileAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/CreateProfileAction.java
@@ -15,6 +15,7 @@
package com.redhat.rhn.frontend.action.rhnpackage.profile;
import com.redhat.rhn.common.localization.LocalizationService;
+import com.redhat.rhn.common.util.StringUtil;
import com.redhat.rhn.domain.channel.NoBaseChannelFoundException;
import com.redhat.rhn.domain.rhnpackage.profile.DuplicateProfileNameException;
import com.redhat.rhn.domain.rhnpackage.profile.Profile;
@@ -130,7 +131,7 @@ public class CreateProfileAction extends RhnAction {
msgs.add(ActionMessages.GLOBAL_MESSAGE,
new ActionMessage("create.jsp.successmessage",
name,
- server.getName()));
+ StringUtil.htmlifyText(server.getName())));
}
catch (DuplicateProfileNameException dbe) {
ActionMessages errors = new ActionMessages();
10 years, 8 months
java/code
by Dimitar Yordanov
java/code/src/com/redhat/rhn/domain/channel/NewChannelHelper.java | 16 +++++-----
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 4 +-
2 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit f5c5063d5ff87f319d121e41041dce97e45ccc41
Author: Dimitar Yordanov <dyordano(a)redhat.com>
Date: Thu Aug 29 13:56:23 2013 +0200
1001826 - fix the API error msg
diff --git a/java/code/src/com/redhat/rhn/domain/channel/NewChannelHelper.java b/java/code/src/com/redhat/rhn/domain/channel/NewChannelHelper.java
index b85b58d..5faa728 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/NewChannelHelper.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/NewChannelHelper.java
@@ -18,6 +18,8 @@ import com.redhat.rhn.domain.errata.Errata;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.manager.errata.ErrataManager;
import com.redhat.rhn.manager.user.UserManager;
+import com.redhat.rhn.frontend.xmlrpc.InvalidChannelLabelException;
+import com.redhat.rhn.frontend.xmlrpc.InvalidChannelNameException;
import java.util.Date;
import java.util.HashSet;
@@ -61,17 +63,15 @@ public class NewChannelHelper {
public Channel clone(boolean originalState, Channel toClone) {
if (!verifyName(name)) {
- throw new InvalidChannelParameter(name, "It must be at least 6 characters " +
- "long, begin with a letter, and contain only lowercase letters, " +
- "digits, '-', ' / ', '_' and '.'. Also, it cannot begin with " +
- "'rhn', 'redhat', or 'red hat'.");
+ throw new InvalidChannelNameException(name,
+ InvalidChannelNameException.Reason.REGEX_FAILS,
+ "edit.channel.invalidchannelname.supportedregex", "");
}
if (!verifyLabel(label)) {
- throw new InvalidChannelParameter(label, "It Must be at least 6 characters " +
- "long, begin with a letter, and contain only lowercase letters, " +
- "digits, '-', '_', and '.'. Also, it cannot begin with 'rhn', " +
- "'redhat', or 'red hat'.");
+ throw new InvalidChannelLabelException(label,
+ InvalidChannelLabelException.Reason.REGEX_FAILS,
+ "edit.channel.invalidchannellabel.supportedregex", "");
}
if (gpgFingerprint != null && !verifyGpgFingerprint(gpgFingerprint)) {
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
index 6e777fe..e6c88fc 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
@@ -7449,7 +7449,7 @@ Follow this url to see the full list of inactive systems:
</context-group>
</trans-unit>
<trans-unit id="edit.channel.invalidchannelname.supportedregex">
- <source>Channel name must begin with a letter and may contain only lowercase letters, hyphens ('-'), periods ('.'), underscores ('_'), numerals, spaces and forward slashes ('/').</source>
+ <source>Channel name must be at least 6 characters long, begin with a letter and may contain only lowercase letters, hyphens ('-'), periods ('.'), underscores ('_'), numerals, spaces, parentheses and forward slashes ('/').</source>
</trans-unit>
<trans-unit id="edit.channel.invalidchannelname.redhat">
<source>Channels names must not start with '{0}'</source>
@@ -7494,7 +7494,7 @@ Follow this url to see the full list of inactive systems:
</context-group>
</trans-unit>
<trans-unit id="edit.channel.invalidchannellabel.supportedregex">
- <source>Channel label must begin with a letter and may contain only lowercase letters, hyphens ('-'), periods ('.'), underscores ('_'), and numerals.</source>
+ <source>Channel label must be at least 6 characters long, begin with a letter or digit and may contain only lowercase letters, hyphens ('-'), periods ('.'), underscores ('_'), and numerals.</source>
</trans-unit>
<trans-unit id="edit.channel.invalidchannellabel.redhat">
<source>Channel labels must not start with '{0}'</source>
10 years, 8 months
java/code
by mkollar
java/code/internal/src/com/redhat/rhn/internal/doclet/EnforcementDoclet.java | 3 -
java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java | 2
java/code/src/com/redhat/rhn/common/db/datasource/DataSourceParserHelper.java | 7 +-
java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java | 10 ++--
java/code/src/com/redhat/rhn/common/db/datasource/test/DataSourceParserTest.java | 16 +++---
java/code/src/com/redhat/rhn/common/db/test/NamedPreparedStatementTest.java | 13 ++---
java/code/src/com/redhat/rhn/common/messaging/test/TestDBAction.java | 3 -
java/code/src/com/redhat/rhn/common/security/acl/ChannelAclHandler.java | 13 ++---
java/code/src/com/redhat/rhn/common/security/acl/KickstartAclHandler.java | 10 ++--
java/code/src/com/redhat/rhn/common/util/CharacterMap.java | 3 -
java/code/src/com/redhat/rhn/common/util/DatePicker.java | 2
java/code/src/com/redhat/rhn/common/util/test/DatePickerTest.java | 3 -
java/code/src/com/redhat/rhn/domain/audit/ScapFactory.java | 3 -
java/code/src/com/redhat/rhn/domain/monitoring/command/test/CommandTest.java | 3 -
java/code/src/com/redhat/rhn/domain/monitoring/notification/MatchType.java | 5 +-
java/code/src/com/redhat/rhn/domain/monitoring/satcluster/SatClusterFactory.java | 5 +-
java/code/src/com/redhat/rhn/domain/monitoring/test/MonitoringTestUtils.java | 10 ++--
java/code/src/com/redhat/rhn/domain/rhnset/SetCleanup.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/SearchAction.java | 8 +--
java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java | 4 -
java/code/src/com/redhat/rhn/frontend/action/common/BaseSetOperateOnDiffAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java | 4 -
java/code/src/com/redhat/rhn/frontend/action/errata/DeleteErratumAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartLocaleEditAction.java | 4 -
java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartSoftwareEditAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartTroubleshootingEditAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuiteProbeEditAction.java | 4 -
java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchSetupAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeCreateAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeEditAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/ProbeDeleteAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/ProbeEditAction.java | 4 -
java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeCreateTestCase.java | 6 +-
java/code/src/com/redhat/rhn/frontend/dto/ClonableErrataDto.java | 3 -
java/code/src/com/redhat/rhn/frontend/dto/XccdfTestResultCounts.java | 5 +-
java/code/src/com/redhat/rhn/frontend/struts/RhnListDispatchAction.java | 2
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java | 3 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/crash/CrashHandler.java | 8 +--
java/code/src/com/redhat/rhn/manager/audit/ScapManager.java | 24 +++++-----
java/code/src/com/redhat/rhn/manager/audit/scap/RuleResultDiffer.java | 3 -
java/code/src/com/redhat/rhn/manager/audit/scap/TestResultDiffer.java | 15 +++---
java/code/src/com/redhat/rhn/manager/kickstart/KickstartLocaleCommand.java | 3 -
java/code/src/com/redhat/rhn/manager/system/VirtualizationActionMap.java | 21 ++++----
java/code/src/com/redhat/rhn/taskomatic/task/DailySummary.java | 12 ++---
java/code/src/com/redhat/rhn/testing/ForwardWrapper.java | 3 -
java/code/src/org/cobbler/test/MockConnection.java | 6 +-
47 files changed, 153 insertions(+), 131 deletions(-)
New commits:
commit 64ecb3f882bb4c946d903539f1933cd7aa9340de
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Wed Aug 28 18:13:54 2013 +0200
Using Map instead of HashMap where possible
diff --git a/java/code/internal/src/com/redhat/rhn/internal/doclet/EnforcementDoclet.java b/java/code/internal/src/com/redhat/rhn/internal/doclet/EnforcementDoclet.java
index c7b6fcd..9401fb3 100644
--- a/java/code/internal/src/com/redhat/rhn/internal/doclet/EnforcementDoclet.java
+++ b/java/code/internal/src/com/redhat/rhn/internal/doclet/EnforcementDoclet.java
@@ -24,6 +24,7 @@ import java.io.InvalidObjectException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
@@ -44,7 +45,7 @@ public class EnforcementDoclet {
}
- private static HashMap<String, List<String>> exceptions =
+ private static Map<String, List<String>> exceptions =
new HashMap<String, List<String>>();
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java b/java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java
index c174f0e..d8a1269 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java
@@ -425,7 +425,7 @@ public class CachedStatement implements Serializable {
" but value map is null");
}
// Only pass the parameters from the original query.
- HashMap<String, Object> intersection = new HashMap<String, Object>();
+ Map<String, Object> intersection = new HashMap<String, Object>();
Iterator<String> i = params.iterator();
while (i.hasNext()) {
String curr = i.next();
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/DataSourceParserHelper.java b/java/code/src/com/redhat/rhn/common/db/datasource/DataSourceParserHelper.java
index 1d773fe..b2113d1 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/DataSourceParserHelper.java
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/DataSourceParserHelper.java
@@ -22,6 +22,7 @@ import org.xml.sax.SAXException;
import java.util.HashMap;
import java.util.Iterator;
import java.util.ListIterator;
+import java.util.Map;
/**
* A contentHandler that knows how to parse the DataSource XML files.
@@ -37,8 +38,8 @@ class DataSourceParserHelper implements ContentHandler {
private static final int MODE_AFTER_QUERY = 4;
private static final int IN_ELABORATOR = 5;
- private HashMap internal_queries;
- private HashMap modes;
+ private Map internal_queries;
+ private Map modes;
private Mode m;
private CachedStatement q;
private int state;
@@ -57,7 +58,7 @@ class DataSourceParserHelper implements ContentHandler {
* Get the modes Map
* @return the modes map.
*/
- public HashMap getModes() {
+ public Map getModes() {
return modes;
}
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java b/java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java
index 1a04cf7..5de2473 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java
@@ -70,7 +70,7 @@ public class AdvDataSourceTest extends RhnBaseTestCase {
private void lookup(String foobar, int id, int size) {
SelectMode m = ModeFactory.getMode("test_queries", "find_in_table");
- HashMap params = new HashMap();
+ Map params = new HashMap();
params.put("foobar", foobar);
params.put("id", new Integer(id));
DataResult<AdvDataSourceDto> dr = m.execute(params);
@@ -83,7 +83,7 @@ public class AdvDataSourceTest extends RhnBaseTestCase {
private void insert(String foobar, int id) throws Exception {
WriteMode m = ModeFactory.getWriteMode("test_queries", "insert_into_table");
- HashMap params = new HashMap();
+ Map params = new HashMap();
params.put("foobar", foobar);
params.put("id", Integer.valueOf(id));
params.put("test_column", "test-" + TestUtils.randomString());
@@ -187,7 +187,7 @@ public class AdvDataSourceTest extends RhnBaseTestCase {
// Take nothing for granted, make sure the data is there.
lookup("Blarg", 1, 1);
WriteMode m = ModeFactory.getWriteMode("test_queries", "delete_from_table");
- HashMap params = new HashMap();
+ Map params = new HashMap();
params.put("foobar", "Blarg");
assertEquals(1, m.executeUpdate(params));
// Close our Session so we test to make sure it
@@ -200,7 +200,7 @@ public class AdvDataSourceTest extends RhnBaseTestCase {
insert("update_test", 4);
WriteMode m = ModeFactory.getWriteMode("test_queries", "update_in_table");
- HashMap params = new HashMap();
+ Map params = new HashMap();
params.put("foobar", "after_update");
params.put("id", new Integer(4));
int res = m.executeUpdate(params);
@@ -218,7 +218,7 @@ public class AdvDataSourceTest extends RhnBaseTestCase {
insert("update_multi_test", 5);
WriteMode m = ModeFactory.getWriteMode("test_queries", "update_in_table");
- HashMap params = new HashMap();
+ Map params = new HashMap();
params.put("foobar", "after_update_multi");
params.put("id", new Integer(5));
int res = m.executeUpdate(params);
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/test/DataSourceParserTest.java b/java/code/src/com/redhat/rhn/common/db/datasource/test/DataSourceParserTest.java
index 7df0890..fd00cfd 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/test/DataSourceParserTest.java
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/test/DataSourceParserTest.java
@@ -90,7 +90,7 @@ public class DataSourceParserTest extends RhnBaseTestCase {
Iterator i = dr.iterator();
int pos = 0;
while (i.hasNext()) {
- HashMap hm = (HashMap)i.next();
+ Map hm = (Map)i.next();
String name = (String)hm.get("username");
if (name.toLowerCase().equals(db_user)) {
@@ -99,7 +99,7 @@ public class DataSourceParserTest extends RhnBaseTestCase {
pos++;
}
- HashMap parameters = new HashMap();
+ Map parameters = new HashMap();
parameters.put("user_name", db_user);
dr.elaborate(parameters);
assertNotNull(dr);
@@ -122,7 +122,7 @@ public class DataSourceParserTest extends RhnBaseTestCase {
Iterator i = dr.iterator();
int pos = 0;
while (i.hasNext()) {
- HashMap hm = (HashMap)i.next();
+ Map hm = (Map)i.next();
String name = (String)hm.get("username");
if (name.toLowerCase().equals(db_user)) {
@@ -131,7 +131,7 @@ public class DataSourceParserTest extends RhnBaseTestCase {
pos++;
}
- HashMap parameters = new HashMap();
+ Map parameters = new HashMap();
parameters.put("user_name", db_user);
dr.elaborate(parameters);
assertNotNull(dr);
@@ -262,7 +262,7 @@ public class DataSourceParserTest extends RhnBaseTestCase {
SelectMode m = ModeFactory.getMode("test_queries", "all_tables" + db_sufix);
assertNotNull(m);
- HashMap params = new HashMap();
+ Map params = new HashMap();
params.put("foo", "bar");
DataResult dr = m.execute(params);
assertNotNull(dr);
@@ -273,7 +273,7 @@ public class DataSourceParserTest extends RhnBaseTestCase {
db_sufix);
assertNotNull(m);
- HashMap hm = new HashMap();
+ Map hm = new HashMap();
hm.put("username", db_user);
DataResult dr = m.execute(hm);
assertNotNull(dr);
@@ -371,7 +371,7 @@ public class DataSourceParserTest extends RhnBaseTestCase {
public void testExternalQuery() throws Exception {
SelectMode m = ModeFactory.getMode("System_queries", "visible_to_uid");
- HashMap params = new HashMap();
+ Map params = new HashMap();
params.put("formvar_uid", new Long(12345));
DataResult dr = m.execute(params);
assertEquals(m, dr.getMode());
@@ -416,7 +416,7 @@ public class DataSourceParserTest extends RhnBaseTestCase {
SelectMode m = ModeFactory.getMode("test_queries", "user_class" + db_sufix);
String clazz = m.getClassString();
assertEquals("com.redhat.rhn.common.db.datasource.test.UserData", clazz);
- HashMap hm = new HashMap();
+ Map hm = new HashMap();
hm.put("username", db_user);
DataResult dr = m.execute(hm);
assertNotNull(dr);
diff --git a/java/code/src/com/redhat/rhn/common/db/test/NamedPreparedStatementTest.java b/java/code/src/com/redhat/rhn/common/db/test/NamedPreparedStatementTest.java
index f72f89a..2a9ebf0 100644
--- a/java/code/src/com/redhat/rhn/common/db/test/NamedPreparedStatementTest.java
+++ b/java/code/src/com/redhat/rhn/common/db/test/NamedPreparedStatementTest.java
@@ -24,6 +24,7 @@ import org.hibernate.Session;
import java.sql.PreparedStatement;
import java.util.HashMap;
import java.util.List;
+import java.util.Map;
public class NamedPreparedStatementTest extends RhnBaseTestCase {
@@ -87,7 +88,7 @@ public class NamedPreparedStatementTest extends RhnBaseTestCase {
public void testColonInQuotes() throws Exception {
String jdbcQuery;
- HashMap pMap = new HashMap();
+ Map pMap = new HashMap();
jdbcQuery = NamedPreparedStatement.replaceBindParams(COLON_IN_QUOTES,
pMap);
@@ -99,7 +100,7 @@ public class NamedPreparedStatementTest extends RhnBaseTestCase {
public void testCreateSQL() throws Exception {
String jdbcQuery;
- HashMap pMap = new HashMap();
+ Map pMap = new HashMap();
jdbcQuery = NamedPreparedStatement.replaceBindParams(SIMPLE_QUERY,
pMap);
@@ -113,7 +114,7 @@ public class NamedPreparedStatementTest extends RhnBaseTestCase {
public void testPrepare() throws Exception {
String jdbcQuery;
- HashMap pMap = new HashMap();
+ Map pMap = new HashMap();
jdbcQuery = NamedPreparedStatement.replaceBindParams(SIMPLE_QUERY,
pMap);
@@ -130,7 +131,7 @@ public class NamedPreparedStatementTest extends RhnBaseTestCase {
public void testTwoBindPrepare() throws Exception {
List lst;
String jdbcQuery;
- HashMap pMap = new HashMap();
+ Map pMap = new HashMap();
jdbcQuery = NamedPreparedStatement.replaceBindParams(TWO_VAR_QUERY,
pMap);
@@ -153,7 +154,7 @@ public class NamedPreparedStatementTest extends RhnBaseTestCase {
public void testNotFoundBindParam() throws Exception {
List lst;
String jdbcQuery;
- HashMap pMap = new HashMap();
+ Map pMap = new HashMap();
jdbcQuery = NamedPreparedStatement.replaceBindParams(TWO_VAR_QUERY,
pMap);
@@ -172,7 +173,7 @@ public class NamedPreparedStatementTest extends RhnBaseTestCase {
PreparedStatement ps = session.connection().prepareStatement(jdbcQuery);
- HashMap parameters = new HashMap();
+ Map parameters = new HashMap();
parameters.put("BAD_DATA", "GARBAGE");
try {
NamedPreparedStatement.execute(ps, pMap, parameters);
diff --git a/java/code/src/com/redhat/rhn/common/messaging/test/TestDBAction.java b/java/code/src/com/redhat/rhn/common/messaging/test/TestDBAction.java
index 581f081..9170023 100644
--- a/java/code/src/com/redhat/rhn/common/messaging/test/TestDBAction.java
+++ b/java/code/src/com/redhat/rhn/common/messaging/test/TestDBAction.java
@@ -22,6 +22,7 @@ import com.redhat.rhn.common.messaging.MessageQueue;
import com.redhat.rhn.testing.TestUtils;
import java.util.HashMap;
+import java.util.Map;
public class TestDBAction implements MessageAction {
@@ -44,7 +45,7 @@ public class TestDBAction implements MessageAction {
public void execute(EventMessage msg) {
TestDBEventMessage tm = (TestDBEventMessage) msg;
System.out.println("Execute ..");
- HashMap params = new HashMap();
+ Map params = new HashMap();
params.put("data", tm.getTestString());
DataResult dr =
TestUtils.runTestQuery("select_test_time_series", params);
diff --git a/java/code/src/com/redhat/rhn/common/security/acl/ChannelAclHandler.java b/java/code/src/com/redhat/rhn/common/security/acl/ChannelAclHandler.java
index f1ff0a3..d2ddd63 100644
--- a/java/code/src/com/redhat/rhn/common/security/acl/ChannelAclHandler.java
+++ b/java/code/src/com/redhat/rhn/common/security/acl/ChannelAclHandler.java
@@ -21,7 +21,6 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.manager.channel.ChannelManager;
import com.redhat.rhn.manager.user.UserManager;
-import java.util.HashMap;
import java.util.Map;
import java.util.Set;
@@ -75,7 +74,7 @@ public class ChannelAclHandler extends BaseHandler {
* @return true if allowed, false else
*/
public boolean aclUserCanAdminChannel(Object ctx, String[] params) {
- HashMap ctxMap = (HashMap)ctx;
+ Map ctxMap = (Map)ctx;
User usr = (User)ctxMap.get(USER);
Channel chan = getChannel(usr, ctxMap);
if (chan != null) {
@@ -91,7 +90,7 @@ public class ChannelAclHandler extends BaseHandler {
* @return true if allowed, false else
*/
public boolean aclOrgChannelSetting(Object ctx, String[] params) {
- HashMap ctxMap = (HashMap)ctx;
+ Map ctxMap = (Map)ctx;
User usr = (User)ctxMap.get(USER);
Channel chan = getChannel(usr, ctxMap);
if (chan != null) {
@@ -124,7 +123,7 @@ public class ChannelAclHandler extends BaseHandler {
return false;
}
- HashMap ctxMap = (HashMap)ctx;
+ Map ctxMap = (Map)ctx;
User usr = (User)ctxMap.get(USER);
Channel chan = getChannel(usr, ctxMap);
String archType = chan.getChannelArch().getArchType().getLabel();
@@ -138,7 +137,7 @@ public class ChannelAclHandler extends BaseHandler {
* @return true if allowed, false else
*/
public boolean aclChannelPackagingType(Object ctx, String[] params) {
- HashMap ctxMap = (HashMap)ctx;
+ Map ctxMap = (Map)ctx;
User usr = (User)ctxMap.get(USER);
Channel chan = getChannel(usr, ctxMap);
String archType = chan.getChannelArch().getArchType().getLabel();
@@ -152,7 +151,7 @@ public class ChannelAclHandler extends BaseHandler {
* @return true if allowed, false else
*/
public boolean aclChannelSubscribable(Object ctx, String[] params) {
- HashMap ctxMap = (HashMap)ctx;
+ Map ctxMap = (Map)ctx;
User usr = (User)ctxMap.get(USER);
Channel chan = getChannel(usr, ctxMap);
@@ -179,7 +178,7 @@ public class ChannelAclHandler extends BaseHandler {
* @return true if channel-vers is RHEL5, false else
*/
public boolean aclIsRhel5(Object ctx, String[] params) {
- HashMap ctxMap = (HashMap)ctx;
+ Map ctxMap = (Map)ctx;
User usr = (User)ctxMap.get(USER);
Channel chan = getChannel(usr, ctxMap);
if (chan != null) {
diff --git a/java/code/src/com/redhat/rhn/common/security/acl/KickstartAclHandler.java b/java/code/src/com/redhat/rhn/common/security/acl/KickstartAclHandler.java
index 656c71c..009b52a 100644
--- a/java/code/src/com/redhat/rhn/common/security/acl/KickstartAclHandler.java
+++ b/java/code/src/com/redhat/rhn/common/security/acl/KickstartAclHandler.java
@@ -22,7 +22,7 @@ import com.redhat.rhn.frontend.struts.RequestContext;
import org.apache.commons.lang.StringUtils;
-import java.util.HashMap;
+import java.util.Map;
/**
@@ -56,7 +56,7 @@ public class KickstartAclHandler extends BaseHandler {
* @return true if a raw format, false else
*/
public boolean aclIsKsRaw(Object ctx, String[] params) {
- HashMap ctxMap = (HashMap)ctx;
+ Map ctxMap = (Map)ctx;
User usr = (User)ctxMap.get(USER);
KickstartData ks = getKickstart(usr, params);
if (ks != null) {
@@ -72,7 +72,7 @@ public class KickstartAclHandler extends BaseHandler {
* @return true if a wizard format, false else
*/
public boolean aclIsKsNotRaw(Object ctx, String[] params) {
- HashMap ctxMap = (HashMap)ctx;
+ Map ctxMap = (Map)ctx;
User usr = (User)ctxMap.get(USER);
KickstartData ks = getKickstart(usr, params);
if (ks == null) {
@@ -90,7 +90,7 @@ public class KickstartAclHandler extends BaseHandler {
* to cobbler
*/
public boolean aclTreeIsSynced(Object ctx, String[] params) {
- HashMap ctxMap = (HashMap)ctx;
+ Map ctxMap = (Map)ctx;
User usr = (User)ctxMap.get(USER);
Long id = getAsLong(ctxMap.get(RequestContext.KSTREE_ID));
if (id == null) {
@@ -111,7 +111,7 @@ public class KickstartAclHandler extends BaseHandler {
* to cobbler
*/
public boolean aclProfileIsValid(Object ctx, String[] params) {
- HashMap ctxMap = (HashMap)ctx;
+ Map ctxMap = (Map)ctx;
User usr = (User)ctxMap.get(USER);
Long id = getAsLong(ctxMap.get(RequestContext.KICKSTART_ID));
if (id == null) {
diff --git a/java/code/src/com/redhat/rhn/common/util/CharacterMap.java b/java/code/src/com/redhat/rhn/common/util/CharacterMap.java
index 3f214bd..9921ccf 100644
--- a/java/code/src/com/redhat/rhn/common/util/CharacterMap.java
+++ b/java/code/src/com/redhat/rhn/common/util/CharacterMap.java
@@ -19,6 +19,7 @@ import org.apache.commons.lang.builder.EqualsBuilder;
import java.io.Serializable;
import java.util.HashMap;
+import java.util.Map;
/**
* An wrapper around HashMap that ONLY acccepts
@@ -31,7 +32,7 @@ import java.util.HashMap;
*/
public class CharacterMap implements Serializable {
- private HashMap innerMap;
+ private Map innerMap;
// increase this number on any data change
private static final long serialVersionUID = 1L;
diff --git a/java/code/src/com/redhat/rhn/common/util/DatePicker.java b/java/code/src/com/redhat/rhn/common/util/DatePicker.java
index ee2200e..cb8d720 100644
--- a/java/code/src/com/redhat/rhn/common/util/DatePicker.java
+++ b/java/code/src/com/redhat/rhn/common/util/DatePicker.java
@@ -541,7 +541,7 @@ public class DatePicker {
}
private static Map makeFieldCalendarMap(boolean isLatin) {
- HashMap result = new HashMap();
+ Map result = new HashMap();
result.put(YEAR, new Integer(Calendar.YEAR));
result.put(MONTH, new Integer(Calendar.MONTH));
result.put(DAY, new Integer(Calendar.DAY_OF_MONTH));
diff --git a/java/code/src/com/redhat/rhn/common/util/test/DatePickerTest.java b/java/code/src/com/redhat/rhn/common/util/test/DatePickerTest.java
index fea9efe..cd716ec 100644
--- a/java/code/src/com/redhat/rhn/common/util/test/DatePickerTest.java
+++ b/java/code/src/com/redhat/rhn/common/util/test/DatePickerTest.java
@@ -22,6 +22,7 @@ import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.Locale;
+import java.util.Map;
import java.util.TimeZone;
import junit.framework.TestCase;
@@ -70,7 +71,7 @@ public class DatePickerTest extends TestCase {
public void testReadWriteFromMap() throws ParseException {
- HashMap form = new HashMap();
+ Map form = new HashMap();
DatePicker p = makePicker(Locale.ENGLISH);
Date d = parseDate("1996-08-03T15:33");
p.setDate(d);
diff --git a/java/code/src/com/redhat/rhn/domain/audit/ScapFactory.java b/java/code/src/com/redhat/rhn/domain/audit/ScapFactory.java
index fd4e763..5e2c835 100644
--- a/java/code/src/com/redhat/rhn/domain/audit/ScapFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/audit/ScapFactory.java
@@ -15,6 +15,7 @@
package com.redhat.rhn.domain.audit;
import java.util.HashMap;
+import java.util.Map;
import org.apache.log4j.Logger;
@@ -39,7 +40,7 @@ public class ScapFactory extends HibernateFactory {
* @return the XccdfTestResult found
*/
public static XccdfTestResult lookupTestResultById(Long xid) {
- HashMap params = new HashMap();
+ Map params = new HashMap();
params.put("xid", xid);
return (XccdfTestResult)singleton.lookupObjectByNamedQuery(
"XccdfTestResult.findById", params);
diff --git a/java/code/src/com/redhat/rhn/domain/monitoring/command/test/CommandTest.java b/java/code/src/com/redhat/rhn/domain/monitoring/command/test/CommandTest.java
index 8765bdd..d50f929 100644
--- a/java/code/src/com/redhat/rhn/domain/monitoring/command/test/CommandTest.java
+++ b/java/code/src/com/redhat/rhn/domain/monitoring/command/test/CommandTest.java
@@ -37,6 +37,7 @@ import org.hibernate.HibernateException;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
/**
* CommandTest
@@ -135,7 +136,7 @@ public class CommandTest extends RhnBaseTestCase {
}
private static class MapTransformer implements Transformer {
- private HashMap map = new HashMap();
+ private Map map = new HashMap();
public Object transform(Object input) {
return map.get(((ThresholdParameter) input).getThresholdType());
diff --git a/java/code/src/com/redhat/rhn/domain/monitoring/notification/MatchType.java b/java/code/src/com/redhat/rhn/domain/monitoring/notification/MatchType.java
index 8688469..ca32f4e 100644
--- a/java/code/src/com/redhat/rhn/domain/monitoring/notification/MatchType.java
+++ b/java/code/src/com/redhat/rhn/domain/monitoring/notification/MatchType.java
@@ -18,6 +18,7 @@ import com.redhat.rhn.common.util.Asserts;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.Map;
import java.util.Set;
/**
@@ -31,8 +32,8 @@ public class MatchType {
public static final String CAT_REGEX = "regex";
public static final String CAT_CONTACT = "contact";
- private static final HashMap TYPES = new HashMap();
- private static final HashMap CATEGORIES = new HashMap();
+ private static final Map TYPES = new HashMap();
+ private static final Map CATEGORIES = new HashMap();
public static final MatchType PROBE = create("PROBE_ID", "probe", CAT_SCOPE);
public static final MatchType SCOUT = create("NETSAINT_ID", "scout", CAT_SCOPE);
diff --git a/java/code/src/com/redhat/rhn/domain/monitoring/satcluster/SatClusterFactory.java b/java/code/src/com/redhat/rhn/domain/monitoring/satcluster/SatClusterFactory.java
index c344b24..052750c 100644
--- a/java/code/src/com/redhat/rhn/domain/monitoring/satcluster/SatClusterFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/monitoring/satcluster/SatClusterFactory.java
@@ -31,6 +31,7 @@ import java.net.SocketException;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* SatClusterFactory - the singleton class used to fetch and store
@@ -73,7 +74,7 @@ public class SatClusterFactory extends HibernateFactory {
* @return the <code>SatCluster</code> with ID <code>satClusterID</code>
*/
public static SatCluster findSatClusterById(Long satClusterID) {
- HashMap params = new HashMap();
+ Map params = new HashMap();
params.put("satClusterID", satClusterID);
return (SatCluster)
singleton.lookupObjectByNamedQuery("SatCluster.findByID", params);
@@ -223,7 +224,7 @@ public class SatClusterFactory extends HibernateFactory {
* @return list of sat clusters
*/
public static List<SatCluster> findSatClusters() {
- HashMap params = new HashMap();
+ Map params = new HashMap();
return singleton.listObjectsByNamedQuery("SatCluster.findAll", params);
}
diff --git a/java/code/src/com/redhat/rhn/domain/monitoring/test/MonitoringTestUtils.java b/java/code/src/com/redhat/rhn/domain/monitoring/test/MonitoringTestUtils.java
index d99ff85..f3988b8 100644
--- a/java/code/src/com/redhat/rhn/domain/monitoring/test/MonitoringTestUtils.java
+++ b/java/code/src/com/redhat/rhn/domain/monitoring/test/MonitoringTestUtils.java
@@ -44,7 +44,7 @@ public final class MonitoringTestUtils {
*/
public static Map parameterValueMap(Probe probe) {
Set ppvSet = probe.getProbeParameterValues();
- HashMap result = new HashMap();
+ Map result = new HashMap();
for (Iterator i = ppvSet.iterator(); i.hasNext();) {
ProbeParameterValue ppv = (ProbeParameterValue) i.next();
result.put(ppv.getParamName(), ppv.getValue());
@@ -100,11 +100,11 @@ public final class MonitoringTestUtils {
*/
public static void setupParamValues(ActionHelper ah, Command command,
int multiplicity) {
- HashMap defaults = makeParamDefaults(command, true);
+ Map defaults = makeParamDefaults(command, true);
setupParamValues(ah, defaults, multiplicity);
}
- public static void setupParamValues(ActionHelper ah, HashMap params,
+ public static void setupParamValues(ActionHelper ah, Map params,
int multiplicity) {
for (Iterator i = params.keySet().iterator(); i.hasNext();) {
String name = (String) i.next();
@@ -120,10 +120,10 @@ public final class MonitoringTestUtils {
* of {@link com.redhat.rhn.domain.monitoring.MonitoringConstants#COMMAND_CHECK_TCP}
* @param includeInvisible TODO
*/
- public static HashMap makeParamDefaults(Command command, boolean includeInvisible) {
+ public static Map makeParamDefaults(Command command, boolean includeInvisible) {
Assert.assertEquals("Only CHECK_TCP is supported",
MonitoringConstants.getCommandCheckTCP().getName(), command.getName());
- HashMap result = new HashMap();
+ Map result = new HashMap();
result.put("send", "send it");
result.put("expect", "expect it");
result.put("r_port_0", "666");
diff --git a/java/code/src/com/redhat/rhn/domain/rhnset/SetCleanup.java b/java/code/src/com/redhat/rhn/domain/rhnset/SetCleanup.java
index b9006ab..19b446c 100644
--- a/java/code/src/com/redhat/rhn/domain/rhnset/SetCleanup.java
+++ b/java/code/src/com/redhat/rhn/domain/rhnset/SetCleanup.java
@@ -21,6 +21,7 @@ import com.redhat.rhn.domain.user.UserFactory;
import org.apache.log4j.Logger;
import java.util.HashMap;
+import java.util.Map;
/**
* Encapsulate the query/method that needs to be run after
@@ -116,7 +117,7 @@ public class SetCleanup {
protected int cleanup(RhnSet set) {
WriteMode m = ModeFactory.getWriteMode(catalogName, modeName);
- HashMap p = new HashMap();
+ Map p = new HashMap();
p.put("user_id", set.getUserId());
p.put("label", set.getLabel());
return m.executeUpdate(p);
@@ -155,7 +156,7 @@ public class SetCleanup {
protected int cleanup(RhnSet set) {
WriteMode m = ModeFactory.getWriteMode("Set_queries", getMode());
- HashMap p = new HashMap();
+ Map p = new HashMap();
p.put("org_id", UserFactory.lookupById(set.getUserId()).getOrg().getId());
p.put("user_id", set.getUserId());
p.put("label", set.getLabel());
diff --git a/java/code/src/com/redhat/rhn/frontend/action/SearchAction.java b/java/code/src/com/redhat/rhn/frontend/action/SearchAction.java
index db8997e..517c6f7 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/SearchAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/SearchAction.java
@@ -69,7 +69,7 @@ public class SearchAction extends RhnAction {
OrgFactory.getEntitlementSwMgrPersonal()) ||
user.getOrg().getEntitlements().contains(
OrgFactory.getEntitlementEnterprise()))) {
- HashMap attributes = new HashMap();
+ Map attributes = new HashMap();
attributes.put(RhnAction.SUBMITTED, "true");
attributes.put(SystemSearchSetupAction.WHERE_TO_SEARCH, "all");
attributes.put(SystemSearchSetupAction.VIEW_MODE,
@@ -84,7 +84,7 @@ public class SearchAction extends RhnAction {
return null;
}
else if (searchType.equals("errata")) {
- HashMap attributes = new HashMap();
+ Map attributes = new HashMap();
attributes.put("view_mode", "errata_search_by_all_fields");
attributes.put(SystemSearchSetupAction.SEARCH_STRING, searchString);
attributes.put("optionIssueDateSearch", Boolean.FALSE);
@@ -100,7 +100,7 @@ public class SearchAction extends RhnAction {
return null;
}
else if (searchType.equals("packages")) {
- HashMap attributes = new HashMap();
+ Map attributes = new HashMap();
attributes.put("view_mode", "search_name_and_summary");
attributes.put(SystemSearchSetupAction.SEARCH_STRING, searchString);
attributes.put(PackageSearchAction.WHERE_CRITERIA, "architecture");
@@ -126,7 +126,7 @@ public class SearchAction extends RhnAction {
return null;
}
else if (searchType.equals("docs")) {
- HashMap attributes = new HashMap();
+ Map attributes = new HashMap();
attributes.put("view_mode", "search_content_title");
attributes.put(SystemSearchSetupAction.SEARCH_STRING, searchString);
performRedirect("/help/Search.do",
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
index 4af49de..b1773f2 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
@@ -635,13 +635,13 @@ public class EditChannelAction extends RhnAction implements Listable {
}
ctx.getRequest().setAttribute("parentChannels", baseChannels);
- HashMap parentChannelArches = new HashMap();
+ Map parentChannelArches = new HashMap();
for (Channel c : bases) {
parentChannelArches.put(c.getId(), c.getChannelArch().getLabel());
}
ctx.getRequest().setAttribute("parentChannelArches", parentChannelArches);
- HashMap parentChannelChecksums = new HashMap();
+ Map parentChannelChecksums = new HashMap();
for (Channel c : bases) {
parentChannelChecksums.put(c.getId(), c.getChecksumTypeLabel());
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/common/BaseSetOperateOnDiffAction.java b/java/code/src/com/redhat/rhn/frontend/action/common/BaseSetOperateOnDiffAction.java
index 89fb2fe..10af2cd 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/common/BaseSetOperateOnDiffAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/common/BaseSetOperateOnDiffAction.java
@@ -87,7 +87,7 @@ public abstract class BaseSetOperateOnDiffAction extends RhnSetAction {
RhnSetManager.store(currentset);
Map params = makeParamMap(formIn, request);
- HashMap diffmap = new HashMap();
+ Map diffmap = new HashMap();
Iterator originalItems = getCurrentItemsIterator(new RequestContext(request));
diff --git a/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java b/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java
index ddf1c9b..2cae11f 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java
@@ -276,7 +276,7 @@ public class DownloadFile extends DownloadAction {
response.sendError(HttpServletResponse.SC_NOT_FOUND);
return mapping.findForward("error");
}
- HashMap params = new HashMap();
+ Map params = new HashMap();
params.put(TYPE, DownloadManager.DOWNLOAD_TYPE_KICKSTART);
params.put(TREE, tree);
params.put(CHILD, child);
@@ -292,7 +292,7 @@ public class DownloadFile extends DownloadAction {
response.sendError(HttpServletResponse.SC_NOT_FOUND);
return mapping.findForward("error");
}
- HashMap params = new HashMap();
+ Map params = new HashMap();
params.put(TYPE, DownloadManager.DOWNLOAD_TYPE_KICKSTART);
params.put(TREE, tree);
params.put(FILENAME, path);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/DeleteErratumAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/DeleteErratumAction.java
index ff3767e..85bfadf 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/DeleteErratumAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/DeleteErratumAction.java
@@ -95,7 +95,7 @@ public class DeleteErratumAction extends LookupDispatchAction {
* {@inheritDoc}
*/
protected Map getKeyMethodMap() {
- HashMap map = new HashMap();
+ Map map = new HashMap();
map.put("delete.jsp.delete", "deleteErratum");
return map;
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartLocaleEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartLocaleEditAction.java
index b57d869..b3ccf29 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartLocaleEditAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartLocaleEditAction.java
@@ -22,8 +22,8 @@ import com.redhat.rhn.manager.kickstart.KickstartLocaleCommand;
import org.apache.struts.action.DynaActionForm;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.Iterator;
+import java.util.Map;
import javax.servlet.http.HttpServletRequest;
@@ -121,7 +121,7 @@ public class KickstartLocaleEditAction extends BaseKickstartEditAction {
Iterator iter = validTimezones.iterator();
while (iter.hasNext()) {
- HashMap possible = (HashMap) iter.next();
+ Map possible = (Map) iter.next();
if (timezone.equals(possible.get("value"))) {
return Boolean.TRUE;
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartSoftwareEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartSoftwareEditAction.java
index 3087dac..163d8d2 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartSoftwareEditAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartSoftwareEditAction.java
@@ -39,6 +39,7 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import javax.servlet.http.HttpServletRequest;
@@ -192,7 +193,7 @@ public class KickstartSoftwareEditAction extends BaseKickstartEditAction {
ctx.getRequest().setAttribute(AVAIL_CHILD_CHANNELS, childchannels);
// Setup the list of selected child channels
- HashMap<Long, Long> selectedChannels = new HashMap<Long, Long>();
+ Map<Long, Long> selectedChannels = new HashMap<Long, Long>();
if (cmd.getKickstartData().getChildChannels() != null) {
Set<Channel> channelSet = cmd.getKickstartData().getChildChannels();
for (Channel c : channelSet) {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartTroubleshootingEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartTroubleshootingEditAction.java
index 41dc7a4..84bb832 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartTroubleshootingEditAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartTroubleshootingEditAction.java
@@ -24,6 +24,7 @@ import org.apache.struts.action.DynaActionForm;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.Map;
import javax.servlet.http.HttpServletRequest;
@@ -118,7 +119,7 @@ public class KickstartTroubleshootingEditAction extends BaseKickstartEditAction
];
*/
- HashMap grub = new HashMap();
+ Map grub = new HashMap();
grub.put("display", "GRUB");
grub.put("value", "grub");
@@ -126,7 +127,7 @@ public class KickstartTroubleshootingEditAction extends BaseKickstartEditAction
displayList.add(grub);
if (!cmd.getKickstartData().isRhel5OrGreater()) {
- HashMap lilo = new HashMap();
+ Map lilo = new HashMap();
lilo.put("display", "LILO");
lilo.put("value", "lilo");
diff --git a/java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuiteProbeEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuiteProbeEditAction.java
index ef452d4..1728a3e 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuiteProbeEditAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuiteProbeEditAction.java
@@ -19,7 +19,7 @@ import com.redhat.rhn.domain.monitoring.suite.ProbeSuite;
import com.redhat.rhn.frontend.action.systems.monitoring.BaseProbeEditAction;
import com.redhat.rhn.frontend.struts.RequestContext;
-import java.util.HashMap;
+import java.util.Map;
/**
* Edit a probe that is part of a probe suite
@@ -35,7 +35,7 @@ public class ProbeSuiteProbeEditAction extends BaseProbeEditAction {
rctx.getRequest().setAttribute("probeSuite", suite);
}
- protected void addSuccessParams(RequestContext rctx, HashMap params, Probe probe) {
+ protected void addSuccessParams(RequestContext rctx, Map params, Probe probe) {
params.put(RequestContext.SUITE_ID, rctx.lookupProbeSuite().getId());
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchSetupAction.java
index a53bc93..48826b4 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchSetupAction.java
@@ -298,7 +298,7 @@ public class SystemSearchSetupAction extends RhnAction implements Listable {
protected void setupForm(HttpServletRequest request,
DynaActionForm form,
String viewMode) {
- HashMap optGroupsMap = new HashMap();
+ Map optGroupsMap = new HashMap();
boolean matchingViewModeFound = false;
/* Here we set up a hashmap using the string resources key for the various options
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeAction.java
index 78d6ae9..182f1b6 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeAction.java
@@ -182,7 +182,7 @@ public class BaseProbeAction extends RhnAction {
private static Map getCommandParameterMap(CommandParameter cp, String paramName,
String value, boolean isThreshold, String lastLabel) {
- HashMap map = new HashMap();
+ Map map = new HashMap();
map.put("value", value);
map.put("mandatory", Boolean.valueOf(cp.isMandatory()));
String label = cp.getDescription();
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeCreateAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeCreateAction.java
index 1e3053a..8ff0490 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeCreateAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeCreateAction.java
@@ -84,7 +84,7 @@ public abstract class BaseProbeCreateAction extends BaseProbeAction {
// ServerProbe created and saved
createSuccessMessage(req, "probecreate.created",
cmd.getProbe().getDescription());
- HashMap params = new HashMap();
+ Map params = new HashMap();
addSuccessParams(ctx, params, cmd.getProbe());
return getStrutsDelegate().forwardParams(mapping.findForward("success"),
params);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeEditAction.java
index bbfd673..f149af8 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeEditAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeEditAction.java
@@ -26,6 +26,7 @@ import org.apache.struts.action.ActionMapping;
import org.apache.struts.action.DynaActionForm;
import java.util.HashMap;
+import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -51,7 +52,7 @@ public abstract class BaseProbeEditAction extends BaseProbeAction {
ModifyProbeCommand cmd = new ModifyProbeCommand(user, probe);
if (editProbe(cmd, form, req)) {
createSuccessMessage(req, "probeedit.probesaved", probe.getDescription());
- HashMap params = new HashMap();
+ Map params = new HashMap();
addSuccessParams(rctx, params, cmd.getProbe());
return getStrutsDelegate().forwardParams(mapping.findForward("success"),
params);
@@ -75,7 +76,7 @@ public abstract class BaseProbeEditAction extends BaseProbeAction {
return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
- protected abstract void addSuccessParams(RequestContext rctx, HashMap params,
+ protected abstract void addSuccessParams(RequestContext rctx, Map params,
Probe probe);
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/ProbeDeleteAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/ProbeDeleteAction.java
index e328a49..d9f28ce 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/ProbeDeleteAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/ProbeDeleteAction.java
@@ -29,6 +29,7 @@ import org.apache.struts.action.ActionMapping;
import org.apache.struts.action.DynaActionForm;
import java.util.HashMap;
+import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -60,7 +61,7 @@ public class ProbeDeleteAction extends BaseProbeAction {
req.setAttribute("probe", probe);
if (submitted) {
- HashMap params = new HashMap();
+ Map params = new HashMap();
params.put(RequestContext.SID, server.getId());
log.debug("Deleted probe: " + probe.getId());
return getStrutsDelegate().forwardParams(mapping.findForward("deleted"),
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/ProbeEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/ProbeEditAction.java
index 714e43a..83c779b 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/ProbeEditAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/ProbeEditAction.java
@@ -17,7 +17,7 @@ package com.redhat.rhn.frontend.action.systems.monitoring;
import com.redhat.rhn.domain.monitoring.Probe;
import com.redhat.rhn.frontend.struts.RequestContext;
-import java.util.HashMap;
+import java.util.Map;
/**
* Edit a probe attached to one system
@@ -35,7 +35,7 @@ public class ProbeEditAction extends BaseProbeEditAction {
protected void addSuccessParams(RequestContext rctx,
- HashMap params, Probe probe) {
+ Map params, Probe probe) {
params.put(SID, rctx.lookupAndBindServer().getId());
params.put(PROBEID, rctx.lookupProbe().getId());
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeCreateTestCase.java b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeCreateTestCase.java
index 0c645f1..c26e6c3 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeCreateTestCase.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeCreateTestCase.java
@@ -35,7 +35,7 @@ import com.redhat.rhn.testing.RhnMockHttpSession;
import org.apache.commons.lang.StringUtils;
import org.hibernate.HibernateException;
-import java.util.HashMap;
+import java.util.Map;
import java.util.List;
import java.util.Set;
@@ -75,7 +75,7 @@ public abstract class ProbeCreateTestCase extends RhnBaseTestCase {
setupCommand(ah, orig);
setupProbeFields(ah, orig);
- HashMap params = MonitoringTestUtils.makeParamDefaults(orig.getCommand(), true);
+ Map params = MonitoringTestUtils.makeParamDefaults(orig.getCommand(), true);
// Remove required param
params.put("r_port_0", "");
MonitoringTestUtils.setupParamValues(ah, params, 3);
@@ -141,7 +141,7 @@ public abstract class ProbeCreateTestCase extends RhnBaseTestCase {
setupCommand(ah, orig);
setupProbeFields(ah, orig);
- HashMap params = MonitoringTestUtils.makeParamDefaults(orig.getCommand(), true);
+ Map params = MonitoringTestUtils.makeParamDefaults(orig.getCommand(), true);
// Make sure that the values are not in ascending order
params.put("warning", "7");
params.put("critical", "7");
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/ClonableErrataDto.java b/java/code/src/com/redhat/rhn/frontend/dto/ClonableErrataDto.java
index 858070a..2f254c4 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/ClonableErrataDto.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/ClonableErrataDto.java
@@ -17,6 +17,7 @@ package com.redhat.rhn.frontend.dto;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* ClonableErrataDto
@@ -62,7 +63,7 @@ public class ClonableErrataDto extends BaseDto {
public List<Object> getChannelMap() {
List<Object> l = new ArrayList<Object>();
for (int i = 0; i < channelId.size(); i++) {
- HashMap<String, Object> m = new HashMap<String, Object>();
+ Map<String, Object> m = new HashMap<String, Object>();
m.put("id", channelId.get(i));
m.put("name", channelName.get(i));
l.add(m);
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/XccdfTestResultCounts.java b/java/code/src/com/redhat/rhn/frontend/dto/XccdfTestResultCounts.java
index 4e7c263..128fbf7 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/XccdfTestResultCounts.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/XccdfTestResultCounts.java
@@ -16,6 +16,7 @@ package com.redhat.rhn.frontend.dto;
import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* Simple DTO for transfering data from the DB to the UI through datasource.
@@ -33,7 +34,7 @@ public abstract class XccdfTestResultCounts extends BaseDto {
private static final String INFORMATIONAL_LABEL = "informational";
private static final String FIXED_LABEL = "fixed";
- private HashMap<String, Long> countMap;
+ private Map<String, Long> countMap;
/* Following properties are set by testresult_counts elaborator. */
private List label;
@@ -186,7 +187,7 @@ public abstract class XccdfTestResultCounts extends BaseDto {
return (result != null) ? result : 0;
}
- private HashMap<String, Long> getCountMap() {
+ private Map<String, Long> getCountMap() {
if (this.countMap == null) {
this.countMap = new HashMap<String, Long>();
if (this.label != null && this.count != null) {
diff --git a/java/code/src/com/redhat/rhn/frontend/struts/RhnListDispatchAction.java b/java/code/src/com/redhat/rhn/frontend/struts/RhnListDispatchAction.java
index af95704..4baeced 100644
--- a/java/code/src/com/redhat/rhn/frontend/struts/RhnListDispatchAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/struts/RhnListDispatchAction.java
@@ -43,7 +43,7 @@ public abstract class RhnListDispatchAction extends RhnLookupDispatchAction {
* {@inheritDoc}
*/
protected Map getKeyMethodMap() {
- HashMap map = new HashMap();
+ Map map = new HashMap();
map.put(RequestContext.FILTER_KEY, "filter");
processMethodKeys(map);
return map;
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java
index 45ff222..87a274a 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java
@@ -24,6 +24,7 @@ import java.io.IOException;
import java.io.Writer;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.Map;
import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
@@ -72,7 +73,7 @@ public class NetworkInterfaceSerializer implements XmlRpcCustomSerializer {
for (ServerNetAddress6 addr : device.getIPv6Addresses()) {
// SerializerHelper m = new SerializerHelper(builtInSerializer);
- HashMap m = new HashMap();
+ Map m = new HashMap();
m.put("address", StringUtils.defaultString(addr.getAddress()));
m.put("netmask", StringUtils.defaultString(addr.getNetmask()));
m.put("scope", StringUtils.defaultString(addr.getScope()));
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/crash/CrashHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/crash/CrashHandler.java
index 877b2ad..ba2d361 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/crash/CrashHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/crash/CrashHandler.java
@@ -235,7 +235,7 @@ public class CrashHandler extends BaseHandler {
List returnList = new ArrayList();
for (CrashFile crashFile : crash.getCrashFiles()) {
- HashMap crashMap = new HashMap();
+ Map crashMap = new HashMap();
crashMap.put("id", crashFile.getId());
crashMap.put("filename", crashFile.getFilename());
crashMap.put("path", crashFile.getPath());
@@ -393,7 +393,7 @@ public class CrashHandler extends BaseHandler {
crashId.longValue());
List returnList = new ArrayList();
for (CrashNote cn : c.getCrashNotes()) {
- HashMap crashNotesMap = new HashMap();
+ Map crashNotesMap = new HashMap();
crashNotesMap.put("id", cn.getId());
crashNotesMap.put("subject", cn.getSubject());
crashNotesMap.put("details", cn.getNote() == null ? "" : cn.getNote());
@@ -426,7 +426,7 @@ public class CrashHandler extends BaseHandler {
List returnList = new ArrayList();
for (IdenticalCrashesDto ic : CrashFactory.listIdenticalCrashesForOrg(user,
user.getOrg())) {
- HashMap crashMap = new HashMap();
+ Map crashMap = new HashMap();
crashMap.put("uuid", ic.getUuid());
String component = ic.getComponent();
if (component != null) {
@@ -468,7 +468,7 @@ public class CrashHandler extends BaseHandler {
List returnList = new ArrayList();
for (CrashSystemsDto cs : CrashFactory.listCrashSystems(user,
user.getOrg(), uuid)) {
- HashMap crashMap = new HashMap();
+ Map crashMap = new HashMap();
crashMap.put("server_id", cs.getServerId());
crashMap.put("server_name", cs.getServerName());
crashMap.put("crash_id", cs.getCrashId());
diff --git a/java/code/src/com/redhat/rhn/manager/audit/ScapManager.java b/java/code/src/com/redhat/rhn/manager/audit/ScapManager.java
index 2238de7..08d5220 100644
--- a/java/code/src/com/redhat/rhn/manager/audit/ScapManager.java
+++ b/java/code/src/com/redhat/rhn/manager/audit/ScapManager.java
@@ -56,7 +56,7 @@ public class ScapManager extends BaseManager {
public static boolean isScapEnabled(Server server, User user) {
SelectMode m = ModeFactory.getMode("scap_queries",
"system_scap_enabled_check");
- HashMap params = new HashMap();
+ Map params = new HashMap();
params.put("user_id", user.getId());
params.put("sid", server.getId());
DataResult<Map<String, ? extends Number>> dr = m.execute(params);
@@ -72,7 +72,7 @@ public class ScapManager extends BaseManager {
public static DataResult latestTestResultByUser(User user) {
SelectMode m = ModeFactory.getMode("scap_queries",
"latest_testresults_by_user");
- HashMap params = new HashMap();
+ Map params = new HashMap();
params.put("user_id", user.getId());
return makeDataResult(params, new HashMap(), null, m);
}
@@ -88,7 +88,7 @@ public class ScapManager extends BaseManager {
User user, Long systemId) {
SelectMode m = ModeFactory.getMode("scap_queries",
"latest_testresults_by_server");
- HashMap<String, Long> params = new HashMap<String, Long>();
+ Map<String, Long> params = new HashMap<String, Long>();
params.put("user_id", user.getId());
params.put("sid", systemId);
return m.execute(params);
@@ -102,7 +102,7 @@ public class ScapManager extends BaseManager {
public static DataResult allScans(Server server) {
SelectMode m = ModeFactory.getMode("scap_queries",
"show_system_scans");
- HashMap params = new HashMap();
+ Map params = new HashMap();
params.put("sid", server.getId());
return makeDataResult(params, new HashMap(), null, m);
}
@@ -116,7 +116,7 @@ public class ScapManager extends BaseManager {
public static DataResult<XccdfTestResultDto> scansInSet(User user, String setLabel) {
SelectMode m = ModeFactory.getMode("scap_queries",
"scans_in_set");
- HashMap<String, Object> params = new HashMap<String, Object>();
+ Map<String, Object> params = new HashMap<String, Object>();
params.put("user_id", user.getId());
params.put("set_label", setLabel);
return makeDataResult(params, new HashMap<String, Object>(), null, m);
@@ -130,7 +130,7 @@ public class ScapManager extends BaseManager {
public static List<XccdfRuleResultDto> ruleResultsPerScan(Long testResultId) {
SelectMode m = ModeFactory.getMode("scap_queries",
"show_ruleresults");
- HashMap params = new HashMap();
+ Map params = new HashMap();
params.put("xid", testResultId);
return m.execute(params);
}
@@ -143,7 +143,7 @@ public class ScapManager extends BaseManager {
public static XccdfRuleResultDto ruleResultById(Long ruleResultId) {
SelectMode m = ModeFactory.getMode("scap_queries",
"ruleresult_by_id");
- HashMap params = new HashMap();
+ Map params = new HashMap();
params.put("rr_id", ruleResultId);
List<XccdfRuleResultDto> result = m.execute(params);
return result.isEmpty() ? null : result.get(0);
@@ -159,7 +159,7 @@ public class ScapManager extends BaseManager {
public static Long previousComparableTestResult(Long testResultId) {
SelectMode m = ModeFactory.getMode("scap_queries",
"previous_comparable_tr");
- HashMap<String, Long> params = new HashMap<String, Long>();
+ Map<String, Long> params = new HashMap<String, Long>();
params.put("xid", testResultId);
DataResult<Map> toReturn = m.execute(params);
return (Long) toReturn.get(0).get("xid");
@@ -199,7 +199,7 @@ public class ScapManager extends BaseManager {
public static List<XccdfIdentDto> identsPerRuleResult(Long ruleResultId) {
SelectMode m = ModeFactory.getMode("scap_queries",
"idents_per_ruleresult");
- HashMap params = new HashMap();
+ Map params = new HashMap();
params.put("rr_id", ruleResultId);
return m.execute(params);
}
@@ -212,7 +212,7 @@ public class ScapManager extends BaseManager {
public static DataResult scapCapableSystemsInSsm(User scheduler) {
SelectMode m = ModeFactory.getMode("scap_queries",
"scap_capable_systems_in_set");
- HashMap params = new HashMap();
+ Map params = new HashMap();
params.put("user_id", scheduler.getId());
params.put("set_label", RhnSetDecl.SYSTEMS.getLabel());
return m.execute(params);
@@ -226,7 +226,7 @@ public class ScapManager extends BaseManager {
public static DataResult systemsInSsmAndScapCapability(User scheduler) {
SelectMode m = ModeFactory.getMode("scap_queries",
"systems_in_set_and_scap_capability");
- HashMap params = new HashMap();
+ Map params = new HashMap();
params.put("user_id", scheduler.getId());
params.put("set_label", RhnSetDecl.SYSTEMS.getLabel());
return m.execute(params);
@@ -278,7 +278,7 @@ public class ScapManager extends BaseManager {
public static boolean isAvailableToUser(User user, Long testResultId) {
SelectMode m = ModeFactory.getMode("scap_queries",
"is_available_to_user");
- HashMap<String, Long> params = new HashMap<String, Long>();
+ Map<String, Long> params = new HashMap<String, Long>();
params.put("user_id", user.getId());
params.put("xid", testResultId);
return m.execute(params).size() >= 1;
diff --git a/java/code/src/com/redhat/rhn/manager/audit/scap/RuleResultDiffer.java b/java/code/src/com/redhat/rhn/manager/audit/scap/RuleResultDiffer.java
index 4e3ac4a..da7e1a4 100644
--- a/java/code/src/com/redhat/rhn/manager/audit/scap/RuleResultDiffer.java
+++ b/java/code/src/com/redhat/rhn/manager/audit/scap/RuleResultDiffer.java
@@ -17,6 +17,7 @@ package com.redhat.rhn.manager.audit.scap;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import com.redhat.rhn.frontend.dto.XccdfRuleResultDto;
import com.redhat.rhn.manager.audit.ScapManager;
@@ -26,7 +27,7 @@ import com.redhat.rhn.manager.audit.ScapManager;
* assigned with given xccdf:TestResult-s
*/
public class RuleResultDiffer {
- private HashMap<String, RuleResultComparator> dataMap;
+ private Map<String, RuleResultComparator> dataMap;
/**
* Constructor
diff --git a/java/code/src/com/redhat/rhn/manager/audit/scap/TestResultDiffer.java b/java/code/src/com/redhat/rhn/manager/audit/scap/TestResultDiffer.java
index 5750c78..f2040aa 100644
--- a/java/code/src/com/redhat/rhn/manager/audit/scap/TestResultDiffer.java
+++ b/java/code/src/com/redhat/rhn/manager/audit/scap/TestResultDiffer.java
@@ -17,6 +17,7 @@ package com.redhat.rhn.manager.audit.scap;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import com.redhat.rhn.domain.audit.XccdfTestResult;
/**
@@ -35,9 +36,9 @@ public class TestResultDiffer {
* @param second the second TestResult to compare
* @return the diff
*/
- public static List<HashMap<String, Object>> diff(XccdfTestResult first,
+ public static List<Map<String, Object>> diff(XccdfTestResult first,
XccdfTestResult second) {
- List<HashMap<String, Object>> result = new ArrayList<HashMap<String, Object>>();
+ List<Map<String, Object>> result = new ArrayList<Map<String, Object>>();
result.add(buildItem("id", linkToScan(first), linkToScan(second)));
result.add(buildItem("system.audit.xccdfdetails.jsp.benchmarkid",
first.getBenchmark().getIdentifier(),
@@ -79,13 +80,13 @@ public class TestResultDiffer {
* False - filters out items which differs
* @return the result
*/
- public static List<HashMap<String, Object>> diff(XccdfTestResult first,
+ public static List<Map<String, Object>> diff(XccdfTestResult first,
XccdfTestResult second, Boolean differs) {
if (differs == null) {
return diff(first, second);
}
- List<HashMap<String, Object>> result = new ArrayList<HashMap<String, Object>>();
- for (HashMap<String, Object> item : diff(first, second)) {
+ List<Map<String, Object>> result = new ArrayList<Map<String, Object>>();
+ for (Map<String, Object> item : diff(first, second)) {
if (differs.equals(item.get(DIFFERS))) {
result.add(item);
}
@@ -93,9 +94,9 @@ public class TestResultDiffer {
return result;
}
- private static HashMap<String, Object> buildItem(String localizationString,
+ private static Map<String, Object> buildItem(String localizationString,
Object first, Object second) {
- HashMap<String, Object> item = new HashMap<String, Object>();
+ Map<String, Object> item = new HashMap<String, Object>();
item.put("msg", localizationString);
item.put(FIRST, first == null ? "" : first);
item.put(SECOND, second == null ? "" : second);
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartLocaleCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartLocaleCommand.java
index 608ba68..a09a2a6 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartLocaleCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartLocaleCommand.java
@@ -30,6 +30,7 @@ import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
+import java.util.Map;
/**
* KickstartLocaleCommand - for editing locale-related options
@@ -130,7 +131,7 @@ public class KickstartLocaleCommand extends BaseKickstartCommand {
while (iter.hasNext()) {
TimezoneDto old = (TimezoneDto) iter.next();
- HashMap row = new HashMap();
+ Map row = new HashMap();
row.put("display", old.getName());
row.put("value", old.getLabel());
diff --git a/java/code/src/com/redhat/rhn/manager/system/VirtualizationActionMap.java b/java/code/src/com/redhat/rhn/manager/system/VirtualizationActionMap.java
index 8a97e7a..2e7b4ae 100644
--- a/java/code/src/com/redhat/rhn/manager/system/VirtualizationActionMap.java
+++ b/java/code/src/com/redhat/rhn/manager/system/VirtualizationActionMap.java
@@ -18,6 +18,7 @@ import com.redhat.rhn.domain.action.ActionFactory;
import com.redhat.rhn.domain.action.ActionType;
import java.util.HashMap;
+import java.util.Map;
/**
* A map between virtualization states and actions
@@ -27,7 +28,7 @@ import java.util.HashMap;
public class VirtualizationActionMap {
private static VirtualizationActionMap singleton = new VirtualizationActionMap();
- private HashMap actionMap;
+ private Map actionMap;
// Essentially a state machine to answer:
// "Given a desired action (start,
// suspend, resume, restart, shutdown) and a
@@ -35,14 +36,14 @@ public class VirtualizationActionMap {
// crashed, paused), what RHN action
// should be used?"
- private HashMap startMap;
- private HashMap suspendMap;
- private HashMap resumeMap;
- private HashMap restartMap;
- private HashMap shutdownMap;
- private HashMap deleteMap;
- private HashMap setVcpusMap;
- private HashMap setMemoryMap;
+ private Map startMap;
+ private Map suspendMap;
+ private Map resumeMap;
+ private Map restartMap;
+ private Map shutdownMap;
+ private Map deleteMap;
+ private Map setVcpusMap;
+ private Map setMemoryMap;
private VirtualizationActionMap() {
setup();
@@ -114,7 +115,7 @@ public class VirtualizationActionMap {
*/
public static ActionType lookupActionType(String currentState, String actionName) {
if (singleton.actionMap.get(actionName) != null) {
- HashMap aMap = (HashMap) singleton.actionMap.get(actionName);
+ Map aMap = (Map) singleton.actionMap.get(actionName);
return (ActionType) aMap.get(currentState);
}
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/DailySummary.java b/java/code/src/com/redhat/rhn/taskomatic/task/DailySummary.java
index 1233a72..d5e511f 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/DailySummary.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/DailySummary.java
@@ -305,8 +305,8 @@ public class DailySummary extends RhnJavaJob {
StringBuffer legend = new StringBuffer();
StringBuffer msg = new StringBuffer();
LinkedHashSet<String> statusSet = new LinkedHashSet();
- TreeMap<String, HashMap<String, Integer>> nonErrataActions = new TreeMap();
- TreeMap<String, HashMap<String, Integer>> errataActions = new TreeMap();
+ TreeMap<String, Map<String, Integer>> nonErrataActions = new TreeMap();
+ TreeMap<String, Map<String, Integer>> errataActions = new TreeMap();
TreeMap<String, String> errataSynopsis = new TreeMap();
legend.append(LocalizationService
@@ -331,7 +331,7 @@ public class DailySummary extends RhnJavaJob {
longestActionLength = advisoryKey.length() + HEADER_SPACER;
}
}
- HashMap<String, Integer> counts = errataActions.get(advisoryKey);
+ Map<String, Integer> counts = errataActions.get(advisoryKey);
counts.put(am.getStatus(), am.getCount());
if (am.getAdvisory() != null &&
@@ -346,7 +346,7 @@ public class DailySummary extends RhnJavaJob {
longestActionLength = am.getType().length() + HEADER_SPACER;
}
}
- HashMap<String, Integer> counts = nonErrataActions.get(am.getType());
+ Map<String, Integer> counts = nonErrataActions.get(am.getType());
counts.put(am.getStatus(), am.getCount());
}
@@ -387,13 +387,13 @@ public class DailySummary extends RhnJavaJob {
private StringBuffer renderActionTree(int longestActionLength,
int longestStatusLength, LinkedHashSet<String> statusSet,
- TreeMap<String, HashMap<String, Integer>> actionTree) {
+ TreeMap<String, Map<String, Integer>> actionTree) {
StringBuffer formattedActions = new StringBuffer();
for (String actionName : actionTree.keySet()) {
formattedActions.append(actionName +
StringUtils.repeat(" ", (longestActionLength - (actionName.length()))));
for (String status : statusSet) {
- HashMap<String, Integer> counts = actionTree.get(actionName);
+ Map<String, Integer> counts = actionTree.get(actionName);
Integer theCount = counts.get(status);
if (counts.containsKey(status)) {
theCount = counts.get(status);
diff --git a/java/code/src/com/redhat/rhn/testing/ForwardWrapper.java b/java/code/src/com/redhat/rhn/testing/ForwardWrapper.java
index d7b9383..728cb34 100644
--- a/java/code/src/com/redhat/rhn/testing/ForwardWrapper.java
+++ b/java/code/src/com/redhat/rhn/testing/ForwardWrapper.java
@@ -19,6 +19,7 @@ import org.apache.struts.action.ActionForward;
import org.apache.struts.config.ForwardConfig;
import java.util.HashMap;
+import java.util.Map;
/**
* A decorator for a {@link org.apache.struts.action.ActionForward}. In
@@ -30,7 +31,7 @@ import java.util.HashMap;
public class ForwardWrapper extends ActionForward {
private ForwardConfig fc;
- private HashMap params;
+ private Map params;
/**
* Create a new forward that decorates <code>fc0</code>
diff --git a/java/code/src/org/cobbler/test/MockConnection.java b/java/code/src/org/cobbler/test/MockConnection.java
index ebe04bd..67e512a 100644
--- a/java/code/src/org/cobbler/test/MockConnection.java
+++ b/java/code/src/org/cobbler/test/MockConnection.java
@@ -132,7 +132,7 @@ public class MockConnection extends CobblerConnection {
return true;
}
else if ("new_profile".equals(name)) {
- HashMap profile = new HashMap();
+ Map profile = new HashMap();
String uid = random();
String key = random();
profile.put("uid", uid);
@@ -187,7 +187,7 @@ public class MockConnection extends CobblerConnection {
else if ("new_distro".equals(name)) {
String uid = random();
- HashMap distro = new HashMap();
+ Map distro = new HashMap();
String key = random();
distro.put("uid", uid);
@@ -235,7 +235,7 @@ public class MockConnection extends CobblerConnection {
systems.remove(findByName((String)args[0], systems));
}
else if ("new_system".equals(name)) {
- HashMap profile = new HashMap();
+ Map profile = new HashMap();
String key = random();
profile.put("uid", random());
Map interfaces = new HashMap();
10 years, 8 months
Changes to 'refs/tags/spacewalk-java-2.1.30-1'
by Tomas Lestach
Tag 'spacewalk-java-2.1.30-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-08-29 07:00 +0000
Tagging package [spacewalk-java] version [2.1.30-1] in directory [java/].
Changes since spacewalk-java-2.1.29-1:
Dimitar Yordanov (2):
removing, to be implemented in spacecmd
1002308 - Cloning a channel via API fails
Grant Gainey (1):
1002232 - remove extraneous error-log invoke
Shannon Hughes (1):
1002183 - allow trusted orgs to list out subscribed systems to shared channels
Silvio Moioli (1):
UserFactoryTest: avoid failure if there are no users
Tomas Lestach (1):
Automatic commit of package [spacewalk-java] release [2.1.30-1].
---
java/code/src/com/redhat/rhn/domain/channel/NewChannelHelper.java | 2
java/code/src/com/redhat/rhn/domain/user/test/UserFactoryTest.java | 1
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java | 2
java/spacewalk-java.spec | 8
rel-eng/packages/spacewalk-java | 2
utils/Makefile | 2
utils/spacewalk-custom-repository | 341 --------
utils/spacewalk-manage-abrt | 395 ----------
utils/spacewalk-sync-setup | 1
9 files changed, 12 insertions(+), 742 deletions(-)
---
10 years, 8 months
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 8 +++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 9301c350dc334d275017e4107fea456091c0e5b6
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Aug 29 09:00:26 2013 +0200
Automatic commit of package [spacewalk-java] release [2.1.30-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index bf43a8b..f7eb51e 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 2.1.29
+Version: 2.1.30
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -771,6 +771,12 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Aug 29 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.30-1
+- 1002183 - allow trusted orgs to list out subscribed systems to shared
+ channels
+- 1002308 - Cloning a channel via API fails
+- UserFactoryTest: avoid failure if there are no users
+
* Wed Aug 28 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.29-1
- add additional check for cases, when pam is disabled
- Fix javascript "Uncaught TypeError"
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 946e567..2ec3a47 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.29-1 java/
+2.1.30-1 java/
10 years, 8 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4f62821f77546f345222ebad79a2aa853c3de3ee
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Wed Aug 28 10:57:03 2013 -0400
1002183 - allow trusted orgs to list out subscribed systems to shared channels
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 4aa322a..b48c8ed 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
@@ -912,7 +912,7 @@ public class ChannelSoftwareHandler extends BaseHandler {
}
// Get the channel.
- Channel channel = lookupChannelByLabel(user.getOrg(), label);
+ Channel channel = lookupChannelByLabel(user, label);
DataResult<Map> dr = SystemManager.systemsSubscribedToChannel(channel, user);
for (Map sys : dr) {
10 years, 8 months
java/code
by Dimitar Yordanov
java/code/src/com/redhat/rhn/domain/channel/NewChannelHelper.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit bec830185e23457cc913633c7a7fe7ac41a0183a
Author: Dimitar Yordanov <dyordano(a)redhat.com>
Date: Wed Aug 28 23:10:55 2013 +0200
1002308 - Cloning a channel via API fails
diff --git a/java/code/src/com/redhat/rhn/domain/channel/NewChannelHelper.java b/java/code/src/com/redhat/rhn/domain/channel/NewChannelHelper.java
index 4049287..b85b58d 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/NewChannelHelper.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/NewChannelHelper.java
@@ -189,7 +189,7 @@ public class NewChannelHelper {
return false;
}
- pattern = Pattern.compile("^[a-z][a-z\\d\\-\\.\\_]*$", Pattern.CASE_INSENSITIVE);
+ pattern = Pattern.compile("^[a-z\\d][a-z\\d\\-\\.\\_]*$", Pattern.CASE_INSENSITIVE);
match = pattern.matcher(label);
if (!match.matches()) {
return false;
10 years, 8 months
utils/Makefile utils/spacewalk-custom-repository utils/spacewalk-manage-abrt
by Dimitar Yordanov
utils/Makefile | 2
utils/spacewalk-custom-repository | 341 --------------------------------
utils/spacewalk-manage-abrt | 395 --------------------------------------
3 files changed, 1 insertion(+), 737 deletions(-)
New commits:
commit 97106977b879a74fc062983ca105f4da7768b6e3
Author: Dimitar Yordanov <dyordano(a)redhat.com>
Date: Wed Aug 28 21:13:34 2013 +0200
removing, to be implemented in spacecmd
diff --git a/utils/Makefile b/utils/Makefile
index fd9f91c..0096ff8 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -7,7 +7,7 @@ NAME := spacewalk-utils
SUBDIR = utils
FILES = __init__ systemSnapshot migrateSystemProfile depsolver cloneByDate
-SCRIPTS = spacewalk-manage-abrt spacewalk-custom-repository sw-system-snapshot migrate-system-profile spacewalk-api apply_errata \
+SCRIPTS = sw-system-snapshot migrate-system-profile spacewalk-api apply_errata \
scr.cgi spacewalk-common-channels delete-old-systems-interactive spacewalk-hostname-rename \
spacewalk-dump-schema spacewalk-clone-by-date spacewalk-sync-setup spacewalk-archive-audits
CONFIGS = spacewalk-common-channels.ini
diff --git a/utils/spacewalk-custom-repository b/utils/spacewalk-custom-repository
deleted file mode 100755
index 3cffd9b..0000000
--- a/utils/spacewalk-custom-repository
+++ /dev/null
@@ -1,341 +0,0 @@
-#!/usr/bin/python
-#
-# Copyright (c) 2010--2012 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public License,
-# version 2 (GPLv2). There is NO WARRANTY for this software, express or
-# implied, including the implied warranties of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
-# along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
-# Red Hat trademarks are not licensed under GPLv2. No permission is
-# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
-#
-# dyordano(a)redhat.com
-
-import sys
-import xmlrpclib
-import fnmatch
-import ConfigParser
-from optparse import OptionParser, Option
-import re
-from spacewalk.common.cli import getUsernamePassword, xmlrpc_login, xmlrpc_logout
-
-DEFAULT_SERVER = "localhost"
-DEFAULT_USER = "spacewalk"
-DEFAULT_PASSWORD = "spacewalk"
-
-exit_code=0
-
-#mmraka
-CHANNEL_ARCH = {
- 'i386': 'channel-ia32',
- 'ia64': 'channel-ia64',
- 'sparc': 'channel-sparc',
- 'sparc64': 'channel-sparc64',
- 'alpha': 'channel-alpha',
- 's390': 'channel-s390',
- 's390x': 'channel-s390x',
- 'iSeries': 'channel-iSeries',
- 'pSeries': 'channel-pSeries',
- 'x86_64': 'channel-x86_64',
- 'ppc': 'channel-ppc',
- 'ppc64': 'channel-ppc64',
- 'sparc-sun-solaris': 'channel-sparc-sun-solaris',
- 'i386-sun-solaris': 'channel-i386-sun-solaris',
- }
-
-class ExtOptionParser(OptionParser):
-
- """extend OptionParser to print examples"""
- def __init__(self, examples=None, **kwargs):
- self.examples = examples
- OptionParser.__init__(self, **kwargs)
- def print_help(self):
- OptionParser.print_help(self)
- print "\n\n" + self.examples
-
-def connect(user, password, server):
- server_url = "http://%s/rpc/api" % server
-
- if options.verbose > 2:
- client_verbose = options.verbose - 2
- else:
- client_verbose = 0
- if options.verbose:
- sys.stdout.write("Connecting to %s\n" % server_url)
- client = xmlrpclib.Server(server_url, verbose=client_verbose, allow_none=1)
- user, password = getUsernamePassword(user, password)
- key = xmlrpc_login(client, user, password)
- return client, key
-
-def f_print_error(msg):
- global exit_code
- print "ERROR: %s\n" % msg
- exit_code+=1
-
-def f_print_info(msg):
- print "INFO: %s\n" % msg
-
-if __name__ == "__main__":
- # options parsing
- usage = "usage: %prog --action [params]"
- examples = """Examples:
-
- List all available repositoies:
- %(prog)s --list-repos
-
- Create software channel:
- %(prog)s --create-channel --channel-label example_channel --channel-name example_name --channel-summary example_summary --channel-arch x86_64 --channel-parent example_parent
-
- %(prog)s --create-channel --channel-label example_channel --channel-name example_name --channel-summary example_summary --channel-arch x86_64 --channel-parent example_parent --channel-checksum sha256
-
- %(prog)s --create-channel --channel-label example_channel --channel-name example_name --channel-summary example_summary --channel-arch x86_64 --channel-parent example_parent --channel-checksum sha256 --channel-gpgKey-url http://example.com/gpg_key --channel-gpgKey-id 069C8460 --channel-gpgKey-fingerprint "25DB B54B DED7 0987 F4C1 0042 B4EB F579 069C 8460"
-
- Create repository:
- %(prog)s --create-repo --repo-label example_repo --repo-url http://example.redhat.com/example_repo
-
- Update Repository Url:
- %(prog)s --update-repourl --repo-label example_repo --repo-url http://example.redhat.com/example_repo_updated
-
- Delete repository:
- %(prog)s --delete-repo --repo-label example_repo
-
- Associate repository to a custom software channel:
- %(prog)s --associate-repo --repo-label example_repo --channel-label example_channel
-
- Disassociate repository to a custom software channel:
- %(prog)s --disassociate-repo --repo-label example_repo --channel-label example_channel
-
- Add filter to a repository:
- %(prog)s --add-filter --repo-label example_repo --filter-string example_filter_string* --filter-flag +
-
- Remove filter from a repository:
- %(prog)s --remove-filter --repo-label example_repo --filter-string example_filter_string* --filter-flag +
-
- Clear filters for a repository:
- %(prog)s --clear-filters --repo-label example_repo
-
- List all filter for a repository:
- %(prog)s --list-filters --repo-label example_repo
-
- List all associated repositories for a custom software channel:
- %(prog)s --list-channels-repos --channel-label example_channel
-
- List all available custom sofware channels:
- %(prog)s --list-channels
-
- Sync custom sofware channel with all associated repositories:
- %(prog)s --sync-now --channel-label example_channel
-
-\n""" % {'prog': sys.argv[0]}
-
- option_list = [
- Option("-u", "--user", help="Spacewalk username", default=DEFAULT_USER),
- Option("-p", "--password", help="Spacewalk password", default=DEFAULT_PASSWORD),
- Option("-s", "--server", help="Spacewalk server Url", default=DEFAULT_SERVER),
- Option("-v", "--verbose", help="verbose", action="count"),
- Option("", "--channel-label", help="Software channel label"),
- Option("", "--channel-name", help="Software channel name"),
- Option("", "--channel-summary", help="Software channel summary"),
- Option("", "--channel-arch", help="Software channel architecture"),
- Option("", "--channel-parent", help="Software channel parent"),
- Option("", "--channel-checksum", help="Software channel checksum sha1,sha256"),
- Option("", "--channel-gpgKey-url", help="Software channel gpgKey url"),
- Option("", "--channel-gpgKey-id", help="Software channel gpgKey id"),
- Option("", "--channel-gpgKey-fingerprint", help="Software channel gpgKey fingerprint"),
- Option("", "--repo-label", help="Repository Label"),
- Option("", "--repo-url", help="Repository Url"),
- Option("", "--filter-string", help="filter string"),
- Option("", "--filter-flag", help="filter flag"),
- Option("", "--list-repos", help="Action: List available repositories", action="store_true"),
- Option("", "--list-channels", help="Action: List available software channels", action="store_true"),
- Option("", "--list-channels-repos", help="Action: List repositories associated with a channel. Requites --channel-label", action="store_true"),
- Option("", "--list-filters", help="Action: List filtes for repository. Requites --repo-label", action="store_true"),
- Option("", "--create-channel", help="Action: Create software channel. Requites label, name, summary, arch", action="store_true"),
- Option("", "--create-repo", help="Action: Create repository. Requites --repo-label --repo-url", action="store_true"),
- Option("", "--delete-repo", help="Action: Delete repository. Requites --repo-label", action="store_true"),
- Option("", "--associate-repo", help="Action: Associate repository. Requites --repo-label --channel-label", action="store_true"),
- Option("", "--disassociate-repo", help="Action: Associate repository. Requites --repo-label --channel-label", action="store_true"),
- Option("", "--add-filter", help="Action: Add filter to repository. Requites --filter-string --filter-flag --repo-label", action="store_true"),
- Option("", "--remove-filter", help="Action: Remove filter from repository. Requites --filter-string --filter-flag --repo-label", action="store_true"),
- Option("", "--clear-filters", help="Action: Clear filters for repository. Requites --repo-label", action="store_true"),
- Option("", "--sync-now", help="Action: Sync software channel with all associated repositories. Requites --channel-label", action="store_true"),
- Option("", "--update-repourl", help="Action: Update repsitory Url. Requites --repo-label --repo-url", action="store_true"),
- Option("", "--list_arch", help="Action: List available architectures.", action="store_true"),
-
- ]
-
- parser = ExtOptionParser(usage=usage, option_list=option_list, examples=examples)
- (options, args) = parser.parse_args()
-
- try:
- client, key = connect(options.user, options.password, options.server)
- except xmlrpclib.Fault, e:
- if e.faultCode == 2950:
- sys.stderr.write("Either the password or username is incorrect.\n")
- sys.exit(2)
- else:
- raise
-
- try:
- # List Repos
- if options.list_repos:
- l_repo=client.channel.software.listUserRepos(key)
- for repo in l_repo:
- print "| %s | %s | id: %d" % (repo['label'],repo['sourceUrl'],repo['id'])
-
- # List Channel
- if options.list_channels:
- d_parents={}
- l_ch=client.channel.listSoftwareChannels(key)
- for ch in l_ch:
- if ch['parent_label'] == '':
- if ch['label'] not in d_parents.keys():
- d_parents[ch['label']]=[]
- continue
-
- if ch['parent_label'] not in d_parents.keys():
- d_parents[ch['parent_label']]=[]
-
- d_parents[ch['parent_label']].append(ch['label'])
-
-
- keys = d_parents.keys()
- keys.sort()
- for ch in keys:
- print ch
- for sub in d_parents[ch]:
- print "\t" + sub
-
- # List Channels Repos
- if options.list_channels_repos:
- if options.channel_label != None:
- l_repos=client.channel.software.listChannelRepos(key, options.channel_label)
- for repo in l_repos:
- print "| %s | %s | id: %d" % (repo['label'],repo['sourceUrl'],repo['id'])
- else:
- f_print_error("Obligatory param --channel-label is missing.")
-
- # List arch
- if options.list_arch:
- for arch in CHANNEL_ARCH.keys():
- print arch
-
- # Create Channel
- if options.create_channel:
- if options.channel_label != None and \
- options.channel_name != None and \
- options.channel_summary != None and \
- options.channel_arch != None :
- client.channel.software.create(key,options.channel_label,
- options.channel_name,
- options.channel_summary,
- CHANNEL_ARCH[options.channel_arch],
- options.channel_parent,
- options.channel_checksum,
- {'url':options.channel_gpgKey_url,'id':options.channel_gpgKey_id,'fingerprint':options.channel_gpgKey_fingerprint} )
- else:
- f_print_error("One or more obligatory params are missing - Label, Name, Summary or Arch.")
-
- # Create Repo
- if options.create_repo:
- client.channel.software.createRepo(key,
- options.repo_label, 'yum',
- options.repo_url)
-
- # Delete Repo
- if options.delete_repo:
- if options.repo_label != None:
- client.channel.software.removeRepo(key, options.repo_label)
- else:
- f_print_error("Obligatory param --repo_label is missing.")
-
- # Associate Repo to Channel
- if options.associate_repo:
- if options.channel_label != None and options.repo_label != None:
- # check if not alredy associated
- flag=0
- l_repos=client.channel.software.listChannelRepos(key, options.channel_label)
- for repo in l_repos:
- if repo['label'] == options.repo_label:
- flag=1;break
- if flag == 0:
- client.channel.software.associateRepo(key,
- options.channel_label, options.repo_label)
- else:
- f_print_info("Repo: %s already is associated with the channel: %s. Nothing to do." % (options.repo_label,options.channel_label))
- else:
- f_print_error("One or more obligatory params are missing: --channel-label --repo-label.")
-
- # Disassociate Repo to Channel
- if options.disassociate_repo:
- if options.channel_label != None and options.repo_label != None:
- client.channel.software.disassociateRepo(key,
- options.channel_label, options.repo_label)
- else:
- f_print_error("One or more obligatory params are missing: --channel-label --repo-label.")
-
- # List Filters for Repo
- if options.list_filters:
- if options.repo_label != None:
- l_filters=client.channel.software.listRepoFilters(key,options.repo_label)
- for filter in l_filters:
- print "| %s | %s | sortOrder: %d" % (filter['filter'],filter['flag'],filter['sortOrder'])
- else:
- f_print_error("Obligatory param --repo-label is missing.")
-
- # Add Filter to Repo
- if options.add_filter:
- if options.repo_label != None and options.filter_string != None and \
- (options.filter_flag == '-' or options.filter_flag == '+'):
- client.channel.software.addRepoFilter(key,options.repo_label,{'filter':options.filter_string,'flag':options.filter_flag})
- else:
- if options.filter_flag == '-' and options.filter_flag == '+':
- f_print_error("One or more obligatory params are missing: --repo-label --filter-string --filter-flag")
- else:
- f_print_error("Parameter flag accept only values + or -.")
-
- # Remove Filter from Repo
- if options.remove_filter:
- if options.repo_label != None and options.filter_string != None and \
- (options.filter_flag == '-' or options.filter_flag == '+'):
- client.channel.software.removeRepoFilter(key,options.repo_label,{'filter':options.filter_string,'flag':options.filter_flag})
- else:
- if options.filter_flag == '-' and options.filter_flag == '+':
- f_print_error("One or more obligatory params are missing: --repo-label --filter-string --filter-flag")
- else:
- f_print_error("Parameter flag accept only values + or -.")
-
- # Clear Filtes for Repo
- if options.clear_filters:
- if options.repo_label != None:
- client.channel.software.clearRepoFilters(key,options.repo_label)
- else:
- f_print_error("Obligatory param --repo-label is missing.")
-
- # Sync channel with all repos
- if options.sync_now:
- if options.channel_label != None:
- client.channel.software.syncRepo(key,options.channel_label)
- else:
- f_print_error("Obligatory param --channel-label is missing.")
-
- #Update Repo Url
- if options.update_repourl:
- if options.repo_url != None:
- client.channel.software.updateRepoUrl(key,options.repo_label,options.repo_url)
- else:
- f_print_error("Obligatory param --repo-url is missing.")
-
- except xmlrpclib.Fault, e:
- f_print_error(e.faultString)
-
-
- if client is not None:
- # logout
- xmlrpc_logout(client, key)
-
- sys.exit(exit_code)
diff --git a/utils/spacewalk-manage-abrt b/utils/spacewalk-manage-abrt
deleted file mode 100755
index 0b40733..0000000
--- a/utils/spacewalk-manage-abrt
+++ /dev/null
@@ -1,395 +0,0 @@
-#!/usr/bin/python
-#
-# Copyright (c) 2010--2013 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public License,
-# version 2 (GPLv2). There is NO WARRANTY for this software, express or
-# implied, including the implied warranties of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
-# along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
-# Red Hat trademarks are not licensed under GPLv2. No permission is
-# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
-#
-# dyordano(a)redhat.com
-
-import sys,os
-from optparse import OptionParser
-import xmlrpclib
-import pprint
-import subprocess
-import signal
-
-DEFAULT_SERVER = "localhost"
-DEFAULT_USER = "spacewalk"
-DEFAULT_PASSWORD = "spacewalk"
-
-exit_code=0
-
-#mmraka
-class ExtOptionParser(OptionParser):
-
- """extend OptionParser to print examples"""
- def __init__(self, examples=None, **kwargs):
- self.examples = examples
- OptionParser.__init__(self, **kwargs)
- def print_help(self):
- OptionParser.print_help(self)
- print "\n\n" + self.examples
-
-class ConfigDispatcher:
-
- def __init__(self, username, password, server):
- '''
- @summary: Create XMLRPC client and sign in the user.
- @param username: username
- @param password: password
- @param server: FQDN
- '''
- rhn_server = "https://%s/rpc/api" % server
- self.client = xmlrpclib.Server(rhn_server, verbose=0)
- self.key = self.client.auth.login(username, password)
- self.pp = pprint.PrettyPrinter(indent=4, width=1)
-
- # DISPATCHED METHODS -----------------------------------------------------------------------------------------------
-
-
- def do_CreateTestCrash(self, kwargs):
- """
- @summary: 'CreateTestCrash' Create a crash note.
- @param sessionKey
- """
- import subprocess
- import signal
- cmd_sleep="sleep 100"
- process = subprocess.Popen(cmd_sleep.split())
- process.send_signal(signal.SIGSEGV)
-
-
- def do_listCrashedSystems(self, kwargs):
- """
- @summary: 'createCrashNote' Create a crash note.
- @param sessionKey
- @param crashId
- @param subject
- @param details
- """
- res=self.client.system.listUserSystems(self.key)
- for sys in res:
- res_crash=self.client.system.crash.listSystemCrashes(self.key,sys['id'])
- if len(res_crash) != 0:
- print "%d:%s:%s" % (len(res_crash),sys['id'],sys['name'])
-
- def do_createCrashNote(self, kwargs):
- """
- @summary: 'createCrashNote' Create a crash note.
- @param sessionKey
- @param crashId
- @param subject
- @param details
- """
- print self.client.system.crash.createCrashNote(self.key, int(kwargs.crashId),kwargs.note_subject,kwargs.note_details)
-
- def do_deleteCrashNote(self, kwargs):
- """
- @summary: 'deleteCrashNote' Delete a crash note.
- @param sessionKey
- @param crashNoteId
-
- """
- print self.client.system.crash.deleteCrashNote(self.key, int(kwargs.noteId))
-
- def do_getCrashNotesForCrash(self, kwargs):
- """
- @summary: 'getCrashNotesForCrash' List crash notes for crash.
- @param sessionKey
- @param crashNoteId
- """
-
- res=self.client.system.crash.getCrashNotesForCrash(self.key, int(kwargs.crashId))
- self.pritty_print(res,kwargs)
-
-
- def do_isCrashfileUploadEnabled(self, kwargs):
- """
- @summary: 'isCrashfileUploadEnabled' Get the status of crash file upload settings for the given organization. Returns true if enabled, false otherwise.
- @param sessionKey
- @param orgId
- """
- print self.client.org.isCrashfileUploadEnabled(self.key, int(kwargs.orgId))
-
- def do_isCrashReportingEnabled(self, kwargs):
- """
- @summary: 'isCrashReportingEnabled' Get the status of crash reporting settings for the given organization. Returns true if enabled, false otherwise.
- @param sessionKey
- @param orgId
- """
- print self.client.org.isCrashReportingEnabled(self.key, int(kwargs.orgId))
-
-
- def do_setCrashfileUpload(self, kwargs):
- """
- @summary: 'setCrashfileUpload' Set the status of crash file upload settings for the given organization. Modifying the settings is possible as long as crash reporting is enabled.
- @param sessionKey
- @param orgId
- @boolean enable - Use true/false to enable/disable
- """
- print self.client.org.setCrashfileUpload(self.key, int(kwargs.orgId),eval(kwargs.bool))
-
- def do_setCrashReporting(self, kwargs):
- """
- @summary: 'setCrashReporting' Set the status of crash reporting settings for the given organization. Disabling crash reporting will automatically disable crash file upload.
- @param sessionKey
- @param orgId
- @boolean enable - Use true/false to enable/disable
- """
- print self.client.org.setCrashReporting(self.key, int(kwargs.orgId),eval(kwargs.bool))
-
- def do_getCrashFileSizeLimit(self, kwargs):
- """
- @summary: 'getCrashFileSizeLimit' action method. Get the organization wide crash file size limit. The limit value must i a non-negative number, zero means no limit.
- @param sessionKey
- @param orgId
- """
- print self.client.org.getCrashFileSizeLimit(self.key, int(kwargs.orgId))
-
- def do_setCrashFileSizeLimit(self, kwargs):
- """
- @summary: 'setCrashFileSizeLimit' action method. Set the organization wide crash file size limit. The limit value must be non-negative, zero means no limit.
- @param sessionKey
- @param orgId
- @param limit
- """
- self.client.org.setCrashFileSizeLimit(self.key, int(kwargs.orgId), int(kwargs.limit))
-
- def do_deleteCrash(self, kwargs):
- """
- @summary: 'deleteCrash' action method. Delete a crash with given crash id.
- @param sessionKey
- @param crashId
- """
- self.client.system.crash.deleteCrash(self.key, int(kwargs.crashId))
-
- def do_getCrashFile (self, kwargs):
- """
- @summary: 'getCrashFile' action method. Download a crash file.
- @param sessionKey
- @param crashFileId
- """
- print self.client.system.crash.getCrashFile(self.key, int(kwargs.crashFileId))
-
- def do_getCrashAllFiles(self, kwargs):
-
- s_dest_folder=''
- if kwargs.dest_folder:
- if not os.path.isdir(kwargs.dest_folder):
- print "FAIL: %s is not a folder!" % kwargs.dest_folder
- return 1
- else:
- s_dest_folder="--directory-prefix " + kwargs.dest_folder + " "
-
- l_res=self.client.system.crash.listSystemCrashFiles(self.key, int(kwargs.crashId))
- for d_file in l_res:
- s_utl=self.client.system.crash.getCrashFileUrl(self.key, d_file['id'])
- bashCommand = "wget " + s_dest_folder + s_utl + " --tries=1 --no-check-certificate"
- os.system(bashCommand)
-
- def do_getCrashFileUrl(self, kwargs):
- """
- @summary: 'getCrashFileUrl' action method. Get a crash file download url.
- @param sessionKey
- @param crashFileId
- """
- print self.client.system.crash.getCrashFileUrl(self.key, int(kwargs.crashFileId))
-
-
- def do_getCrashCountInfo(self, kwargs):
- """
- @summary: 'getCrashCountInfo' action method. Return crash count information.
- @param sessionKey
- @param serverId
- """
- res=self.client.system.crash.getCrashCountInfo(self.key, int(kwargs.serverId))
- if kwargs.param_key:
- print res[kwargs.param_key]
- else:
- print res
-
- def do_listSystemCrashFiles(self, kwargs):
- """
- @summary: 'listSystemCrashFiles' action method. Return list of crash files for given crash id.
- @param sessionKey
- @param crashId
- """
- res=self.client.system.crash.listSystemCrashFiles(self.key, int(kwargs.crashId))
- self.pritty_print(res,kwargs)
-
-
- def do_listSystemCrashes(self,kwargs):
- """
- @summary: 'listSystemCrashes' action method. Return list of software crashes for a system.
- @param sessionKey
- @param serverId
- """
- res=self.client.system.crash.listSystemCrashes(self.key, int(kwargs.serverId))
- self.pritty_print(res,kwargs)
-
- def do_getCrashOverview(self,kwargs):
- res=self.client.system.crash.getCrashOverview(self.key)
- self.pritty_print(res,kwargs)
-
- def do_getCrashesByUuid(self,kwargs):
- if kwargs.uuid:
- res=self.client.system.crash.getCrashesByUuid(self.key,kwargs.uuid)
- self.pritty_print(res,kwargs)
- else:
- res=self.client.system.crash.getCrashOverview(self.key)
- for crash in res:
- res=self.client.system.crash.getCrashesByUuid(self.key,crash['uuid'])
- self.pritty_print(res,kwargs)
-
-#-----
- def pritty_print(self,res,kwargs):
- if kwargs.param_key:
- l_params=kwargs.param_key.split()
- for i in range(len(res)):
- l_str=[]
- for param in l_params:
- l_str.append(str(res[i][param]))
- self.pp.pprint(l_str)
- else:
- self.pp.pprint(res)
-
- def clean(self):
- """ Cleaning actions like sign out the user. """
- self.client.auth.logout(self.key)
-
- def error(self, message):
- """ Print given message and exit with error code. """
- print(message)
- sys.exit(1)
-
- def dispatch(self, options):
- """ Command dispatching method. """
- method_name = 'do_' + options.action
- try:
- method = getattr(self, method_name)
- method(options)
- except AttributeError:
- self.error("Error: unknown action `%s`" % options.action)
-
-
-if __name__ == '__main__':
- usage = "Usage: %prog -a action param1=value1 [param2=value2 ...]"
- examples = """Examples:
-
- List all the systems that have experienced a crash in format ( Number of crashes, SystemID, Profile Name).
-
- %(prog)s -u ${sat_user} -p ${sat_pass} -s ${sat_server} -a listCrashedSystems
-
- List craches details
-
- %(prog)s -u ${sat_user} -p ${sat_pass} -s ${sat_server} -a listSystemCrashes -i ${serverId}
- %(prog)s -u ${sat_user} -p ${sat_pass} -s ${sat_server} -a listSystemCrashes -i ${serverId} -v 'id'
- %(prog)s -u ${sat_user} -p ${sat_pass} -s ${sat_server} -a listSystemCrashes -i ${serverId} -v 'id crash'
- %(prog)s -u ${sat_user} -p ${sat_pass} -s ${sat_server} -a listSystemCrashes -i ${serverId} -v 'id crash executable reason ...'
-
-
- List files from single crash
-
- %(prog)s -u ${sat_user} -p ${sat_pass} -s ${sat_server} -a listSystemCrashFiles -c ${crashId}
- %(prog)s -u ${sat_user} -p ${sat_pass} -s ${sat_server} -a listSystemCrashFiles -c ${crashId} -v 'id'
- %(prog)s -u ${sat_user} -p ${sat_pass} -s ${sat_server} -a listSystemCrashFiles -c ${crashId} -v 'id path filesize ...'
-
- Get crash file
-
- %(prog)s -u ${sat_user} -p ${sat_pass} -s ${sat_server} -a getCrashFile -f ${crashFileId}
-
- Get all crash files for a single crash
-
- %(prog)s -u ${sat_user} -p ${sat_pass} -s ${sat_server} -a getCrashAllFiles -c ${crashId}
- %(prog)s -u ${sat_user} -p ${sat_pass} -s ${sat_server} -a getCrashAllFiles -c ${crashId} -w "dest_folder"
-
- Get crash file Url
-
- %(prog)s -u ${sat_user} -p ${sat_pass} -s ${sat_server} -a getCrashFileUrl -f ${crashFileId}
-
-
- Get crash info
-
- %(prog)s -u ${sat_user} -p ${sat_pass} -s ${sat_server} -a getCrashCountInfo -i ${serverId} -v 'total_count'
- %(prog)s -u ${sat_user} -p ${sat_pass} -s ${sat_server} -a getCrashCountInfo -i ${serverId} -v 'unique_count'
- %(prog)s -u ${sat_user} -p ${sat_pass} -s ${sat_server} -a getCrashCountInfo -i ${serverId} -v 'last_report'
-
- Delete single crash
-
- %(prog)s -u ${sat_user} -p ${sat_pass} -s ${sat_server} -a deleteCrash -c ${crashId}
-
-
- Manage crash notes
-
- %(prog)s -u ${sat_user} -p ${sat_pass} -s ${sat_server} -a createCrashNote -c ${crashId} -j ${note_sunject} -d ${note_details}
- %(prog)s -u ${sat_user} -p ${sat_pass} -s ${sat_server} -a deleteCrashNote -n ${noteId}
- %(prog)s -u ${sat_user} -p ${sat_pass} -s ${sat_server} -a getCrashNotesForCrash -c ${crashId} -v 'id subject details'
-
- Get crash file size limit for certain organization
-
- %(prog)s -u ${sat_user} -p ${sat_pass} -s ${sat_server} -a getCrashFileSizeLimit -o ${orgId}
-
- Set crash file size limit for certain organization
-
- %(prog)s -u ${sat_user} -p ${sat_pass} -s ${sat_server} -a setCrashFileSizeLimit -o ${orgId} -l 1
-
- Get satellite abrt flags configuration
-
- %(prog)s -u ${sat_user} -p ${sat_pass} -s ${sat_server} -a isCrashfileUploadEnabled -o ${orgId}
- %(prog)s -u ${sat_user} -p ${sat_pass} -s ${sat_server} -a isCrashReportingEnabled -o ${orgId}
-
- Set satellite abrt flags configuration
-
- %(prog)s -u ${sat_user} -p ${sat_pass} -s ${sat_server} -a setCrashfileUpload -o ${orgId} -b [True|False]
- %(prog)s -u ${sat_user} -p ${sat_pass} -s ${sat_server} -a setCrashReporting -o ${orgId} -b [True|False]
-
- Get ABRT Overview
-
- %(prog)s -u ${sat_user} -p ${sat_pass} -s ${sat_server} -a getCrashOverview
-
- Get Crash by UUID
-
- %(prog)s -u ${sat_user} -p ${sat_pass} -s ${sat_server} -a getCrashesByUuid -o ${UUID}
- %(prog)s -u ${sat_user} -p ${sat_pass} -s ${sat_server} -a getCrashesByUuid
-
- Create test crash
-
- %(prog)s -u ${sat_user} -p ${sat_pass} -s ${sat_server} -a CreateTestCrash
-
- \n""" % {'prog': sys.argv[0]}
-
- parser = ExtOptionParser(usage=usage, examples=examples)
- parser.add_option("-u", "--username", dest="username", metavar="USER", default=DEFAULT_USER)
- parser.add_option("-p", "--password", dest="password", metavar="PASS", default=DEFAULT_PASSWORD)
- parser.add_option("-s", "--server", dest="server", metavar="SERVER", help="server's FQDN", default=DEFAULT_SERVER)
- parser.add_option("-a", "--action", dest="action", metavar="ACTION",
- help="Actions: listCrashedSystems, listSystemCrashes, listSystemCrashFiles, getCrashFile, getCrashFileUrl, \
- getCrashCountInfo, deleteCrash, createCrashNote, deleteCrashNote, getCrashNotesForCrash, getCrashFileSizeLimit,\
- setCrashFileSizeLimit, isCrashfileUploadEnabled, isCrashReportingEnabled, setCrashfileUpload, setCrashReporting, CreateTestCrash, getCrashOverview, getCrashesByUuid")
- parser.add_option("-i", "--serverId", dest="serverId", metavar="SERVERID", help="Profile ID on Satellite" )
- parser.add_option("-c", "--crashId", dest="crashId", metavar="CRASHID")
- parser.add_option("-o", "--orgId", dest="orgId", metavar="ORGID")
- parser.add_option("-l", "--limit", dest="limit", metavar="LIMIT", help="Set to 2048 by default.")
- parser.add_option("-f", "--crashFileId", dest="crashFileId", metavar="CRASHFILEID")
- parser.add_option("-v", "--param_key", dest="param_key", metavar="PARAM_KEY", help="Space separeted list of params")
- parser.add_option("-b", "--bool", dest="bool", metavar="BOOL", help="Posible values: True, False")
- parser.add_option("-j", "--note_subject", dest="note_subject", metavar="NOTE_SUBJECT")
- parser.add_option("-d", "--note_details", dest="note_details", metavar="NOTE_DETAILS")
- parser.add_option("-n", "--noteId", dest="noteId", metavar="NOTEID")
- parser.add_option("-w", "--dest_folder", dest="dest_folder", metavar="DESTINATION_FOLDER", help="Distination folder")
- parser.add_option("-m", "--uuid", dest="uuid", metavar="UUID", help="UUID")
- (options, args) = parser.parse_args()
- assert options.action, "Action must be provided"
-
- dispr = ConfigDispatcher(username=options.username, password=options.password, server=options.server)
- dispr.dispatch(options)
- dispr.clean()
10 years, 8 months
java/code
by Grant Gainey
java/code/src/com/redhat/rhn/domain/user/test/UserFactoryTest.java | 1 +
1 file changed, 1 insertion(+)
New commits:
commit ec2fc829ff5af9479b0fdeecf0481f3c553e4a43
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Wed Aug 28 13:22:30 2013 -0400
UserFactoryTest: avoid failure if there are no users
diff --git a/java/code/src/com/redhat/rhn/domain/user/test/UserFactoryTest.java b/java/code/src/com/redhat/rhn/domain/user/test/UserFactoryTest.java
index fe25383..93eb1be 100644
--- a/java/code/src/com/redhat/rhn/domain/user/test/UserFactoryTest.java
+++ b/java/code/src/com/redhat/rhn/domain/user/test/UserFactoryTest.java
@@ -350,6 +350,7 @@ public class UserFactoryTest extends RhnBaseTestCase {
}
public void testSatelliteHasUsers() {
+ UserTestUtils.findNewUser("testUser", "testUserOrg", true);
assertTrue(UserFactory.satelliteHasUsers());
}
10 years, 8 months