spacewalk-commits
February 2014
spacewalk-commits@lists.fedorahosted.org
- 10 participants
- 275 discussions
Tag 'rhn-custom-info-5.4.22-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2014-02-14 10:32 +0000
Tagging package [rhn-custom-info] version [5.4.22-1] in directory [client/tools/rhncustominfo/].
Changes since spacewalk-search-2.1.14-1:
Dimitar Yordanov (1):
1063808 - Custom info with empty value added
Matej Kollar (25):
Separate datepicker and its label
Schedule action unification
Schedule action unification
Schedule action unification
Schedule action unification
Schedule action unification
Schedule action unification
Schedule action unification
Schedule action unification
Schedule action unification
Schedule action unification
Schedule action unification
remove unused localization string
remove unused localization string
Schedule action unification
remove unused localization string
Schedule action unification
remove unused localization string
remove unused localization string
remove unused localization string
remove unused localization string
Make string look similar to other strings used with datepicker
Use more suitable string
Unnecessary "strong" removed from localization string.
Added tool to manipulate localization files (format, del, sed).
Tomas Lestach (1):
Automatic commit of package [rhn-custom-info] release [5.4.22-1].
---
client/tools/rhncustominfo/rhn-custom-info.py | 3
client/tools/rhncustominfo/rhn-custom-info.spec | 5
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml | 44 -----
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 44 -----
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 37 ----
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 44 -----
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 44 -----
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml | 44 -----
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml | 44 -----
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 44 -----
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 44 -----
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 44 -----
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml | 44 -----
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 44 -----
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 44 -----
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml | 44 -----
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 44 -----
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 44 -----
java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp | 14 -
java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf | 24 --
java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_confirm.jspf | 26 ---
java/code/webapp/WEB-INF/pages/common/fragments/datepicker-with-label.jsp | 9 +
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf | 19 --
java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp | 23 --
java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp | 21 --
java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp | 24 --
java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp | 24 --
java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata-confirm.jsp | 14 -
java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncprofile.jsp | 23 --
java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp | 23 --
java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp | 15 -
java/code/webapp/WEB-INF/pages/systems/system-remote-command.jsp | 14 -
java/scripts/editlangs.sh | 81 ++++++++++
rel-eng/packages/rhn-custom-info | 2
34 files changed, 186 insertions(+), 875 deletions(-)
---
1
0
client/tools/rhncustominfo/rhn-custom-info.spec | 5 ++++-
rel-eng/packages/rhn-custom-info | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 6b080a67608df5bde6a12c8a184047e2ad8d4b0a
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Feb 14 11:32:04 2014 +0100
Automatic commit of package [rhn-custom-info] release [5.4.22-1].
diff --git a/client/tools/rhncustominfo/rhn-custom-info.spec b/client/tools/rhncustominfo/rhn-custom-info.spec
index c991fa0..7805b31 100644
--- a/client/tools/rhncustominfo/rhn-custom-info.spec
+++ b/client/tools/rhncustominfo/rhn-custom-info.spec
@@ -4,7 +4,7 @@ Group: Applications/System
License: GPLv2
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL: https://fedorahosted.org/spacewalk
-Version: 5.4.21
+Version: 5.4.22
Release: 1%{?dist}
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch: noarch
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/rhn-custom-info.*
%changelog
+* Fri Feb 14 2014 Tomas Lestach <tlestach(a)redhat.com> 5.4.22-1
+- 1063808 - Custom info with empty value added
+
* Fri Nov 29 2013 Michael Mraka <michael.mraka(a)redhat.com> 5.4.21-1
- add the option -d to delete custom values
diff --git a/rel-eng/packages/rhn-custom-info b/rel-eng/packages/rhn-custom-info
index 7f56877..92676c4 100644
--- a/rel-eng/packages/rhn-custom-info
+++ b/rel-eng/packages/rhn-custom-info
@@ -1 +1 @@
-5.4.21-1 client/tools/rhncustominfo/
+5.4.22-1 client/tools/rhncustominfo/
1
0
client/tools/rhncustominfo/rhn-custom-info.py | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit 1d893694cebf56245ac0034fb41c6addff1e888f
Author: Dimitar Yordanov <dyordano(a)redhat.com>
Date: Thu Feb 13 20:29:33 2014 +0100
1063808 - Custom info with empty value added
diff --git a/client/tools/rhncustominfo/rhn-custom-info.py b/client/tools/rhncustominfo/rhn-custom-info.py
index 2f49c4d..47e610c 100755
--- a/client/tools/rhncustominfo/rhn-custom-info.py
+++ b/client/tools/rhncustominfo/rhn-custom-info.py
@@ -151,6 +151,9 @@ def verify_command_line():
if not args and not options.list_values and not options.delete_values:
system_exit(1, "You must provide key/value pairs to store")
+ if '' in map(lambda e : e.strip(), args):
+ system_exit(1, "Not valid value is provided for key/value pairs")
+
if not args and options.delete_values:
system_exit(1, "You must provide a key to delete")
1
0
java/scripts/editlangs.sh | 81 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 81 insertions(+)
New commits:
commit e3c3f36643bf76e9a7fc58e5a0edc8cabfb61c6e
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Fri Feb 14 10:30:58 2014 +0100
Added tool to manipulate localization files (format, del, sed).
diff --git a/java/scripts/editlangs.sh b/java/scripts/editlangs.sh
new file mode 100644
index 0000000..5852388
--- /dev/null
+++ b/java/scripts/editlangs.sh
@@ -0,0 +1,81 @@
+#!/bin/bash
+# Just a small script to do couple of common tasks with translations.
+# Commands expect XML files to be formatted using xmllint. Such state
+# can be achieved by command `format`. Available commands:
+#
+# * format
+# Formats all translation XML files
+# * del <key>
+# Deletes all translation units which have id matching
+# `<key>` pattern.
+# * sed <key> <expression>
+# Transforms with sed `<expression>` all translation units
+# which have id matching `<key>`
+#
+# PS: Source is often be better than any other documentation ;-).
+
+RESOURCES_BASE="java/code/src/com/redhat/rhn/frontend/strings/jsp"
+GIT_ROOT="$( git -c alias.a='!pwd' a )"
+
+function fail() {
+ echo "$@"
+ exit 1
+}
+
+function run_sed() {
+ find "$RESOURCES_BASE" -name '*.xml' -print0 \
+ | xargs -0 --no-run-if-empty -n 1 \
+ sed -i '/^[[:space:]]*<trans-unit id="'"$1"'">$/,/^[[:space:]]*<\/trans-unit>$/{'"$2"'}'
+}
+
+function run_del() {
+ run_sed "$1" 'd'
+}
+
+function run_format() {
+ find "$RESOURCES_BASE" -name '*.xml' -print0 \
+ | xargs -0 --no-run-if-empty -n 1 \
+ bash -c 'tmp=$( mktemp ); xmllint --format "$1" > $tmp; mv $tmp "$1"' --
+}
+
+function main() {
+ if ! git status >&/dev/null; then
+ fail 'Not in git repo'
+ fi
+ cd "$GIT_ROOT"
+ if ! [ -d $RESOURCES_BASE ]; then
+ fail "Can't find $GIT_ROOT/$RESOURCES_BASE"
+ fi
+ if [[ $# -lt 1 ]]; then
+ fail 'Expected command'
+ fi
+ local run
+ local cmd=$1
+ shift
+ case "$cmd" in
+ sed)
+ run=run_$cmd
+ if [[ $# -ne 2 ]]; then
+ fail "Have to be: $cmd <key> <expression>"
+ fi
+ ;;
+ del)
+ run=run_$cmd
+ if [[ $# -ne 1 ]]; then
+ fail "Have to be: $cmd <key>"
+ fi
+ ;;
+ format)
+ run=run_$cmd
+ if [[ $# -ne 0 ]]; then
+ fail "Command $cmd takes no arguments"
+ fi
+ ;;
+ *)
+ fail "Invalid command: $1"
+ ;;
+ esac
+ "$run" "$@"
+}
+
+main "$@"
1
0
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 4 ++--
16 files changed, 31 insertions(+), 31 deletions(-)
New commits:
commit 4d86cd79c16997b9a41e0aa79d87dad99c5eb393
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Thu Feb 13 16:32:32 2014 +0100
Unnecessary "strong" removed from localization string.
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
index 7b9406f..03a23b2 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
@@ -13160,11 +13160,11 @@ You may grant provisioning entitlements _here_.
<target>স্থাপনার জন্য যথাশীঘ্র সময় নির্ধারণ করতে পারেন অথবা কোনো নির্ধারিত সময়ের পশ্চাৎ সঞ্চালনের উদ্দেশ্যে চিহ্নিত করতে পারেন</target>
</trans-unit>
<trans-unit id="deploy.jsp.usedate">
- <source><strong>Schedule this file to be deployed no earlier than:</strong></source>
+ <source>Schedule this file to be deployed no earlier than:</strong></source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/configuration/RevisionDeploy.do</context>
</context-group>
- <target><strong>ফাইলটি চিহ্নিত সময়ের পরে স্থাপিত হবে:</strong></target>
+ <target>ফাইলটি চিহ্নিত সময়ের পরে স্থাপিত হবে:</strong></target>
</trans-unit>
<!-- regular -->
<trans-unit id="deploy.jsp.header2">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
index 25a38be..a07313c 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
@@ -14712,11 +14712,11 @@ You may grant provisioning entitlements _here_.
<target>Sie können diesen Einsatz für sobald wie möglich planen, oder für nicht früher als zu einem bestimmten Zeitpunkt</target>
</trans-unit>
<trans-unit id="deploy.jsp.usedate">
- <source><strong>Schedule this file to be deployed no earlier than:</strong></source>
+ <source>Schedule this file to be deployed no earlier than:</strong></source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/configuration/RevisionDeploy.do</context>
</context-group>
- <target><strong>Planen des Einsatzes dieser Datei für nicht früher planen, als:</strong></target>
+ <target>Planen des Einsatzes dieser Datei für nicht früher planen, als:</strong></target>
</trans-unit>
<!-- regular -->
<trans-unit id="deploy.jsp.header2">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index 62a4777..5ace5ac 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -12821,7 +12821,7 @@ You may grant provisioning entitlements _here_.
</context-group>
</trans-unit>
<trans-unit id="deploy.jsp.usedate">
- <source><strong>Schedule this file to be deployed no earlier than:</strong></source>
+ <source>Schedule this file to be deployed no earlier than:</strong></source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/configuration/RevisionDeploy.do</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
index b42cd2f..f0e01d4 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
@@ -14710,11 +14710,11 @@ You may grant provisioning entitlements _here_.
<target>Puede programar esta implementación para que se ejecute tan pronto como sea posible o para que se ejecute no antes de un tiempo especificado.</target>
</trans-unit>
<trans-unit id="deploy.jsp.usedate">
- <source><strong>Schedule this file to be deployed no earlier than:</strong></source>
+ <source>Schedule this file to be deployed no earlier than:</strong></source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/configuration/RevisionDeploy.do</context>
</context-group>
- <target><strong>Programar este archivo para que sea implementado no antes de:</strong></target>
+ <target>Programar este archivo para que sea implementado no antes de:</strong></target>
</trans-unit>
<!-- regular -->
<trans-unit id="deploy.jsp.header2">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
index da7367a..0db1380 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
@@ -14712,11 +14712,11 @@ You may grant provisioning entitlements _here_.
<target>Vous pouvez programmer ce déploiement pour qu'il commence le plus tôt possible ou à partir d'une date spécifiée.</target>
</trans-unit>
<trans-unit id="deploy.jsp.usedate">
- <source><strong>Schedule this file to be deployed no earlier than:</strong></source>
+ <source>Schedule this file to be deployed no earlier than:</strong></source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/configuration/RevisionDeploy.do</context>
</context-group>
- <target><strong>Programmer ce fichier pour qu'il ne soit pas déployé avant le :</strong></target>
+ <target>Programmer ce fichier pour qu'il ne soit pas déployé avant le :</strong></target>
</trans-unit>
<!-- regular -->
<trans-unit id="deploy.jsp.header2">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
index 0ec225c..a1b4d9e 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
@@ -13161,11 +13161,11 @@ You may grant provisioning entitlements _here_.
<target>તમે આ જમાવટને શક્ય એટલું જલદી, અથવા સ્પષ્ટ થયેલ સમય કરતાં વહેલું નહિં બને તે માટે સુનિશ્ચિત કરી શકશો</target>
</trans-unit>
<trans-unit id="deploy.jsp.usedate">
- <source><strong>Schedule this file to be deployed no earlier than:</strong></source>
+ <source>Schedule this file to be deployed no earlier than:</strong></source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/configuration/RevisionDeploy.do</context>
</context-group>
- <target><strong>આના કરતાં વહેલાં આ ફાઈલ નહિં જમાવાય તે માટે સુનિશ્ચિત કરો:</strong></target>
+ <target>આના કરતાં વહેલાં આ ફાઈલ નહિં જમાવાય તે માટે સુનિશ્ચિત કરો:</strong></target>
</trans-unit>
<!-- regular -->
<trans-unit id="deploy.jsp.header2">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
index 8c96c57..fe54b44 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
@@ -13161,11 +13161,11 @@ You may grant provisioning entitlements _here_.
<target>आप इस तैनाती को यथासंभव जल्द नियोजित कर सकते हैं, या निर्दिष्ट समय से पहले नहीं</target>
</trans-unit>
<trans-unit id="deploy.jsp.usedate">
- <source><strong>Schedule this file to be deployed no earlier than:</strong></source>
+ <source>Schedule this file to be deployed no earlier than:</strong></source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/configuration/RevisionDeploy.do</context>
</context-group>
- <target><strong>इस फाइल को इससे पहले तैनाती करने के लिए नियोजित करें:</strong></target>
+ <target>इस फाइल को इससे पहले तैनाती करने के लिए नियोजित करें:</strong></target>
</trans-unit>
<!-- regular -->
<trans-unit id="deploy.jsp.header2">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
index 4864e21..ae1921a 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
@@ -14693,11 +14693,11 @@ You may grant provisioning entitlements _here_.
<target>È possibile programmare il processo d'implementazione appena possibile, oppure non prima del periodo specificato</target>
</trans-unit>
<trans-unit id="deploy.jsp.usedate">
- <source><strong>Schedule this file to be deployed no earlier than:</strong></source>
+ <source>Schedule this file to be deployed no earlier than:</strong></source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/configuration/RevisionDeploy.do</context>
</context-group>
- <target><strong>Programma l'implementazione di questo file non prima di:</strong></target>
+ <target>Programma l'implementazione di questo file non prima di:</strong></target>
</trans-unit>
<!-- regular -->
<trans-unit id="deploy.jsp.header2">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
index 62de520..315ebf8 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
@@ -14713,11 +14713,11 @@ You may grant provisioning entitlements _here_.
<target>この配備をできるだけ早く実施するようスケジュールするか、または指定時間以降に実施するようスケジュールすることができます</target>
</trans-unit>
<trans-unit id="deploy.jsp.usedate">
- <source><strong>Schedule this file to be deployed no earlier than:</strong></source>
+ <source>Schedule this file to be deployed no earlier than:</strong></source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/configuration/RevisionDeploy.do</context>
</context-group>
- <target><strong>指定時刻以降にこのファイルが配備されるようスケジュール</strong></target>
+ <target>指定時刻以降にこのファイルが配備されるようスケジュール</strong></target>
</trans-unit>
<!-- regular -->
<trans-unit id="deploy.jsp.header2">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
index 522baac..b848967 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
@@ -14703,11 +14703,11 @@ You may grant provisioning entitlements _here_.
<target><strong>확실히</strong> 이 작업을 수행하시고자 하신다면, 동기화 작업이 최대한 빨리 실행되도록 스케쥴하거나, 또는 지정한 시간보다 빨리 실행되도록 스케줄하실 수 있습니다:</target>
</trans-unit>
<trans-unit id="deploy.jsp.usedate">
- <source><strong>Schedule this file to be deployed no earlier than:</strong></source>
+ <source>Schedule this file to be deployed no earlier than:</strong></source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/configuration/RevisionDeploy.do</context>
</context-group>
- <target><strong>보다 빨리 파일이 배치되도록 스케줄:</strong></target>
+ <target>보다 빨리 파일이 배치되도록 스케줄:</strong></target>
</trans-unit>
<!-- regular -->
<trans-unit id="deploy.jsp.header2">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
index c82ae7a..8b0de6d 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
@@ -13160,11 +13160,11 @@ You may grant provisioning entitlements _here_.
<target>ਤੁਸੀਂ ਛੇਤੀ ਤੋਂ ਛੇਤੀ ਸ਼ਾਮਿਲ ਕਾਰਵਾਈ ਤਹਿ ਕਰ ਸਕਦੇ ਹੋ ਜਾਂ ਇੱਕ ਦਿੱਤੇ ਸਮੇਂ ਪਹਿਲਾਂ ਨਹੀਂ:</target>
</trans-unit>
<trans-unit id="deploy.jsp.usedate">
- <source><strong>Schedule this file to be deployed no earlier than:</strong></source>
+ <source>Schedule this file to be deployed no earlier than:</strong></source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/configuration/RevisionDeploy.do</context>
</context-group>
- <target><strong>ਇਸ ਫਾਇਲ ਨੂੰ ਸ਼ਾਮਿਲ ਹੋਣ ਲਈ ਸਮਾ-ਤਹਿ ਕਰੋ, ਇਸ ਸਮੇਂ ਤੋਂ ਬਾਅਦ:</strong></target>
+ <target>ਇਸ ਫਾਇਲ ਨੂੰ ਸ਼ਾਮਿਲ ਹੋਣ ਲਈ ਸਮਾ-ਤਹਿ ਕਰੋ, ਇਸ ਸਮੇਂ ਤੋਂ ਬਾਅਦ:</strong></target>
</trans-unit>
<!-- regular -->
<trans-unit id="deploy.jsp.header2">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
index 1c16bb4..1445045 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
@@ -14706,11 +14706,11 @@ You may grant provisioning entitlements _here_.
<target>Você pode agendar esta implementação para iniciar assim que possível, ou para iniciar no tempo especificado.</target>
</trans-unit>
<trans-unit id="deploy.jsp.usedate">
- <source><strong>Schedule this file to be deployed no earlier than:</strong></source>
+ <source>Schedule this file to be deployed no earlier than:</strong></source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/configuration/RevisionDeploy.do</context>
</context-group>
- <target><strong>Agendar este arquivo para ser implementado depois de:</strong></target>
+ <target>Agendar este arquivo para ser implementado depois de:</strong></target>
</trans-unit>
<!-- regular -->
<trans-unit id="deploy.jsp.header2">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
index ecf3e20..1807617 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
@@ -14694,11 +14694,11 @@ You may grant provisioning entitlements _here_.
<target>Вы можете назначить развертывание как можно раньше или не раньше определенного момента</target>
</trans-unit>
<trans-unit id="deploy.jsp.usedate">
- <source><strong>Schedule this file to be deployed no earlier than:</strong></source>
+ <source>Schedule this file to be deployed no earlier than:</strong></source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/configuration/RevisionDeploy.do</context>
</context-group>
- <target><strong>Назначить применение этого файла не ранее чем:</strong></target>
+ <target>Назначить применение этого файла не ранее чем:</strong></target>
</trans-unit>
<!-- regular -->
<trans-unit id="deploy.jsp.header2">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
index a805991..e348a2f 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
@@ -13161,11 +13161,11 @@ You may grant provisioning entitlements _here_.
<target>நீங்கள் இந்த வரிசைப்படுத்தலை செய்ய, சீக்கீரமாக அல்லது குறிப்பிட்ட நேரத்திற்குள் திட்டமிடலாம்</target>
</trans-unit>
<trans-unit id="deploy.jsp.usedate">
- <source><strong>Schedule this file to be deployed no earlier than:</strong></source>
+ <source>Schedule this file to be deployed no earlier than:</strong></source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/configuration/RevisionDeploy.do</context>
</context-group>
- <target><strong>முன்னதாகவே இந்த கோப்பினை வரிசைப்படுத்த திட்டமிட வேண்டாம்:</strong></target>
+ <target>முன்னதாகவே இந்த கோப்பினை வரிசைப்படுத்த திட்டமிட வேண்டாம்:</strong></target>
</trans-unit>
<!-- regular -->
<trans-unit id="deploy.jsp.header2">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
index af81531..fdff88c 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
@@ -14706,11 +14706,11 @@ You may grant provisioning entitlements _here_.
<target>您可以马上或不早于一个特定的时间调度这个部署：</target>
</trans-unit>
<trans-unit id="deploy.jsp.usedate">
- <source><strong>Schedule this file to be deployed no earlier than:</strong></source>
+ <source>Schedule this file to be deployed no earlier than:</strong></source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/configuration/RevisionDeploy.do</context>
</context-group>
- <target><strong>调度这个文件的部署不早于：</strong></target>
+ <target>调度这个文件的部署不早于：</strong></target>
</trans-unit>
<!-- regular -->
<trans-unit id="deploy.jsp.header2">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
index 2f0a32a..e73256e 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
@@ -14708,11 +14708,11 @@ You may grant provisioning entitlements _here_.
<target>您可以排程此建置作業，讓它儘早發生，或不早於特定時間</target>
</trans-unit>
<trans-unit id="deploy.jsp.usedate">
- <source><strong>Schedule this file to be deployed no earlier than:</strong></source>
+ <source>Schedule this file to be deployed no earlier than:</strong></source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/configuration/RevisionDeploy.do</context>
</context-group>
- <target><strong>將此檔案的建置動作排程在不早於：</strong></target>
+ <target>將此檔案的建置動作排程在不早於：</strong></target>
</trans-unit>
<!-- regular -->
<trans-unit id="deploy.jsp.header2">
1
0
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 2 +-
java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata-confirm.jsp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 6d269fcbf52d0e26737f38296c903547b7d9c344
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Thu Feb 13 16:15:12 2014 +0100
Use more suitable string
diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata-confirm.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata-confirm.jsp
index 30d5caf..8b6d565 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata-confirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata-confirm.jsp
@@ -20,7 +20,7 @@
<jsp:include page="/WEB-INF/pages/common/fragments/datepicker-with-label.jsp">
<jsp:param name="widget" value="date" />
- <jsp:param name="label_text" value="scheduleremote.jsp.nosoonerthan" />
+ <jsp:param name="label_text" value="schedule.jsp.at" />
</jsp:include>
<div class="text-right">
<hr />
commit 1141f73224c3d4084e13f963190d8a1c6065378c
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Thu Feb 13 15:12:24 2014 +0100
Make string look similar to other strings used with datepicker
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index 09117f4..62a4777 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -6268,7 +6268,7 @@ value for this entitlement, excluding the default organization's consumption.</s
</context-group>
</trans-unit>
<trans-unit id="schedule.jsp.at">
- <source>Schedule no sooner than a specified time:</source>
+ <source>Schedule no sooner than:</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/details/packages/ScheduleRemoteCommand.do</context>
</context-group>
1
0
13 Feb '14
backend/satellite_tools/spacewalk-remove-channel | 2
branding/css/spacewalk-theme.less | 11
branding/spacewalk-branding.spec | 5
branding/styles/navbar_top_sat.txt | 2
branding/templates/c.pxt | 2
java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml | 76
java/code/src/com/redhat/rhn/domain/monitoring/command/CommandParameter.java | 20
java/code/src/com/redhat/rhn/domain/monitoring/command/FloatValidator.java | 1
java/code/src/com/redhat/rhn/domain/monitoring/command/IntegerValidator.java | 1
java/code/src/com/redhat/rhn/domain/monitoring/command/ParameterValidator.java | 8
java/code/src/com/redhat/rhn/domain/monitoring/command/ProbeStateValidator.java | 1
java/code/src/com/redhat/rhn/domain/monitoring/command/test/CommandTest.java | 36
java/code/src/com/redhat/rhn/domain/rhnpackage/MissingArchitectureException.java | 59
java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFactory.java | 127
java/code/src/com/redhat/rhn/domain/rhnpackage/Package_satellite.hbm.xml | 34
java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageFactoryTest.java | 16
java/code/src/com/redhat/rhn/frontend/action/BaseSearchAction.java | 256 ++
java/code/src/com/redhat/rhn/frontend/action/SearchAction.java | 169 -
java/code/src/com/redhat/rhn/frontend/action/audit/AuditSearchAction.java | 59
java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchAction.java | 134 -
java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchAction.java | 383 +-
java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchHelper.java | 134 -
java/code/src/com/redhat/rhn/frontend/action/common/DateRangePicker.java | 3
java/code/src/com/redhat/rhn/frontend/action/errata/ErrataSearchAction.java | 285 --
java/code/src/com/redhat/rhn/frontend/action/errata/test/ErrataSearchActionTest.java | 44
java/code/src/com/redhat/rhn/frontend/action/help/DocSearchSetupAction.java | 185 -
java/code/src/com/redhat/rhn/frontend/action/ssm/ProvisioningRemoteCommand.java | 2
java/code/src/com/redhat/rhn/frontend/action/systems/OverviewAction.java | 28
java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchAction.java | 316 ++
java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchHelper.java | 42
java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchSetupAction.java | 433 ---
java/code/src/com/redhat/rhn/frontend/action/systems/test/SystemSearchActionTest.java | 152 +
java/code/src/com/redhat/rhn/frontend/action/systems/test/SystemSearchSetupActionTest.java | 153 -
java/code/src/com/redhat/rhn/frontend/action/test/SearchActionTest.java | 16
java/code/src/com/redhat/rhn/frontend/security/PxtAuthenticationService.java | 2
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_en_US.xml | 6
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 6
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml | 33
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 33
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 27
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 33
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 33
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml | 33
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml | 33
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 33
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 33
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 33
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml | 33
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 33
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 33
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml | 33
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 33
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 33
java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/PageSizeDecorator.java | 7
java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/search/PackagesSearchHandler.java | 42
java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 23
java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java | 11
java/code/webapp/WEB-INF/includes/header.jsp | 5
java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp | 114
java/code/webapp/WEB-INF/pages/admin/users/edit_address.jsp | 5
java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp | 38
java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp | 12
java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf | 24
java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_confirm.jspf | 26
java/code/webapp/WEB-INF/pages/common/fragments/datepicker-with-label.jsp | 9
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf | 19
java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp | 23
java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp | 21
java/code/webapp/WEB-INF/pages/configuration/overview/summary.jsp | 2
java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp | 24
java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp | 24
java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp | 53
java/code/webapp/WEB-INF/pages/help/docsearch.jsp | 18
java/code/webapp/WEB-INF/pages/ssm/provisioning-remote-command.jsp | 1
java/code/webapp/WEB-INF/pages/ssm/systems/misc/reboot-system-confirm.jsp | 2
java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata-confirm.jsp | 14
java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncprofile.jsp | 23
java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp | 23
java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp | 132 -
java/code/webapp/WEB-INF/pages/systems/sdc/notes.jsp | 4
java/code/webapp/WEB-INF/pages/systems/system-remote-command.jsp | 14
java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp | 12
java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp | 10
java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp | 2
java/code/webapp/WEB-INF/struts-config.xml | 170 -
java/spacewalk-java.spec | 45
rel-eng/packages/spacewalk-branding | 2
rel-eng/packages/spacewalk-java | 2
rel-eng/packages/spacewalk-schema | 2
rel-eng/packages/spacewalk-search | 2
rel-eng/packages/spacewalk-web | 2
schema/spacewalk/common/data/rhnTimezone.sql | 6
schema/spacewalk/oracle/packages/rhn_channel.pkb | 16
schema/spacewalk/postgres/packages/rhn_channel.pkb | 18
schema/spacewalk/spacewalk-schema.spec | 14
schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.oracle | 1255 +++++++++
schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.postgresql | 1278 ++++++++++
schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/050-rhnTimezone-data.sql | 12
search-server/spacewalk-search/spacewalk-search.spec | 5
search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml | 22
search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/package.xml | 18
search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml | 7
search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java | 22
web/html/errors/403.html | 2
web/html/errors/404.html | 2
web/html/errors/413.html | 2
web/html/errors/500.html | 2
web/spacewalk-web.spec | 13
108 files changed, 4625 insertions(+), 2762 deletions(-)
New commits:
commit 5879a0c819cd5fdc49e6eba3b8312555fc854533
Merge: 16f1279 76766d9
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Thu Feb 13 16:14:41 2014 +0100
Merge branch 'master' into master-bootstrap-css-fixes
Conflicts:
java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp
java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp
diff --cc java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp
index ccc0e8d,e024c14..eef87dc
--- a/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp
@@@ -2,71 -2,53 +2,53 @@@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
-
-
<html>
- <head>
- <meta name="name" value="Systems Affected" />
- </head>
- <body>
-
- <%@ include file="/WEB-INF/pages/common/fragments/errata/errata-header.jspf" %>
- <h2><bean:message key="confirm.jsp.header"/> ${errata.advisoryName}</h2>
-
- <div class="page-summary">
- <p>
- <bean:message key="confirm.jsp.summary" arg0="${errata.advisoryName}" />
- </p>
- </div>
-
- <c:set var="pageList" value="${requestScope.pageList}" />
- <html:form method="POST" action="errata/details/ErrataConfirmSubmit.do">
- <rhn:csrf />
- <rhn:list pageList="${requestScope.pageList}" noDataText="nosystems.message">
- <rhn:listdisplay>
- <rhn:column header="actions.jsp.system">
- ${current.name}
- </rhn:column>
- <rhn:column header="actions.jsp.basechannel">
- ${current.channelLabels}
- </rhn:column>
- </rhn:listdisplay>
-
-
-
- <p><bean:message key="applyerrata.disclaimer" /></p>
-
- <table class="schedule-action-interface" align="center">
- <tr>
- <td><html:radio property="use_date" value="false" /></td>
- <th><bean:message key="syncprofile.jsp.now"/></th>
- </tr>
- <tr>
- <td><html:radio property="use_date" value="true" /></td>
- <th><bean:message key="syncprofile.jsp.than"/></th>
- </tr>
- <tr>
- <th><rhn:icon type="header-schedule" title="syncprofile.jsp.selection" />
- </th>
- <td>
- <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
- <jsp:param name="widget" value="date"/>
- </jsp:include>
- </td>
- </tr>
- </table>
-
- <div class="text-right">
- <hr />
- <html:submit styleClass="btn btn-default" property="dispatch">
- <bean:message key="confirm.jsp.confirm"/>
- </html:submit>
- </div>
-
- <html:hidden property="eid" value="${param.eid}"/>
-
- </rhn:list>
- </html:form>
-
- </body>
+ <head>
+ <meta name="name" value="Systems Affected" />
+ </head>
+ <body>
+ <%@ include file="/WEB-INF/pages/common/fragments/errata/errata-header.jspf" %>
+ <h2>
+ <bean:message key="confirm.jsp.header" /> ${errata.advisoryName}
+ </h2>
+ <p>
+ <bean:message key="confirm.jsp.summary" arg0="${errata.advisoryName}" />
+ </p>
+ <c:set var="pageList" value="${requestScope.pageList}" />
+ <html:form method="POST"
+ styleClass="form-horizontal"
+ action="errata/details/ErrataConfirmSubmit.do">
+ <rhn:csrf />
+ <rhn:list pageList="${requestScope.pageList}" noDataText="nosystems.message">
+ <rhn:listdisplay>
+ <rhn:column header="actions.jsp.system">
+ ${current.name}
+ </rhn:column>
+ <rhn:column header="actions.jsp.basechannel">
+ ${current.channelLabels}
+ </rhn:column>
+ </rhn:listdisplay>
+ <div class="form-group">
+ <div class="col-md-offset-3 col-md-6">
+ <span class="help-block">
+ <bean:message key="applyerrata.disclaimer" />
+ </span>
+ </div>
+ </div>
+ <jsp:include page="/WEB-INF/pages/common/fragments/datepicker-with-label.jsp">
+ <jsp:param name="widget" value="date" />
+ <jsp:param name="label_text" value="schedule.jsp.at" />
+ </jsp:include>
+ <div class="form-group">
+ <div class="col-md-offset-3 col-md-6">
- <html:submit property="dispatch">
++ <html:submit styleClass="btn btn-default" property="dispatch">
+ <bean:message key="confirm.jsp.confirm" />
+ </html:submit>
+ </div>
+ </div>
+ <html:hidden property="eid" value="${param.eid}" />
+ <input type="hidden" name="use_date" value="true" />
+ </rhn:list>
+ </html:form>
+ </body>
</html>
diff --cc java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf
index b9551eb,4fe640a..84174a0
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf
@@@ -40,28 -40,12 +40,12 @@@
<c:choose>
<c:when test="${requestScope.deployable}">
<p><bean:message key="deploy.jsp.widgetsummary" /></p>
- <table class="schedule-action-interface" align="center">
- <tr>
- <td><html:radio property="use_date" value="false" /></td>
- <th><bean:message key="deploy.jsp.now"/></th>
- </tr>
- <tr>
- <td><html:radio property="use_date" value="true" /></td>
- <th><bean:message key="deploy.jsp.usedate"/></th>
- </tr>
- <tr>
- <th>
- <rhn:icon type="header-schedule" title="deploy.jsp.selection" />
- </th>
- <td>
- <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
- <jsp:param name="widget" value="date"/>
- </jsp:include>
- </td>
- </tr>
- </table>
+ <jsp:include page="/WEB-INF/pages/common/fragments/datepicker-with-label.jsp">
+ <jsp:param name="widget" value="date" />
+ <jsp:param name="label_text" value="deploy.jsp.usedate" />
+ </jsp:include>
<hr />
- <div class="text-right"><html:submit property="dispatch">
+ <div class="text-right"><html:submit styleClass="btn btn-default" property="dispatch">
<bean:message key="deploy.jsp.deploybutton" />
</html:submit></div>
</c:when>
diff --cc java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_confirm.jspf
index 0d2fdef,510a90c..a1da471
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_confirm.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_confirm.jspf
@@@ -13,29 -13,13 +13,13 @@@
<c:if test="${not empty requestScope.pageList}">
<p><bean:message key="sdcconfigconfirm.jsp.widgetsummary" /></p>
- <table class="schedule-action-interface" align="center">
- <tr>
- <td><html:radio property="use_date" value="false" /></td>
- <th><bean:message key="sdcconfigconfirm.jsp.now"/></th>
- </tr>
- <tr>
- <td><html:radio property="use_date" value="true" /></td>
- <th><bean:message key="sdcconfigconfirm.jsp.usedate"/></th>
- </tr>
- <tr>
- <th><rhn:icon type="header-schedule" title="syncprofile.jsp.selection" />
- </th>
- <td>
- <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
- <jsp:param name="widget" value="date"/>
- </jsp:include>
- </td>
- </tr>
- </table>
-
+ <jsp:include page="/WEB-INF/pages/common/fragments/datepicker-with-label.jsp">
+ <jsp:param name="widget" value="date" />
+ <jsp:param name="label_text" value="sdcconfigconfirm.jsp.usedate" />
+ </jsp:include>
<div class="text-right">
<hr />
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default" property="dispatch">
<bean:message key="${button}" />
</html:submit>
</div>
diff --cc java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp
index 2c08a95,e49f73a..4e27b22
--- a/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp
@@@ -71,28 -71,13 +71,13 @@@
<c:if test="${not empty requestScope.selectedSystems && not empty requestScope.selectedFiles}">
<!-- Date picker -->
<p><bean:message key="deployconfirm.jsp.widgetsummary" /></p>
- <table class="schedule-action-interface" align="center">
- <tr>
- <td><input type="radio" name="use_date" checked="checked" value="false" /></td>
- <th><bean:message key="deployconfirm.jsp.now"/></th>
- </tr>
- <tr>
- <td><input type="radio" name="use_date" value="true" /></td>
- <th><bean:message key="deployconfirm.jsp.usedate"/></th>
- </tr>
- <tr>
- <th><rhn:icon type="header-schedule" title="syncprofile.jsp.selection" />
- </th>
- <td>
- <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
- <jsp:param name="widget" value="date"/>
- </jsp:include>
- </td>
- </tr>
- </table>
+ <jsp:include page="/WEB-INF/pages/common/fragments/datepicker-with-label.jsp">
+ <jsp:param name="widget" value="date" />
+ <jsp:param name="label_text" value="deployconfirm.jsp.usedate" />
+ </jsp:include>
<!-- DoIt Button -->
<div class="text-right">
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default" property="dispatch">
<bean:message key="deployconfirm.jsp.confirmbutton" />
</html:submit>
</div>
diff --cc java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp
index d8e6ae1,c7d9c2b..2b30b1a
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp
@@@ -60,29 -60,13 +60,13 @@@
<c:if test="${not empty requestScope.pageList}">
<p><bean:message key="sdcimportconfirm.jsp.widgetsummary" /></p>
- <table class="schedule-action-interface" align="center">
- <tr>
- <td><html:radio property="use_date" value="false" /></td>
- <th><bean:message key="sdcimportconfirm.jsp.now"/></th>
- </tr>
- <tr>
- <td><html:radio property="use_date" value="true" /></td>
- <th><bean:message key="sdcimportconfirm.jsp.usedate"/></th>
- </tr>
- <tr>
- <th><rhn:icon type="header-schedule" title="syncprofile.jsp.selection" />
- </th>
- <td>
- <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
- <jsp:param name="widget" value="date"/>
- </jsp:include>
- </td>
- </tr>
- </table>
-
+ <jsp:include page="/WEB-INF/pages/common/fragments/datepicker-with-label.jsp">
+ <jsp:param name="widget" value="date" />
+ <jsp:param name="label_text" value="sdcimportconfirm.jsp.usedate" />
+ </jsp:include>
<div class="text-right">
<hr />
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default" property="dispatch">
<bean:message key="sdcimportconfirm.jsp.confirm" />
</html:submit>
</div>
diff --cc java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp
index 2b7c9af,6d91b9e..769fd1f
--- a/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp
@@@ -31,29 -31,13 +31,13 @@@
<c:if test="${not empty requestScope.pageList}">
<p><bean:message key="deployconfirm.jsp.widgetsummary" /></p>
- <table class="schedule-action-interface" align="center">
- <tr>
- <td><html:radio property="use_date" value="false" /></td>
- <th><bean:message key="deployconfirm.jsp.now"/></th>
- </tr>
- <tr>
- <td><html:radio property="use_date" value="true" /></td>
- <th><bean:message key="deployconfirm.jsp.usedate"/></th>
- </tr>
- <tr>
- <th><rhn:icon type="header-schedule" title="syncprofile.jsp.selection" />
- </th>
- <td>
- <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
- <jsp:param name="widget" value="date"/>
- </jsp:include>
- </td>
- </tr>
- </table>
-
+ <jsp:include page="/WEB-INF/pages/common/fragments/datepicker-with-label.jsp">
+ <jsp:param name="widget" value="date" />
+ <jsp:param name="label_text" value="deployconfirm.jsp.usedate" />
+ </jsp:include>
<div class="text-right">
<hr />
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default" property="dispatch">
<bean:message key="deployconfirm.jsp.confirm" />
</html:submit>
</div>
diff --cc java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata-confirm.jsp
index 7e0140d,30d5caf..f392835
--- a/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata-confirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata-confirm.jsp
@@@ -18,19 -18,13 +18,13 @@@
<c:set var="notSelectable" value="True" />
<%@ include file="/WEB-INF/pages/ssm/systems/errata-list-fragment.jspf" %>
- <table class="details" align="center">
- <tr>
- <th><label for="radio_use_date_now"><bean:message key="scheduleremote.jsp.nosoonerthan" /></label></th>
- <td>
- <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
- <jsp:param name="widget" value="date" />
- </jsp:include>
- </td>
- </tr>
- </table>
+ <jsp:include page="/WEB-INF/pages/common/fragments/datepicker-with-label.jsp">
+ <jsp:param name="widget" value="date" />
+ <jsp:param name="label_text" value="scheduleremote.jsp.nosoonerthan" />
+ </jsp:include>
<div class="text-right">
<hr />
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-success" property="dispatch">
<bean:message key="confirm.jsp.confirm" />
</html:submit>
</div>
diff --cc java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp
index fc79379,652c5a4..21bff41
--- a/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp
@@@ -4,85 -4,57 +4,57 @@@
<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
-
<html>
- <head>
- <meta name="name" value="System Details" />
- </head>
- <body>
-
- <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
-
- <h2><rhn:icon type="header-errata" /><bean:message key="errataconfirm.jsp.header"/></h2>
-
- <rhn:systemtimemessage server="${system}" />
-
-
- <rl:listset name="erratConfirmListSet">
- <rhn:csrf />
- <rhn:submitted />
- <rl:list
- width="100%"
- styleclass="list"
- emptykey="erratalist.jsp.noerrata">
-
- <rl:decorator name="PageSizeDecorator"/>
- <rl:decorator name="ElaborationDecorator"/>
-
- <rl:column headerkey="erratalist.jsp.type" styleclass="text-align: center;">
- <c:if test="${current.securityAdvisory}">
- <rhn:icon type="errata-security" />
- </c:if>
- <c:if test="${current.bugFix}">
- <rhn:icon type="errata-bugfix" />
- </c:if>
- <c:if test="${current.productEnhancement}">
- <rhn:icon type="errata-enhance" />
- </c:if>
- </rl:column>
-
- <rl:column headerkey="erratalist.jsp.advisory">
- <a href="/rhn/errata/details/Details.do?eid=${current.id}">
- ${current.advisoryName}</a>
- </rl:column>
-
- <rl:column headerkey="erratalist.jsp.synopsis">
- ${current.advisorySynopsis}
- </rl:column>
-
- <rl:column headerkey="erratalist.jsp.updated">
- ${current.updateDate}
- </rl:column>
- </rl:list>
-
- <table class="schedule-action-interface" align="center">
- <tr>
- <td><input type="radio" name="use_date" value="false" checked="checked"/></td>
- <th><bean:message key="syncprofile.jsp.now"/></th>
- </tr>
- <tr>
- <td><input type="radio" name="use_date" value="true" /></td>
- <th><bean:message key="syncprofile.jsp.than"/></th>
- </tr>
- <tr>
- <th><rhn:icon type="header-schedule" title="syncprofile.jsp.selection" />
- </th>
- <td>
- <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
- <jsp:param name="widget" value="date"/>
- </jsp:include>
- </td>
- </tr>
- </table>
-
- <div class="text-right">
- <hr />
- <html:submit styleClass="btn btn-success" property="dispatch">
- <bean:message key="errataconfirm.jsp.confirm"/>
- </html:submit>
- </div>
- <html:hidden property="sid" value="${param.sid}"/>
-
- </rl:listset>
- </body>
+ <head>
+ <meta name="name" value="System Details" />
+ </head>
+ <body>
+ <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
+ <h2>
+ <rhn:icon type="header-errata" /><bean:message key="errataconfirm.jsp.header" />
+ </h2>
+ <rhn:systemtimemessage server="${system}" />
+ <rl:listset name="erratConfirmListSet">
+ <rhn:csrf />
+ <rhn:submitted />
+ <rl:list width="100%" styleclass="list" emptykey="erratalist.jsp.noerrata">
+ <rl:decorator name="PageSizeDecorator" />
+ <rl:decorator name="ElaborationDecorator" />
+ <rl:column headerkey="erratalist.jsp.type" styleclass="text-align: center;">
+ <c:if test="${current.securityAdvisory}">
+ <rhn:icon type="errata-security" />
+ </c:if>
+ <c:if test="${current.bugFix}">
+ <rhn:icon type="errata-bugfix" />
+ </c:if>
+ <c:if test="${current.productEnhancement}">
+ <rhn:icon type="errata-enhance" />
+ </c:if>
+ </rl:column>
+ <rl:column headerkey="erratalist.jsp.advisory">
+ <a href="/rhn/errata/details/Details.do?eid=${current.id}">
+ ${current.advisoryName}
+ </a>
+ </rl:column>
+ <rl:column headerkey="erratalist.jsp.synopsis">${current.advisorySynopsis}</rl:column>
+ <rl:column headerkey="erratalist.jsp.updated">${current.updateDate}</rl:column>
+ </rl:list>
+ <div class="form-horizontal">
+ <jsp:include page="/WEB-INF/pages/common/fragments/datepicker-with-label.jsp">
+ <jsp:param name="widget" value="date" />
+ <jsp:param name="label_text" value="schedule.jsp.at" />
+ </jsp:include>
+ <div class="form-group">
+ <div class="col-md-offset-3 col-md-6">
- <html:submit property="dispatch">
++ <html:submit styleClass="btn btn-success" property="dispatch">
+ <bean:message key="errataconfirm.jsp.confirm" />
+ </html:submit>
+ </div>
+ </div>
+ </div>
+
+ <html:hidden property="sid" value="${param.sid}" />
+ <input type="hidden" name="use_date" value="true">
+ </rl:listset>
+ </body>
</html>
commit 76766d9c7821e9bff4d2658f88090bf90e8bd6b4
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Thu Feb 13 13:45:06 2014 +0100
remove unused localization string
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
index 095561d..4e37278 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
@@ -16188,13 +16188,6 @@ Kickstart করার সময় অনুগ্রহ করে সিস্ট
</context-group>
<target>Kickstart-র সময় নির্ধারণ করুন</target>
</trans-unit>
- <trans-unit id="kickstart.schedule.heading3.option1.jsp">
- <source>Begin kickstart at the next system check in.</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/kickstart/ScheduleWizard.do</context>
- </context-group>
- <target>সিস্টেম পুনরায় সংযোগ করলে kickstart আরম্ভ করা হবে।</target>
- </trans-unit>
<trans-unit id="kickstart.schedule.heading3.option2.jsp">
<source>Schedule kickstart no sooner than:</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
index fa79856..9791355 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
@@ -17768,13 +17768,6 @@ den Tab <a href="/rhn/kickstart/ActivationKeysList.do?ksid={0}">Aktivierun
</context-group>
<target>Kickstart einplanen</target>
</trans-unit>
- <trans-unit id="kickstart.schedule.heading3.option1.jsp">
- <source>Begin kickstart at the next system check in.</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/kickstart/ScheduleWizard.do</context>
- </context-group>
- <target>Beginnen Sie Kickstart beim nächsten System-Check-in.</target>
- </trans-unit>
<trans-unit id="kickstart.schedule.heading3.option2.jsp">
<source>Schedule kickstart no sooner than:</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index 2dc1cf2..4cfa044 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -15450,12 +15450,6 @@ the <a href="/rhn/kickstart/ActivationKeysList.do?ksid={0}">Activation Key
<context context-type="sourcefile">/rhn/systems/details/kickstart/ScheduleWizard.do</context>
</context-group>
</trans-unit>
- <trans-unit id="kickstart.schedule.heading3.option1.jsp">
- <source>Begin kickstart at the next system check in.</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/kickstart/ScheduleWizard.do</context>
- </context-group>
- </trans-unit>
<trans-unit id="kickstart.schedule.heading3.option2.jsp">
<source>Schedule kickstart no sooner than:</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
index ac82720..cb99a58 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
@@ -17766,13 +17766,6 @@ para suscribir los sistemas a los canales de software durante el inicio de insta
</context-group>
<target>Programar Kickstart</target>
</trans-unit>
- <trans-unit id="kickstart.schedule.heading3.option1.jsp">
- <source>Begin kickstart at the next system check in.</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/kickstart/ScheduleWizard.do</context>
- </context-group>
- <target>Inicie la instalación a través de Kickstart la próxima vez que se conecte el sistema.</target>
- </trans-unit>
<trans-unit id="kickstart.schedule.heading3.option2.jsp">
<source>Schedule kickstart no sooner than:</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
index 578e283..ea04363 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
@@ -17766,13 +17766,6 @@ pour abonner des systèmes aux canaux de logiciels durant le kickstart.</span
</context-group>
<target>Programmer le kickstart</target>
</trans-unit>
- <trans-unit id="kickstart.schedule.heading3.option1.jsp">
- <source>Begin kickstart at the next system check in.</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/kickstart/ScheduleWizard.do</context>
- </context-group>
- <target>Commence le kickstart à la prochaine connexion du système.</target>
- </trans-unit>
<trans-unit id="kickstart.schedule.heading3.option2.jsp">
<source>Schedule kickstart no sooner than:</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
index 4ed7d32..e3019a8 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
@@ -16190,13 +16190,6 @@ the <a href="/rhn/kickstart/ActivationKeysList.do?ksid={0}">Activation Key
</context-group>
<target>કિકસ્ટાર્ટ સુનિશ્ચિત કરો</target>
</trans-unit>
- <trans-unit id="kickstart.schedule.heading3.option1.jsp">
- <source>Begin kickstart at the next system check in.</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/kickstart/ScheduleWizard.do</context>
- </context-group>
- <target>આગળની સિસ્ટમ ચકાસણીએ કિકસ્ટાર્ટ શરૂ કરો.</target>
- </trans-unit>
<trans-unit id="kickstart.schedule.heading3.option2.jsp">
<source>Schedule kickstart no sooner than:</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
index 467aac4..dcd3204 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
@@ -16190,13 +16190,6 @@ the <a href="/rhn/kickstart/ActivationKeysList.do?ksid={0}">Activation Key
</context-group>
<target>किकस्टार्ट नियोजित करें</target>
</trans-unit>
- <trans-unit id="kickstart.schedule.heading3.option1.jsp">
- <source>Begin kickstart at the next system check in.</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/kickstart/ScheduleWizard.do</context>
- </context-group>
- <target>किकस्टार्ट अगले सिस्टम चेकइन पर शुरू करें.</target>
- </trans-unit>
<trans-unit id="kickstart.schedule.heading3.option2.jsp">
<source>Schedule kickstart no sooner than:</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
index 1bc112c..c692ed5 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
@@ -17736,13 +17736,6 @@ per sottoscrivere i sistemi ai canali software durante un kickstart.</span>
</context-group>
<target>Programma Kickstart</target>
</trans-unit>
- <trans-unit id="kickstart.schedule.heading3.option1.jsp">
- <source>Begin kickstart at the next system check in.</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/kickstart/ScheduleWizard.do</context>
- </context-group>
- <target>Inizia processo kickstart al prossimo check in del sistema.</target>
- </trans-unit>
<trans-unit id="kickstart.schedule.heading3.option2.jsp">
<source>Schedule kickstart no sooner than:</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
index 1e91d28..c49dbf2 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
@@ -17769,13 +17769,6 @@ the <a href="/rhn/kickstart/ActivationKeysList.do?ksid={0}">Activation Key
</context-group>
<target>キックスタートのスケジュール</target>
</trans-unit>
- <trans-unit id="kickstart.schedule.heading3.option1.jsp">
- <source>Begin kickstart at the next system check in.</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/kickstart/ScheduleWizard.do</context>
- </context-group>
- <target>次回のシステムチェックインでキックスタートを開始します。</target>
- </trans-unit>
<trans-unit id="kickstart.schedule.heading3.option2.jsp">
<source>Schedule kickstart no sooner than:</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
index 9942d2f..68d2bb3 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
@@ -17754,13 +17754,6 @@ the <a href="/rhn/kickstart/ActivationKeysList.do?ksid={0}">Activation Key
</context-group>
<target>킥스타트 스케줄</target>
</trans-unit>
- <trans-unit id="kickstart.schedule.heading3.option1.jsp">
- <source>Begin kickstart at the next system check in.</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/kickstart/ScheduleWizard.do</context>
- </context-group>
- <target>다음에 접속하는 시스템에 킥스타트 시작. </target>
- </trans-unit>
<trans-unit id="kickstart.schedule.heading3.option2.jsp">
<source>Schedule kickstart no sooner than:</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
index eee172d..9b49170 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
@@ -16189,13 +16189,6 @@ the <a href="/rhn/kickstart/ActivationKeysList.do?ksid={0}">Activation Key
</context-group>
<target>ਕਿੱਕਸਟਾਰਟ ਸਮਾਂ-ਤਹਿ ਕਰੋ</target>
</trans-unit>
- <trans-unit id="kickstart.schedule.heading3.option1.jsp">
- <source>Begin kickstart at the next system check in.</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/kickstart/ScheduleWizard.do</context>
- </context-group>
- <target>ਅਗਲੀ ਸਿਸਟਮ ਜਾਂਚ ਦੌਰਾਨ ਕਿੱਕਸਟਾਰਟ ਚਲਾਓ।</target>
- </trans-unit>
<trans-unit id="kickstart.schedule.heading3.option2.jsp">
<source>Schedule kickstart no sooner than:</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
index bc30fc7..59ea111 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
@@ -17762,13 +17762,6 @@ a aba <a href="/rhn/kickstart/ActivationKeysList.do?ksid={0}">Chaves de At
</context-group>
<target>Agendar Kickstart</target>
</trans-unit>
- <trans-unit id="kickstart.schedule.heading3.option1.jsp">
- <source>Begin kickstart at the next system check in.</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/kickstart/ScheduleWizard.do</context>
- </context-group>
- <target>Iniciar kickstart na próxima vez que o sistema executar a autenticação.</target>
- </trans-unit>
<trans-unit id="kickstart.schedule.heading3.option2.jsp">
<source>Schedule kickstart no sooner than:</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
index f082e23..cc24095 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
@@ -17748,13 +17748,6 @@ the <a href="/rhn/kickstart/ActivationKeysList.do?ksid={0}">Activation Key
</context-group>
<target>Назначить кикстарт</target>
</trans-unit>
- <trans-unit id="kickstart.schedule.heading3.option1.jsp">
- <source>Begin kickstart at the next system check in.</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/kickstart/ScheduleWizard.do</context>
- </context-group>
- <target>Начать кикстарт при следующем входе.</target>
- </trans-unit>
<trans-unit id="kickstart.schedule.heading3.option2.jsp">
<source>Schedule kickstart no sooner than:</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
index b0c5d03..e98b6f2 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
@@ -16190,13 +16190,6 @@ the <a href="/rhn/kickstart/ActivationKeysList.do?ksid={0}">Activation Key
</context-group>
<target>கிக்ஸ்டார்ட்டை திட்டமிடவும்</target>
</trans-unit>
- <trans-unit id="kickstart.schedule.heading3.option1.jsp">
- <source>Begin kickstart at the next system check in.</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/kickstart/ScheduleWizard.do</context>
- </context-group>
- <target>கணினியின் அடுத்த சோதனையில் கிக்ஸ்டார்ட்டை தொடங்கவும்</target>
- </trans-unit>
<trans-unit id="kickstart.schedule.heading3.option2.jsp">
<source>Schedule kickstart no sooner than:</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
index 238a2b5..7741ea8 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
@@ -17760,13 +17760,6 @@ the <a href="/rhn/kickstart/ActivationKeysList.do?ksid={0}">Activation Key
</context-group>
<target>调度 kickstart</target>
</trans-unit>
- <trans-unit id="kickstart.schedule.heading3.option1.jsp">
- <source>Begin kickstart at the next system check in.</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/kickstart/ScheduleWizard.do</context>
- </context-group>
- <target>在系统下一次登录的时候开始 kickstart。</target>
- </trans-unit>
<trans-unit id="kickstart.schedule.heading3.option2.jsp">
<source>Schedule kickstart no sooner than:</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
index a9cf9ae..6b338c6 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
@@ -17763,13 +17763,6 @@ the <a href="/rhn/kickstart/ActivationKeysList.do?ksid={0}">Activation Key
</context-group>
<target>排程 Kickstart</target>
</trans-unit>
- <trans-unit id="kickstart.schedule.heading3.option1.jsp">
- <source>Begin kickstart at the next system check in.</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/kickstart/ScheduleWizard.do</context>
- </context-group>
- <target>在下一次系統登入時，開始 kickstart。</target>
- </trans-unit>
<trans-unit id="kickstart.schedule.heading3.option2.jsp">
<source>Schedule kickstart no sooner than:</source>
<context-group name="ctx">
commit 678b18f11b9edaa69a0368c72fc741e1496e0587
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Thu Feb 13 13:43:22 2014 +0100
remove unused localization string
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
index b0e96ba..095561d 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
@@ -6875,13 +6875,6 @@ value for this entitlement, excluding the default organization's consumption.</s
</context-group>
<target>উল্লিখিত সময়ের পরে কর্ম নির্ধারণ করুন:</target>
</trans-unit>
- <trans-unit id="confirm.jsp.now">
- <source>Schedule action as soon as possible</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/packages/InstallConfirm.do</context>
- </context-group>
- <target>কর্ম যথাশীঘ্র সময়ে সঞ্চালনের জন্য নির্ধারণ করুন</target>
- </trans-unit>
<trans-unit id="installconfirm.jsp.confirm">
<source>Confirm</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
index f73e241..fa79856 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
@@ -7589,13 +7589,6 @@ Sobald Sie zusätzliche <strong>Management</strong> Berechtigungen h
</context-group>
<target>Ablauf einplanen für nicht früher als:</target>
</trans-unit>
- <trans-unit id="confirm.jsp.now">
- <source>Schedule action as soon as possible</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/packages/InstallConfirm.do</context>
- </context-group>
- <target>Ablauf für so bald wie möglich einplanen</target>
- </trans-unit>
<trans-unit id="installconfirm.jsp.confirm">
<source>Confirm</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index 9d0b4df..2dc1cf2 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -6704,12 +6704,6 @@ value for this entitlement, excluding the default organization's consumption.</s
<context context-type="sourcefile">/rhn/systems/details/packages/InstallConfirm.do</context>
</context-group>
</trans-unit>
- <trans-unit id="confirm.jsp.now">
- <source>Schedule action as soon as possible</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/packages/InstallConfirm.do</context>
- </context-group>
- </trans-unit>
<trans-unit id="installconfirm.jsp.confirm">
<source>Confirm</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
index ed205ea..ac82720 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
@@ -7588,13 +7588,6 @@ para este derecho, excluyendo el consumo de la organización predeterminada.</ta
</context-group>
<target>Programar acción para después de:</target>
</trans-unit>
- <trans-unit id="confirm.jsp.now">
- <source>Schedule action as soon as possible</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/packages/InstallConfirm.do</context>
- </context-group>
- <target>Programar una acción tan pronto como sea posible</target>
- </trans-unit>
<trans-unit id="installconfirm.jsp.confirm">
<source>Confirm</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
index aec0204..578e283 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
@@ -7589,13 +7589,6 @@ pour ce droit d'accès, moins la consommation par défaut de l'organisation.</ta
</context-group>
<target>Programmer l'action pas avant :</target>
</trans-unit>
- <trans-unit id="confirm.jsp.now">
- <source>Schedule action as soon as possible</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/packages/InstallConfirm.do</context>
- </context-group>
- <target>Programmer l'action dès que possible</target>
- </trans-unit>
<trans-unit id="installconfirm.jsp.confirm">
<source>Confirm</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
index 12e102c..4ed7d32 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
@@ -6875,13 +6875,6 @@ value for this entitlement, excluding the default organization's consumption.</s
</context-group>
<target>આનાં કરતાંની જલદી નહિં તેવી રીતે ક્રિયા સુનિશ્ચિત કરો:</target>
</trans-unit>
- <trans-unit id="confirm.jsp.now">
- <source>Schedule action as soon as possible</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/packages/InstallConfirm.do</context>
- </context-group>
- <target>શક્ય હોય એટલી જલદી ક્રિયા સુનિશ્ચિત કરો</target>
- </trans-unit>
<trans-unit id="installconfirm.jsp.confirm">
<source>Confirm</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
index 6203d80..467aac4 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
@@ -6875,13 +6875,6 @@ value for this entitlement, excluding the default organization's consumption.</s
</context-group>
<target>इससे पहले क्रिया अनुसूचित न करें:</target>
</trans-unit>
- <trans-unit id="confirm.jsp.now">
- <source>Schedule action as soon as possible</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/packages/InstallConfirm.do</context>
- </context-group>
- <target>अनुसूचित यथासंभव जल्दी</target>
- </trans-unit>
<trans-unit id="installconfirm.jsp.confirm">
<source>Confirm</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
index ee63893..1bc112c 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
@@ -7588,13 +7588,6 @@ value for this entitlement, excluding the default organization's consumption.</s
</context-group>
<target>Programma azione non prima di:</target>
</trans-unit>
- <trans-unit id="confirm.jsp.now">
- <source>Schedule action as soon as possible</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/packages/InstallConfirm.do</context>
- </context-group>
- <target>Programma azione appena possibile</target>
- </trans-unit>
<trans-unit id="installconfirm.jsp.confirm">
<source>Confirm</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
index b0608bd..1e91d28 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
@@ -7590,13 +7590,6 @@ value for this entitlement, excluding the default organization's consumption.</s
</context-group>
<target>次の日付以降に動作をスケジュール:</target>
</trans-unit>
- <trans-unit id="confirm.jsp.now">
- <source>Schedule action as soon as possible</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/packages/InstallConfirm.do</context>
- </context-group>
- <target>可能な限り早く動作をスケジュール</target>
- </trans-unit>
<trans-unit id="installconfirm.jsp.confirm">
<source>Confirm</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
index e9080b7..9942d2f 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
@@ -7587,13 +7587,6 @@ value for this entitlement, excluding the default organization's consumption.</s
</context-group>
<target>다음 날짜 이후에 작업을 스케줄: </target>
</trans-unit>
- <trans-unit id="confirm.jsp.now">
- <source>Schedule action as soon as possible</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/packages/InstallConfirm.do</context>
- </context-group>
- <target>최대한 빨리 작업을 스케줄 </target>
- </trans-unit>
<trans-unit id="installconfirm.jsp.confirm">
<source>Confirm</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
index 339afbe..eee172d 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
@@ -6875,13 +6875,6 @@ value for this entitlement, excluding the default organization's consumption.</s
</context-group>
<target>ਇਸ ਤੋਂ ਪਹਿਲਾਂ ਕਾਰਵਾਈ ਲਈ ਸਮਾਂ-ਤਹਿ ਨਾ ਕਰੋ:</target>
</trans-unit>
- <trans-unit id="confirm.jsp.now">
- <source>Schedule action as soon as possible</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/packages/InstallConfirm.do</context>
- </context-group>
- <target>ਜਿੰਨਾ ਵੀ ਛੇਤੇ ਹੋਵੇ, ਕਾਰਵਾਈ ਲਈ ਸਮਾਂ-ਤਹਿ ਕਰੋ</target>
- </trans-unit>
<trans-unit id="installconfirm.jsp.confirm">
<source>Confirm</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
index 3ba5246..bc30fc7 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
@@ -7588,13 +7588,6 @@ value for this entitlement, excluding the default organization's consumption.</s
</context-group>
<target>Agendar ação para depois de:</target>
</trans-unit>
- <trans-unit id="confirm.jsp.now">
- <source>Schedule action as soon as possible</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/packages/InstallConfirm.do</context>
- </context-group>
- <target>Agendar ação o mais rápido possível</target>
- </trans-unit>
<trans-unit id="installconfirm.jsp.confirm">
<source>Confirm</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
index f3f5dfd..f082e23 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
@@ -7585,13 +7585,6 @@ value for this entitlement, excluding the default organization's consumption.</s
</context-group>
<target>Назначить действие не раньше чем:</target>
</trans-unit>
- <trans-unit id="confirm.jsp.now">
- <source>Schedule action as soon as possible</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/packages/InstallConfirm.do</context>
- </context-group>
- <target>Назначить действие как можно раньше</target>
- </trans-unit>
<trans-unit id="installconfirm.jsp.confirm">
<source>Confirm</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
index 1d57706..b0c5d03 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
@@ -6875,13 +6875,6 @@ value for this entitlement, excluding the default organization's consumption.</s
</context-group>
<target>செயல்களை அவரசமாக திட்டமிட வேண்டாம்:</target>
</trans-unit>
- <trans-unit id="confirm.jsp.now">
- <source>Schedule action as soon as possible</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/packages/InstallConfirm.do</context>
- </context-group>
- <target>செயலை எவ்வளவு சீக்கிரம் முடியுமோ அவ்வளவுக்குள் திட்டமிடவும்</target>
- </trans-unit>
<trans-unit id="installconfirm.jsp.confirm">
<source>Confirm</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
index 19d03a7..238a2b5 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
@@ -7588,13 +7588,6 @@ value for this entitlement, excluding the default organization's consumption.</s
</context-group>
<target>调度动作不晚于：</target>
</trans-unit>
- <trans-unit id="confirm.jsp.now">
- <source>Schedule action as soon as possible</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/packages/InstallConfirm.do</context>
- </context-group>
- <target>尽快调度动作</target>
- </trans-unit>
<trans-unit id="installconfirm.jsp.confirm">
<source>Confirm</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
index 76498e4..a9cf9ae 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
@@ -7585,13 +7585,6 @@ value for this entitlement, excluding the default organization's consumption.</s
</context-group>
<target>排程動作不晚於：</target>
</trans-unit>
- <trans-unit id="confirm.jsp.now">
- <source>Schedule action as soon as possible</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/packages/InstallConfirm.do</context>
- </context-group>
- <target>立即排程動作</target>
- </trans-unit>
<trans-unit id="installconfirm.jsp.confirm">
<source>Confirm</source>
<context-group name="ctx">
commit 809b2638630c8814e8df1361f87c76d3bd8ffa6b
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Thu Feb 13 13:36:48 2014 +0100
remove unused localization string
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
index ce46afe..b0e96ba 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
@@ -15634,10 +15634,6 @@ any of these revisions. Are you sure you want to do this?</source>
<source>You may schedule configuration actions for the time below.</source>
<target>কনফিগারেশন কর্মের জন্য নীচে সময় নির্ধারণ করা যাবে।</target>
</trans-unit>
- <trans-unit id="sdcconfigconfirm.jsp.now">
- <source>Schedule configuration actions as soon as possible.</source>
- <target>কনফিগারেশন কর্ম যথাশীঘ্র সময়ে সঞ্চালনের জন্য নির্ধারণ করুন।</target>
- </trans-unit>
<trans-unit id="sdcconfigconfirm.jsp.usedate">
<source>Schedule configuration actions for no sooner than:</source>
<target>উল্লিখিত সময়ের পরে কনফিগারেশন কর্ম নির্ধারণ করুন:</target>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
index ed2d892..f73e241 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
@@ -17204,10 +17204,6 @@ dieser Revisionen. Möchten Sie dies wirklich tun?</target>
<source>You may schedule configuration actions for the time below.</source>
<target>Sie können Sie diese Konfigurationsaktionen für den nachfolgenden Zeitpunkt planen.</target>
</trans-unit>
- <trans-unit id="sdcconfigconfirm.jsp.now">
- <source>Schedule configuration actions as soon as possible.</source>
- <target>Konfigurationsaktionen für sobald wie möglich planen.</target>
- </trans-unit>
<trans-unit id="sdcconfigconfirm.jsp.usedate">
<source>Schedule configuration actions for no sooner than:</source>
<target>Konfigurationsaktionen planen für nicht früher als:</target>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index 965fd32..9d0b4df 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -14870,9 +14870,6 @@ any of these revisions. Are you sure you want to do this?</source>
<trans-unit id="sdcconfigconfirm.jsp.widgetsummary">
<source>You may schedule configuration actions for the time below.</source>
</trans-unit>
- <trans-unit id="sdcconfigconfirm.jsp.now">
- <source>Schedule configuration actions as soon as possible.</source>
- </trans-unit>
<trans-unit id="sdcconfigconfirm.jsp.usedate">
<source>Schedule configuration actions for no sooner than:</source>
</trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
index 032a8c7..ed205ea 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
@@ -17203,10 +17203,6 @@ concerniente con esas revisiones. ¿Está seguro que es ésto lo que desea hacer
<source>You may schedule configuration actions for the time below.</source>
<target>Puede programar acciones de configuración para la fecha dada a continuación.</target>
</trans-unit>
- <trans-unit id="sdcconfigconfirm.jsp.now">
- <source>Schedule configuration actions as soon as possible.</source>
- <target>Programar acciones de configuración tan pronto como sea posible.</target>
- </trans-unit>
<trans-unit id="sdcconfigconfirm.jsp.usedate">
<source>Schedule configuration actions for no sooner than:</source>
<target>Programar acciones de configuración para después de:</target>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
index 0454048..aec0204 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
@@ -17203,10 +17203,6 @@ pour ces versions seront également supprimées, ainsi que tous les historiques
<source>You may schedule configuration actions for the time below.</source>
<target>Vous pouvez programmer des actions de configuration à la date et à l'heure indiquées ci-dessous.</target>
</trans-unit>
- <trans-unit id="sdcconfigconfirm.jsp.now">
- <source>Schedule configuration actions as soon as possible.</source>
- <target>Programmer les actions de configuration dès que possible.</target>
- </trans-unit>
<trans-unit id="sdcconfigconfirm.jsp.usedate">
<source>Schedule configuration actions for no sooner than:</source>
<target>Programmer les actions de configuration pas avant :</target>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
index 407a0a8..12e102c 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
@@ -15635,10 +15635,6 @@ any of these revisions. Are you sure you want to do this?</source>
<source>You may schedule configuration actions for the time below.</source>
<target>તમે નીચેના સમયે રૂપરેખાંકન ક્રિયાઓ સુનિશ્ચિત કરી શકશો.</target>
</trans-unit>
- <trans-unit id="sdcconfigconfirm.jsp.now">
- <source>Schedule configuration actions as soon as possible.</source>
- <target>રૂપરેખાંકન ક્રિયાઓ શક્ય એટલી જલદી સુનિશ્ચિત કરો.</target>
- </trans-unit>
<trans-unit id="sdcconfigconfirm.jsp.usedate">
<source>Schedule configuration actions for no sooner than:</source>
<target>આનાં કરતાં મોડી નહિં એવી રૂપરેખાંકન ક્રિયાઓ સુનિશ્ચિત કરો:</target>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
index df4964e..6203d80 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
@@ -15635,10 +15635,6 @@ any of these revisions. Are you sure you want to do this?</source>
<source>You may schedule configuration actions for the time below.</source>
<target>आप विन्यास क्रिया नीचे के समय के लिये जरूर चुन सकते हैं.</target>
</trans-unit>
- <trans-unit id="sdcconfigconfirm.jsp.now">
- <source>Schedule configuration actions as soon as possible.</source>
- <target>यथासंभव विन्यास क्रिया निजोयति करें.</target>
- </trans-unit>
<trans-unit id="sdcconfigconfirm.jsp.usedate">
<source>Schedule configuration actions for no sooner than:</source>
<target>इससे पहले क्रिया विन्यास क्रिया नियोजित न करें:</target>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
index af117ba..ee63893 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
@@ -17177,10 +17177,6 @@ Siete sicuri di voler fare questo?</target>
<source>You may schedule configuration actions for the time below.</source>
<target>È possibile programmare azioni di configurazione per il periodo sotto riportato.</target>
</trans-unit>
- <trans-unit id="sdcconfigconfirm.jsp.now">
- <source>Schedule configuration actions as soon as possible.</source>
- <target>Programma le azioni di configurazione appena possibile.</target>
- </trans-unit>
<trans-unit id="sdcconfigconfirm.jsp.usedate">
<source>Schedule configuration actions for no sooner than:</source>
<target>Programma le azioni di configurazione non prima di:</target>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
index 24790cc..b0608bd 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
@@ -17205,10 +17205,6 @@ any of these revisions. Are you sure you want to do this?</source>
<source>You may schedule configuration actions for the time below.</source>
<target>以下の時間で設定の動作をスケジュールすることができます。</target>
</trans-unit>
- <trans-unit id="sdcconfigconfirm.jsp.now">
- <source>Schedule configuration actions as soon as possible.</source>
- <target>できるだけ早く設定の動作をスケジュールします。</target>
- </trans-unit>
<trans-unit id="sdcconfigconfirm.jsp.usedate">
<source>Schedule configuration actions for no sooner than:</source>
<target>指定時間以降に設定の動作をスケジュール:</target>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
index d05eff9..e9080b7 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
@@ -17194,10 +17194,6 @@ any of these revisions. Are you sure you want to do this?</source>
<source>You may schedule configuration actions for the time below.</source>
<target>아래 시간에 따라 설정 작업을 스케줄하실 수 있습니다.</target>
</trans-unit>
- <trans-unit id="sdcconfigconfirm.jsp.now">
- <source>Schedule configuration actions as soon as possible.</source>
- <target>최대한 빨리 설정 작업을 스케줄하기</target>
- </trans-unit>
<trans-unit id="sdcconfigconfirm.jsp.usedate">
<source>Schedule configuration actions for no sooner than:</source>
<target>최대한 빨리 설정 작업을 스케줄:</target>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
index 3475405..339afbe 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
@@ -15634,10 +15634,6 @@ any of these revisions. Are you sure you want to do this?</source>
<source>You may schedule configuration actions for the time below.</source>
<target>ਤੁਸੀਂ ਹੇਠਲੇ ਸਮੇਂ ਲਈ ਸੰਰਚਨਾ ਕਾਰਵਾਈ ਦਾ ਸਮਾਂ-ਤਹਿ ਕਰ ਸਕਦੇ ਹੋ।</target>
</trans-unit>
- <trans-unit id="sdcconfigconfirm.jsp.now">
- <source>Schedule configuration actions as soon as possible.</source>
- <target>ਜਿੰਨਾ ਵੀ ਛੇਤੇ ਹੋਵੇ, ਸੰਰਚਨਾ ਕਾਰਵਾਈ ਲਈ ਸਮਾਂ-ਤਹਿ ਕਰੋ।</target>
- </trans-unit>
<trans-unit id="sdcconfigconfirm.jsp.usedate">
<source>Schedule configuration actions for no sooner than:</source>
<target>ਇਸ ਤੋਂ ਪਹਿਲਾਂ ਸੰਰਚਨਾ ਕਾਰਵਾਈ ਲਈ ਸਮਾਂ-ਤਹਿ ਨਾ ਕਰੋ:</target>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
index 0e91e49..3ba5246 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
@@ -17197,10 +17197,6 @@ para qualquer uma das revisões, assim como todo o histórico de implementação
<source>You may schedule configuration actions for the time below.</source>
<target>Você deve agendar ações de configuração para este horário abaixo.</target>
</trans-unit>
- <trans-unit id="sdcconfigconfirm.jsp.now">
- <source>Schedule configuration actions as soon as possible.</source>
- <target>Agendar ações de configuração o mais rápido possível</target>
- </trans-unit>
<trans-unit id="sdcconfigconfirm.jsp.usedate">
<source>Schedule configuration actions for no sooner than:</source>
<target>Agendar ações de configuração para depois de:</target>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
index 9a9720a..f3f5dfd 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
@@ -17185,10 +17185,6 @@ any of these revisions. Are you sure you want to do this?</source>
<source>You may schedule configuration actions for the time below.</source>
<target>Ниже вы можете назначить выполнение действий конфигурации на определенное время.</target>
</trans-unit>
- <trans-unit id="sdcconfigconfirm.jsp.now">
- <source>Schedule configuration actions as soon as possible.</source>
- <target>Назначить действия конфигурации как можно раньше.</target>
- </trans-unit>
<trans-unit id="sdcconfigconfirm.jsp.usedate">
<source>Schedule configuration actions for no sooner than:</source>
<target>Назначить действия конфигурации не ранее чем:</target>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
index bfe168f..1d57706 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
@@ -15635,10 +15635,6 @@ any of these revisions. Are you sure you want to do this?</source>
<source>You may schedule configuration actions for the time below.</source>
<target>கீழேயுள்ள நேரத்திற்கு கட்டமைப்பு செயல்களை திட்டமிடலாம்.</target>
</trans-unit>
- <trans-unit id="sdcconfigconfirm.jsp.now">
- <source>Schedule configuration actions as soon as possible.</source>
- <target>கட்டமைப்பு செயலை எவ்வளவு சீக்கிரம் முடியுமோ அவ்வளவுக்குள் திட்டமிடவும்.</target>
- </trans-unit>
<trans-unit id="sdcconfigconfirm.jsp.usedate">
<source>Schedule configuration actions for no sooner than:</source>
<target>கட்டமைப்பு செயல்களை அவரசமாக திட்டமிட வேண்டாம்:</target>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
index ebee201..19d03a7 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
@@ -17198,10 +17198,6 @@ any of these revisions. Are you sure you want to do this?</source>
<source>You may schedule configuration actions for the time below.</source>
<target>您可以根据下面的时间调度配置动作。</target>
</trans-unit>
- <trans-unit id="sdcconfigconfirm.jsp.now">
- <source>Schedule configuration actions as soon as possible.</source>
- <target>尽快调度配置动作。</target>
- </trans-unit>
<trans-unit id="sdcconfigconfirm.jsp.usedate">
<source>Schedule configuration actions for no sooner than:</source>
<target>调度配置动作不早于：</target>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
index 8883745..76498e4 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
@@ -17200,10 +17200,6 @@ any of these revisions. Are you sure you want to do this?</source>
<source>You may schedule configuration actions for the time below.</source>
<target>您能夠將配置動作排程在下列的時段中。</target>
</trans-unit>
- <trans-unit id="sdcconfigconfirm.jsp.now">
- <source>Schedule configuration actions as soon as possible.</source>
- <target>儘早排程配置動作。</target>
- </trans-unit>
<trans-unit id="sdcconfigconfirm.jsp.usedate">
<source>Schedule configuration actions for no sooner than:</source>
<target>將配置動作排程在不早於：</target>
commit 9a4d97581d80a0e3a2973aaab49b2fd62c35ac3d
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Thu Feb 13 13:32:45 2014 +0100
Schedule action unification
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_confirm.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_confirm.jspf
index 741bb0b..510a90c 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_confirm.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_confirm.jspf
@@ -13,30 +13,14 @@
<c:if test="${not empty requestScope.pageList}">
<p><bean:message key="sdcconfigconfirm.jsp.widgetsummary" /></p>
-<table class="schedule-action-interface" align="center">
- <tr>
- <td><html:radio property="use_date" value="false" /></td>
- <th><bean:message key="sdcconfigconfirm.jsp.now"/></th>
- </tr>
- <tr>
- <td><html:radio property="use_date" value="true" /></td>
- <th><bean:message key="sdcconfigconfirm.jsp.usedate"/></th>
- </tr>
- <tr>
- <th><rhn:icon type="header-schedule" title="syncprofile.jsp.selection" />
- </th>
- <td>
- <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
- <jsp:param name="widget" value="date"/>
- </jsp:include>
- </td>
- </tr>
-</table>
-
+<jsp:include page="/WEB-INF/pages/common/fragments/datepicker-with-label.jsp">
+ <jsp:param name="widget" value="date" />
+ <jsp:param name="label_text" value="sdcconfigconfirm.jsp.usedate" />
+</jsp:include>
<div class="text-right">
<hr />
<html:submit property="dispatch">
<bean:message key="${button}" />
</html:submit>
</div>
-</c:if>
\ No newline at end of file
+</c:if>
commit b9ac12a9339d1e3130caa28f2793dcfb483ed5b7
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Thu Feb 13 13:27:08 2014 +0100
remove unused localization string
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
index cb9796a..ce46afe 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
@@ -15589,10 +15589,6 @@ any of these revisions. Are you sure you want to do this?</source>
<source>You may schedule this import action to take place as soon as possible, or for no sooner than a specified time</source>
<target>আপনি এই ইম্পোর্ট কর্মের জন্য সময় নির্ধারণ করতে পারেন যার ফলে তা যথাশীঘ্র অথবা কোনো নির্ধারিত সময়ের পশ্চাৎ সঞ্চালিত হবে</target>
</trans-unit>
- <trans-unit id="sdcimportconfirm.jsp.now">
- <source>Schedule import action as soon as possible.</source>
- <target>ইম্পোর্ট কর্ম যথাশীঘ্র সময়ে সঞ্চালনের জন্য নির্ধারণ করুন</target>
- </trans-unit>
<trans-unit id="sdcimportconfirm.jsp.usedate">
<source>Schedule import action for no sooner than:</source>
<target>উল্লিখিত সময়ের পরে ইম্পোর্ট কর্ম নির্ধারণ করুন:</target>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
index d4ac5f0..ed2d892 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
@@ -17159,10 +17159,6 @@ dieser Revisionen. Möchten Sie dies wirklich tun?</target>
<source>You may schedule this import action to take place as soon as possible, or for no sooner than a specified time</source>
<target>Sie können Sie diese Import-Aktion für sobald wie möglich planen oder auch für nicht früher als zu einem bestimmten Zeitpunkt</target>
</trans-unit>
- <trans-unit id="sdcimportconfirm.jsp.now">
- <source>Schedule import action as soon as possible.</source>
- <target>Import-Aktion für sobald wie möglich planen.</target>
- </trans-unit>
<trans-unit id="sdcimportconfirm.jsp.usedate">
<source>Schedule import action for no sooner than:</source>
<target>Import-Aktion planen für nicht früher als:</target>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index 8ff81ae..965fd32 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -14834,9 +14834,6 @@ any of these revisions. Are you sure you want to do this?</source>
<trans-unit id="sdcimportconfirm.jsp.widgetsummary">
<source>You may schedule this import action to take place as soon as possible, or for no sooner than a specified time</source>
</trans-unit>
- <trans-unit id="sdcimportconfirm.jsp.now">
- <source>Schedule import action as soon as possible.</source>
- </trans-unit>
<trans-unit id="sdcimportconfirm.jsp.usedate">
<source>Schedule import action for no sooner than:</source>
</trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
index a92d9d4..032a8c7 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
@@ -17158,10 +17158,6 @@ concerniente con esas revisiones. ¿Está seguro que es ésto lo que desea hacer
<source>You may schedule this import action to take place as soon as possible, or for no sooner than a specified time</source>
<target>Puede programar la importación para que suceda lo antes posible o después de un tiempo determinado:</target>
</trans-unit>
- <trans-unit id="sdcimportconfirm.jsp.now">
- <source>Schedule import action as soon as possible.</source>
- <target>Programar acción importante tan pronto como sea posible.</target>
- </trans-unit>
<trans-unit id="sdcimportconfirm.jsp.usedate">
<source>Schedule import action for no sooner than:</source>
<target>Programar acción importante para después de:</target>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
index 1a20e5c..0454048 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
@@ -17158,10 +17158,6 @@ pour ces versions seront également supprimées, ainsi que tous les historiques
<source>You may schedule this import action to take place as soon as possible, or for no sooner than a specified time</source>
<target>Vous pouvez programmer cette action d'import pour qu'elle commence aussi tôt que possible ou pas avant une date spécifiée</target>
</trans-unit>
- <trans-unit id="sdcimportconfirm.jsp.now">
- <source>Schedule import action as soon as possible.</source>
- <target>Programmer l'action d'import dès que possible.</target>
- </trans-unit>
<trans-unit id="sdcimportconfirm.jsp.usedate">
<source>Schedule import action for no sooner than:</source>
<target>Programmer une action d'import pas avant :</target>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
index 32dfaf9..407a0a8 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
@@ -15590,10 +15590,6 @@ any of these revisions. Are you sure you want to do this?</source>
<source>You may schedule this import action to take place as soon as possible, or for no sooner than a specified time</source>
<target>તમે આ આયાત ક્રિયાને શક્ય એટલું જલદી કરવા માટે સુનિશ્ચિત કરશે, અથવા ચોક્કસ સમય કરતાં વહેલું નહિં એમ</target>
</trans-unit>
- <trans-unit id="sdcimportconfirm.jsp.now">
- <source>Schedule import action as soon as possible.</source>
- <target>શક્ય એટલી જલદી આયાત ક્રિયા સુનિશ્ચિત કરો.</target>
- </trans-unit>
<trans-unit id="sdcimportconfirm.jsp.usedate">
<source>Schedule import action for no sooner than:</source>
<target>આના કરતાં જલદી નહિં એવી આયાત ક્રિયા સુનિશ્ચિત કરો:</target>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
index 0744f54..df4964e 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
@@ -15590,10 +15590,6 @@ any of these revisions. Are you sure you want to do this?</source>
<source>You may schedule this import action to take place as soon as possible, or for no sooner than a specified time</source>
<target>अगर आप इस आयात क्रिया को यथासंभव जल्दी कर सकते हैं, या निर्दिष्ट समय से पहले नहीं:</target>
</trans-unit>
- <trans-unit id="sdcimportconfirm.jsp.now">
- <source>Schedule import action as soon as possible.</source>
- <target>नियोजित आयात क्रिया यथासंभव जल्दी.</target>
- </trans-unit>
<trans-unit id="sdcimportconfirm.jsp.usedate">
<source>Schedule import action for no sooner than:</source>
<target>इससे पहले आयात क्रिया अनुसूचित न करें:</target>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
index 84388f4..af117ba 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
@@ -17132,10 +17132,6 @@ Siete sicuri di voler fare questo?</target>
<source>You may schedule this import action to take place as soon as possible, or for no sooner than a specified time</source>
<target>Potrete programmare l'azione d'importazione in modo da verificarsi il prima possibile, oppure non prima di un determinato periodo</target>
</trans-unit>
- <trans-unit id="sdcimportconfirm.jsp.now">
- <source>Schedule import action as soon as possible.</source>
- <target>Programma importazione appena possibile.</target>
- </trans-unit>
<trans-unit id="sdcimportconfirm.jsp.usedate">
<source>Schedule import action for no sooner than:</source>
<target>Programma importazione non prima di:</target>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
index f5f3212..24790cc 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
@@ -17160,10 +17160,6 @@ any of these revisions. Are you sure you want to do this?</source>
<source>You may schedule this import action to take place as soon as possible, or for no sooner than a specified time</source>
<target>このインポート動作をできるだけ早く実施するようスケジュールするか、または指定時間以降に実施するようスケジュールすることができます</target>
</trans-unit>
- <trans-unit id="sdcimportconfirm.jsp.now">
- <source>Schedule import action as soon as possible.</source>
- <target>できるだけ早くインポート動作をスケジュール</target>
- </trans-unit>
<trans-unit id="sdcimportconfirm.jsp.usedate">
<source>Schedule import action for no sooner than:</source>
<target>指定時間以降にインポート動作をスケジュール:</target>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
index 1f6e82f..d05eff9 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
@@ -17149,10 +17149,6 @@ any of these revisions. Are you sure you want to do this?</source>
<source>You may schedule this import action to take place as soon as possible, or for no sooner than a specified time</source>
<target>가져오기 작업을 최대한 빨리 실행되도록 스케줄하거나, 또는 지정한 시간보다 빨리 실행되도록 스케줄하실 수 있습니다:</target>
</trans-unit>
- <trans-unit id="sdcimportconfirm.jsp.now">
- <source>Schedule import action as soon as possible.</source>
- <target>최대한 빨리 가져오기 작업을 스케줄하기</target>
- </trans-unit>
<trans-unit id="sdcimportconfirm.jsp.usedate">
<source>Schedule import action for no sooner than:</source>
<target>최대한 빨리 가져오기 작업을 스케줄:</target>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
index 2308eaf..3475405 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
@@ -15589,10 +15589,6 @@ any of these revisions. Are you sure you want to do this?</source>
<source>You may schedule this import action to take place as soon as possible, or for no sooner than a specified time</source>
<target>ਤੁਸੀਂ ਜਲਦੀ ਤੋਂ ਜਲਦੀ ਇਹ ਅਯਾਤ ਕਾਰਵਾਈ ਲਈ ਸਮਾਂ-ਤਹਿ ਸਕਦੇ ਹੋ, ਜਾਂ ਇੱਕ ਦਿੱਤੇ ਸਮੇਂ ਪਹਿਲਾਂ ਨਹੀਂ:</target>
</trans-unit>
- <trans-unit id="sdcimportconfirm.jsp.now">
- <source>Schedule import action as soon as possible.</source>
- <target>ਜਿੰਨਾ ਵੀ ਛੇਤੇ ਹੋਵੇ, ਅਯਾਤ ਕਾਰਵਾਈ ਲਈ ਸਮਾਂ-ਤਹਿ ਕਰੋ।</target>
- </trans-unit>
<trans-unit id="sdcimportconfirm.jsp.usedate">
<source>Schedule import action for no sooner than:</source>
<target>ਇਸ ਤੋਂ ਪਹਿਲਾਂ ਅਯਾਤ ਕਾਰਵਾਈ ਲਈ ਸਮਾਂ-ਤਹਿ ਨਾ ਕਰੋ:</target>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
index 9e9e887..0e91e49 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
@@ -17152,10 +17152,6 @@ para qualquer uma das revisões, assim como todo o histórico de implementação
<source>You may schedule this import action to take place as soon as possible, or for no sooner than a specified time</source>
<target>Você pode agendar esta ação de importação para ocorrer assim que possível ou depois de uma determinada hora:</target>
</trans-unit>
- <trans-unit id="sdcimportconfirm.jsp.now">
- <source>Schedule import action as soon as possible.</source>
- <target>Agendar ação de importação o mais rápido possível</target>
- </trans-unit>
<trans-unit id="sdcimportconfirm.jsp.usedate">
<source>Schedule import action for no sooner than:</source>
<target>Agendar ação de importação para depois de:</target>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
index 112f965..9a9720a 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
@@ -17140,10 +17140,6 @@ any of these revisions. Are you sure you want to do this?</source>
<source>You may schedule this import action to take place as soon as possible, or for no sooner than a specified time</source>
<target>Вы можете назначить выполнение импорта как можно раньше или не раньше определенного времени</target>
</trans-unit>
- <trans-unit id="sdcimportconfirm.jsp.now">
- <source>Schedule import action as soon as possible.</source>
- <target>Импорт как можно раньше</target>
- </trans-unit>
<trans-unit id="sdcimportconfirm.jsp.usedate">
<source>Schedule import action for no sooner than:</source>
<target>Импорт не ранее чем:</target>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
index b0e4d16..bfe168f 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
@@ -15590,10 +15590,6 @@ any of these revisions. Are you sure you want to do this?</source>
<source>You may schedule this import action to take place as soon as possible, or for no sooner than a specified time</source>
<target>இந்த ஏற்றும் செயலை செய்ய, சீக்கீரமாக அல்லது குறிப்பிட்ட நேரத்திற்குள் திட்டமிடவும்</target>
</trans-unit>
- <trans-unit id="sdcimportconfirm.jsp.now">
- <source>Schedule import action as soon as possible.</source>
- <target>இறக்கும் செயலை எவ்வளவு சீக்கிரம் முடியுமோ அவ்வளவுக்குள் திட்டமிடவும்.</target>
- </trans-unit>
<trans-unit id="sdcimportconfirm.jsp.usedate">
<source>Schedule import action for no sooner than:</source>
<target>இறக்கும் செயல்களை அவரசமாக திட்டமிட வேண்டாம்:</target>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
index 8a74ac4..ebee201 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
@@ -17153,10 +17153,6 @@ any of these revisions. Are you sure you want to do this?</source>
<source>You may schedule this import action to take place as soon as possible, or for no sooner than a specified time</source>
<target>您可以调度这个导入动作尽早开始，或者不早于一个特定的时间</target>
</trans-unit>
- <trans-unit id="sdcimportconfirm.jsp.now">
- <source>Schedule import action as soon as possible.</source>
- <target>尽快调度导入动作。</target>
- </trans-unit>
<trans-unit id="sdcimportconfirm.jsp.usedate">
<source>Schedule import action for no sooner than:</source>
<target>调度导入动作不早于：</target>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
index 974b8af..8883745 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
@@ -17155,10 +17155,6 @@ any of these revisions. Are you sure you want to do this?</source>
<source>You may schedule this import action to take place as soon as possible, or for no sooner than a specified time</source>
<target>您能夠為這個匯入的動作排程作業，讓它儘早發生，或不早於特定時間</target>
</trans-unit>
- <trans-unit id="sdcimportconfirm.jsp.now">
- <source>Schedule import action as soon as possible.</source>
- <target>儘早排程匯入動作。</target>
- </trans-unit>
<trans-unit id="sdcimportconfirm.jsp.usedate">
<source>Schedule import action for no sooner than:</source>
<target>將匯入動作排程不早於：</target>
commit 998af5b4b46853790ceffb63566cc7265d4a65e5
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Thu Feb 13 13:21:01 2014 +0100
Schedule action unification
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf
index 8404dd9..4fe640a 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf
@@ -40,26 +40,10 @@
<c:choose>
<c:when test="${requestScope.deployable}">
<p><bean:message key="deploy.jsp.widgetsummary" /></p>
- <table class="schedule-action-interface" align="center">
- <tr>
- <td><html:radio property="use_date" value="false" /></td>
- <th><bean:message key="deploy.jsp.now"/></th>
- </tr>
- <tr>
- <td><html:radio property="use_date" value="true" /></td>
- <th><bean:message key="deploy.jsp.usedate"/></th>
- </tr>
- <tr>
- <th>
- <rhn:icon type="header-schedule" title="deploy.jsp.selection" />
- </th>
- <td>
- <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
- <jsp:param name="widget" value="date"/>
- </jsp:include>
- </td>
- </tr>
- </table>
+ <jsp:include page="/WEB-INF/pages/common/fragments/datepicker-with-label.jsp">
+ <jsp:param name="widget" value="date" />
+ <jsp:param name="label_text" value="deploy.jsp.usedate" />
+ </jsp:include>
<hr />
<div class="text-right"><html:submit property="dispatch">
<bean:message key="deploy.jsp.deploybutton" />
commit 5ede90d826bb256b59bbecbdda1a772771e24ab1
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Thu Feb 13 13:08:00 2014 +0100
remove unused localization string
after 763db3824588e0b041c78c330825fbba764fec52
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
index 3eb8d42..cb9796a 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
@@ -13173,13 +13173,6 @@ You may grant provisioning entitlements _here_.
</context-group>
<target>স্থাপনার জন্য যথাশীঘ্র সময় নির্ধারণ করতে পারেন অথবা কোনো নির্ধারিত সময়ের পশ্চাৎ সঞ্চালনের উদ্দেশ্যে চিহ্নিত করতে পারেন</target>
</trans-unit>
- <trans-unit id="deploy.jsp.now">
- <source><strong>Schedule this file to be deployed as soon as possible</strong></source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/configuration/RevisionDeploy.do</context>
- </context-group>
- <target><strong>যথাশীঘ্র ফাইল স্থাপনার জন্য নির্ধারণ করুন</strong></target>
- </trans-unit>
<trans-unit id="deploy.jsp.usedate">
<source><strong>Schedule this file to be deployed no earlier than:</strong></source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
index 2274559..d4ac5f0 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
@@ -14725,13 +14725,6 @@ You may grant provisioning entitlements _here_.
</context-group>
<target>Sie können diesen Einsatz für sobald wie möglich planen, oder für nicht früher als zu einem bestimmten Zeitpunkt</target>
</trans-unit>
- <trans-unit id="deploy.jsp.now">
- <source><strong>Schedule this file to be deployed as soon as possible</strong></source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/configuration/RevisionDeploy.do</context>
- </context-group>
- <target><strong>Einsatz dieser Datei für sobald wie möglich planen</strong></target>
- </trans-unit>
<trans-unit id="deploy.jsp.usedate">
<source><strong>Schedule this file to be deployed no earlier than:</strong></source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index 3753d1e..8ff81ae 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -12832,12 +12832,6 @@ You may grant provisioning entitlements _here_.
<context context-type="sourcefile">/rhn/configuration/RevisionDeploy.do</context>
</context-group>
</trans-unit>
- <trans-unit id="deploy.jsp.now">
- <source><strong>Schedule this file to be deployed as soon as possible</strong></source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/configuration/RevisionDeploy.do</context>
- </context-group>
- </trans-unit>
<trans-unit id="deploy.jsp.usedate">
<source><strong>Schedule this file to be deployed no earlier than:</strong></source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
index b502f5e..a92d9d4 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
@@ -14723,13 +14723,6 @@ You may grant provisioning entitlements _here_.
</context-group>
<target>Puede programar esta implementación para que se ejecute tan pronto como sea posible o para que se ejecute no antes de un tiempo especificado.</target>
</trans-unit>
- <trans-unit id="deploy.jsp.now">
- <source><strong>Schedule this file to be deployed as soon as possible</strong></source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/configuration/RevisionDeploy.do</context>
- </context-group>
- <target><strong>Programar para que este archivo sea implementado tan pronto como sea posible</strong></target>
- </trans-unit>
<trans-unit id="deploy.jsp.usedate">
<source><strong>Schedule this file to be deployed no earlier than:</strong></source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
index adb9c80..1a20e5c 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
@@ -14725,13 +14725,6 @@ You may grant provisioning entitlements _here_.
</context-group>
<target>Vous pouvez programmer ce déploiement pour qu'il commence le plus tôt possible ou à partir d'une date spécifiée.</target>
</trans-unit>
- <trans-unit id="deploy.jsp.now">
- <source><strong>Schedule this file to be deployed as soon as possible</strong></source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/configuration/RevisionDeploy.do</context>
- </context-group>
- <target><strong>Programmer ce fichier pour qu'il soit déployé le plus tôt possible</strong></target>
- </trans-unit>
<trans-unit id="deploy.jsp.usedate">
<source><strong>Schedule this file to be deployed no earlier than:</strong></source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
index f0cb230..32dfaf9 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
@@ -13174,13 +13174,6 @@ You may grant provisioning entitlements _here_.
</context-group>
<target>તમે આ જમાવટને શક્ય એટલું જલદી, અથવા સ્પષ્ટ થયેલ સમય કરતાં વહેલું નહિં બને તે માટે સુનિશ્ચિત કરી શકશો</target>
</trans-unit>
- <trans-unit id="deploy.jsp.now">
- <source><strong>Schedule this file to be deployed as soon as possible</strong></source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/configuration/RevisionDeploy.do</context>
- </context-group>
- <target><strong>આ ફાઈલને શક્ય એટલી જલદી જમાવાઈ જાય તે માટે સુનિશ્ચિત કરો</strong></target>
- </trans-unit>
<trans-unit id="deploy.jsp.usedate">
<source><strong>Schedule this file to be deployed no earlier than:</strong></source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
index 03e482d..0744f54 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
@@ -13174,13 +13174,6 @@ You may grant provisioning entitlements _here_.
</context-group>
<target>आप इस तैनाती को यथासंभव जल्द नियोजित कर सकते हैं, या निर्दिष्ट समय से पहले नहीं</target>
</trans-unit>
- <trans-unit id="deploy.jsp.now">
- <source><strong>Schedule this file to be deployed as soon as possible</strong></source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/configuration/RevisionDeploy.do</context>
- </context-group>
- <target><strong>इस फाइल को जल्द से जल्द तैनात किया जाना चाहिए</strong></target>
- </trans-unit>
<trans-unit id="deploy.jsp.usedate">
<source><strong>Schedule this file to be deployed no earlier than:</strong></source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
index bbf7a57..84388f4 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
@@ -14706,13 +14706,6 @@ You may grant provisioning entitlements _here_.
</context-group>
<target>È possibile programmare il processo d'implementazione appena possibile, oppure non prima del periodo specificato</target>
</trans-unit>
- <trans-unit id="deploy.jsp.now">
- <source><strong>Schedule this file to be deployed as soon as possible</strong></source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/configuration/RevisionDeploy.do</context>
- </context-group>
- <target><strong>Programma l'implementazione di questo file il prima possibile</strong></target>
- </trans-unit>
<trans-unit id="deploy.jsp.usedate">
<source><strong>Schedule this file to be deployed no earlier than:</strong></source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
index d8ec822..f5f3212 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
@@ -14726,13 +14726,6 @@ You may grant provisioning entitlements _here_.
</context-group>
<target>この配備をできるだけ早く実施するようスケジュールするか、または指定時間以降に実施するようスケジュールすることができます</target>
</trans-unit>
- <trans-unit id="deploy.jsp.now">
- <source><strong>Schedule this file to be deployed as soon as possible</strong></source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/configuration/RevisionDeploy.do</context>
- </context-group>
- <target><strong>できるだけ早くこのファイルが配備されるようスケジュール</strong></target>
- </trans-unit>
<trans-unit id="deploy.jsp.usedate">
<source><strong>Schedule this file to be deployed no earlier than:</strong></source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
index 7c55805..1f6e82f 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
@@ -14716,13 +14716,6 @@ You may grant provisioning entitlements _here_.
</context-group>
<target><strong>확실히</strong> 이 작업을 수행하시고자 하신다면, 동기화 작업이 최대한 빨리 실행되도록 스케쥴하거나, 또는 지정한 시간보다 빨리 실행되도록 스케줄하실 수 있습니다:</target>
</trans-unit>
- <trans-unit id="deploy.jsp.now">
- <source><strong>Schedule this file to be deployed as soon as possible</strong></source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/configuration/RevisionDeploy.do</context>
- </context-group>
- <target><strong>최대한 빨리 파일이 배치되도록 스케줄함</strong></target>
- </trans-unit>
<trans-unit id="deploy.jsp.usedate">
<source><strong>Schedule this file to be deployed no earlier than:</strong></source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
index 7ee8711..2308eaf 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
@@ -13173,13 +13173,6 @@ You may grant provisioning entitlements _here_.
</context-group>
<target>ਤੁਸੀਂ ਛੇਤੀ ਤੋਂ ਛੇਤੀ ਸ਼ਾਮਿਲ ਕਾਰਵਾਈ ਤਹਿ ਕਰ ਸਕਦੇ ਹੋ ਜਾਂ ਇੱਕ ਦਿੱਤੇ ਸਮੇਂ ਪਹਿਲਾਂ ਨਹੀਂ:</target>
</trans-unit>
- <trans-unit id="deploy.jsp.now">
- <source><strong>Schedule this file to be deployed as soon as possible</strong></source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/configuration/RevisionDeploy.do</context>
- </context-group>
- <target><strong>ਜਿੰਨਾ ਵੀ ਛੇਤੇ ਹੋਵੇ ਇਹ ਫਾਇਲ ਸ਼ਾਮਿਲ ਕਰਨ ਲਈ ਤਹਿ ਕਰੋ</strong></target>
- </trans-unit>
<trans-unit id="deploy.jsp.usedate">
<source><strong>Schedule this file to be deployed no earlier than:</strong></source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
index d2c3be3..9e9e887 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
@@ -14719,13 +14719,6 @@ You may grant provisioning entitlements _here_.
</context-group>
<target>Você pode agendar esta implementação para iniciar assim que possível, ou para iniciar no tempo especificado.</target>
</trans-unit>
- <trans-unit id="deploy.jsp.now">
- <source><strong>Schedule this file to be deployed as soon as possible</strong></source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/configuration/RevisionDeploy.do</context>
- </context-group>
- <target><strong>Agendar este arquivo para ser implementado assim que possível</strong></target>
- </trans-unit>
<trans-unit id="deploy.jsp.usedate">
<source><strong>Schedule this file to be deployed no earlier than:</strong></source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
index 834b446..112f965 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
@@ -14707,13 +14707,6 @@ You may grant provisioning entitlements _here_.
</context-group>
<target>Вы можете назначить развертывание как можно раньше или не раньше определенного момента</target>
</trans-unit>
- <trans-unit id="deploy.jsp.now">
- <source><strong>Schedule this file to be deployed as soon as possible</strong></source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/configuration/RevisionDeploy.do</context>
- </context-group>
- <target><strong>Назначить применение этого файла как можно раньше</strong></target>
- </trans-unit>
<trans-unit id="deploy.jsp.usedate">
<source><strong>Schedule this file to be deployed no earlier than:</strong></source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
index d27ca54..b0e4d16 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
@@ -13174,13 +13174,6 @@ You may grant provisioning entitlements _here_.
</context-group>
<target>நீங்கள் இந்த வரிசைப்படுத்தலை செய்ய, சீக்கீரமாக அல்லது குறிப்பிட்ட நேரத்திற்குள் திட்டமிடலாம்</target>
</trans-unit>
- <trans-unit id="deploy.jsp.now">
- <source><strong>Schedule this file to be deployed as soon as possible</strong></source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/configuration/RevisionDeploy.do</context>
- </context-group>
- <target><strong>வரிசைப்படுத்த எவ்வளவு சீக்கிரம் முடியுமோ அவ்வளவுக்குள் திட்டமிடவும்</strong></target>
- </trans-unit>
<trans-unit id="deploy.jsp.usedate">
<source><strong>Schedule this file to be deployed no earlier than:</strong></source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
index 4d9d166..8a74ac4 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
@@ -14719,13 +14719,6 @@ You may grant provisioning entitlements _here_.
</context-group>
<target>您可以马上或不早于一个特定的时间调度这个部署：</target>
</trans-unit>
- <trans-unit id="deploy.jsp.now">
- <source><strong>Schedule this file to be deployed as soon as possible</strong></source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/configuration/RevisionDeploy.do</context>
- </context-group>
- <target><strong>尽快调度这个文件的部署</strong></target>
- </trans-unit>
<trans-unit id="deploy.jsp.usedate">
<source><strong>Schedule this file to be deployed no earlier than:</strong></source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
index 359a725..974b8af 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
@@ -14721,13 +14721,6 @@ You may grant provisioning entitlements _here_.
</context-group>
<target>您可以排程此建置作業，讓它儘早發生，或不早於特定時間</target>
</trans-unit>
- <trans-unit id="deploy.jsp.now">
- <source><strong>Schedule this file to be deployed as soon as possible</strong></source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/configuration/RevisionDeploy.do</context>
- </context-group>
- <target><strong>儘快排程此檔案的建置動作</strong></target>
- </trans-unit>
<trans-unit id="deploy.jsp.usedate">
<source><strong>Schedule this file to be deployed no earlier than:</strong></source>
<context-group name="ctx">
commit 6912ed821d53d25790cc55d4c7d3243bde4c9fb8
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Thu Feb 13 13:04:12 2014 +0100
remove unused localization string
after
c2fe9eeb51514488e45c018bdfc83645d1dd635f
af1e8548d79cdffbc13027661233631952dce151
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
index ae13b28..3eb8d42 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
@@ -14957,10 +14957,6 @@ any of these revisions. Are you sure you want to do this?</source>
<source>You may schedule configuration file deploy actions to occur for the time below. <br/> <strong>Note: The time below represents the earliest time the action could occur</strong>.</source>
<target>নিম্নলিখিত সময়ের জন্য কনফিগারেশন ফাইল স্থাপনা কর্ম নির্ধারণ করা যাবে। <br/> <strong>উল্লেখ্য: নিম্নলিখিত সময় দ্বারা শীঘ্রতম সময় নির্দিষ্ট করা হয়</strong>।</target>
</trans-unit>
- <trans-unit id="deployconfirm.jsp.now">
- <source>Schedule configuration file deploys as soon as possible.</source>
- <target>যথাশীঘ্র কনফিগারেশন ফাইল স্থাপনা নির্ধারণ করা হবে।</target>
- </trans-unit>
<trans-unit id="deployconfirm.jsp.usedate">
<source>Schedule configuration file deploys for no sooner than:</source>
<target>উল্লিখিত সময়ের পরে ফাইল স্থাপনা কর্ম নির্ধারণ করুন:</target>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
index cccd641..2274559 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
@@ -16527,10 +16527,6 @@ dieser Revisionen. Möchten Sie dies wirklich tun?</target>
<source>You may schedule configuration file deploy actions to occur for the time below. <br/> <strong>Note: The time below represents the earliest time the action could occur</strong>.</source>
<target>Sie können Einsatzaktionen für die Konfigurationsdatei für den unten aufgeführten Zeitpunkt planen. <br/> <strong>Anmerkung: Der unten aufgeführte Zeitpunkt repräsentiert den nächstmöglichen Zeitpunkt für den Einsatz</strong>.</target>
</trans-unit>
- <trans-unit id="deployconfirm.jsp.now">
- <source>Schedule configuration file deploys as soon as possible.</source>
- <target>Einsätze der Konfigurationsdatei für sobald wie möglich planen.</target>
- </trans-unit>
<trans-unit id="deployconfirm.jsp.usedate">
<source>Schedule configuration file deploys for no sooner than:</source>
<target>Einsätze der Konfigurationsdatei planen für nicht früher als:</target>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index 1a453b2..3753d1e 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -14329,9 +14329,6 @@ any of these revisions. Are you sure you want to do this?</source>
<trans-unit id="deployconfirm.jsp.widgetsummary">
<source>You may schedule configuration file deploy actions to occur for the time below. <br/> <strong>Note: The time below represents the earliest time the action could occur</strong>.</source>
</trans-unit>
- <trans-unit id="deployconfirm.jsp.now">
- <source>Schedule configuration file deploys as soon as possible.</source>
- </trans-unit>
<trans-unit id="deployconfirm.jsp.usedate">
<source>Schedule configuration file deploys for no sooner than:</source>
</trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
index 3156157..b502f5e 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
@@ -16526,10 +16526,6 @@ concerniente con esas revisiones. ¿Está seguro que es ésto lo que desea hacer
<source>You may schedule configuration file deploy actions to occur for the time below. <br/> <strong>Note: The time below represents the earliest time the action could occur</strong>.</source>
<target>Puede programar una acción de implementación del archivo de configuración para la fecha y hora dada a continuación. <br/> <strong>Nota: la acción no ocurrirá antes de la fecha dada</strong>.</target>
</trans-unit>
- <trans-unit id="deployconfirm.jsp.now">
- <source>Schedule configuration file deploys as soon as possible.</source>
- <target>Programar implementaciones de archivos de configuración tan pronto como sea posible.</target>
- </trans-unit>
<trans-unit id="deployconfirm.jsp.usedate">
<source>Schedule configuration file deploys for no sooner than:</source>
<target>Programar implementaciones de archivos de configuración no antes de:</target>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
index c86a7b5..adb9c80 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
@@ -16526,10 +16526,6 @@ pour ces versions seront également supprimées, ainsi que tous les historiques
<source>You may schedule configuration file deploy actions to occur for the time below. <br/> <strong>Note: The time below represents the earliest time the action could occur</strong>.</source>
<target>Vous pouvez programmer les actions de déploiement des fichiers de configuration à la date et à l'heure indiquées ci-dessous. <br/> <strong>Remarque : l'action ne peut pas se produire avant la date et l'heure indiquées</strong>.</target>
</trans-unit>
- <trans-unit id="deployconfirm.jsp.now">
- <source>Schedule configuration file deploys as soon as possible.</source>
- <target>Programmer les déploiements de fichiers de configuration dès que possible.</target>
- </trans-unit>
<trans-unit id="deployconfirm.jsp.usedate">
<source>Schedule configuration file deploys for no sooner than:</source>
<target>Programmer les déploiements de fichiers de configuration pas avant :</target>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
index d9c2cc6..f0cb230 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
@@ -14958,10 +14958,6 @@ any of these revisions. Are you sure you want to do this?</source>
<source>You may schedule configuration file deploy actions to occur for the time below. <br/> <strong>Note: The time below represents the earliest time the action could occur</strong>.</source>
<target>તમે નીચેના સમય માટે રૂપરેખાંકન ફાઈલ જમાવટ ક્રિયા સુનિશ્ચિત કરી શકશો. <br/> <strong>નોંધ: નીચેનો સમય ક્રિયા થવા માટેનો વહેલો સમય રજૂ કરે છે</strong>.</target>
</trans-unit>
- <trans-unit id="deployconfirm.jsp.now">
- <source>Schedule configuration file deploys as soon as possible.</source>
- <target>રૂપરેખાંકન ફાઈલ જમાવટ શક્ય એટલી જલદી સુનિશ્ચિત કરો.</target>
- </trans-unit>
<trans-unit id="deployconfirm.jsp.usedate">
<source>Schedule configuration file deploys for no sooner than:</source>
<target>રૂપરેખાંકન ફાઈલ જમાવટો આનાં કરતાં જલદી નહિં હોય એમ સુનિશ્ચિત કરો:</target>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
index 4943faa..03e482d 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
@@ -14958,10 +14958,6 @@ any of these revisions. Are you sure you want to do this?</source>
<source>You may schedule configuration file deploy actions to occur for the time below. <br/> <strong>Note: The time below represents the earliest time the action could occur</strong>.</source>
<target>आप विन्यास फाइल तैनाती क्रिया के लिए नियोजित कर सकते हैं नीचे दिए समय में होने के लिए. <br/> <strong>नोट: नीचे दिया समय सबसे पहले का समय प्रतिरूपित करता है जिसमें क्रिया होनी सकता था</strong>.</target>
</trans-unit>
- <trans-unit id="deployconfirm.jsp.now">
- <source>Schedule configuration file deploys as soon as possible.</source>
- <target>यथासंभव जल्द नियोजित विन्यास फाइल तैनात करें.</target>
- </trans-unit>
<trans-unit id="deployconfirm.jsp.usedate">
<source>Schedule configuration file deploys for no sooner than:</source>
<target>विन्यास फाइल तैनाती को इससे पहले नियोजित करें:</target>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
index 0dd09b7..bbf7a57 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
@@ -16500,10 +16500,6 @@ Siete sicuri di voler fare questo?</target>
<source>You may schedule configuration file deploy actions to occur for the time below. <br/> <strong>Note: The time below represents the earliest time the action could occur</strong>.</source>
<target>Potete programmare l'implementazione dei file di configurazione durante il periodo sotto riportato. <br/> <strong>Nota Bene: L'ora riportata qui di seguito rappresenta l'orario più prossimo entro il quale tale azione può essere eseguita</strong>.</target>
</trans-unit>
- <trans-unit id="deployconfirm.jsp.now">
- <source>Schedule configuration file deploys as soon as possible.</source>
- <target>Programma implementazione del file di configurazione il prima possibile.</target>
- </trans-unit>
<trans-unit id="deployconfirm.jsp.usedate">
<source>Schedule configuration file deploys for no sooner than:</source>
<target>Programma implementazione del file di configurazione non prima di:</target>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
index f0494f4..d8ec822 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
@@ -16528,10 +16528,6 @@ any of these revisions. Are you sure you want to do this?</source>
<source>You may schedule configuration file deploy actions to occur for the time below. <br/> <strong>Note: The time below represents the earliest time the action could occur</strong>.</source>
<target>以下の時間で設定ファイル配備の動作を実行するようスケジュールすることができます。<br/> <strong> 注記: 以下の時間が動作を実行できる最も早い時間になります。</strong></target>
</trans-unit>
- <trans-unit id="deployconfirm.jsp.now">
- <source>Schedule configuration file deploys as soon as possible.</source>
- <target>できるだけ早く設定ファイルの配備をスケジュールします。</target>
- </trans-unit>
<trans-unit id="deployconfirm.jsp.usedate">
<source>Schedule configuration file deploys for no sooner than:</source>
<target>指定時間以降に設定ファイルの配備をスケジュール:</target>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
index 231fcaf..7c55805 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
@@ -16517,10 +16517,6 @@ any of these revisions. Are you sure you want to do this?</source>
<source>You may schedule configuration file deploy actions to occur for the time below. <br/> <strong>Note: The time below represents the earliest time the action could occur</strong>.</source>
<target>아래에 있는 시간에 따라 설정 파일 배치 작업을 스케줄하실 수 있습니다. <br/> <strong>알림: 아래의 시간은 작업을 실행할 수 있는 가장 빠른 시간입니다</strong>.</target>
</trans-unit>
- <trans-unit id="deployconfirm.jsp.now">
- <source>Schedule configuration file deploys as soon as possible.</source>
- <target>가능한 빨리 설정 파일 배치 작업을 스케줄하기.</target>
- </trans-unit>
<trans-unit id="deployconfirm.jsp.usedate">
<source>Schedule configuration file deploys for no sooner than:</source>
<target>최대한 빨리 설정 파일 배치 작업을 스케줄:</target>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
index 7434a89..7ee8711 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
@@ -14957,10 +14957,6 @@ any of these revisions. Are you sure you want to do this?</source>
<source>You may schedule configuration file deploy actions to occur for the time below. <br/> <strong>Note: The time below represents the earliest time the action could occur</strong>.</source>
<target>ਤੁਸੀਂ ਹੇਠਲੇ ਸਮੇਂ ਤੇ ਸੰਰਚਨਾ ਫਾਇਲ ਸ਼ਾਮਿਲ ਕਾਰਵਾਈ ਲਈ ਸਮਾਂ-ਤਹਿ ਕਰ ਸਕਦੇ ਹੋ। <br/> <strong>ਸੂਚਨਾ: ਹੇਠਲਾ ਸਮਾਂ ਦੱਸਦਾ ਹੈ ਕਿ ਇਸ ਤੋਂ ਪਹਿਲਾਂ ਕਾਰਵਾਈ ਹੋਵੇਗੀ</strong>।</target>
</trans-unit>
- <trans-unit id="deployconfirm.jsp.now">
- <source>Schedule configuration file deploys as soon as possible.</source>
- <target>ਜਿੰਨਾ ਵੀ ਛੇਤੇ ਹੋਵੇ, ਸੰਰਚਨਾ ਫਾਇਲ ਸ਼ਾਮਿਲ ਕਰਨ ਲਈ ਸਮਾਂ-ਤਹਿ ਕਰੋ।</target>
- </trans-unit>
<trans-unit id="deployconfirm.jsp.usedate">
<source>Schedule configuration file deploys for no sooner than:</source>
<target>ਇਸ ਤੋਂ ਪਹਿਲਾਂ ਸੰਰਚਨਾ ਫਾਇਲ ਸ਼ਾਮਿਲ ਕਰਨ ਲਈ ਸਮਾਂ-ਤਹਿ ਨਾ ਕਰੋ:</target>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
index 68afda6..d2c3be3 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
@@ -16520,10 +16520,6 @@ para qualquer uma das revisões, assim como todo o histórico de implementação
<source>You may schedule configuration file deploy actions to occur for the time below. <br/> <strong>Note: The time below represents the earliest time the action could occur</strong>.</source>
<target>Você pode agendar as ações de implementações dos arquivos de configuração para acontecer no horário abaixo. <br/> <strong>Nota: O horário abaixo representa o horário mais recente que a ação pode acontecer</strong>.</target>
</trans-unit>
- <trans-unit id="deployconfirm.jsp.now">
- <source>Schedule configuration file deploys as soon as possible.</source>
- <target>Agendar implementações de arquivo de configuração assim que possível.</target>
- </trans-unit>
<trans-unit id="deployconfirm.jsp.usedate">
<source>Schedule configuration file deploys for no sooner than:</source>
<target>Agendar implementações de arquivo de configuração assim que possível.</target>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
index 041f087..834b446 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
@@ -16508,10 +16508,6 @@ any of these revisions. Are you sure you want to do this?</source>
<source>You may schedule configuration file deploy actions to occur for the time below. <br/> <strong>Note: The time below represents the earliest time the action could occur</strong>.</source>
<target>Ниже вы можете назначить время развертывания файлов.<br/> <strong>Примечание. Указанное значение определяет наиболее ранее время исполнения.</strong></target>
</trans-unit>
- <trans-unit id="deployconfirm.jsp.now">
- <source>Schedule configuration file deploys as soon as possible.</source>
- <target>Назначить применение файла конфигурации как можно раньше.</target>
- </trans-unit>
<trans-unit id="deployconfirm.jsp.usedate">
<source>Schedule configuration file deploys for no sooner than:</source>
<target>Назначить развертывание файла конфигурации не ранее:</target>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
index 3bcc175..d27ca54 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
@@ -14958,10 +14958,6 @@ any of these revisions. Are you sure you want to do this?</source>
<source>You may schedule configuration file deploy actions to occur for the time below. <br/> <strong>Note: The time below represents the earliest time the action could occur</strong>.</source>
<target>நீங்கள் கட்டமைப்பு கோப்பு வரிசைப்படுத்தல் செயல்களை கீழே நேரத்திற்குள் திட்டமிடலாம். <br/> <strong>குறிப்பு: கீழே குறிப்பிடப்பட்ட நேரத்திற்குள் செயல் நிகழலாம்</strong>.</target>
</trans-unit>
- <trans-unit id="deployconfirm.jsp.now">
- <source>Schedule configuration file deploys as soon as possible.</source>
- <target>கட்டமைப்பு கோப்பு வரிசைப்படுத்தலை எவ்வளவு சீக்கிரம் முடியுமோ அவ்வளவுக்குள் திட்டமிடவும்</target>
- </trans-unit>
<trans-unit id="deployconfirm.jsp.usedate">
<source>Schedule configuration file deploys for no sooner than:</source>
<target>கட்டமைப்பு கோப்பு வரிசைப்படுத்தலை அவரசமாக திட்டமிட வேண்டாம்:</target>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
index 3ba18ca..4d9d166 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
@@ -16521,10 +16521,6 @@ any of these revisions. Are you sure you want to do this?</source>
<source>You may schedule configuration file deploy actions to occur for the time below. <br/> <strong>Note: The time below represents the earliest time the action could occur</strong>.</source>
<target>您可以根据下面的时间调度配置文件部署动作的发生。<br/> <strong>注意：下面的时间代表了该动作最早可以执行的时间</strong>。</target>
</trans-unit>
- <trans-unit id="deployconfirm.jsp.now">
- <source>Schedule configuration file deploys as soon as possible.</source>
- <target>尽快调度配置文件的部署</target>
- </trans-unit>
<trans-unit id="deployconfirm.jsp.usedate">
<source>Schedule configuration file deploys for no sooner than:</source>
<target>调度配置文件部署不早于：</target>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
index 209b3ff..359a725 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
@@ -16523,10 +16523,6 @@ any of these revisions. Are you sure you want to do this?</source>
<source>You may schedule configuration file deploy actions to occur for the time below. <br/> <strong>Note: The time below represents the earliest time the action could occur</strong>.</source>
<target>您能夠將配置檔案的建置動作排程在下列的時間中。<br/> <strong>請注意：下列顯示的時間代表此動作能發生的最早時間</strong>。</target>
</trans-unit>
- <trans-unit id="deployconfirm.jsp.now">
- <source>Schedule configuration file deploys as soon as possible.</source>
- <target>儘快排程配置檔案的建置動作。</target>
- </trans-unit>
<trans-unit id="deployconfirm.jsp.usedate">
<source>Schedule configuration file deploys for no sooner than:</source>
<target>將配置檔案的建置動作排程在不早於：</target>
commit cf9a6fedd52c6b12eff06925bdc675f15b70e072
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Thu Feb 13 11:30:21 2014 +0100
Schedule action unification
diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata-confirm.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata-confirm.jsp
index 9fc24f7..30d5caf 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata-confirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata-confirm.jsp
@@ -18,16 +18,10 @@
<c:set var="notSelectable" value="True" />
<%@ include file="/WEB-INF/pages/ssm/systems/errata-list-fragment.jspf" %>
- <table class="details" align="center">
- <tr>
- <th><label for="radio_use_date_now"><bean:message key="scheduleremote.jsp.nosoonerthan" /></label></th>
- <td>
- <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
- <jsp:param name="widget" value="date" />
- </jsp:include>
- </td>
- </tr>
- </table>
+ <jsp:include page="/WEB-INF/pages/common/fragments/datepicker-with-label.jsp">
+ <jsp:param name="widget" value="date" />
+ <jsp:param name="label_text" value="scheduleremote.jsp.nosoonerthan" />
+ </jsp:include>
<div class="text-right">
<hr />
<html:submit property="dispatch">
commit 7d91026c4c16f26da5baed8ed635260deaca9b67
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Thu Feb 13 09:56:16 2014 +0100
Schedule action unification
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf
index 7728e0f..88e3b03 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf
@@ -17,16 +17,9 @@
</c:otherwise>
</c:choose>
- <table width="50%">
- <tr>
- <td><input type="radio" name="scheduleAsap" value="true" id="scheduleAsap" ${byAsap} /><bean:message key="kickstart.schedule.heading3.option1.jsp" /></td>
- </tr>
- <tr>
- <td><input type="radio" name="scheduleAsap" value="false" id="scheduleDate" ${byDate} /><bean:message key="kickstart.schedule.heading3.option2.jsp" /><br /><br />
- <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
- <jsp:param name="widget" value="date"/>
- </jsp:include>
- </td>
- </tr>
- </table>
- <hr />
\ No newline at end of file
+ <jsp:include page="/WEB-INF/pages/common/fragments/datepicker-with-label.jsp">
+ <jsp:param name="widget" value="date" />
+ <jsp:param name="label_text" value="kickstart.schedule.heading3.option2.jsp" />
+ </jsp:include>
+ <input type="hidden" name="scheduleAsap" value="false" />
+ <hr />
commit 5b665153ef3134dfe01d250d67cccc9b4af08e2e
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Thu Feb 13 10:19:24 2014 +0100
Schedule action unification
diff --git a/java/code/webapp/WEB-INF/pages/systems/system-remote-command.jsp b/java/code/webapp/WEB-INF/pages/systems/system-remote-command.jsp
index 071f5fd..7143a0b 100644
--- a/java/code/webapp/WEB-INF/pages/systems/system-remote-command.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/system-remote-command.jsp
@@ -66,16 +66,10 @@
rows="8" wrap="off" style="width: 100%;">${formData.scriptBody}</textarea>
</div>
</div>
- <div class="form-group">
- <label class="col-lg-3 control-label" for="fLblInput">
- <bean:message key="ssm.operations.provisioning.remotecommand.form.date.label"/>:
- </label>
- <div class="col-lg-6">
- <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
- <jsp:param name="widget" value="date"/>
- </jsp:include>
- </div>
- </div>
+ <jsp:include page="/WEB-INF/pages/common/fragments/datepicker-with-label.jsp">
+ <jsp:param name="widget" value="date" />
+ <jsp:param name="label_text" value="ssm.operations.provisioning.remotecommand.form.date.label" />
+ </jsp:include>
<div class="form-group">
<div class="col-lg-offset-3 col-lg-6">
<button type="submit" name="schedule" class="btn btn-success"
commit 2842f9025296d9b6fd89318e28ff27fc214a4da1
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Thu Feb 13 09:48:08 2014 +0100
Schedule action unification
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp
index 6ff8b16..50e58dc 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp
@@ -42,25 +42,10 @@
</rl:list>
<p><bean:message key="schedulesync.jsp.disclaimer" /></p>
- <table class="schedule-action-interface" align="center">
- <tr>
- <td><input type="radio" name="use_date" value="false" checked="checked" /></td>
- <th><bean:message key="confirm.jsp.now"/></th>
- </tr>
- <tr>
- <td><input type="radio" name="use_date" value="true"/></td>
- <th><bean:message key="confirm.jsp.than"/></th>
- </tr>
- <tr>
- <th><rhn:icon type="header-schedule" title="confirm.jsp.selection" />
- </th>
- <td>
- <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
- <jsp:param name="widget" value="date"/>
- </jsp:include>
- </td>
- </tr>
- </table>
+ <jsp:include page="/WEB-INF/pages/common/fragments/datepicker-with-label.jsp">
+ <jsp:param name="widget" value="date" />
+ <jsp:param name="label_text" value="confirm.jsp.than" />
+ </jsp:include>
<rhn:require acl="system_feature(ftr_delta_action)"
mixins="com.redhat.rhn.common.security.acl.SystemAclHandler">
commit 717d3a3424c8703717f2f49675a840f2ef4b3c26
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Thu Feb 13 09:44:16 2014 +0100
Schedule action unification
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncprofile.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncprofile.jsp
index 56a1bdd..8697dd6 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncprofile.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncprofile.jsp
@@ -41,25 +41,10 @@
</rl:list>
<p><bean:message key="schedulesync.jsp.disclaimer" /></p>
- <table class="schedule-action-interface" align="center">
- <tr>
- <td><input type="radio" name="use_date" value="false" checked="checked" /></td>
- <th><bean:message key="confirm.jsp.now"/></th>
- </tr>
- <tr>
- <td><input type="radio" name="use_date" value="true"/></td>
- <th><bean:message key="confirm.jsp.than"/></th>
- </tr>
- <tr>
- <th><rhn:icon type="header-schedule" title="confirm.jsp.selection" />
- </th>
- <td>
- <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
- <jsp:param name="widget" value="date"/>
- </jsp:include>
- </td>
- </tr>
- </table>
+ <jsp:include page="/WEB-INF/pages/common/fragments/datepicker-with-label.jsp">
+ <jsp:param name="widget" value="date" />
+ <jsp:param name="label_text" value="confirm.jsp.than" />
+ </jsp:include>
<html:hidden property="sid" value="${param.sid}" />
<html:hidden property="prid" value="${param.prid}" />
commit af1e8548d79cdffbc13027661233631952dce151
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Thu Feb 13 09:42:20 2014 +0100
Schedule action unification
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp
index acf28db..6d91b9e 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp
@@ -31,26 +31,10 @@
<c:if test="${not empty requestScope.pageList}">
<p><bean:message key="deployconfirm.jsp.widgetsummary" /></p>
- <table class="schedule-action-interface" align="center">
- <tr>
- <td><html:radio property="use_date" value="false" /></td>
- <th><bean:message key="deployconfirm.jsp.now"/></th>
- </tr>
- <tr>
- <td><html:radio property="use_date" value="true" /></td>
- <th><bean:message key="deployconfirm.jsp.usedate"/></th>
- </tr>
- <tr>
- <th><rhn:icon type="header-schedule" title="syncprofile.jsp.selection" />
- </th>
- <td>
- <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
- <jsp:param name="widget" value="date"/>
- </jsp:include>
- </td>
- </tr>
- </table>
-
+ <jsp:include page="/WEB-INF/pages/common/fragments/datepicker-with-label.jsp">
+ <jsp:param name="widget" value="date" />
+ <jsp:param name="label_text" value="deployconfirm.jsp.usedate" />
+ </jsp:include>
<div class="text-right">
<hr />
<html:submit property="dispatch">
commit c1c91bcf32ebc13bb37ac350abad18dda5e142c2
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Thu Feb 13 09:40:22 2014 +0100
Schedule action unification
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp
index 50b466f..c7d9c2b 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp
@@ -60,26 +60,10 @@
<c:if test="${not empty requestScope.pageList}">
<p><bean:message key="sdcimportconfirm.jsp.widgetsummary" /></p>
- <table class="schedule-action-interface" align="center">
- <tr>
- <td><html:radio property="use_date" value="false" /></td>
- <th><bean:message key="sdcimportconfirm.jsp.now"/></th>
- </tr>
- <tr>
- <td><html:radio property="use_date" value="true" /></td>
- <th><bean:message key="sdcimportconfirm.jsp.usedate"/></th>
- </tr>
- <tr>
- <th><rhn:icon type="header-schedule" title="syncprofile.jsp.selection" />
- </th>
- <td>
- <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
- <jsp:param name="widget" value="date"/>
- </jsp:include>
- </td>
- </tr>
- </table>
-
+ <jsp:include page="/WEB-INF/pages/common/fragments/datepicker-with-label.jsp">
+ <jsp:param name="widget" value="date" />
+ <jsp:param name="label_text" value="sdcimportconfirm.jsp.usedate" />
+ </jsp:include>
<div class="text-right">
<hr />
<html:submit property="dispatch">
commit 763db3824588e0b041c78c330825fbba764fec52
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Thu Feb 13 09:37:02 2014 +0100
Schedule action unification
diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp
index d2bcaf3..c9d5e45 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp
@@ -35,23 +35,10 @@
<c:if test="${not empty requestScope.pageList}">
<div>
<bean:message key="deploy.jsp.widgetsummary" /></p>
- <table class="schedule-action-interface" align="center">
- <tr>
- <td><html:radio property="use_date" value="false" /></td>
- <th><bean:message key="deploy.jsp.now" /></th>
- </tr>
- <tr>
- <td><html:radio property="use_date" value="true" /></td>
- <th><bean:message key="deploy.jsp.usedate" /></th>
- </tr>
- <tr>
- <th><rhn:icon type="header-schedule" title="deploy.jsp.selection" /></th>
- <td><jsp:include
- page="/WEB-INF/pages/common/fragments/date-picker.jsp" flush="">
- <jsp:param name="widget" value="date" />
- </jsp:include></td>
- </tr>
- </table>
+ <jsp:include page="/WEB-INF/pages/common/fragments/datepicker-with-label.jsp">
+ <jsp:param name="widget" value="date" />
+ <jsp:param name="label_text" value="deploy.jsp.usedate" />
+ </jsp:include>
</div>
<hr />
<div class="text-right">
commit c2fe9eeb51514488e45c018bdfc83645d1dd635f
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Thu Feb 13 09:34:46 2014 +0100
Schedule action unification
diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp
index 08b3c92..e49f73a 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp
@@ -71,25 +71,10 @@
<c:if test="${not empty requestScope.selectedSystems && not empty requestScope.selectedFiles}">
<!-- Date picker -->
<p><bean:message key="deployconfirm.jsp.widgetsummary" /></p>
- <table class="schedule-action-interface" align="center">
- <tr>
- <td><input type="radio" name="use_date" checked="checked" value="false" /></td>
- <th><bean:message key="deployconfirm.jsp.now"/></th>
- </tr>
- <tr>
- <td><input type="radio" name="use_date" value="true" /></td>
- <th><bean:message key="deployconfirm.jsp.usedate"/></th>
- </tr>
- <tr>
- <th><rhn:icon type="header-schedule" title="syncprofile.jsp.selection" />
- </th>
- <td>
- <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
- <jsp:param name="widget" value="date"/>
- </jsp:include>
- </td>
- </tr>
- </table>
+ <jsp:include page="/WEB-INF/pages/common/fragments/datepicker-with-label.jsp">
+ <jsp:param name="widget" value="date" />
+ <jsp:param name="label_text" value="deployconfirm.jsp.usedate" />
+ </jsp:include>
<!-- DoIt Button -->
<div class="text-right">
<html:submit property="dispatch">
commit 092babe835d1f9c51bb6df0802f6c393f04ee8aa
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Thu Feb 13 09:27:30 2014 +0100
Schedule action unification
diff --git a/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp b/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp
index 2f24151..e024c14 100644
--- a/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp
@@ -35,16 +35,10 @@
</span>
</div>
</div>
- <div class="form-group">
- <label class="col-md-3 control-label">
- <bean:message key="schedule.jsp.at" />
- </label>
- <div class="col-md-6">
- <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
- <jsp:param name="widget" value="date" />
- </jsp:include>
- </div>
- </div>
+ <jsp:include page="/WEB-INF/pages/common/fragments/datepicker-with-label.jsp">
+ <jsp:param name="widget" value="date" />
+ <jsp:param name="label_text" value="schedule.jsp.at" />
+ </jsp:include>
<div class="form-group">
<div class="col-md-offset-3 col-md-6">
<html:submit property="dispatch">
commit af1b66fb48171dc58cf8f76b6d6790730d603ac7
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Wed Feb 12 18:48:08 2014 +0100
Schedule action unification
diff --git a/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp
index 81b89f7..652c5a4 100644
--- a/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp
@@ -40,16 +40,10 @@
<rl:column headerkey="erratalist.jsp.updated">${current.updateDate}</rl:column>
</rl:list>
<div class="form-horizontal">
- <div class="form-group">
- <label class="col-md-3 control-label">
- <bean:message key="schedule.jsp.at" />
- </label>
- <div class="col-md-6">
- <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
- <jsp:param name="widget" value="date" />
- </jsp:include>
- </div>
- </div>
+ <jsp:include page="/WEB-INF/pages/common/fragments/datepicker-with-label.jsp">
+ <jsp:param name="widget" value="date" />
+ <jsp:param name="label_text" value="schedule.jsp.at" />
+ </jsp:include>
<div class="form-group">
<div class="col-md-offset-3 col-md-6">
<html:submit property="dispatch">
@@ -58,6 +52,7 @@
</div>
</div>
</div>
+
<html:hidden property="sid" value="${param.sid}" />
<input type="hidden" name="use_date" value="true">
</rl:listset>
commit b7f023ff07b9944f9c34022a98768cafb317df70
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Mon Feb 10 15:55:26 2014 +0100
Separate datepicker and its label
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/datepicker-with-label.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/datepicker-with-label.jsp
new file mode 100644
index 0000000..fb95126
--- /dev/null
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/datepicker-with-label.jsp
@@ -0,0 +1,9 @@
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<div class="form-group">
+ <label class="col-lg-3 control-label"><bean:message key="${param.label_text}" /></label>
+ <div class="col-lg-6">
+ <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
+ <jsp:param name="widget" value="${param.widget}" />
+ </jsp:include>
+ </div>
+</div>
commit ceb8dc1c5013640b9482e821d7c1f8089bcb1b17
Author: Stephen Herr <sherr(a)redhat.com>
Date: Wed Feb 12 18:51:01 2014 -0500
Automatic commit of package [spacewalk-search] release [2.1.14-1].
diff --git a/rel-eng/packages/spacewalk-search b/rel-eng/packages/spacewalk-search
index 4f879c8..62b3f65 100644
--- a/rel-eng/packages/spacewalk-search
+++ b/rel-eng/packages/spacewalk-search
@@ -1 +1 @@
-2.1.13-1 search-server/spacewalk-search/
+2.1.14-1 search-server/spacewalk-search/
diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec
index b71fc48..256c65a 100644
--- a/search-server/spacewalk-search/spacewalk-search.spec
+++ b/search-server/spacewalk-search/spacewalk-search.spec
@@ -4,7 +4,7 @@ Name: spacewalk-search
Summary: Spacewalk Full Text Search Server
Group: Applications/Internet
License: GPLv2
-Version: 2.1.13
+Version: 2.1.14
Release: 1%{?dist}
# This src.rpm is cannonical upstream
# You can obtain it using this set of commands
@@ -198,6 +198,9 @@ fi
%{_var}/lib/rhn/search/indexes/docs
%changelog
+* Wed Feb 12 2014 Stephen Herr <sherr(a)redhat.com> 2.1.14-1
+- 1061425 - make package search faster
+
* Thu Jan 16 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.13-1
- %%attr() mode not applicaple to symlink
- resolve conflict between {apache,jakarta}-commons-cli on Fedora 20
commit 3e010b4c8800511f61091fc77d9ea7a64c5420e5
Author: Stephen Herr <sherr(a)redhat.com>
Date: Wed Feb 12 18:50:51 2014 -0500
Automatic commit of package [spacewalk-java] release [2.1.150-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 7e078b8..7d8aec1 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.149
+Version: 2.1.150
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -801,6 +801,11 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Feb 12 2014 Stephen Herr <sherr(a)redhat.com> 2.1.150-1
+- 1061425 - make package search faster
+- Non-existent icon
+- Forgotten internationalization...
+
* Wed Feb 12 2014 Tomas Kasparek <tkasparek(a)redhat.com> 2.1.149-1
- fix spanish translation for selected systems (string does not take a
parameter anymore)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 22ed532..5dab4fe 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.149-1 java/
+2.1.150-1 java/
commit 5b36a2e9cc24ec983218d48410139578e1895426
Author: Stephen Herr <sherr(a)redhat.com>
Date: Tue Feb 11 16:24:04 2014 -0500
1061425 - make package search faster
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
index 3d61289..eccab77 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
@@ -1910,4 +1910,80 @@ WHERE p.id IN (%s)
</query>
</mode>
+<mode name="searchByIdAndArches" class="com.redhat.rhn.frontend.dto.PackageOverview">
+ <query>
+ select max(p.id) as id
+ from rhnPackage p,
+ rhnChannel c,
+ rhnChannelPackage cp,
+ rhnChannelArch ca
+ where p.id = cp.package_id
+ and c.id = cp.channel_id
+ and c.channel_arch_id = ca.id
+ and ca.label IN (:channel_arch_labels)
+ and p.id IN (%s)
+ group by p.name_id
+ </query>
+ <elaborator name="package_summary" />
+</mode>
+
+<mode name="searchByIdInChannel" class="com.redhat.rhn.frontend.dto.PackageOverview">
+ <query params="cid">
+ select max(p.id) as id
+ from rhnPackage p,
+ rhnChannelPackage cp
+ where p.id = cp.package_id
+ and cp.channel_id = :cid
+ and p.id IN (%s)
+ group by p.name_id
+ </query>
+ <elaborator name="package_summary" />
+</mode>
+
+<mode name="relevantSearchById" class="com.redhat.rhn.frontend.dto.PackageOverview">
+ <query params="uid">
+ select max(p.id) as id
+ from rhnPackage p,
+ rhnChannelPackage cp,
+ rhnServerChannel sc,
+ rhnUserServerPerms usp
+ where p.id = cp.package_id
+ and sc.channel_id = cp.channel_id
+ and usp.server_id = sc.server_id
+ and usp.user_id = :uid
+ and p.id IN (%s)
+ group by p.name_id
+ </query>
+ <elaborator name="package_summary" />
+</mode>
+
+<query name="package_summary" params="">
+select p.id, pn.name as package_name, p.summary
+ from rhnPackage p,
+ rhnPackageName pn
+ where p.name_id = pn.id
+ and p.id in (%s)
+</query>
+
+<mode name="searchById" class="com.redhat.rhn.frontend.dto.PackageOverview">
+ <query>
+ select p.id, pn.name as package_name, p.summary, p.description, pe.epoch,
+ pe.version, pe.release, pa.label as package_arch, pp.name as provider
+ from rhnPackage p,
+ rhnPackageName pn,
+ rhnPackageArch pa,
+ rhnPackageEVR pe,
+ rhnPackageKeyAssociation pka,
+ rhnPackageKey pk,
+ rhnPackageProvider pp
+ where pn.id = p.name_id
+ and p.evr_id = pe.id
+ and p.package_arch_id = pa.id
+ and p.id = pka.package_id
+ and pk.id = pka.key_id
+ and pp.id = pk.provider_id
+ and p.id IN (%s)
+ </query>
+</mode>
+
</datasource_modes>
diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/MissingArchitectureException.java b/java/code/src/com/redhat/rhn/domain/rhnpackage/MissingArchitectureException.java
new file mode 100644
index 0000000..a74ceef
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/MissingArchitectureException.java
@@ -0,0 +1,59 @@
+/**
+ * Copyright (c) 2009--2010 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.
+ */
+
+/*
+ * AUTOMATICALLY GENERATED FILE, DO NOT EDIT.
+ */
+package com.redhat.rhn.domain.rhnpackage;
+
+import com.redhat.rhn.common.RhnRuntimeException;
+
+/**
+ * No Base Channel was found for a particular server.
+ * <p>
+ *
+ *
+ * @version definition($Rev: 76724 $)/template($Rev: 67725 $)
+ */
+public class MissingArchitectureException extends RhnRuntimeException {
+
+ // ///////////////////////
+ // Constructors
+ // ///////////////////////
+ /**
+ * Constructor
+ * @param message exception message
+ */
+ public MissingArchitectureException(String message) {
+ super(message);
+ // begin member variable initialization
+ }
+
+ /**
+ * Constructor
+ * @param message exception message
+ * @param cause the cause (which is saved for later retrieval by the
+ * Throwable.getCause() method). (A null value is permitted, and indicates
+ * that the cause is nonexistent or unknown.)
+ */
+ public MissingArchitectureException(String message, Throwable cause) {
+ super(message, cause);
+ // begin member variable initialization
+ }
+
+ // ///////////////////////
+ // Getters/Setters
+ // ///////////////////////
+}
diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFactory.java b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFactory.java
index 18231cc..25de848 100644
--- a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFactory.java
@@ -14,6 +14,7 @@
*/
package com.redhat.rhn.domain.rhnpackage;
+import com.redhat.rhn.common.db.datasource.CachedStatement;
import com.redhat.rhn.common.db.datasource.DataResult;
import com.redhat.rhn.common.db.datasource.ModeFactory;
import com.redhat.rhn.common.db.datasource.SelectMode;
@@ -22,6 +23,7 @@ import com.redhat.rhn.domain.org.Org;
import com.redhat.rhn.domain.server.InstalledPackage;
import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.user.User;
+import com.redhat.rhn.frontend.action.channel.PackageSearchAction;
import com.redhat.rhn.frontend.dto.BooleanWrapper;
import com.redhat.rhn.frontend.dto.PackageOverview;
import com.redhat.rhn.manager.user.UserManager;
@@ -29,7 +31,6 @@ import com.redhat.rhn.manager.user.UserManager;
import org.apache.log4j.Logger;
import org.hibernate.Session;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -298,69 +299,89 @@ public class PackageFactory extends HibernateFactory {
return packs.get(packs.size() - 1);
}
- private static List composePackageSearchResults(String queryName, Map params,
- List pids) {
- List results = new ArrayList();
- int limit = 1000; // ORA-01795
-
- for (int n = 0; n < pids.size(); n += limit) {
- int chunkSize = (pids.size() > n + limit) ? n + limit : pids.size();
- List chunk = pids.subList(n, chunkSize);
- params.put("pids", chunk);
- results.addAll(singleton.listObjectsByNamedQuery(queryName, params));
- }
-
- return results;
- }
-
- /**
- * Returns PackageOverviews from a search.
- * @param pids List of package ids returned from search server.
- * @param archLabels List of channel arch labels.
- * @return PackageOverviews from a search.
- */
- public static List<PackageOverview> packageSearch(List pids, List archLabels) {
- return packageSearch(pids, archLabels, true);
- }
/**
* Returns PackageOverviews from a search.
* @param pids List of package ids returned from search server.
* @param archLabels List of channel arch labels.
- * @param relevantFlag if set will only return packages relevant to subscribed channels
+ * @param relevantUserId user id to filter by if relevant or architecture search
+ * server the user can see is subscribed to
+ * @param filterChannelId channel id to filter by if channel search
+ * @param searchType type of search to do, one of "relevant", "channel",
+ * "architecture", or "all"
* @return PackageOverviews from a search.
*/
- public static List<PackageOverview> packageSearch(List pids, List archLabels,
- boolean relevantFlag) {
- List results = null;
- Map params = new HashMap();
- if (archLabels != null && !archLabels.isEmpty()) {
- params.put("channel_arch_labels", archLabels);
- results = composePackageSearchResults("Package.searchByIdAndArches",
- params, pids);
+ public static List<PackageOverview> packageSearch(List<Long> pids,
+ List<String> archLabels, Long relevantUserId, Long filterChannelId,
+ String searchType) {
+ Map<String, Object> params = new HashMap<String, Object>();
+ SelectMode m = null;
+
+ if (searchType.equals(PackageSearchAction.ARCHITECTURE)) {
+ if (!(archLabels != null && archLabels.size() > 0)) {
+ throw new MissingArchitectureException(
+ "archLabels must not be null for architecture search!");
+ }
+
+ // This makes me very sad. PreparedSatement.setObject does not allow
+ // you to pass in Lists or Arrays. We can't manually convert archLabels
+ // to a string and use the regular infrastructure because it will
+ // escape the quotes between architectures. The only thing we can do
+ // is to get the SelectMode and manually insert the architecture types
+ // before we continue. If we can get PreparedStatement to accept Lists
+ // then all this hackishness can go away. NOTE: we know that we have to
+ // guard against sql injection in this case. Notice that the archLabels
+ // will all be enclosed in single quotes. Valid archLabels will only
+ // contain alphanumeric, '-', and "_" characters. We will simply
+ // check and enforce that constraint, and then even if someone injected
+ // something we would either end up throwing an error or it would be
+ // in a string, and therefore not dangerous.
+ m = ModeFactory.getMode("Package_queries", "searchByIdAndArches");
+ CachedStatement cs = m.getQuery();
+ String query = cs.getOrigQuery();
+ String archString = "'" + sanitizeArchLabel(archLabels.get(0)) + "'";
+ for (int i = 1; i < archLabels.size(); i++) {
+ archString += ", '" + sanitizeArchLabel(archLabels.get(i)) + "'";
+ }
+ query = query.replace(":channel_arch_labels", archString);
+ cs.setQuery(query);
+ m.setQuery(cs);
}
- else if (relevantFlag) {
- results = composePackageSearchResults("Package.relevantSearchById",
- params, pids);
+ else if (searchType.equals(PackageSearchAction.RELEVANT)) {
+ if (relevantUserId == null) {
+ throw new IllegalArgumentException(
+ "relevantUserId must not be null for relevant search!");
+ }
+ params.put("uid", relevantUserId);
+ m = ModeFactory.getMode("Package_queries", "relevantSearchById");
}
- else {
- results = composePackageSearchResults("Package.searchById", params, pids);
+ else if (searchType.equals(PackageSearchAction.CHANNEL)) {
+ if (filterChannelId == null) {
+ throw new IllegalArgumentException(
+ "filterChannelId must not be null for channel search!");
+ }
+ params.put("cid", filterChannelId);
+ m = ModeFactory.getMode("Package_queries", "searchByIdInChannel");
}
- List<PackageOverview> realResults = new ArrayList<PackageOverview>();
- for (Object result : results) {
- Object[] values = (Object[]) result;
- PackageOverview po = new PackageOverview();
- po.setId((Long) values[0]);
- po.setPackageName((String) values[1]);
- po.setSummary((String) values[2]);
- po.setPackageArch((String)values[3]);
- po.setDescription((String) values[4]);
- po.setEpoch((String) values[5]);
- po.setVersion((String) values[6]);
- po.setRelease((String) values[7]);
- realResults.add(po);
+ else {
+ m = ModeFactory.getMode("Package_queries", "searchById");
}
- return realResults;
+ // SelectMode.execute will batch the size properly and CachedStatement.execute
+ // will create a comma separated string representation of the list of pids
+ DataResult result = m.execute(params, pids);
+ result.elaborate();
+ return result;
+ }
+
+ private static String sanitizeArchLabel(String archLabel) {
+ // ArchLabels can only contain alphanumeric, '-', or '_' in order to guard
+ // against sql injection. They will never contain anything else during the
+ // normal course of operation, throw an error if the regex doesn't match.
+ if (!archLabel.matches("^[a-zA-Z0-9\\-_]*$")) {
+ throw new IllegalArgumentException("The channel architecture " + archLabel +
+ " is invalid! Possible sql injection attempt!");
+ }
+ return archLabel;
}
/**
diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/Package_satellite.hbm.xml b/java/code/src/com/redhat/rhn/domain/rhnpackage/Package_satellite.hbm.xml
index 1a4beb2..35a3236 100644
--- a/java/code/src/com/redhat/rhn/domain/rhnpackage/Package_satellite.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/Package_satellite.hbm.xml
@@ -186,40 +186,6 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<![CDATA[from com.redhat.rhn.domain.rhnpackage.Package as p where p.packageName = :packageName]]>
</query>
- <query name="Package.searchByIdAndArches">
- <![CDATA[select distinct p.packageName.id, p.packageName.name, p.summary,
- p.packageArch.label, p.description, p.packageEvr.epoch,
- p.packageEvr.version, p.packageEvr.release
- from com.redhat.rhn.domain.rhnpackage.Package as p,
- com.redhat.rhn.domain.channel.Channel as c
- where p.id IN (:pids)
- and c IN elements(p.channels)
- and c.channelArch.label IN (:channel_arch_labels)
- ]]>
- </query>
-
- <query name="Package.searchById">
- <![CDATA[select distinct p.id, p.packageName.name, p.summary,
- p.packageArch.label, p.description, p.packageEvr.epoch,
- p.packageEvr.version, p.packageEvr.release
- from com.redhat.rhn.domain.rhnpackage.Package as p
- where p.id IN (:pids)
- ]]>
- </query>
-
- <query name="Package.relevantSearchById">
- <![CDATA[select distinct p.packageName.id, p.packageName.name, p.summary,
- p.packageArch.label, p.description, p.packageEvr.epoch,
- p.packageEvr.version, p.packageEvr.release
- from com.redhat.rhn.domain.rhnpackage.Package as p,
- com.redhat.rhn.domain.channel.Channel as c,
- com.redhat.rhn.domain.server.Server as s
- where p.id IN (:pids)
- and c IN elements (p.channels)
- and c IN elements (s.channels)
- ]]>
- </query>
-
<query name="Package.listOrphans">
<![CDATA[ select p
from com.redhat.rhn.domain.rhnpackage.Package as p
diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageFactoryTest.java b/java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageFactoryTest.java
index 596cd59..d5b5eae 100644
--- a/java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageFactoryTest.java
+++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageFactoryTest.java
@@ -20,17 +20,18 @@ import com.redhat.rhn.domain.channel.test.ChannelFactoryTest;
import com.redhat.rhn.domain.org.Org;
import com.redhat.rhn.domain.rhnpackage.Package;
import com.redhat.rhn.domain.rhnpackage.PackageFactory;
+import com.redhat.rhn.domain.rhnpackage.PackageSource;
import com.redhat.rhn.domain.server.InstalledPackage;
import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.server.ServerFactory;
import com.redhat.rhn.domain.server.test.ServerFactoryTest;
import com.redhat.rhn.domain.user.User;
+import com.redhat.rhn.frontend.action.channel.PackageSearchAction;
import com.redhat.rhn.frontend.dto.PackageOverview;
import com.redhat.rhn.testing.BaseTestCaseWithUser;
import com.redhat.rhn.testing.UserTestUtils;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -78,7 +79,7 @@ public class PackageFactoryTest extends BaseTestCaseWithUser {
testInstPack.setEvr(testPackage.getPackageEvr());
testInstPack.setName(testPackage.getPackageName());
testInstPack.setServer(testServer);
- Set serverPackages = new HashSet();
+ Set<InstalledPackage> serverPackages = new HashSet<InstalledPackage>();
serverPackages.add(testInstPack);
testServer.setPackages(serverPackages);
@@ -92,13 +93,16 @@ public class PackageFactoryTest extends BaseTestCaseWithUser {
}
public void testPackageSearch() {
- List pids = new ArrayList();
+ List<Long> pids = new ArrayList<Long>();
pids.add(2125L);
pids.add(2915L);
- String[] arches = {"channel-ia32", "channel-ia64"};
+ List<String> arches = new ArrayList<String>();
+ arches.add("channel-ia32");
+ arches.add("channel-ia64");
List<PackageOverview> results =
- PackageFactory.packageSearch(pids, Arrays.asList(arches));
+ PackageFactory.packageSearch(pids, arches, user.getId(), null,
+ PackageSearchAction.ARCHITECTURE);
assertNotNull(results);
}
@@ -118,7 +122,7 @@ public class PackageFactoryTest extends BaseTestCaseWithUser {
public void testPackageSourceLookup() throws Exception {
Package pack = PackageTest.createTestPackage(user.getOrg());
- List list = PackageFactory.lookupPackageSources(pack);
+ List<PackageSource> list = PackageFactory.lookupPackageSources(pack);
assertTrue(list.size() > 0);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/BaseSearchAction.java b/java/code/src/com/redhat/rhn/frontend/action/BaseSearchAction.java
index ecc158b..f176503 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/BaseSearchAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/BaseSearchAction.java
@@ -38,6 +38,7 @@ import redstone.xmlrpc.XmlRpcFault;
import com.redhat.rhn.common.localization.LocalizationService;
import com.redhat.rhn.common.validator.ValidatorException;
+import com.redhat.rhn.domain.rhnpackage.MissingArchitectureException;
import com.redhat.rhn.frontend.struts.RhnAction;
import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.taglibs.list.ListTagHelper;
@@ -170,6 +171,10 @@ public abstract class BaseSearchAction extends RhnAction {
errors.add(ActionMessages.GLOBAL_MESSAGE,
new ActionMessage("packages.search.use_free_form"));
}
+ catch (MissingArchitectureException mae) {
+ errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(
+ "packages.search.need_one_arch"));
+ }
if (!errors.isEmpty()) {
addErrors(request, errors);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchAction.java
index b66bcbb..3c8ea67 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchAction.java
@@ -32,11 +32,8 @@ import org.apache.struts.action.DynaActionForm;
import redstone.xmlrpc.XmlRpcFault;
-import com.redhat.rhn.domain.channel.Channel;
import com.redhat.rhn.domain.channel.ChannelArch;
-import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.BaseSearchAction;
-import com.redhat.rhn.frontend.dto.PackageDto;
import com.redhat.rhn.frontend.dto.PackageOverview;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnHelper;
@@ -62,11 +59,16 @@ public class PackageSearchAction extends BaseSearchAction {
Long filterChannelId = null;
boolean relevantFlag = false;
+ // Default to relevant channels if no search criteria was specified
+ if (searchCriteria == null || searchCriteria.equals("")) {
+ searchCriteria = RELEVANT;
+ }
+
// Handle the radio button selection for channel filtering
if (searchCriteria.equals(RELEVANT)) {
relevantFlag = true;
}
- if (searchCriteria.equals(ARCHITECTURE)) {
+ else if (searchCriteria.equals(ARCHITECTURE)) {
/* The search call will function as being scoped to architectures if the arch
list isn't null. In order to actually get radio-button-like functionality
we can't rely on the arch list coming in from the form to be null; the
@@ -102,8 +104,10 @@ public class PackageSearchAction extends BaseSearchAction {
request.setAttribute(WHERE_CRITERIA, searchCriteria);
if (!StringUtils.isBlank(searchString)) {
- List<PackageOverview> results = performSearch(ctx, searchString, viewmode,
- fineGrained, selectedArches, filterChannelId, relevantFlag);
+ List<PackageOverview> results =
+ performSearch(ctx, searchString, viewmode, fineGrained, selectedArches,
+ filterChannelId, relevantFlag, searchCriteria);
+
request.setAttribute(RequestContext.PAGE_LIST,
results != null ? results : Collections.emptyList());
}
@@ -122,27 +126,22 @@ public class PackageSearchAction extends BaseSearchAction {
* @param selectedArches do we care about specific arches?
* @param filterChannelId do we care about a specific channel?
* @param relevantFlag do we only care about 'relevant to registered profiles"?
+ * @param searchCriteria the type of search we are doing
* @return list of package-overviews found
* @throws XmlRpcFault bad communication with search server
* @throws MalformedURLException possibly bad configuration for search server address
*/
public List<PackageOverview> performSearch(RequestContext ctx, String searchString,
String viewmode, Boolean fineGrained, String[] selectedArches,
- Long filterChannelId, boolean relevantFlag)
+ Long filterChannelId, boolean relevantFlag, String searchCriteria)
throws XmlRpcFault, MalformedURLException {
List<PackageOverview> results =
- PackageSearchHelper.performSearch(ctx.getWebSession().getId(),
- searchString,
- viewmode,
- selectedArches, relevantFlag, fineGrained);
+ PackageSearchHelper.performSearch(ctx.getWebSession().getId(),
+ searchString, viewmode, selectedArches, ctx.getLoggedInUser()
+ .getId(), fineGrained, filterChannelId, searchCriteria);
// Perform any post-search logic that wasn't done by the search server
results = removeDuplicateNames(results);
-
- if (filterChannelId != null) {
- User user = ctx.getLoggedInUser();
- results = filterByChannel(user, filterChannelId, results);
- }
return results;
}
@@ -169,41 +168,6 @@ public class PackageSearchAction extends BaseSearchAction {
}
/**
- * Since the search server does not carry channel information, we do any
- * channel filtering in the Java stack. This method will return a new list
- * containing packages that are present in the given channel; others
- * returned from the search will be removed.
- *
- * @param user user making the request
- * @param channelId channel against which the filter should be run
- * @param pkgs list of packages returned from the search query that should be
- * filtered
- * @return new list object with duplicates removed; does not change the list in place
- */
- private List<PackageOverview> filterByChannel(User user, Long channelId,
- List<PackageOverview> pkgs) {
-
- Channel channel = ChannelManager.lookupByIdAndUser(channelId, user);
- List<PackageDto> allPackagesList = ChannelManager.listAllPackages(channel);
-
- // Convert the package list into a set for quicker lookup
- Set<String> packageNameSet = new HashSet<String>();
- for (PackageDto dto : allPackagesList) {
- packageNameSet.add(dto.getName());
- }
-
- // Iterate results and remove if not in the channel
- List<PackageOverview> newResult = new ArrayList<PackageOverview>();
- for (PackageOverview pkg : pkgs) {
- if (packageNameSet.contains(pkg.getPackageName())) {
- newResult.add(pkg);
- }
- }
-
- return newResult;
- }
-
- /**
* Make sure we have appropriate defaults no matter how we got here
* Set the defaults (where needed) back into the form so that the rest of the action
* can find them
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchHelper.java b/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchHelper.java
index 3db8130..abce15d 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchHelper.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchHelper.java
@@ -19,10 +19,10 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
-import java.util.LinkedList;
+import java.util.HashSet;
import java.util.List;
-import java.util.ListIterator;
import java.util.Map;
+import java.util.Set;
import org.apache.log4j.Logger;
@@ -31,6 +31,7 @@ import redstone.xmlrpc.XmlRpcFault;
import com.redhat.rhn.common.conf.ConfigDefaults;
import com.redhat.rhn.common.validator.ValidatorException;
+import com.redhat.rhn.domain.rhnpackage.PackageFactory;
import com.redhat.rhn.frontend.action.BaseSearchAction;
import com.redhat.rhn.frontend.dto.PackageOverview;
import com.redhat.rhn.frontend.xmlrpc.SearchServerIndexException;
@@ -53,18 +54,21 @@ public class PackageSearchHelper {
* @param searchString search string
* @param mode mode as in name only, name description, name and summary, free form
* @param selectedArches list of archs
- * @param relevantFlag if set will force packages returned to be relevant to
- * subscribed channels
+ * @param relevantUserId user id to filter by if relevant or architecture search
+ * server the user can see is subscribed to
* @param fineGrained fine grained search
+ * @param filterChannelId channel id to filter by if channel search
+ * @param searchType type of search to do, one of "relevant", "channel",
+ * "architecture", or "all"
* @return List of PackageOverview objects
* @throws XmlRpcFault bad communication with search server
* @throws MalformedURLException possibly bad configuration for search server address
* @throws SearchServerIndexException error executing query
*/
public static List<PackageOverview> performSearch(Long sessionId, String searchString,
- String mode, String[] selectedArches, boolean relevantFlag,
- Boolean fineGrained)
- throws XmlRpcFault, MalformedURLException, SearchServerIndexException {
+ String mode, String[] selectedArches, Long relevantUserId, Boolean fineGrained,
+ Long filterChannelId, String searchType) throws XmlRpcFault,
+ MalformedURLException, SearchServerIndexException {
log.info("Performing pkg search: " + searchString + ", " + mode);
@@ -76,7 +80,7 @@ public class PackageSearchHelper {
// call search server
XmlRpcClient client = new XmlRpcClient(
ConfigDefaults.get().getSearchServerUrl(), true);
- List args = new ArrayList();
+ List<Object> args = new ArrayList<Object>();
args.add(sessionId);
args.add("package");
args.add(preprocessSearchString(searchString, mode, pkgArchLabels));
@@ -93,68 +97,58 @@ public class PackageSearchHelper {
// need to make the search server results usable by database
// so we can get the actual results we are to display to the user.
- // also save the items into a Map for lookup later.
+ // also save the names into a Set for later.
List<Long> pids = new ArrayList<Long>();
- Map<String, Integer> lookupmap = new HashMap<String, Integer>();
- // do it in reverse because the search server can return more than one
- // record for a given package name, but that means if we don't go
- // in reverse we risk getting the wrong rank in the lookupmap.
- // for example, [{id:125,name:gtk},{id:127,name:gtk}{id:200,name:kernel}]
- // if we go forward we end up with gtk:1 and kernel:2 but we wanted
- // kernel:2, gtk:0.
- for (int x = results.size() - 1; x >= 0; x--) {
- Map item = (Map) results.get(x);
- lookupmap.put((String)item.get("name"), x);
+ Set<String> names = new HashSet<String>();
+ for (Object itemObject : results) {
+ Map item = (Map) itemObject;
+ names.add((String) item.get("name"));
Long pid = new Long((String)item.get("id"));
pids.add(pid);
}
+ List<String> arList = null;
+ if (selectedArches != null) {
+ arList = Arrays.asList(selectedArches);
+ }
+
// The database does not maintain the order of the where clause.
// In order to maintain the ranking from the search server, we
// need to reorder the database results to match. This will lead
// to a better user experience.
- ArrayList<String> arList = null;
- if (selectedArches != null) {
- arList = new ArrayList<String>(Arrays.asList(selectedArches));
- }
List<PackageOverview> unsorted =
- ChannelManager.packageSearch(pids, arList, relevantFlag);
- List<PackageOverview> ordered = new LinkedList<PackageOverview>();
+ PackageFactory.packageSearch(pids, arList, relevantUserId, filterChannelId,
+ searchType);
+ List<PackageOverview> ordered = new ArrayList<PackageOverview>();
+
+ Map<String, PackageOverview> nameToPackageMap =
+ new HashMap<String, PackageOverview>();
+ Set<String> alreadyAddedNames = new HashSet<String>();
- // we need to use the package names to determine the mapping order
- // because the id in PackageOverview is that of a PackageName while
- // the id from the search server is the Package id.
+ // we need to be able to look up the PackageOverview by its name
for (PackageOverview po : unsorted) {
- Object objIdx = lookupmap.get(po.getPackageName());
- if (objIdx == null) {
- // We got an error looking up a package name, it is most likely caused
- // by the search server giving us data which doesn't map into what is
- // in our database. This could happen if the search indexes are formed
- // for a different database instance.
- throw new SearchServerIndexException();
- }
- int idx = (Integer)objIdx;
- if (ordered.isEmpty()) {
- ordered.add(po);
- continue;
- }
+ nameToPackageMap.put(po.getPackageName(), po);
+ }
- boolean added = false;
- for (ListIterator itr = ordered.listIterator(); itr.hasNext();) {
- PackageOverview curpo = (PackageOverview) itr.next();
- int curidx = lookupmap.get(curpo.getPackageName());
- if (idx <= curidx) {
- itr.previous();
- itr.add(po);
- added = true;
- break;
- }
- }
+ // We got an error looking up a package name, it is most likely caused
+ // by the search server giving us data which doesn't map into what is
+ // in our database. This could happen if the search indexes are formed
+ // for a different database instance.
+ if (!names.containsAll(nameToPackageMap.keySet())) {
+ throw new SearchServerIndexException();
+ }
- if (!added) {
- ordered.add(po);
+ // Iterate through in the order that the search server returned, add packages
+ // to the return list in the order they appear in the search results.
+ for (Object resultObject : results) {
+ Map result = (Map) resultObject;
+ String name = (String) result.get("name");
+ if (!alreadyAddedNames.contains(name) &&
+ nameToPackageMap.keySet().contains(name)) {
+ ordered.add(nameToPackageMap.get(name));
+ alreadyAddedNames.add(name);
}
}
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 7680b42..1e04f45 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
@@ -2530,6 +2530,12 @@ available for this kickstart profile to function properly.
<context context-type="sourcefile">/rhn/channels/Search</context>
</context-group>
</trans-unit>
+ <trans-unit id="packages.search.need_one_arch">
+ <source>When searching by architecture you must select at least one architecture.</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/channels/software/Search</context>
+ </context-group>
+ </trans-unit>
<trans-unit id="packages.search.connection_error">
<source>Could not connect to search server.</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/search/PackagesSearchHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/search/PackagesSearchHandler.java
index c4e06ef..4378f27 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/search/PackagesSearchHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/search/PackagesSearchHandler.java
@@ -33,6 +33,7 @@ import com.redhat.rhn.domain.token.ActivationKey;
import com.redhat.rhn.domain.token.TokenPackage;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.BaseSearchAction;
+import com.redhat.rhn.frontend.action.channel.PackageSearchAction;
import com.redhat.rhn.frontend.action.channel.PackageSearchHelper;
import com.redhat.rhn.frontend.dto.PackageDto;
import com.redhat.rhn.frontend.dto.PackageOverview;
@@ -316,8 +317,8 @@ public class PackagesSearchHandler extends BaseHandler {
Long sessionId = session.getId();
List<PackageOverview> pkgs = null;
try {
- pkgs = PackageSearchHelper.performSearch(sessionId, query, mode, null, false,
- true);
+ pkgs = PackageSearchHelper.performSearch(sessionId, query, mode, null, null,
+ true, null, PackageSearchAction.WHERE_ALL);
}
catch (MalformedURLException e) {
log.info("Caught Exception :" + e);
diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
index 025d880..e7123d8 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
@@ -45,7 +45,6 @@ import com.redhat.rhn.domain.kickstart.KickstartData;
import com.redhat.rhn.domain.org.Org;
import com.redhat.rhn.domain.org.OrgFactory;
import com.redhat.rhn.domain.rhnpackage.PackageEvr;
-import com.redhat.rhn.domain.rhnpackage.PackageFactory;
import com.redhat.rhn.domain.role.RoleFactory;
import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.user.User;
@@ -58,7 +57,6 @@ import com.redhat.rhn.frontend.dto.MultiOrgEntitlementsDto;
import com.redhat.rhn.frontend.dto.OrgChannelFamily;
import com.redhat.rhn.frontend.dto.OrgSoftwareEntitlementDto;
import com.redhat.rhn.frontend.dto.PackageDto;
-import com.redhat.rhn.frontend.dto.PackageOverview;
import com.redhat.rhn.frontend.listview.ListControl;
import com.redhat.rhn.frontend.listview.PageControl;
import com.redhat.rhn.frontend.xmlrpc.NoSuchChannelException;
@@ -622,27 +620,6 @@ public class ChannelManager extends BaseManager {
DataResult dr = makeDataResult(params, params, lc, m);
return dr;
}
- /**
- * Returns a list of packages whose ids match those from the given list.
- * @param pids The ids of the package list.
- * @param archLabels Channel arch labels.
- * @param relevantFlag if set will only return packages relevant to subscribed channels
- * @return list of packages
- */
- public static List<PackageOverview> packageSearch(List pids, List archLabels,
- boolean relevantFlag) {
- return PackageFactory.packageSearch(pids, archLabels, relevantFlag);
- }
-
- /**
- * Returns a list of packages whose ids match those from the given list.
- * @param pids The ids of the package list.
- * @param archLabels Channel arch labels.
- * @return list of packages
- */
- public static List<PackageOverview> packageSearch(List pids, List archLabels) {
- return PackageFactory.packageSearch(pids, archLabels);
- }
/**
* Returns a dataresult containing the channels in an org.
diff --git a/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java b/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java
index 30959d4..2fa3df3 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java
@@ -765,17 +765,6 @@ public class ChannelManagerTest extends BaseTestCaseWithUser {
"5.0.0.9"));
}
- public void testPackageSearch() {
- List ids = new ArrayList();
- ids.add(824L); // firefox
- ids.add(497L); // kernel
- ids.add(545L); // gcc
- List archlabels = new ArrayList();
- archlabels.add("channel-ia32");
- List<PackageOverview> pkgs = ChannelManager.packageSearch(ids, archlabels);
- assertNotNull(pkgs);
- }
-
public void testFindCompatibleChildren() throws Exception {
ProductName pn = ChannelFactoryTest.createProductName();
Channel parent = ChannelFactoryTest.createBaseChannel(user);
diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml
index 8ae20ae..a225171 100644
--- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml
+++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml
@@ -42,18 +42,16 @@
FROM rhnErrata
</select>
<select id="verifyErrataVisibility" resultType="string">
- select distinct e.id
- from rhnErrata e,
- rhnChannelErrata ce,
- rhnAvailableChannels ac,
- pxtsessions ps,
- web_contact wc
- where e.id = ce.errata_id and
- ce.channel_id = ac.channel_id and
- ac.org_id = wc.org_id and
- ps.web_user_id = wc.id and
- ps.id = #{session_id}
- and e.id IN
+ select ce.errata_id
+ from rhnChannelErrata ce,
+ pxtsessions ps,
+ rhnUserChannelFamilyPerms ucfp,
+ rhnChannelFamilyMembers cfm
+ where cfm.channel_id = ce.channel_id
+ and cfm.channel_family_id = ucfp.channel_family_id
+ and ps.web_user_id = ucfp.user_id
+ and ps.id = #{session_id}
+ and ce.errata_id IN
<foreach collection="id_list" item="item" separator="," close=")" open="(">
#{item}
</foreach>
diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/package.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/package.xml
index 3643781..c733d96 100644
--- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/package.xml
+++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/package.xml
@@ -58,18 +58,16 @@
FROM rhnPackage
</select>
<select id="verifyPackageVisibility" resultType="string">
- select distinct p.id
- from rhnPackage p,
- rhnAvailableChannels ac,
- rhnChannelPackage cp,
+ select cp.package_id
+ from rhnChannelPackage cp,
pxtsessions ps,
- web_contact wc
- where cp.package_id = p.id
- and ac.channel_id = cp.channel_id
- and ac.org_id = wc.org_id
- and ps.web_user_id = wc.id
+ rhnUserChannelFamilyPerms ucfp,
+ rhnChannelFamilyMembers cfm
+ where cfm.channel_id = cp.channel_id
+ and cfm.channel_family_id = ucfp.channel_family_id
+ and ucfp.user_id = ps.web_user_id
and ps.id = #{session_id}
- and p.id IN
+ and cp.package_id IN
<foreach collection="id_list" item="item" separator="," close=")" open="(">
#{item}
</foreach>
diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml
index a6a75ac..5c4b52a 100644
--- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml
+++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml
@@ -83,12 +83,11 @@
SELECT last_modified from rhnIndexerWork where object_type='server'
</select>
<select id="verifyServerVisibility" resultType="string">
- SELECT DISTINCT s.id
- FROM rhnServer s
- INNER JOIN rhnUserServerPerms usp ON s.id = usp.server_id
+ SELECT usp.server_id
+ FROM rhnUserServerPerms usp
INNER JOIN pxtsessions ps ON ps.web_user_id = usp.user_id
WHERE ps.id = #{session_id}
- AND s.id IN
+ AND usp.server_id IN
<foreach collection="id_list" item="item" separator="," close=")" open="(">
#{item}
</foreach>
diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java
index 3832dff..c3773c2 100644
--- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java
+++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java
@@ -30,9 +30,11 @@ import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
+import java.util.Set;
import redstone.xmlrpc.XmlRpcFault;
@@ -223,12 +225,22 @@ public class IndexHandler {
return hits;
}
- Map<String, Object> params = new HashMap<String, Object>();
- params.put("session_id", sessionId);
- params.put("id_list", ids);
-
try {
- List<String> visible = query.loadList(params);
+ Set<String> visible = new HashSet<String>();
+
+ // we have to batch the visibility query in clause to no more
+ // than 1000 for oracle
+ final int batch_size = 1000;
+ for (int i = 0; i < ids.size(); i += batch_size) {
+ Map<String, Object> params = new HashMap<String, Object>();
+ params.put("session_id", sessionId);
+ // sub list includes the first index and excludes the last.
+ // so the proper last index of ids to pass to subList is ids.size()
+ params.put("id_list", ids.subList(i, (i + batch_size) <= ids.size() ? i +
+ batch_size : ids.size()));
+ visible.addAll(query.loadList(params));
+ }
+
if (log.isDebugEnabled()) {
log.debug("results: " + visible);
}
commit 0fd4fc23b847b2553c7992d47a5048e6aa05a814
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Wed Feb 12 15:52:21 2014 +0100
Non-existent icon
diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/summary.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/summary.jsp
index 5f7f60f..db64887 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/overview/summary.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/overview/summary.jsp
@@ -6,7 +6,7 @@
<html>
<body>
-<rhn:toolbar base="h1" icon="fa-cogs">
+<rhn:toolbar base="h1" icon="header-preferences">
<bean:message key="summary.jsp.toolbar"/>
</rhn:toolbar>
commit 9f63dd19e2289a6bc635daf391d1268cc41a31f1
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Tue Feb 11 15:00:15 2014 +0100
Forgotten internationalization...
diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/misc/reboot-system-confirm.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/misc/reboot-system-confirm.jsp
index 95d1b38..8288a0d 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/systems/misc/reboot-system-confirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/systems/misc/reboot-system-confirm.jsp
@@ -8,7 +8,7 @@
<body>
<%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %>
-following systems will get rebooted...
+<p><bean:message key="reboot.jsp.widgetsummary" /></p>
<rl:listset name="systemListSet">
<c:set var="notSelectable" value="True"/>
<c:set var="noCsv" value="1" />
commit 891de33651bb0e42e2a16f6cad9fb79b101a87a5
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Feb 12 15:55:29 2014 +0100
Automatic commit of package [spacewalk-schema] release [2.1.43-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index b3c33d7..4bb5dd5 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-2.1.42-1 schema/spacewalk/
+2.1.43-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 4f7a513..53427f5 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -4,7 +4,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 2.1.42
+Version: 2.1.43
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Wed Feb 12 2014 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.43-1
+- 1063821 - lock rhnServerNeededCache to avoid a db deadlock
+
* Wed Feb 12 2014 Tomas Kasparek <tkasparek(a)redhat.com> 2.1.42-1
- Add missing GMT+3 timezone as Saudi Arabia
commit 797782c1e260e773c4c0a3c24fbf356f517e98ad
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Feb 12 15:41:07 2014 +0100
1063821 - lock rhnServerNeededCache to avoid a db deadlock
rhn_server.update_needed_cache() and rhn_channel.(un)subscribe_server()
need to sync on rhnServerNeededCache table to avoid a deadlock (rather
than rhnServer).
diff --git a/schema/spacewalk/oracle/packages/rhn_channel.pkb b/schema/spacewalk/oracle/packages/rhn_channel.pkb
index 57bfa05..492f324 100644
--- a/schema/spacewalk/oracle/packages/rhn_channel.pkb
+++ b/schema/spacewalk/oracle/packages/rhn_channel.pkb
@@ -63,11 +63,6 @@ IS
is_fve CHAR(1) := 'N';
update_lock number;
BEGIN
- select 1
- into update_lock
- from rhnServer
- where id = server_id_in
- for update;
if user_id_in is not null then
allowed := rhn_channel.user_role_check(channel_id_in, user_id_in, 'subscribe');
else
@@ -160,6 +155,13 @@ IS
from rhnChannel c
where c.id = channel_id_in
);
+
+ select 1
+ into update_lock
+ from rhnServerNeededCache
+ where server_id = server_id_in
+ for update;
+
UPDATE rhnServer SET channels_changed = current_timestamp WHERE id = server_id_in;
INSERT INTO rhnServerChannel (server_id, channel_id, is_fve) VALUES (server_id_in, channel_id_in, is_fve);
IF recalcfamily_in > 0
@@ -483,11 +485,6 @@ IS
and c.id = sc.channel_id
and sc.server_id = server_id_in;
BEGIN
- select 1
- into update_lock
- from rhnServer
- where id = server_id_in
- for update;
FOR child IN local_chk_server_parent_memb(server_id_in, channel_id_in)
LOOP
if unsubscribe_children_in = 1 then
@@ -525,6 +522,12 @@ IS
where c.id = channel_id_in
);
+ select 1
+ into update_lock
+ from rhnServerNeededCache
+ where server_id = server_id_in
+ for update;
+
UPDATE rhnServer SET channels_changed = current_timestamp WHERE id = server_id_in;
end if;
diff --git a/schema/spacewalk/oracle/packages/rhn_server.pkb b/schema/spacewalk/oracle/packages/rhn_server.pkb
index 40939b2..36b711c 100644
--- a/schema/spacewalk/oracle/packages/rhn_server.pkb
+++ b/schema/spacewalk/oracle/packages/rhn_server.pkb
@@ -747,13 +747,7 @@ is
procedure update_needed_cache(server_id_in in number)
is
- update_lock number;
begin
- select 1
- into update_lock
- from rhnServer
- where id = server_id_in
- for update;
delete from rhnServerNeededCache
where server_id = server_id_in;
insert into rhnServerNeededCache
diff --git a/schema/spacewalk/postgres/packages/rhn_channel.pkb b/schema/spacewalk/postgres/packages/rhn_channel.pkb
index 7f9adec..2db8fad 100644
--- a/schema/spacewalk/postgres/packages/rhn_channel.pkb
+++ b/schema/spacewalk/postgres/packages/rhn_channel.pkb
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 cc1b86fd8db5758d5f3a7ccc146f38954454def1
+-- oracle equivalent source sha1 3f65e7873daaa42b5ba247a903dc78d07c505bbc
--
-- Copyright (c) 2008--2013 Red Hat, Inc.
--
@@ -67,11 +67,6 @@ update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_
is_fve_char char(1) := 'N';
update_lock numeric;
BEGIN
- select 1
- into update_lock
- from rhnServer
- where id = server_id_in
- for update;
if user_id_in is not null then
allowed := rhn_channel.user_role_check(channel_id_in, user_id_in, 'subscribe');
else
@@ -153,6 +148,13 @@ update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_
from rhnChannel c
where c.id = channel_id_in
);
+
+ select 1
+ into update_lock
+ from rhnServerNeededCache
+ where server_id = server_id_in
+ for update;
+
UPDATE rhnServer SET channels_changed = current_timestamp WHERE id = server_id_in;
INSERT INTO rhnServerChannel (server_id, channel_id, is_fve) VALUES (server_id_in, channel_id_in, is_fve_char);
IF recalcfamily_in > 0
@@ -502,11 +504,6 @@ update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_
and label = 'rhn-satellite';
child record;
BEGIN
- select 1
- into update_lock
- from rhnServer
- where id = server_id_in
- for update;
-- In PostgreSQL recursion with opened cursors is not allowed so we use
-- FOR IN SELECT form which is ok.
FOR child IN select c.id
@@ -547,6 +544,12 @@ update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_
where c.id = channel_id_in
);
+ select 1
+ into update_lock
+ from rhnServerNeededCache
+ where server_id = server_id_in
+ for update;
+
UPDATE rhnServer SET channels_changed = current_timestamp WHERE id = server_id_in;
end if;
diff --git a/schema/spacewalk/postgres/packages/rhn_server.pkb b/schema/spacewalk/postgres/packages/rhn_server.pkb
index d47df86..41f2e9a 100644
--- a/schema/spacewalk/postgres/packages/rhn_server.pkb
+++ b/schema/spacewalk/postgres/packages/rhn_server.pkb
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 07b6ab3867e4d4ebf772b6ee9731f83e33f4d7ae
+-- oracle equivalent source sha1 b6947eea546edc7a66c7b53d0b62dc734ce3ca8a
--
-- Copyright (c) 2008--2012 Red Hat, Inc.
--
@@ -789,14 +789,7 @@ update pg_settings set setting = 'rhn_server,' || setting where name = 'search_p
create or replace function update_needed_cache(
server_id_in in numeric
) returns void as $$
- declare
- update_lock numeric;
begin
- select 1
- into update_lock
- from rhnServer
- where id = server_id_in
- for update;
delete from rhnServerNeededCache
where server_id = server_id_in;
insert into rhnServerNeededCache
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.oracle b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.oracle
index 74680f3..3b573e5 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.oracle
+++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.oracle
@@ -63,11 +63,6 @@ IS
is_fve CHAR(1) := 'N';
update_lock number;
BEGIN
- select 1
- into update_lock
- from rhnServer
- where id = server_id_in
- for update;
if user_id_in is not null then
allowed := rhn_channel.user_role_check(channel_id_in, user_id_in, 'subscribe');
else
@@ -160,6 +155,13 @@ IS
from rhnChannel c
where c.id = channel_id_in
);
+
+ select 1
+ into update_lock
+ from rhnServerNeededCache
+ where server_id = server_id_in
+ for update;
+
UPDATE rhnServer SET channels_changed = current_timestamp WHERE id = server_id_in;
INSERT INTO rhnServerChannel (server_id, channel_id, is_fve) VALUES (server_id_in, channel_id_in, is_fve);
IF recalcfamily_in > 0
@@ -483,11 +485,6 @@ IS
and c.id = sc.channel_id
and sc.server_id = server_id_in;
BEGIN
- select 1
- into update_lock
- from rhnServer
- where id = server_id_in
- for update;
FOR child IN local_chk_server_parent_memb(server_id_in, channel_id_in)
LOOP
if unsubscribe_children_in = 1 then
@@ -525,6 +522,12 @@ IS
where c.id = channel_id_in
);
+ select 1
+ into update_lock
+ from rhnServerNeededCache
+ where server_id = server_id_in
+ for update;
+
UPDATE rhnServer SET channels_changed = current_timestamp WHERE id = server_id_in;
end if;
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.postgresql
index 6708d12..e59c5d4 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.postgresql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.postgresql
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 2687a15d4354aa84c0af253684b234ed82900c66
+-- oracle equivalent source sha1 7f21173dd16ae3c29c150aa42623feba45894363
--
-- Copyright (c) 2008--2013 Red Hat, Inc.
--
@@ -67,11 +67,6 @@ update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_
is_fve_char char(1) := 'N';
update_lock numeric;
BEGIN
- select 1
- into update_lock
- from rhnServer
- where id = server_id_in
- for update;
if user_id_in is not null then
allowed := rhn_channel.user_role_check(channel_id_in, user_id_in, 'subscribe');
else
@@ -153,6 +148,13 @@ update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_
from rhnChannel c
where c.id = channel_id_in
);
+
+ select 1
+ into update_lock
+ from rhnServerNeededCache
+ where server_id = server_id_in
+ for update;
+
UPDATE rhnServer SET channels_changed = current_timestamp WHERE id = server_id_in;
INSERT INTO rhnServerChannel (server_id, channel_id, is_fve) VALUES (server_id_in, channel_id_in, is_fve_char);
IF recalcfamily_in > 0
@@ -502,11 +504,6 @@ update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_
and label = 'rhn-satellite';
child record;
BEGIN
- select 1
- into update_lock
- from rhnServer
- where id = server_id_in
- for update;
-- In PostgreSQL recursion with opened cursors is not allowed so we use
-- FOR IN SELECT form which is ok.
FOR child IN select c.id
@@ -547,6 +544,12 @@ update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_
where c.id = channel_id_in
);
+ select 1
+ into update_lock
+ from rhnServerNeededCache
+ where server_id = server_id_in
+ for update;
+
UPDATE rhnServer SET channels_changed = current_timestamp WHERE id = server_id_in;
end if;
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/049-rhn_server.pkb.oracle b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/049-rhn_server.pkb.oracle
deleted file mode 100644
index b910b56..0000000
--- a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/049-rhn_server.pkb.oracle
+++ /dev/null
@@ -1,790 +0,0 @@
---
--- Copyright (c) 2008--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.
---
---
---
---
-
-create or replace
-package body rhn_server
-is
- function system_service_level(
- server_id_in in number,
- service_level_in in varchar2
- ) return number is
-
- cursor ents is
- select label from rhnServerEntitlementView
- where server_id = server_id_in;
-
- retval number := 0;
-
- begin
- for ent in ents loop
- retval := rhn_entitlements.entitlement_grants_service (ent.label, service_level_in);
- if retval = 1 then
- return retval;
- end if;
- end loop;
-
- return retval;
-
- end system_service_level;
-
-
- function can_change_base_channel(server_id_in IN NUMBER)
- return number
- is
- throwaway number;
- begin
- -- the idea: if we get past this query, the server is
- -- neither sat nor proxy, so base channel is changeable
-
- select 1 into throwaway
- from rhnServer S
- where S.id = server_id_in
- and not exists (select 1 from rhnSatelliteInfo SI where SI.server_id = S.id)
- and not exists (select 1 from rhnProxyInfo PI where PI.server_id = S.id);
-
- return 1;
- exception
- when no_data_found
- then
- return 0;
- end can_change_base_channel;
-
- procedure set_custom_value(
- server_id_in in number,
- user_id_in in number,
- key_label_in in varchar2,
- value_in in varchar2
- ) is
- key_id_val number;
- begin
- select CDK.id into key_id_val
- from rhnCustomDataKey CDK,
- rhnServer S
- where S.id = server_id_in
- and S.org_id = CDK.org_id
- and CDK.label = key_label_in;
-
- begin
- insert into rhnServerCustomDataValue (server_id, key_id, value, created_by, last_modified_by)
- values (server_id_in, key_id_val, value_in, user_id_in, user_id_in);
- exception
- when DUP_VAL_ON_INDEX
- then
- update rhnServerCustomDataValue
- set value = value_in,
- last_modified_by = user_id_in
- where server_id = server_id_in
- and key_id = key_id_val;
- end;
-
- end set_custom_value;
-
- function bulk_set_custom_value(
- key_label_in in varchar2,
- value_in in varchar2,
- set_label_in in varchar2,
- set_uid_in in number
- )
- return integer
- is
- i integer := 0;
- begin
- i := 0;
- for server in (
- SELECT user_id, label, element, element_two
- FROM rhnSet
- WHERE label = set_label_in
- AND user_id = set_uid_in
- ) loop
- if rhn_server.system_service_level(server.element, 'provisioning') = 1 then
- rhn_server.set_custom_value(server.element, set_uid_in, key_label_in, value_in);
- i := i + 1;
- end if;
- end loop server;
- return i;
- end bulk_set_custom_value;
-
- procedure bulk_snapshot_tag(
- org_id_in in number,
- tagname_in in varchar2,
- set_label_in in varchar2,
- set_uid_in in number
- ) is
- snapshot_id number;
- begin
- for server in (
- SELECT user_id, label, element, element_two
- FROM rhnSet
- WHERE label = set_label_in
- AND user_id = set_uid_in
- ) loop
- if rhn_server.system_service_level(server.element, 'provisioning') = 1 then
- begin
- select max(id) into snapshot_id
- from rhnSnapshot
- where server_id = server.element;
- exception
- when NO_DATA_FOUND then
- rhn_server.snapshot_server(server.element, 'tagging system: ' || tagname_in);
-
- select max(id) into snapshot_id
- from rhnSnapshot
- where server_id = server.element;
- end;
-
- -- now have a snapshot_id to work with...
- begin
- rhn_server.tag_snapshot(snapshot_id, org_id_in, tagname_in);
- exception
- when DUP_VAL_ON_INDEX
- then
- -- do nothing, be forgiving...
- null;
- end;
- end if;
- end loop server;
- end bulk_snapshot_tag;
-
- procedure tag_delete(
- server_id_in in number,
- tag_id_in in number
- ) is
- cursor snapshots is
- select snapshot_id
- from rhnSnapshotTag
- where tag_id = tag_id_in;
- tag_id_tmp number;
- begin
- select id into tag_id_tmp
- from rhnTag
- where id = tag_id_in
- for update;
-
- delete
- from rhnSnapshotTag
- where server_id = server_id_in
- and tag_id = tag_id_in;
- for snapshot in snapshots loop
- return;
- end loop;
- delete
- from rhnTag
- where id = tag_id_in;
- end tag_delete;
-
- procedure tag_snapshot(
- snapshot_id_in in number,
- org_id_in in number,
- tagname_in in varchar2
- ) is
- begin
- insert into rhnSnapshotTag (snapshot_id, server_id, tag_id)
- select snapshot_id_in, server_id, lookup_tag(org_id_in, tagname_in)
- from rhnSnapshot
- where id = snapshot_id_in;
- end tag_snapshot;
-
- procedure bulk_snapshot(
- reason_in in varchar2,
- set_label_in in varchar2,
- set_uid_in in number
- ) is
- begin
- for server in (
- SELECT user_id, label, element, element_two
- FROM rhnSet
- WHERE label = set_label_in
- AND user_id = set_uid_in
- ) loop
- if rhn_server.system_service_level(server.element, 'provisioning') = 1 then
- rhn_server.snapshot_server(server.element, reason_in);
- end if;
- end loop server;
- end bulk_snapshot;
-
- procedure snapshot_server(
- server_id_in in number,
- reason_in in varchar2
- ) is
- snapshot_id number;
- cursor revisions is
- select distinct
- cr.id
- from rhnConfigRevision cr,
- rhnConfigFileName cfn,
- rhnConfigFile cf,
- rhnConfigChannel cc,
- rhnServerConfigChannel scc
- where 1=1
- and scc.server_id = server_id_in
- and scc.config_channel_id = cc.id
- and cc.id = cf.config_channel_id
- and cf.id = cr.config_file_id
- and cr.id = cf.latest_config_revision_id
- and cf.config_file_name_id = cfn.id
- and cf.id = lookup_first_matching_cf(scc.server_id, cfn.path);
- locked integer;
- begin
- select rhn_snapshot_id_seq.nextval into snapshot_id from dual;
-
- insert into rhnSnapshot (id, org_id, server_id, reason) (
- select snapshot_id,
- s.org_id,
- server_id_in,
- reason_in
- from rhnServer s
- where s.id = server_id_in
- );
- insert into rhnSnapshotChannel (snapshot_id, channel_id) (
- select snapshot_id, sc.channel_id
- from rhnServerChannel sc
- where sc.server_id = server_id_in
- );
- insert into rhnSnapshotServerGroup (snapshot_id, server_group_id) (
- select snapshot_id, sgm.server_group_id
- from rhnServerGroupMembers sgm
- where sgm.server_id = server_id_in
- );
- locked := 0;
- while true loop
- begin
- insert into rhnPackageNEVRA (id, name_id, evr_id, package_arch_id)
- select rhn_pkgnevra_id_seq.nextval, sp.name_id, sp.evr_id, sp.package_arch_id
- from rhnServerPackage sp
- where sp.server_id = server_id_in
- and not exists
- (select 1
- from rhnPackageNEVRA nevra
- where nevra.name_id = sp.name_id
- and nevra.evr_id = sp.evr_id
- and (nevra.package_arch_id = sp.package_arch_id
- or (nevra.package_arch_id is null
- and sp.package_arch_id is null)));
- exit;
- exception when dup_val_on_index then
- if locked = 1 then
- raise;
- else
- lock table rhnPackageNEVRA in exclusive mode;
- locked := 1;
- end if;
- end;
- end loop;
- insert into rhnSnapshotPackage (snapshot_id, nevra_id) (
- select distinct snapshot_id, nevra.id
- from rhnServerPackage sp, rhnPackageNEVRA nevra
- where sp.server_id = server_id_in
- and nevra.name_id = sp.name_id
- and nevra.evr_id = sp.evr_id
- and (nevra.package_arch_id = sp.package_arch_id
- or (nevra.package_arch_id is null
- and sp.package_arch_id is null))
- );
-
- insert into rhnSnapshotConfigChannel ( snapshot_id, config_channel_id ) (
- select snapshot_id, scc.config_channel_id
- from rhnServerConfigChannel scc
- where server_id = server_id_in
- );
-
- for revision in revisions loop
- insert into rhnSnapshotConfigRevision (
- snapshot_id, config_revision_id
- ) values (
- snapshot_id, revision.id
- );
- end loop;
- end snapshot_server;
-
- procedure remove_action(
- server_id_in in number,
- action_id_in in number
- ) is
- -- this really wants "nulls last", but 8.1.7.3.0 sucks ass.
- -- instead, we make a local table that holds our
- -- list of ids with null prereqs. There's surely a better way
- -- (an array instead of a table maybe? who knows...)
- -- but I've got code to do this handy that I can look at ;)
- cursor chained_actions is
- select id, prerequisite
- from rhnAction
- start with id = action_id_in
- connect by prior id = prerequisite
- order by prerequisite desc;
- cursor sessions is
- select s.id
- from rhnKickstartSession s
- where server_id_in in (s.old_server_id, s.new_server_id)
- and s.action_id = action_id_in
- and not exists (
- select 1
- from rhnKickstartSessionState ss
- where ss.id = s.state_id
- and ss.label in ('failed','complete')
- );
- type chain_end_type is table of number index by binary_integer;
- chain_ends chain_end_type;
- i number;
- prereq number := 1;
- begin
- select prerequisite
- into prereq
- from rhnAction
- where id = action_id_in;
-
- if prereq is not null then
- rhn_exception.raise_exception('action_is_child');
- end if;
-
- i := 0;
- for action in chained_actions loop
- if action.prerequisite is null then
- chain_ends(i) := action.id;
- i := i + 1;
- else
- delete from rhnServerAction
- where server_id = server_id_in
- and action_id = action.id;
- end if;
- end loop;
- i := chain_ends.first;
- while i is not null loop
- delete from rhnServerAction
- where server_id = server_id_in
- and action_id = chain_ends(i);
- i := chain_ends.next(i);
- end loop;
- for s in sessions loop
- update rhnKickstartSession
- set state_id = (
- select id
- from rhnKickstartSessionState
- where label = 'failed'
- ),
- action_id = null
- where id = s.id;
- set_ks_session_history_message(s.id, 'failed', 'Kickstart cancelled due to action removal');
- end loop;
- end remove_action;
-
- function check_user_access(server_id_in in number, user_id_in in number)
- return number
- is
- has_access number;
- begin
- -- first check; if this returns no rows, then the server/user are in different orgs, and we bail
- select 1 into has_access
- from rhnServer S,
- web_contact wc
- where wc.org_id = s.org_id
- and s.id = server_id_in
- and wc.id = user_id_in;
-
- -- okay, so they're in the same org. if we have an org admin, they get a free pass
- if rhn_user.check_role(user_id_in, 'org_admin') = 1
- then
- return 1;
- end if;
-
- select 1 into has_access
- from rhnServerGroupMembers SGM,
- rhnUserServerGroupPerms USG
- where SGM.server_group_id = USG.server_group_id
- and SGM.server_id = server_id_in
- and USG.user_id = user_id_in
- and rownum = 1;
-
- return 1;
- exception
- when no_data_found
- then
- return 0;
- end check_user_access;
-
- -- *******************************************************************
- -- FUNCTION: can_server_consume_virt_slot
- -- Returns 1 if the server id is eligible to consume a virtual slot,
- -- else returns 0.
- -- Called by: insert_into_servergroup, delete_from_servergroup
- -- *******************************************************************
- function can_server_consume_virt_slot(server_id_in in number,
- group_type_in in
- rhnServerGroupType.label%TYPE)
- return number
- is
-
- cursor server_virt_slots is
- select vi.VIRTUAL_SYSTEM_ID
- from
- rhnVirtualInstance vi
- where
- -- server id is a virtual instance
- vi.VIRTUAL_SYSTEM_ID = server_id_in
- -- server id's host is virt entitled
- and exists ( select 1
- from rhnServerEntitlementView sev
- where vi.HOST_SYSTEM_ID = sev.server_id
- and sev.label in ('virtualization_host',
- 'virtualization_host_platform') )
- -- server id's host also has the ent we want
- and exists ( select 1
- from rhnServerEntitlementView sev2
- where vi.HOST_SYSTEM_ID = sev2.server_id
- and sev2.label = group_type_in );
-
- begin
- for server_virt_slot in server_virt_slots loop
- return 1;
- end loop;
- return 0;
- end can_server_consume_virt_slot;
-
-
- procedure insert_into_servergroup (
- server_id_in in number,
- server_group_id_in in number
- ) is
- used_slots number;
- max_slots number;
- org_id number;
- mgmt_available number;
- mgmt_upgrade number;
- mgmt_sgid number;
- prov_available number;
- prov_upgrade number;
- prov_sgid number;
- group_label rhnServerGroupType.label%TYPE;
- group_type number;
- begin
- -- frist, group_type = null, because it's easy...
-
- -- this will rowlock the servergroup we're trying to change;
- -- we probably need to lock the other one, but I think the chances
- -- of it being a real issue are very small for now...
- select sg.group_type, sg.org_id, sg.current_members, sg.max_members
- into group_type, org_id, used_slots, max_slots
- from rhnServerGroup sg
- where sg.id = server_group_id_in
- for update of sg.current_members;
-
- if group_type is null then
- if used_slots >= max_slots then
- rhn_exception.raise_exception('servergroup_max_members');
- end if;
-
- insert into rhnServerGroupMembers(
- server_id, server_group_id
- ) values (
- server_id_in, server_group_id_in
- );
- update rhnServerGroup
- set current_members = current_members + 1
- where id = server_group_id_in;
-
- rhn_cache.update_perms_for_server_group(server_group_id_in);
- return;
- end if;
-
- -- now for group_type != null
- --
- select label
- into group_label
- from rhnServerGroupType sgt
- where sgt.id = group_type;
-
- -- the naive easy path that gets hit most often and has to be quickest.
- if group_label in ('sw_mgr_entitled',
- 'enterprise_entitled',
- 'monitoring_entitled',
- 'provisioning_entitled',
- 'virtualization_host',
- 'virtualization_host_platform') then
- if used_slots >= max_slots and
- (can_server_consume_virt_slot(server_id_in, group_label) != 1)
- then
- rhn_exception.raise_exception('servergroup_max_members');
- end if;
-
- insert into rhnServerGroupMembers(
- server_id, server_group_id
- ) values (
- server_id_in, server_group_id_in
- );
-
- -- Only update current members if the system in consuming a
- -- physical slot.
- if can_server_consume_virt_slot(server_id_in, group_label) = 0 then
- update rhnServerGroup
- set current_members = current_members + 1
- where id = server_group_id_in;
- end if;
-
- return;
- end if;
- end;
-
- function insert_into_servergroup_maybe (
- server_id_in in number,
- server_group_id_in in number
- ) return number is
- retval number := 0;
- cursor servergroups is
- select s.id server_id,
- sg.id server_group_id
- from rhnServerGroup sg,
- rhnServer s
- where s.id = server_id_in
- and sg.id = server_group_id_in
- and s.org_id = sg.org_id
- and not exists (
- select 1
- from rhnServerGroupMembers sgm
- where sgm.server_id = s.id
- and sgm.server_group_id = sg.id
- );
- begin
- for sgm in servergroups loop
- rhn_server.insert_into_servergroup(sgm.server_id, sgm.server_group_id);
- retval := retval + 1;
- end loop;
- return retval;
- end insert_into_servergroup_maybe;
-
- procedure insert_set_into_servergroup (
- server_group_id_in in number,
- user_id_in in number,
- set_label_in in varchar2
- ) is
- cursor servers is
- select st.element id
- from rhnSet st
- where st.user_id = user_id_in
- and st.label = set_label_in
- and exists (
- select 1
- from rhnUserManagedServerGroups umsg
- where umsg.server_group_id = server_group_id_in
- and umsg.user_id = user_id_in
- )
- and not exists (
- select 1
- from rhnServerGroupMembers sgm
- where sgm.server_id = st.element
- and sgm.server_group_id = server_group_id_in
- );
- begin
- for s in servers loop
- rhn_server.insert_into_servergroup(s.id, server_group_id_in);
- end loop;
- end insert_set_into_servergroup;
-
- procedure delete_from_servergroup (
- server_id_in in number,
- server_group_id_in in number
- ) is
- cursor server_virt_groups is
- select 1
- from rhnServerEntitlementVirtual sev
- where sev.server_id = server_id_in
- and sev.server_group_id = server_group_id_in;
-
- oid number;
- mgmt_sgid number;
- label rhnServerGroupType.label%TYPE;
- group_type number;
- begin
- begin
- select sg.group_type, sg.org_id
- into group_type, oid
- from rhnServerGroupMembers sgm,
- rhnServerGroup sg
- where sg.id = server_group_id_in
- and sg.id = sgm.server_group_id
- and sgm.server_id = server_id_in
- for update of sg.current_members;
- exception
- when no_data_found then
- rhn_exception.raise_exception('server_not_in_group');
- end;
-
- -- do group_type is null first
- if group_type is null then
- delete from rhnServerGroupMembers
- where server_group_id = server_group_id_in
- and server_id = server_id_in;
- update rhnServerGroup
- set current_members = current_members - 1
- where id = server_group_id_in;
- rhn_cache.update_perms_for_server_group(server_group_id_in);
- return;
- end if;
-
- select sgt.label
- into label
- from rhnServerGroupType sgt
- where sgt.id = group_type;
-
- if label in ('sw_mgr_entitled',
- 'enterprise_entitled',
- 'provisioning_entitled',
- 'monitoring_entitled',
- 'virtualization_host',
- 'virtualization_host_platform') then
-
- -- Only update current members if the system is consuming
- -- a physical slot.
- for server_virt_group in server_virt_groups loop
- delete from rhnServerGroupMembers
- where server_group_id = server_group_id_in
- and server_id = server_id_in;
- return;
- end loop;
-
- delete from rhnServerGroupMembers
- where server_group_id = server_group_id_in
- and server_id = server_id_in;
-
- update rhnServerGroup
- set current_members = current_members - 1
- where id = server_group_id_in;
-
- end if;
- end;
-
- procedure delete_set_from_servergroup (
- server_group_id_in in number,
- user_id_in in number,
- set_label_in in varchar2
- ) is
- cursor servergroups is
- select sgm.server_id, sgm.server_group_id
- from rhnSet st,
- rhnServerGroupMembers sgm
- where sgm.server_group_id = server_group_id_in
- and st.user_id = user_id_in
- and st.label = set_label_in
- and sgm.server_id = st.element
- and exists (
- select 1
- from rhnUserManagedServerGroups usgp
- where usgp.server_group_id = server_group_id_in
- and usgp.user_id = user_id_in
- );
- begin
- for sgm in servergroups loop
- rhn_server.delete_from_servergroup(sgm.server_id, server_group_id_in);
- end loop;
- end delete_set_from_servergroup;
-
- procedure clear_servergroup (
- server_group_id_in in number
- ) is
- cursor servers is
- select sgm.server_id id
- from rhnServerGroupMembers sgm
- where sgm.server_group_id = server_group_id_in;
- begin
- for s in servers loop
- rhn_server.delete_from_servergroup(s.id, server_group_id_in);
- end loop;
- end clear_servergroup;
-
- procedure delete_from_org_servergroups (
- server_id_in in number
- ) is
- cursor servergroups is
- select sgm.server_group_id id
- from rhnServerGroup sg,
- rhnServerGroupMembers sgm
- where sgm.server_id = server_id_in
- and sgm.server_group_id = sg.id
- and sg.group_type is null;
- begin
- for sg in servergroups loop
- rhn_server.delete_from_servergroup(server_id_in, sg.id);
- end loop;
- end delete_from_org_servergroups;
-
- function get_ip_address (
- server_id_in in number
- ) return varchar2 is
- cursor interfaces is
- select ni.name as name, na4.address as address
- from rhnServerNetInterface ni,
- rhnServerNetAddress4 na4
- where ni.server_id = server_id_in
- and ni.id = na4.interface_id
- and na4.address != '127.0.0.1';
- cursor addresses is
- select ipaddr ip_addr
- from rhnServerNetwork
- where server_id = server_id_in
- and ipaddr != '127.0.0.1';
- begin
- for addr in addresses loop
- return addr.ip_addr;
- end loop;
- for iface in interfaces loop
- return iface.address;
- end loop;
- return NULL;
- end get_ip_address;
-
- procedure update_needed_cache(server_id_in in number)
- is
- update_lock number;
- begin
- select 1
- into update_lock
- from rhnServer
- where id = server_id_in
- for update;
- delete from rhnServerNeededCache
- where server_id = server_id_in;
- insert into rhnServerNeededCache
- (server_id, errata_id, package_id, channel_id)
- (select distinct sp.server_id, x.errata_id, p.id, x.channel_id
- FROM (SELECT sp_sp.server_id, sp_sp.name_id,
- sp_sp.package_arch_id, max(sp_pe.evr) AS max_evr
- FROM rhnServerPackage sp_sp
- join rhnPackageEvr sp_pe ON sp_pe.id = sp_sp.evr_id
- GROUP BY sp_sp.server_id, sp_sp.name_id, sp_sp.package_arch_id) sp
- join rhnPackage p ON p.name_id = sp.name_id
- join rhnPackageEvr pe ON pe.id = p.evr_id
- AND sp.max_evr < pe.evr
- join rhnPackageUpgradeArchCompat puac
- ON puac.package_arch_id = sp.package_arch_id
- AND puac.package_upgrade_arch_id = p.package_arch_id
- join rhnServerChannel sc ON sc.server_id = sp.server_id
- join rhnChannelPackage cp ON cp.package_id = p.id
- AND cp.channel_id = sc.channel_id
- left join (SELECT ep.errata_id, ce.channel_id, ep.package_id
- FROM rhnChannelErrata ce
- join rhnErrataPackage ep
- ON ep.errata_id = ce.errata_id
- join rhnServerChannel sc_sc
- ON sc_sc.channel_id = ce.channel_id
- WHERE sc_sc.server_id = server_id_in) x
- ON x.channel_id = sc.channel_id
- AND x.package_id = cp.package_id
- where sp.server_id = server_id_in);
- end update_needed_cache;
-
-end rhn_server;
-/
-SHOW ERRORS
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/049-rhn_server.pkb.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/049-rhn_server.pkb.postgresql
deleted file mode 100644
index ee89929..0000000
--- a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/049-rhn_server.pkb.postgresql
+++ /dev/null
@@ -1,829 +0,0 @@
--- oracle equivalent source sha1 d15b33804b83137c38edd4ca8b7981741cd93e98
---
--- Copyright (c) 2008--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.
---
---
---
---
-
--- create schema rhn_server;
-
---update pg_setting
-update pg_settings set setting = 'rhn_server,' || setting where name = 'search_path';
-
- create or replace function system_service_level(
- server_id_in in numeric,
- service_level_in in varchar
- ) returns numeric as $$
- declare
- ents cursor is
- select label from rhnServerEntitlementView
- where server_id = server_id_in;
-
- retval numeric := 0;
-
- begin
- for ent in ents loop
- retval := rhn_entitlements.entitlement_grants_service (ent.label, service_level_in);
- if retval = 1 then
- return retval;
- end if;
- end loop;
-
- return retval;
-
- end$$ language plpgsql;
-
-
- create or replace function can_change_base_channel(server_id_in IN NUMERIC)
- returns numeric
- as $$
- declare
- throwaway numeric;
- begin
- -- the idea: if we get past this query, the server is
- -- neither sat nor proxy, so base channel is changeable
-
- select 1 into throwaway
- from rhnServer S
- where S.id = server_id_in
- and not exists (select 1 from rhnSatelliteInfo SI where SI.server_id = S.id)
- and not exists (select 1 from rhnProxyInfo PI where PI.server_id = S.id);
-
- if not found then
- return 0;
- end if;
-
- return 1;
- end$$ language plpgsql;
-
- create or replace function set_custom_value(
- server_id_in in numeric,
- user_id_in in numeric,
- key_label_in in varchar,
- value_in in varchar
- ) returns void
- as $$
- declare
- key_id_val numeric;
- begin
- select CDK.id into strict key_id_val
- from rhnCustomDataKey CDK,
- rhnServer S
- where S.id = server_id_in
- and S.org_id = CDK.org_id
- and CDK.label = key_label_in;
-
- begin
- insert into rhnServerCustomDataValue (server_id, key_id, value, created_by, last_modified_by)
- values (server_id_in, key_id_val, value_in, user_id_in, user_id_in);
- exception
- when UNIQUE_VIOLATION
- then
- update rhnServerCustomDataValue
- set value = value_in,
- last_modified_by = user_id_in
- where server_id = server_id_in
- and key_id = key_id_val;
- end;
-
- end$$ language plpgsql;
-
- create or replace function bulk_set_custom_value(
- key_label_in in varchar,
- value_in in varchar,
- set_label_in in varchar,
- set_uid_in in numeric
- )
- returns integer
- as $$
- declare
- i integer;
- server record;
- begin
- i := 0;
- for server in (
- SELECT user_id, label, element, element_two
- FROM rhnSet
- WHERE label = set_label_in
- AND user_id = set_uid_in
- ) loop
- if rhn_server.system_service_level(server.element, 'provisioning') = 1 then
- perform rhn_server.set_custom_value(server.element, set_uid_in, key_label_in, value_in);
- i := i + 1;
- end if;
- end loop;
- return i;
- end$$ language plpgsql;
-
- create or replace function bulk_snapshot_tag(
- org_id_in in numeric,
- tagname_in in varchar,
- set_label_in in varchar,
- set_uid_in in numeric
- ) returns void
- as $$
- declare
- server record;
- snapshot_id numeric;
- begin
- for server in (
- SELECT user_id, label, element, element_two
- FROM rhnSet
- WHERE label = set_label_in
- AND user_id = set_uid_in
- ) loop
- if rhn_server.system_service_level(server.element, 'provisioning') = 1 then
- select max(id) into snapshot_id
- from rhnSnapshot
- where server_id = server.element;
-
- if snapshot_id is null then
- perform rhn_server.snapshot_server(server.element, 'tagging system: ' || tagname_in);
-
- select max(id) into snapshot_id
- from rhnSnapshot
- where server_id = server.element;
- end if;
-
- -- now have a snapshot_id to work with...
- begin
- perform rhn_server.tag_snapshot(snapshot_id, org_id_in, tagname_in);
- exception
- when UNIQUE_VIOLATION
- then
- -- do nothing, be forgiving...
- null;
- end;
- end if;
- end loop;
- end$$ language plpgsql;
-
- create or replace function tag_delete(
- server_id_in in numeric,
- tag_id_in in numeric
- ) returns void
- as $$
- declare
- snapshots cursor is
- select snapshot_id
- from rhnSnapshotTag
- where tag_id = tag_id_in;
- tag_id_tmp numeric;
- begin
- select id into tag_id_tmp
- from rhnTag
- where id = tag_id_in
- for update;
-
- delete
- from rhnSnapshotTag
- where server_id = server_id_in
- and tag_id = tag_id_in;
- for snapshot in snapshots loop
- return;
- end loop;
- delete
- from rhnTag
- where id = tag_id_in;
- end$$ language plpgsql;
-
- create or replace function tag_snapshot(
- snapshot_id_in in numeric,
- org_id_in in numeric,
- tagname_in in varchar
- ) returns void
- as $$
- begin
- insert into rhnSnapshotTag (snapshot_id, server_id, tag_id)
- select snapshot_id_in, server_id, lookup_tag(org_id_in, tagname_in)
- from rhnSnapshot
- where id = snapshot_id_in;
- end$$ language plpgsql;
-
- create or replace function bulk_snapshot(
- reason_in in varchar,
- set_label_in in varchar,
- set_uid_in in numeric
- ) returns void
- as $$
- declare
- server record;
- begin
- for server in (
- SELECT user_id, label, element, element_two
- FROM rhnSet
- WHERE label = set_label_in
- AND user_id = set_uid_in
- ) loop
- if rhn_server.system_service_level(server.element, 'provisioning') = 1 then
- perform rhn_server.snapshot_server(server.element, reason_in);
- end if;
- end loop;
- end$$ language plpgsql;
-
- create or replace function snapshot_server(
- server_id_in in numeric,
- reason_in in varchar
- ) returns void
- as $$
- declare
- snapshot_id_v numeric;
- revisions cursor is
- select distinct
- cr.id
- from rhnConfigRevision cr,
- rhnConfigFileName cfn,
- rhnConfigFile cf,
- rhnConfigChannel cc,
- rhnServerConfigChannel scc
- where 1=1
- and scc.server_id = server_id_in
- and scc.config_channel_id = cc.id
- and cc.id = cf.config_channel_id
- and cf.id = cr.config_file_id
- and cr.id = cf.latest_config_revision_id
- and cf.config_file_name_id = cfn.id
- and cf.id = lookup_first_matching_cf(scc.server_id, cfn.path);
- locked integer;
- begin
- select nextval('rhn_snapshot_id_seq') into snapshot_id_v;
-
- insert into rhnSnapshot (id, org_id, server_id, reason) (
- select snapshot_id_v,
- s.org_id,
- server_id_in,
- reason_in
- from rhnServer s
- where s.id = server_id_in
- );
- insert into rhnSnapshotChannel (snapshot_id, channel_id) (
- select snapshot_id_v, sc.channel_id
- from rhnServerChannel sc
- where sc.server_id = server_id_in
- );
- insert into rhnSnapshotServerGroup (snapshot_id, server_group_id) (
- select snapshot_id_v, sgm.server_group_id
- from rhnServerGroupMembers sgm
- where sgm.server_id = server_id_in
- );
- locked := 0;
- <<iloop>>
- while true loop
- begin
- insert into rhnPackageNEVRA (id, name_id, evr_id, package_arch_id)
- select nextval('rhn_pkgnevra_id_seq'), sp.name_id, sp.evr_id, sp.package_arch_id
- from rhnServerPackage sp
- where sp.server_id = server_id_in
- and not exists
- (select 1
- from rhnPackageNEVRA nevra
- where nevra.name_id = sp.name_id
- and nevra.evr_id = sp.evr_id
- and (nevra.package_arch_id = sp.package_arch_id
- or (nevra.package_arch_id is null
- and sp.package_arch_id is null)));
- exit iloop;
- exception when unique_violation then
- if locked = 1 then
- raise;
- else
- lock table rhnPackageNEVRA in exclusive mode;
- locked := 1;
- end if;
- end;
- end loop;
- insert into rhnSnapshotPackage (snapshot_id, nevra_id) (
- select distinct snapshot_id_v, nevra.id
- from rhnServerPackage sp, rhnPackageNEVRA nevra
- where sp.server_id = server_id_in
- and nevra.name_id = sp.name_id
- and nevra.evr_id = sp.evr_id
- and (nevra.package_arch_id = sp.package_arch_id
- or (nevra.package_arch_id is null
- and sp.package_arch_id is null))
- );
-
- insert into rhnSnapshotConfigChannel ( snapshot_id, config_channel_id ) (
- select snapshot_id_v, scc.config_channel_id
- from rhnServerConfigChannel scc
- where server_id = server_id_in
- );
-
- for revision in revisions loop
- insert into rhnSnapshotConfigRevision (
- snapshot_id, config_revision_id
- ) values (
- snapshot_id_v, revision.id
- );
- end loop;
- end$$ language plpgsql;
-
- create or replace function remove_action(
- server_id_in in numeric,
- action_id_in in numeric
- ) returns void
- as $$
- declare
- -- this really wants "nulls last", but 8.1.7.3.0 sucks ass.
- -- instead, we make a local table that holds our
- -- list of ids with null prereqs. There's surely a better way
- -- (an array instead of a table maybe? who knows...)
- -- but I've got code to do this handy that I can look at ;)
- chained_actions cursor is
- with recursive r(id, prerequisite) as (
- select id, prerequisite
- from rhnAction
- where id = action_id_in
- union all
- select r1.id, r1.prerequisite
- from rhnAction r1, r
- where r.id = r1.prerequisite
- )
- select * from r
- order by prerequisite desc;
- sessions cursor is
- select s.id
- from rhnKickstartSession s
- where server_id_in in (s.old_server_id, s.new_server_id)
- and s.action_id = action_id_in
- and not exists (
- select 1
- from rhnKickstartSessionState ss
- where ss.id = s.state_id
- and ss.label in ('failed','complete')
- );
- chain_ends numeric[];
- i numeric;
- prereq numeric := 1;
- begin
- select prerequisite
- into prereq
- from rhnAction
- where id = action_id_in;
-
- if prereq is not null then
- perform rhn_exception.raise_exception('action_is_child');
- end if;
-
- chain_ends := '{}';
- i := 1;
- for action in chained_actions loop
- if action.prerequisite is null then
- chain_ends[i] := action.id;
- i := i + 1;
- else
- delete from rhnServerAction
- where server_id = server_id_in
- and action_id = action.id;
- end if;
- end loop;
-
- delete from rhnServerAction
- where server_id = server_id_in
- and action_id = any(chain_ends);
-
- for s in sessions loop
- update rhnKickstartSession
- set state_id = (
- select id
- from rhnKickstartSessionState
- where label = 'failed'
- ),
- action_id = null
- where id = s.id;
- perform set_ks_session_history_message(s.id, 'failed', 'Kickstart cancelled due to action removal');
- end loop;
- end$$ language plpgsql;
-
- create or replace function check_user_access(server_id_in in numeric, user_id_in in numeric)
- returns numeric
- as $$
- declare
- has_access numeric;
- begin
- -- first check; if this returns no rows, then the server/user are in different orgs, and we bail
- select 1 into has_access
- from rhnServer S,
- web_contact wc
- where wc.org_id = s.org_id
- and s.id = server_id_in
- and wc.id = user_id_in;
-
- if not found then
- return 0;
- end if;
-
- -- okay, so they're in the same org. if we have an org admin, they get a free pass
- if rhn_user.check_role(user_id_in, 'org_admin') = 1
- then
- return 1;
- end if;
-
- select 1 into has_access
- from rhnServerGroupMembers SGM,
- rhnUserServerGroupPerms USG
- where SGM.server_group_id = USG.server_group_id
- and SGM.server_id = server_id_in
- and USG.user_id = user_id_in;
-
- if not found then
- return 0;
- end if;
-
- return 1;
- end$$ language plpgsql;
-
- -- *******************************************************************
- -- FUNCTION: can_server_consume_virt_slot
- -- Returns 1 if the server id is eligible to consume a virtual slot,
- -- else returns 0.
- -- Called by: insert_into_servergroup, delete_from_servergroup
- -- *******************************************************************
- create or replace function can_server_consume_virt_slot(server_id_in in numeric,
- group_type_in in varchar)
- returns numeric
- as $$
- declare
- server_virt_slots cursor is
- select vi.VIRTUAL_SYSTEM_ID
- from
- rhnVirtualInstance vi
- where
- -- server id is a virtual instance
- vi.VIRTUAL_SYSTEM_ID = server_id_in
- -- server id's host is virt entitled
- and exists ( select 1
- from rhnServerEntitlementView sev
- where vi.HOST_SYSTEM_ID = sev.server_id
- and sev.label in ('virtualization_host',
- 'virtualization_host_platform') )
- -- server id's host also has the ent we want
- and exists ( select 1
- from rhnServerEntitlementView sev2
- where vi.HOST_SYSTEM_ID = sev2.server_id
- and sev2.label = group_type_in );
-
- begin
- for server_virt_slot in server_virt_slots loop
- return 1;
- end loop;
- return 0;
- end$$ language plpgsql;
-
-
- create or replace function insert_into_servergroup (
- server_id_in in numeric,
- server_group_id_in in numeric
- ) returns void
- as $$
- declare
- used_slots numeric;
- max_slots numeric;
- org_id numeric;
- mgmt_available numeric;
- mgmt_upgrade numeric;
- mgmt_sgid numeric;
- prov_available numeric;
- prov_upgrade numeric;
- prov_sgid numeric;
- group_label varchar;
- group_type numeric;
- begin
- -- first, group_type = null, because it's easy...
-
- -- this will rowlock the servergroup we're trying to change;
- -- we probably need to lock the other one, but I think the chances
- -- of it being a real issue are very small for now...
- select sg.group_type, sg.org_id, sg.current_members, sg.max_members
- into group_type, org_id, used_slots, max_slots
- from rhnServerGroup sg
- where sg.id = server_group_id_in
- for update of sg;
-
- if group_type is null then
- if used_slots >= max_slots then
- perform rhn_exception.raise_exception('servergroup_max_members');
- end if;
-
- insert into rhnServerGroupMembers(
- server_id, server_group_id
- ) values (
- server_id_in, server_group_id_in
- );
- update rhnServerGroup
- set current_members = current_members + 1
- where id = server_group_id_in;
-
- perform rhn_cache.update_perms_for_server_group(server_group_id_in);
- return;
- end if;
-
- -- now for group_type != null
- --
- select label
- into group_label
- from rhnServerGroupType sgt
- where sgt.id = group_type;
-
- -- the naive easy path that gets hit most often and has to be quickest.
- if group_label in ('sw_mgr_entitled',
- 'enterprise_entitled',
- 'monitoring_entitled',
- 'provisioning_entitled',
- 'virtualization_host',
- 'virtualization_host_platform') then
- if used_slots >= max_slots and
- (rhn_server.can_server_consume_virt_slot(server_id_in, group_label) != 1)
- then
- perform rhn_exception.raise_exception('servergroup_max_members');
- end if;
-
- insert into rhnServerGroupMembers(
- server_id, server_group_id
- ) values (
- server_id_in, server_group_id_in
- );
-
- -- Only update current members if the system in consuming a
- -- physical slot.
- if rhn_server.can_server_consume_virt_slot(server_id_in, group_label) = 0 then
- update rhnServerGroup
- set current_members = current_members + 1
- where id = server_group_id_in;
- end if;
-
- return;
- end if;
- end$$ language plpgsql;
-
- create or replace function insert_into_servergroup_maybe (
- server_id_in in numeric,
- server_group_id_in in numeric
- ) returns numeric as $$
- declare
- retval numeric := 0;
- servergroups cursor is
- select s.id server_id,
- sg.id server_group_id
- from rhnServerGroup sg,
- rhnServer s
- where s.id = server_id_in
- and sg.id = server_group_id_in
- and s.org_id = sg.org_id
- and not exists (
- select 1
- from rhnServerGroupMembers sgm
- where sgm.server_id = s.id
- and sgm.server_group_id = sg.id
- );
- begin
- for sgm in servergroups loop
- perform rhn_server.insert_into_servergroup(sgm.server_id, sgm.server_group_id);
- retval := retval + 1;
- end loop;
- return retval;
- end$$ language plpgsql;
-
- create or replace function insert_set_into_servergroup (
- server_group_id_in in numeric,
- user_id_in in numeric,
- set_label_in in varchar
- ) returns void
- as $$
- declare
- servers cursor is
- select st.element id
- from rhnSet st
- where st.user_id = user_id_in
- and st.label = set_label_in
- and exists (
- select 1
- from rhnUserManagedServerGroups umsg
- where umsg.server_group_id = server_group_id_in
- and umsg.user_id = user_id_in
- )
- and not exists (
- select 1
- from rhnServerGroupMembers sgm
- where sgm.server_id = st.element
- and sgm.server_group_id = server_group_id_in
- );
- begin
- for s in servers loop
- perform rhn_server.insert_into_servergroup(s.id, server_group_id_in);
- end loop;
- end$$ language plpgsql;
-
- create or replace function delete_from_servergroup (
- server_id_in in numeric,
- server_group_id_in in numeric
- ) returns void
- as $$
- declare
- server_virt_groups cursor is
- select 1
- from rhnServerEntitlementVirtual sev
- where sev.server_id = server_id_in
- and sev.server_group_id = server_group_id_in;
-
- oid numeric;
- mgmt_sgid numeric;
- label varchar;
- group_type numeric;
- begin
- select sg.group_type, sg.org_id
- into group_type, oid
- from rhnServerGroupMembers sgm,
- rhnServerGroup sg
- where sg.id = server_group_id_in
- and sg.id = sgm.server_group_id
- and sgm.server_id = server_id_in
- for update of sg;
-
- if not found then
- perform rhn_exception.raise_exception('server_not_in_group');
- end if;
-
- -- do group_type is null first
- if group_type is null then
- delete from rhnServerGroupMembers
- where server_group_id = server_group_id_in
- and server_id = server_id_in;
- update rhnServerGroup
- set current_members = current_members - 1
- where id = server_group_id_in;
- perform rhn_cache.update_perms_for_server_group(server_group_id_in);
- return;
- end if;
-
- select sgt.label
- into label
- from rhnServerGroupType sgt
- where sgt.id = group_type;
-
- if label in ('sw_mgr_entitled',
- 'enterprise_entitled',
- 'provisioning_entitled',
- 'monitoring_entitled',
- 'virtualization_host',
- 'virtualization_host_platform') then
-
- -- Only update current members if the system is consuming
- -- a physical slot.
- for server_virt_group in server_virt_groups loop
- delete from rhnServerGroupMembers
- where server_group_id = server_group_id_in
- and server_id = server_id_in;
- return;
- end loop;
-
- delete from rhnServerGroupMembers
- where server_group_id = server_group_id_in
- and server_id = server_id_in;
-
- update rhnServerGroup
- set current_members = current_members - 1
- where id = server_group_id_in;
-
- end if;
- end$$ language plpgsql;
-
- create or replace function delete_set_from_servergroup (
- server_group_id_in in numeric,
- user_id_in in numeric,
- set_label_in in varchar
- ) returns void
- as $$
- declare
- servergroups cursor is
- select sgm.server_id, sgm.server_group_id
- from rhnSet st,
- rhnServerGroupMembers sgm
- where sgm.server_group_id = server_group_id_in
- and st.user_id = user_id_in
- and st.label = set_label_in
- and sgm.server_id = st.element
- and exists (
- select 1
- from rhnUserManagedServerGroups usgp
- where usgp.server_group_id = server_group_id_in
- and usgp.user_id = user_id_in
- );
- begin
- for sgm in servergroups loop
- perform rhn_server.delete_from_servergroup(sgm.server_id, server_group_id_in);
- end loop;
- end$$ language plpgsql;
-
- create or replace function clear_servergroup (
- server_group_id_in in numeric
- ) returns void
- as $$
- declare
- servers cursor is
- select sgm.server_id id
- from rhnServerGroupMembers sgm
- where sgm.server_group_id = server_group_id_in;
- begin
- for s in servers loop
- perform rhn_server.delete_from_servergroup(s.id, server_group_id_in);
- end loop;
- end$$ language plpgsql;
-
- create or replace function delete_from_org_servergroups (
- server_id_in in numeric
- ) returns void
- as $$
- declare
- servergroups cursor is
- select sgm.server_group_id id
- from rhnServerGroup sg,
- rhnServerGroupMembers sgm
- where sgm.server_id = server_id_in
- and sgm.server_group_id = sg.id
- and sg.group_type is null;
- begin
- for sg in servergroups loop
- perform rhn_server.delete_from_servergroup(server_id_in, sg.id);
- end loop;
- end$$ language plpgsql;
-
- create or replace function get_ip_address (
- server_id_in in numeric
- ) returns varchar as $$
- declare
- interfaces cursor is
- select ni.name as name, na4.address as address
- from rhnServerNetInterface ni,
- rhnServerNetAddress4 na4
- where server_id = server_id_in
- and ni.id = na4.interface_id
- and na4.address != '127.0.0.1';
- addresses cursor is
- select ipaddr ip_addr
- from rhnServerNetwork
- where server_id = server_id_in
- and ipaddr != '127.0.0.1';
- begin
- for addr in addresses loop
- return addr.ip_addr;
- end loop;
- for iface in interfaces loop
- return iface.address;
- end loop;
- return NULL;
- end$$ language plpgsql;
-
- create or replace function update_needed_cache(
- server_id_in in numeric
- ) returns void as $$
- declare
- update_lock numeric;
- begin
- select 1
- into update_lock
- from rhnServer
- where id = server_id_in
- for update;
- delete from rhnServerNeededCache
- where server_id = server_id_in;
- insert into rhnServerNeededCache
- (server_id, errata_id, package_id, channel_id)
- (select distinct sp.server_id, x.errata_id, p.id, x.channel_id
- FROM (SELECT sp_sp.server_id, sp_sp.name_id,
- sp_sp.package_arch_id, max(sp_pe.evr) AS max_evr
- FROM rhnServerPackage sp_sp
- join rhnPackageEvr sp_pe ON sp_pe.id = sp_sp.evr_id
- GROUP BY sp_sp.server_id, sp_sp.name_id, sp_sp.package_arch_id) sp
- join rhnPackage p ON p.name_id = sp.name_id
- join rhnPackageEvr pe ON pe.id = p.evr_id AND sp.max_evr < pe.evr
- join rhnPackageUpgradeArchCompat puac
- ON puac.package_arch_id = sp.package_arch_id
- AND puac.package_upgrade_arch_id = p.package_arch_id
- join rhnServerChannel sc ON sc.server_id = sp.server_id
- join rhnChannelPackage cp ON cp.package_id = p.id
- AND cp.channel_id = sc.channel_id
- left join (SELECT ep.errata_id, ce.channel_id, ep.package_id
- FROM rhnChannelErrata ce
- join rhnErrataPackage ep
- ON ep.errata_id = ce.errata_id
- join rhnServerChannel sc_sc
- ON sc_sc.channel_id = ce.channel_id
- WHERE sc_sc.server_id = server_id_in) x
- ON x.channel_id = sc.channel_id AND x.package_id = cp.package_id
- where sp.server_id = server_id_in);
- end$$ language plpgsql;
--- restore the original setting
-update pg_settings set setting = overlay( setting placing '' from 1 for (length('rhn_server')+1) ) where name = 'search_path';
commit 96d0964751733492751c827510513bb66bb0c47a
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Wed Feb 12 15:38:39 2014 +0100
Automatic commit of package [spacewalk-web] release [2.1.56-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 37ee506..01d5512 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-2.1.55-1 web/
+2.1.56-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 494c202..566a4a6 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -4,7 +4,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 2.1.55
+Version: 2.1.56
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk/
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -269,6 +269,14 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE
%changelog
+* Wed Feb 12 2014 Tomas Kasparek <tkasparek(a)redhat.com> 2.1.56-1
+- Fixes bar going from 0..9 A..Z on
+ /rhn/systems/details/packages/PackageList.do but A..Z 0..9 on
+ /rhn/systems/SystemEntitlements.do and
+ /network/systems/system_list/regular_in_channel_family.pxt
+- different set of pagination arrows on
+ /network/systems/system_list/regular_in_channel_family.pxt
+
* Tue Feb 11 2014 Grant Gainey 2.1.55-1
- 1063915, CVE-2013-4415 - Missed changing Search.do to post, perl-side
commit 83107d74910c32d48a1a3d65d7f500d5bacd4ed0
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Wed Feb 12 15:36:57 2014 +0100
Automatic commit of package [spacewalk-schema] release [2.1.42-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index e8fb97a..b3c33d7 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-2.1.41-1 schema/spacewalk/
+2.1.42-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 1856fc5..4f7a513 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -4,7 +4,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 2.1.41
+Version: 2.1.42
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Wed Feb 12 2014 Tomas Kasparek <tkasparek(a)redhat.com> 2.1.42-1
+- Add missing GMT+3 timezone as Saudi Arabia
+
* Tue Feb 11 2014 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.41-1
- fix sha1 sums
commit f9d0ad8e370e420b92013cb271349b9948ffd7ef
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Wed Feb 12 15:35:15 2014 +0100
Automatic commit of package [spacewalk-java] release [2.1.149-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index c88916b..7e078b8 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.148
+Version: 2.1.149
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -801,6 +801,29 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Feb 12 2014 Tomas Kasparek <tkasparek(a)redhat.com> 2.1.149-1
+- fix spanish translation for selected systems (string does not take a
+ parameter anymore)
+- Revert "fix spanish translation for selected systems (string does not take a
+ parameter anymore)"
+- Add missing GMT+3 timezone as Saudi Arabia
+- style CreateUser page so it resembles old look
+- /rhn/systems/details/configuration/addfiles/CreateFile.do?sid=... too much
+ space between radios due to wrong usage of form-group.
+- use help-block for help text in form
+- /rhn/systems/ssm/MigrateSystems.do popup menu (aka select) after 'Target
+ Orgenization' is not styled
+- Unstyled elements in /rhn/errata/manage/AddPackages.do?eid=...
+- panel inside a panel in rhn/configuration/Overview.do, just give a title to
+ the list, which is already a panel.
+- /rhn/admin/config/MonitoringConfig.do help texts ((e.g. 'redhat.com' for
+ myemail@…)) should be bellow input bars (see
+ /rhn/activationkeys/Edit.do?tid=1 how it should look like)
+- fix unclosed that broke the top pagination selected count for example
+ /rhn/systems/DuplicateIPList.do
+- fix spanish translation for selected systems (string does not take a
+ parameter anymore)
+
* Tue Feb 11 2014 Grant Gainey <ggainey(a)redhat.com> 2.1.148-1
- 1063915, CVE-2013-4415 - Fix XSS flaws in Spacewalk-search
- 1063915, CVE-2013-4415 - Fix XSS in new-list-tag by escaping _LABEL_SELECTED
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 1342778..22ed532 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.148-1 java/
+2.1.149-1 java/
commit 8e3f257dad0311933f9718a8f65d4374938747bc
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Wed Feb 12 15:02:09 2014 +0100
fix spanish translation for selected systems (string does not take a parameter anymore)
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
index 9e31510..3156157 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
@@ -1350,7 +1350,7 @@
5 systems selected
</context>
</context-group>
- <target>{0} sistemas seleccionados</target>
+ <target>sistemas seleccionados</target>
</trans-unit>
<!-- footer.jsp -->
<trans-unit id="footer.jsp.copyright">
commit 703702ab00e78bcdc7ade98e0079b6966d48a5f7
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Wed Feb 12 14:57:33 2014 +0100
Revert "fix spanish translation for selected systems (string does not take a parameter anymore)"
This reverts commit 268ad12a92fcc26cc71ec9a1cdcffc69aac519fa.
buildconf changes did it there accidentaly reverting
diff --git a/java/buildconf/build-taskdefs.xml b/java/buildconf/build-taskdefs.xml
index 551bc59..121905f 100644
--- a/java/buildconf/build-taskdefs.xml
+++ b/java/buildconf/build-taskdefs.xml
@@ -1,17 +1,17 @@
<project name="build-taskdefs">
<target name="init-ivy" depends="boot-deps" unless="installbuild">
<taskdef name="ivy-retrieve"
- classname="org.apache.ivy.ant.IvyRetrieve"
- classpathref="bootjars" />
+ classname="fr.jayasoft.ivy.ant.IvyRetrieve"
+ classpathref="bootjars"/>
<taskdef name="ivy-configure"
- classname="org.apache.ivy.ant.IvyConfigure"
- classpathref="bootjars" />
+ classname="fr.jayasoft.ivy.ant.IvyConfigure"
+ classpathref="bootjars"/>
<taskdef name="ivy-resolve"
- classname="org.apache.ivy.ant.IvyResolve"
- classpathref="bootjars" />
+ classname="fr.jayasoft.ivy.ant.IvyResolve"
+ classpathref="bootjars"/>
<taskdef name="ivy-publish"
- classname="org.apache.ivy.ant.IvyPublish"
- classpathref="bootjars" />
+ classname="fr.jayasoft.ivy.ant.IvyPublish"
+ classpathref="bootjars"/>
</target>
<target name="init-taskdefs" depends="link-jars,compile-internal"
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
index 3156157..9e31510 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
@@ -1350,7 +1350,7 @@
5 systems selected
</context>
</context-group>
- <target>sistemas seleccionados</target>
+ <target>{0} sistemas seleccionados</target>
</trans-unit>
<!-- footer.jsp -->
<trans-unit id="footer.jsp.copyright">
commit fe7eae1b5e7b5fae73ecf145b6fa25d753c087a0
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Feb 12 14:17:49 2014 +0100
query should not end with semicolon in oracle
diff --git a/backend/satellite_tools/spacewalk-remove-channel b/backend/satellite_tools/spacewalk-remove-channel
index 5b5380f..e40b288 100755
--- a/backend/satellite_tools/spacewalk-remove-channel
+++ b/backend/satellite_tools/spacewalk-remove-channel
@@ -559,7 +559,7 @@ def _delete_ks_files(channel_labels):
join rhnChannel cx on cx.id = ktx.channel_id
where replace(ktx.base_path, :mnt_point, '') =
replace(kt.base_path, :mnt_point, '')
- and cx.label not in (%s));
+ and cx.label not in (%s))
"""
params, bind_params = _bind_many(channel_labels)
commit 5c264e4331e6e2b72921f84eeb699c2f40969e2c
Author: Johannes Renner <jrenner(a)suse.de>
Date: Wed Feb 12 10:39:07 2014 +0100
Add missing GMT+3 timezone as Saudi Arabia
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_en_US.xml
index 0312614..e7f3437 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_en_US.xml
@@ -326,6 +326,12 @@
<context context-type="sourcefile">/rhn/account/UserDetails</context>
</context-group>
</trans-unit>
+ <trans-unit id="Asia/Riyadh">
+ <source>(GMT+0300) Saudi Arabia</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/account/UserDetails</context>
+ </context-group>
+ </trans-unit>
<trans-unit id="Asia/Tehran">
<source>(GMT+0330) Iran</source>
<context-group name="ctx">
diff --git a/schema/spacewalk/common/data/rhnTimezone.sql b/schema/spacewalk/common/data/rhnTimezone.sql
index 2a70465..84b6fce 100644
--- a/schema/spacewalk/common/data/rhnTimezone.sql
+++ b/schema/spacewalk/common/data/rhnTimezone.sql
@@ -224,6 +224,12 @@ insert into rhnTimezone
(id, olson_name, display_name)
values
(sequence_nextval('rhn_timezone_id_seq'),
+ 'Asia/Riyadh', 'Saudi Arabia');
+
+insert into rhnTimezone
+ (id, olson_name, display_name)
+values
+ (sequence_nextval('rhn_timezone_id_seq'),
'Asia/Tehran', 'Iran');
insert into rhnTimezone
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/050-rhnTimezone-data.sql b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/050-rhnTimezone-data.sql
new file mode 100644
index 0000000..117806a
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/050-rhnTimezone-data.sql
@@ -0,0 +1,12 @@
+insert into rhnTimezone (id, olson_name, display_name) (
+ select sequence_nextval('rhn_timezone_id_seq'),
+ 'Asia/Riyadh',
+ 'Saudi Arabia'
+ from dual
+ where not exists (
+ select 1
+ from rhnTimezone
+ where olson_name = 'Asia/Riyadh'
+ and display_name = 'Saudi Arabia'
+ )
+);
commit 3e800b42ec666f9812e1e72b234fb90f43fb82e9
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Wed Feb 12 09:25:58 2014 +0100
style CreateUser page so it resembles old look
diff --git a/branding/css/spacewalk-theme.less b/branding/css/spacewalk-theme.less
index 82f2902..b5a6c77 100644
--- a/branding/css/spacewalk-theme.less
+++ b/branding/css/spacewalk-theme.less
@@ -720,3 +720,14 @@ ul.nav.nav-tabs:last-child {
color: #c00;
}
+
+.box-small {
+ display: inline !important;
+ width: 70px !important;
+}
+
+.box-large {
+ display: inline !important;
+ width: 200px !important;
+}
+
diff --git a/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp b/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp
index 017e827..35fa5d9 100644
--- a/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp
+++ b/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp
@@ -33,7 +33,6 @@
<rhn:csrf />
<div class="row-0">
- <div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">
<h4><bean:message key="usercreate.login" /></h4>
@@ -102,8 +101,6 @@
</table>
</div>
</div>
- </div>
- <div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">
<h4><bean:message key="usercreate.accountInfo" /></h4>
@@ -113,14 +110,14 @@
<tr>
<td><label for="firstNames"><rhn:required-field key="usercreate.names"/>:</td></label>
<td>
- <html:select styleClass="form-control margin-bottom-xs" property="prefix">
+ <html:select styleClass="form-control margin-bottom-xs box-small" property="prefix">
<html:options collection="availablePrefixes"
property="value"
labelProperty="label" />
</html:select>
- <html:text property="firstNames" size="15" styleClass="form-control margin-bottom-xs" maxlength="${firstNameLength}" styleId="firstNames"/>
- <html:text property="lastName" size="15" styleClass="form-control margin-bottom-xs" maxlength="${lastNameLength}"/>
+ <html:text property="firstNames" size="15" styleClass="form-control margin-bottom-xs box-large" maxlength="${firstNameLength}" styleId="firstNames"/>
+ <html:text property="lastName" size="15" styleClass="form-control margin-bottom-xs box-large" maxlength="${lastNameLength}"/>
</td>
</tr>
@@ -137,7 +134,6 @@
</table>
</div>
</div>
- </div>
</div>
<c:if test="${account_type == 'into_org'}">
commit 1913f5c5a9d2658d0b79a2683159419d884fb43d
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Mon Feb 10 14:26:07 2014 +0100
/rhn/systems/details/configuration/addfiles/CreateFile.do?sid=...
too much space between radios due to wrong usage of form-group.
(cherry picked from commit d95d0ad2c58790750a6b7c563187a18ae09111a6)
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf
index b48e677..2e8721c 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf
@@ -32,20 +32,12 @@
<bean:message key="addfiles.jsp.type.text" />
</label>
</div>
- </div>
- </div>
- <div class="form-group">
- <div class="col-lg-offset-3 col-lg-6">
<div class="checkbox">
<label>
<html:radio property="filetype" value="directory" styleId="dir_radio" />
<bean:message key="addfiles.jsp.type.directory" />
</label>
</div>
- </div>
- </div>
- <div class="form-group">
- <div class="col-lg-offset-3 col-lg-6">
<div class="checkbox">
<label>
<html:radio property="filetype" value="symlink" styleId="symlink_radio" />
commit 9d5b1aec7478aaffddbb3acfd4fcffd58ce8af9a
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Mon Feb 10 12:20:55 2014 +0100
use help-block for help text in form
(cherry picked from commit ff8bb05e0c32bce08ca45204a1b65cf39bcbcb45)
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf
index 335d48f..b48e677 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf
@@ -134,7 +134,9 @@
</div>
<div class="form-group">
<div class="col-lg-offset-3 col-lg-6">
- <strong><bean:message key="filedetails.jsp.tip.ownership" /></strong>
+ <span class="help-block">
+ <bean:message key="filedetails.jsp.tip.ownership" />
+ </span>
</div>
</div>
<div class="form-group">
commit e04050a4dc872a175c94393c83ab5f58ba728b69
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Sun Feb 9 19:49:16 2014 +0100
/rhn/systems/ssm/MigrateSystems.do popup menu (aka select) after 'Target Orgenization' is not styled
(cherry picked from commit 97cc7c7f5f562d496c6d1a8c4febc1aa9d63db12)
diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/migrate.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/migrate.jsp
index 325bab2..b694fb8 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/systems/migrate.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/systems/migrate.jsp
@@ -19,30 +19,30 @@
<c:choose>
<c:when test="${trustedOrgs == 0}">
- <strong><bean:message key="ssm.migrate.systems.notrust"/></strong>
+ <p class="bg-warning"><bean:message key="ssm.migrate.systems.notrust"/></p>
</c:when>
<c:otherwise>
- <html:form method="post" action="/systems/ssm/MigrateSystems.do">
+ <html:form styleClass="form-inline" method="post" action="/systems/ssm/MigrateSystems.do">
<rhn:csrf />
<rhn:submitted />
- <table class="details">
- <tr>
- <th>
- <bean:message key="ssm.migrate.systems.org"/>
- </th>
- <td>
- <html:select property="org">
- <html:option value="">-- None --</html:option>
- <c:forEach var="o" items="${orgs}">
- <html:option value="${o.name}">${o.name}</html:option>
- </c:forEach>
- </html:select>
- </td>
- <td class="text-right">
- <input type ="submit" name="dispatch" value="${rhn:localize('ssm.migrate.systems.confirmbutton')}"/>
- </td>
- </tr>
- </table>
+ <div class="form-group">
+ <label>
+ <bean:message key="ssm.migrate.systems.org"/>
+ </label>
+ </div>
+ <div class="form-group">
+ <html:select styleClass="form-control" property="org">
+ <html:option value="">-- None --</html:option>
+ <c:forEach var="o" items="${orgs}">
+ <html:option value="${o.name}">${o.name}</html:option>
+ </c:forEach>
+ </html:select>
+ </div>
+ <div class="form-group">
+ <button class="btn btn-success" type ="submit" name="dispatch" value="${rhn:localize('ssm.migrate.systems.confirmbutton')}">
+ ${rhn:localize('ssm.migrate.systems.confirmbutton')}
+ </button>
+ </div>
</html:form>
</c:otherwise>
</c:choose>
commit d15de33f700615d2023a49f17697f0b5418e608f
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Sat Feb 8 18:14:11 2014 +0100
Unstyled elements in /rhn/errata/manage/AddPackages.do?eid=...
(cherry picked from commit 60a749eb5d63e75641c27b553b5c479038b6c90b)
diff --git a/java/code/webapp/WEB-INF/pages/errata/packages/add.jsp b/java/code/webapp/WEB-INF/pages/errata/packages/add.jsp
index 20a5053..7309040 100644
--- a/java/code/webapp/WEB-INF/pages/errata/packages/add.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/packages/add.jsp
@@ -35,27 +35,28 @@
<rl:listset name="groupSet">
- <rhn:csrf />
-
-
-
-
- <p>
- <bean:message key="errata.edit.packages.add.viewlabel"/>
- <select name="view_channel">
- <c:forEach items="${viewoptions}" var="option">
- <option value="<c:out value="${option.value}"/>"
- <c:if test="${option.value == param.view_channel}">selected="1"</c:if>>
- <c:out value="${option.label}"/>
- </option>
- </c:forEach>
- </select>
- <html:submit property="view_clicked">
- <bean:message key="errata.edit.packages.add.viewsubmit"/>
- </html:submit>
- </p>
-
-
+ <rhn:csrf />
+ <p>
+ <div class="row-0">
+ <div class="col-xs-12 col-lg-6">
+ <div class="input-group">
+ <select class="form-control" name="view_channel">
+ <c:forEach items="${viewoptions}" var="option">
+ <option value="<c:out value="${option.value}"/>"
+ <c:if test="${option.value == param.view_channel}">selected="1"</c:if>>
+ <c:out value="${option.label}"/>
+ </option>
+ </c:forEach>
+ </select>
+ <span class="input-group-btn">
+ <button class="btn btn-default" type="submit" name="view_clicked">
+ <i class="fa fa-filter"></i>
+ </button>
+ </span>
+ </div>
+ </div>
+ </div>
+ </p>
<input type="hidden" name="eid" value="<c:out value="${param.eid}"/>" />
@@ -95,10 +96,9 @@
<div class="text-right">
<rhn:submitted/>
- <hr/>
- <input type="submit"
- name="dispatch"
- value='<bean:message key="errata.edit.packages.add.addpackages"/>'/>
+ <button type="submit" name="dispatch" class="btn btn-primary" value="<bean:message key='errata.edit.packages.add.addpackages'/>">
+ <bean:message key="errata.edit.packages.add.addpackages"/>
+ </button>
</div>
</rl:listset>
commit eccd640f1f807a2f5cc36f8fd3180ac42571891e
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Sat Feb 8 15:48:15 2014 +0100
Fixes bar going from 0..9 A..Z on /rhn/systems/details/packages/PackageList.do but A..Z 0..9 on /rhn/systems/SystemEntitlements.do and /network/systems/system_list/regular_in_channel_family.pxt
(Note, this is bug has been always been there and is not related to the user interface changes)
(cherry picked from commit fcaa4a1e8ce5b3d98d23f6b3b619f11eec82f389)
diff --git a/web/modules/sniglets/Sniglets/ListView/List.pm b/web/modules/sniglets/Sniglets/ListView/List.pm
index 3a69b9b..2b0beb1 100644
--- a/web/modules/sniglets/Sniglets/ListView/List.pm
+++ b/web/modules/sniglets/Sniglets/ListView/List.pm
@@ -511,7 +511,7 @@ sub render_alphabar_content {
my @ret;
my @attr;
- foreach my $alpha ('A' .. 'Z', '0' .. '9') {
+ foreach my $alpha ('0' .. '9', 'A' .. 'Z') {
if (exists $alphabar->{$alpha}) {
my $base = $alphabar->{$alpha};
commit db4e844c9eccff043e9dd60714319b42e8e5b967
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Sat Feb 8 15:16:06 2014 +0100
different set of pagination arrows on /network/systems/system_list/regular_in_channel_family.pxt
(cherry picked from commit 2aca14e864725a01c95bd8f86eff70919a455b9b)
diff --git a/web/modules/sniglets/Sniglets/ListView/List.pm b/web/modules/sniglets/Sniglets/ListView/List.pm
index 1e62114..3a69b9b 100644
--- a/web/modules/sniglets/Sniglets/ListView/List.pm
+++ b/web/modules/sniglets/Sniglets/ListView/List.pm
@@ -667,10 +667,10 @@ sub render_pagination_buttons {
# show buttons
if ($lower != '1' || ($upper != $total)) {
- $back_buttons_str = $self->render_pagination_button("First", "fa fa-fast-backward", " |< ", $back_status);
- $back_buttons_str .= $self->render_pagination_button("Prev", "fa fa-backward", " < ", $back_status);
- $forward_buttons_str = $self->render_pagination_button("Next", "fa fa-forward", " > ", $forward_status);
- $forward_buttons_str .= $self->render_pagination_button("Last", "fa fa-fast-forward", " >| ", $forward_status);
+ $back_buttons_str = $self->render_pagination_button("First", "fa fa-angle-double-left", " |< ", $back_status);
+ $back_buttons_str .= $self->render_pagination_button("Prev", "fa fa-angle-left", " < ", $back_status);
+ $forward_buttons_str = $self->render_pagination_button("Next", "fa fa-angle-right", " > ", $forward_status);
+ $forward_buttons_str .= $self->render_pagination_button("Last", "fa fa-angle-double-right", " >| ", $forward_status);
}
my %subst;
commit 15cd09cf6f5638d84148e1ded084dda8b2b238de
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Sat Feb 8 14:41:19 2014 +0100
panel inside a panel in rhn/configuration/Overview.do, just
give a title to the list, which is already a panel.
(cherry picked from commit 5284f38b0cfe4ef81cc053d253ce0f5594f1c415)
diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp
index 0f85f0d..3fd1233 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp
@@ -37,60 +37,52 @@
</div>
</div>
- <div class="panel panel-default">
- <div class="panel-heading">
- <h4><bean:message key="configoverview.jsp.modconfig"/></h4>
- </div>
- <div class="panel-body">
-
- <rhn:list pageList="${requestScope.recentFiles}" noDataText="configoverview.jsp.noFiles">
- <rhn:listdisplay>
- <rhn:column header="configoverview.jsp.filename"
- url="/rhn/configuration/file/FileDetails.do?cfid=${current.id}">
- <c:choose>
- <c:when test="${current.type == 'file'}">
- <rhn:icon type="header-file" />
- ${fn:escapeXml(current.path)}
- </c:when>
- <c:when test="${current.type == 'directory'}">
- <rhn:icon type="header-folder" />
- ${fn:escapeXml(current.path)}
- </c:when>
- <c:otherwise>
- <rhn:icon type="header-symlink" />
- ${fn:escapeXml(current.path)}
- </c:otherwise>
- </c:choose>
- </rhn:column>
-
- <rhn:column header="config.common.configChannel"
- url="/rhn/configuration/ChannelOverview.do?ccid=${current.configChannelId}">
-
- <c:if test="${current.configChannelType == 'normal'}">
- <rhn:icon type="header-channel" />
- ${current.channelNameDisplay}
- </c:if>
-
- <c:if test="${current.configChannelType == 'local_override'}">
- <rhn:icon type="header-system" />
- ${current.channelNameDisplay}
- </c:if>
-
- <c:if test="${current.configChannelType == 'server_import'}">
- <rhn:icon type="header-sandbox" />
- ${current.channelNameDisplay}
- </c:if>
-
- </rhn:column>
-
- <rhn:column header="configoverview.jsp.modified">
- ${current.modifiedDisplay}
- </rhn:column>
-
- </rhn:listdisplay>
- </rhn:list>
- </div>
- </div>
+ <rhn:list pageList="${requestScope.recentFiles}" noDataText="configoverview.jsp.noFiles">
+ <rhn:listdisplay title="configoverview.jsp.modconfig">
+ <rhn:column header="configoverview.jsp.filename"
+ url="/rhn/configuration/file/FileDetails.do?cfid=${current.id}">
+ <c:choose>
+ <c:when test="${current.type == 'file'}">
+ <rhn:icon type="header-file" />
+ ${fn:escapeXml(current.path)}
+ </c:when>
+ <c:when test="${current.type == 'directory'}">
+ <rhn:icon type="header-folder" />
+ ${fn:escapeXml(current.path)}
+ </c:when>
+ <c:otherwise>
+ <rhn:icon type="header-symlink" />
+ ${fn:escapeXml(current.path)}
+ </c:otherwise>
+ </c:choose>
+ </rhn:column>
+
+ <rhn:column header="config.common.configChannel"
+ url="/rhn/configuration/ChannelOverview.do?ccid=${current.configChannelId}">
+
+ <c:if test="${current.configChannelType == 'normal'}">
+ <rhn:icon type="header-channel" />
+ ${current.channelNameDisplay}
+ </c:if>
+
+ <c:if test="${current.configChannelType == 'local_override'}">
+ <rhn:icon type="header-system" />
+ ${current.channelNameDisplay}
+ </c:if>
+
+ <c:if test="${current.configChannelType == 'server_import'}">
+ <rhn:icon type="header-sandbox" />
+ ${current.channelNameDisplay}
+ </c:if>
+
+ </rhn:column>
+
+ <rhn:column header="configoverview.jsp.modified">
+ ${current.modifiedDisplay}
+ </rhn:column>
+
+ </rhn:listdisplay>
+ </rhn:list>
<div class="panel panel-default">
<div class="panel-heading">
commit 44b7e341f06254df8ccf874163f13ebd37f6f8e3
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Sat Feb 8 12:07:24 2014 +0100
/rhn/admin/config/MonitoringConfig.do
help texts ((e.g. 'redhat.com' for myemail@…)) should be bellow input bars (see /rhn/activationkeys/Edit.do?tid=1 how it should look like)
This form is generated from the backend by iterating a config description and a config
value map. The description is already concatenated with the help.
(This was already like that in Spacewalk 2.0 so this issue is not Bootstrap-port
specific)
We use a bit of page-specific Javascript to detect text of the type
"This is something (with some help)" to move the help and apply
the right style to it.
If the backend can provide the text separated then we should
try that instead.
(cherry picked from commit 12b33028b0fb4ee0662b45dd6decadefa73959a8)
diff --git a/java/code/webapp/WEB-INF/pages/admin/config/monitoring.jsp b/java/code/webapp/WEB-INF/pages/admin/config/monitoring.jsp
index a6663ca..cc475c8 100644
--- a/java/code/webapp/WEB-INF/pages/admin/config/monitoring.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/config/monitoring.jsp
@@ -4,6 +4,28 @@
<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html>
+ <head>
+ <script type="text/javascript">
+ /*
+ * Config option value and help are already
+ * concatenated. Split them to display the help
+ * in the form correctly.
+ */
+ $(function() {
+ var textMixedWithHelp = /^(.+)\((.+)\)\s*$/;
+ $('label').each(function(idx, lbl) {
+ var match = textMixedWithHelp.exec($(lbl).html());
+ var input = $(lbl).attr('for');
+ if (match != null && input != undefined) {
+ $("[name='" + input + "']").after(
+ '<span class="help-block">' + match[2] + '</span>'
+ );
+ $(lbl).html(match[1]);
+ }
+ });
+ });
+ </script>
+ </head>
<body>
<rhn:toolbar base="h1" icon="header-info"
helpUrl="">
commit 1a4c333a6c7533ef72921243a7186088bc4cffe6
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Fri Feb 7 16:29:00 2014 +0100
fix unclosed that broke the top pagination selected count
for example /rhn/systems/DuplicateIPList.do
(cherry picked from commit 8839652c56473be64c9d9017d8e4ef5daac66fa8)
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java
index b032e50..7eee746 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java
@@ -703,7 +703,7 @@ public class ListTagUtil {
public static void renderFilterSubmit(PageContext pageContext,
String uniqueName) throws JspException {
String filterName = makeFilterNameByLabel(uniqueName);
- String result = (String.format("<input type=\"hidden\" name=\"%s\" ", filterName));
+ String result = (String.format("<input type=\"hidden\" name=\"%s\">", filterName));
ListTagUtil.write(pageContext, result);
}
commit 268ad12a92fcc26cc71ec9a1cdcffc69aac519fa
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Fri Feb 7 16:00:54 2014 +0100
fix spanish translation for selected systems (string does not take a parameter anymore)
(cherry picked from commit 70d810ceccb28d0a48bf0c113bfbc5fb4fd8597a)
diff --git a/java/buildconf/build-taskdefs.xml b/java/buildconf/build-taskdefs.xml
index 121905f..551bc59 100644
--- a/java/buildconf/build-taskdefs.xml
+++ b/java/buildconf/build-taskdefs.xml
@@ -1,17 +1,17 @@
<project name="build-taskdefs">
<target name="init-ivy" depends="boot-deps" unless="installbuild">
<taskdef name="ivy-retrieve"
- classname="fr.jayasoft.ivy.ant.IvyRetrieve"
- classpathref="bootjars"/>
+ classname="org.apache.ivy.ant.IvyRetrieve"
+ classpathref="bootjars" />
<taskdef name="ivy-configure"
- classname="fr.jayasoft.ivy.ant.IvyConfigure"
- classpathref="bootjars"/>
+ classname="org.apache.ivy.ant.IvyConfigure"
+ classpathref="bootjars" />
<taskdef name="ivy-resolve"
- classname="fr.jayasoft.ivy.ant.IvyResolve"
- classpathref="bootjars"/>
+ classname="org.apache.ivy.ant.IvyResolve"
+ classpathref="bootjars" />
<taskdef name="ivy-publish"
- classname="fr.jayasoft.ivy.ant.IvyPublish"
- classpathref="bootjars"/>
+ classname="org.apache.ivy.ant.IvyPublish"
+ classpathref="bootjars" />
</target>
<target name="init-taskdefs" depends="link-jars,compile-internal"
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
index 9e31510..3156157 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
@@ -1350,7 +1350,7 @@
5 systems selected
</context>
</context-group>
- <target>{0} sistemas seleccionados</target>
+ <target>sistemas seleccionados</target>
</trans-unit>
<!-- footer.jsp -->
<trans-unit id="footer.jsp.copyright">
commit d482c94e23d5cf91d4ea8fdb89d52adc364ba245
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Tue Feb 11 14:35:24 2014 -0500
Automatic commit of package [spacewalk-branding] release [2.1.27-1].
diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec
index 3afea03..95d513a 100644
--- a/branding/spacewalk-branding.spec
+++ b/branding/spacewalk-branding.spec
@@ -9,7 +9,7 @@
%endif
Name: spacewalk-branding
-Version: 2.1.26
+Version: 2.1.27
Release: 1%{?dist}
Summary: Spacewalk branding data
@@ -87,6 +87,9 @@ rm -rf %{buildroot}
%doc LICENSE
%changelog
+* Tue Feb 11 2014 Grant Gainey 2.1.27-1
+- 1063915, CVE-2013-4415 - Missed changing Search.do to post, perl-side
+
* Thu Feb 06 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.26-1
- fixed create probe page aligning
- required field marker used to be red
diff --git a/rel-eng/packages/spacewalk-branding b/rel-eng/packages/spacewalk-branding
index 389225b..333cc0c 100644
--- a/rel-eng/packages/spacewalk-branding
+++ b/rel-eng/packages/spacewalk-branding
@@ -1 +1 @@
-2.1.26-1 branding/
+2.1.27-1 branding/
commit 36a45306e9891d8bce38bf719462b328f7f2304b
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Tue Feb 11 14:34:20 2014 -0500
Automatic commit of package [spacewalk-web] release [2.1.55-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 58b6d3b..37ee506 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-2.1.54-1 web/
+2.1.55-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 952f244..494c202 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -4,7 +4,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 2.1.54
+Version: 2.1.55
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk/
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -269,6 +269,9 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE
%changelog
+* Tue Feb 11 2014 Grant Gainey 2.1.55-1
+- 1063915, CVE-2013-4415 - Missed changing Search.do to post, perl-side
+
* Tue Feb 04 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.54-1
- changes in the logic to update the tick icon
commit a1447d9a892756af6d90f9c6d7454c9630ca03d6
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Tue Feb 11 14:32:44 2014 -0500
1063915, CVE-2013-4415 - Missed changing Search.do to post, perl-side
diff --git a/branding/styles/navbar_top_sat.txt b/branding/styles/navbar_top_sat.txt
index 43bc0bc..f57adcc 100644
--- a/branding/styles/navbar_top_sat.txt
+++ b/branding/styles/navbar_top_sat.txt
@@ -28,7 +28,7 @@ class="navPipe">|</span><a href="/rhn/Logout.do"><span>Sign Out</span></a>
<div id="header">
<a href="/"><img src="/img/logo.png" alt="Spacewalk" width="228" height="52" id="rhnLogo" /></a>
<div id="searchbar">
- <form name="form1" action="/rhn/Search.do" method="get">
+ <form name="form1" action="/rhn/Search.do" method="post">
<select name="search_type">
<option value="systems">Systems</option>
diff --git a/branding/templates/c.pxt b/branding/templates/c.pxt
index ccfdcd2..0f1eb80 100644
--- a/branding/templates/c.pxt
+++ b/branding/templates/c.pxt
@@ -49,7 +49,7 @@
</ul>
</rhn-display-login>
- <form name="form1" class="form-inline hidden-xs" role="form" action="/rhn/Search.do" method="get">
+ <form name="form1" class="form-inline hidden-xs" role="form" action="/rhn/Search.do" method="post">
<div class="form-group">
<select name="search_type" class="form-control input-sm">
diff --git a/web/html/errors/403.html b/web/html/errors/403.html
index 66cff71..c60feb1 100644
--- a/web/html/errors/403.html
+++ b/web/html/errors/403.html
@@ -28,7 +28,7 @@
<div id="header">
<a href="/"><img src="/img/logo.png" id="rhnLogo"></a>
<div id="searchbar">
- <form name="form1" action="/rhn/Search.do" method="get">
+ <form name="form1" action="/rhn/Search.do" method="post">
<select name="search_type">
<option value="systems">Systems</option>
diff --git a/web/html/errors/404.html b/web/html/errors/404.html
index e7b5fb3..511e31e 100644
--- a/web/html/errors/404.html
+++ b/web/html/errors/404.html
@@ -28,7 +28,7 @@
<div id="header">
<a href="/"><img src="/img/logo.png" id="rhnLogo"></a>
<div id="searchbar">
- <form name="form1" action="/rhn/Search.do" method="get">
+ <form name="form1" action="/rhn/Search.do" method="post">
<select name="search_type">
<option value="systems">Systems</option>
diff --git a/web/html/errors/413.html b/web/html/errors/413.html
index 984b736..2cae3a4 100644
--- a/web/html/errors/413.html
+++ b/web/html/errors/413.html
@@ -28,7 +28,7 @@
<div id="header">
<a href="/"><img src="/img/logo.png" id="rhnLogo"></a>
<div id="searchbar">
- <form name="form1" action="/rhn/Search.do" method="get">
+ <form name="form1" action="/rhn/Search.do" method="post">
<select name="search_type">
<option value="systems">Systems</option>
diff --git a/web/html/errors/500.html b/web/html/errors/500.html
index 1008075..049841a 100644
--- a/web/html/errors/500.html
+++ b/web/html/errors/500.html
@@ -28,7 +28,7 @@
<div id="header">
<a href="/"><img src="/img/logo.png" id="rhnLogo"></a>
<div id="searchbar">
- <form name="form1" action="/rhn/Search.do" method="get">
+ <form name="form1" action="/rhn/Search.do" method="post">
<select name="search_type">
<option value="systems">Systems</option>
commit 18c70164285cae0660fa3ac55c6656bb19b3b13f
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Tue Feb 11 11:13:20 2014 -0500
Automatic commit of package [spacewalk-java] release [2.1.148-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 5f319fc..c88916b 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.147
+Version: 2.1.148
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -801,6 +801,21 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Feb 11 2014 Grant Gainey <ggainey(a)redhat.com> 2.1.148-1
+- 1063915, CVE-2013-4415 - Fix XSS flaws in Spacewalk-search
+- 1063915, CVE-2013-4415 - Fix XSS in new-list-tag by escaping _LABEL_SELECTED
+- 1063915, CVE-2013-1871, Fix XSS in edit-address JSPs
+- 1063915, CVE-2013-1869, close header-injection hole
+- 1063915, CVE-2010-2236, Cleanse backticks from monitoring-probes where
+ appropriate
+- 1063915, CVE-2013-1869, Only follow internal return_urls
+- 1063915, CVE-2012-6149, Fix XSS in notes.jsp
+- Fix an ISE that could happen after clearing cookies (elaborator not bound)
+- Removed duplicate colons
+- Unified space before slash in void tags
+- Datepicker UI unification: Errata pages
+- use normal checkbox
+
* Mon Feb 10 2014 Tomas Kasparek <tkasparek(a)redhat.com> 2.1.147-1
- style ProbeEdit page
- updating susestudio-java-client to 1.4
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index d0207e4..1342778 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.147-1 java/
+2.1.148-1 java/
commit 13351dd38339ae3635196894ae73c5dbb9058b99
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Tue Feb 11 11:03:06 2014 -0500
1063915, CVE-2013-4415 - Fix XSS flaws in Spacewalk-search
This is a single large change, since everything touches everything else:
* Rework search to rely on scrubbed form fields
* Refactor search to have a common, consistent approach
* Refactor search to use struts-standard wiring instead of making direct
redirect calls
* Clean up a lot of use/misuse/inconsistent-use of quoted strings vs
declared statics
* Stop blindly passing parameters along
* Stop blindly relying on params in JSPs, and use form-vars instead
* Combine struts-config search-forms into one combined-form, given the
number of shared fields
* Standardize (some) on html:hidden instead of mixing that and
<input type="hidden" in JSPs affected by other changes
diff --git a/java/code/src/com/redhat/rhn/frontend/action/BaseSearchAction.java b/java/code/src/com/redhat/rhn/frontend/action/BaseSearchAction.java
new file mode 100644
index 0000000..ecc158b
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/frontend/action/BaseSearchAction.java
@@ -0,0 +1,251 @@
+/**
+ * Copyright (c) 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.
+ */
+package com.redhat.rhn.frontend.action;
+
+import java.net.MalformedURLException;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.log4j.Logger;
+import org.apache.struts.action.ActionErrors;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
+import org.apache.struts.action.DynaActionForm;
+
+import redstone.xmlrpc.XmlRpcException;
+import redstone.xmlrpc.XmlRpcFault;
+
+import com.redhat.rhn.common.localization.LocalizationService;
+import com.redhat.rhn.common.validator.ValidatorException;
+import com.redhat.rhn.frontend.struts.RhnAction;
+import com.redhat.rhn.frontend.struts.RhnHelper;
+import com.redhat.rhn.frontend.taglibs.list.ListTagHelper;
+
+/**
+ * Base action for searches - this is a place to put the 'magic strings' that connect the
+ * JSP forms and pages to the action, and to impose a certain amount of uniformity on
+ * our (currently-very-non-uniform) search processing.
+ *
+ * @author ggainey
+ *
+ */
+public abstract class BaseSearchAction extends RhnAction {
+ protected static Logger log = Logger.getLogger(BaseSearchAction.class);
+
+ /** Channel-arches a default package-search should look in */
+ public static final String[] DEFAULT_ARCHES = {
+ "channel-ia32", "channel-ia64",
+ "channel-x86_64",
+ "channel-s390",
+ "channel-s390x",
+ "channel-ppc",
+ "channel-sparc-sun-solaris", "channel-i386-sun-solaris" };
+
+ /** List of channel arches we don't really support any more. */
+ public static final List<String> EXCLUDED_ARCHES = Arrays.asList(new String[]
+ {"channel-sparc", "channel-alpha", "channel-iSeries", "channel-pSeries"});
+
+ // combinedSearchForm common keys
+ public static final String FINE_GRAINED = "fineGrained";
+ public static final String SEARCH_STR = "search_string";
+ public static final String VIEW_MODE = "view_mode";
+ public static final String SEARCH_OPT = "searchOptions";
+
+ // Package-specific keys
+ public static final String ALL_CHANNELS = "allChannels";
+ public static final String ARCHITECTURE = "architecture";
+ public static final String CHANNEL = "channel";
+ public static final String CHANNEL_ARCH = "channel_arch";
+ public static final String CHANNEL_ARCHES = "channelArches";
+ public static final String CHANNEL_FILTER = "channel_filter";
+ public static final String OPT_FREE_FORM = "search_free_form";
+ public static final String OPT_NAME_AND_DESC = "search_name_and_description";
+ public static final String OPT_NAME_AND_SUMMARY = "search_name_and_summary";
+ public static final String OPT_NAME_ONLY = "search_name";
+ public static final String RELEVANT = "relevant";
+ public static final String WHERE_CRITERIA = "whereCriteria";
+
+ // Errata-specific keys
+ public static final String OPT_ISSUE_DATE = "optionIssueDateSearch";
+ public static final String OPT_ADVISORY = "errata_search_by_advisory";
+ public static final String OPT_PKG_NAME = "errata_search_by_package_name";
+ public static final String OPT_CVE = "errata_search_by_cve";
+ public static final String OPT_ALL_FIELDS = "errata_search_by_all_fields";
+ public static final String ERRATA_BUG = "errata_type_bug";
+ public static final String ERRATA_SEC = "errata_type_security";
+ public static final String ERRATA_ENH = "errata_type_enhancement";
+
+ // Doc-specific keys
+ public static final String OPT_CONTENT_ONLY = "search_content";
+ public static final String OPT_TITLE_ONLY = "search_title";
+ public static final String OPT_CONTENT_TITLE = "search_content_title";
+
+ // System-specific keys
+ public static final String OPT_GROUPS_MAP = "optGroupsMap";
+ public static final String OPT_GROUPS_KEYS = "optGroupsKeys";
+ public static final String WHERE_TO_SEARCH = "whereToSearch";
+ public static final String INVERT_RESULTS = "invert";
+ public static final String WHERE_ALL = "all";
+ public static final String WHERE_SSM = "system_list";
+
+ //Xcddf-specific keys
+ public static final String SCAN_DATE_SEARCH = "optionScanDateSearch";
+
+ // addOption keys
+ public static final String DISPLAY_KEY = "display";
+ public static final String VALUE_KEY = "value";
+
+ /**
+ * {@inheritDoc}
+ * The default execute() workflow for search-related actions is to call executeBody(),
+ * handle any execptions thrown, and return whatever destination executeBody returned.
+ */
+ public ActionForward execute(ActionMapping mapping,
+ ActionForm formIn,
+ HttpServletRequest request,
+ HttpServletResponse response) {
+ ActionErrors errors = new ActionErrors();
+ DynaActionForm form = (DynaActionForm)formIn;
+ request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
+ String searchString = form.getString(BaseSearchAction.SEARCH_STR);
+ ActionForward destination = mapping.findForward(RhnHelper.DEFAULT_FORWARD);
+
+ try {
+ // handle setup, the submission setups the searchstring below
+ // and redirects to this page which then performs the search.
+ destination = executeBody(request, mapping, form);
+ }
+ catch (XmlRpcException xre) {
+ log.error("Could not connect to search server.", xre);
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("packages.search.connection_error"));
+ }
+ catch (XmlRpcFault e) {
+ log.info("Caught Exception :" + e + ", code [" + e.getErrorCode() + "]");
+ if (e.getErrorCode() == 100) {
+ log.error("Invalid search query", e);
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("packages.search.could_not_parse_query",
+ searchString));
+ }
+ else if (e.getErrorCode() == 200) {
+ log.error("Index files appear to be missing: ", e);
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("packages.search.index_files_missing",
+ searchString));
+ }
+ else {
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("packages.search.could_not_execute_query",
+ searchString));
+ }
+ }
+ catch (MalformedURLException e) {
+ log.error("Could not connect to server.", e);
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("packages.search.connection_error"));
+ }
+ catch (ValidatorException ve) {
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("packages.search.use_free_form"));
+ }
+
+ if (!errors.isEmpty()) {
+ addErrors(request, errors);
+ }
+
+ return destination;
+ }
+
+ /**
+ * This method invokes insureFormDefaults(), followed by doExecute(). Child classes
+ * are expected to do "reasonable" things in those methods.
+ * @param request http request
+ * @param mapping action mapping
+ * @param form associated form
+ * @return expected destination from doExecute
+ * @throws MalformedURLException
+ * @throws XmlRpcFault
+ */
+ protected ActionForward executeBody(HttpServletRequest request, ActionMapping mapping,
+ DynaActionForm form)
+ throws MalformedURLException, XmlRpcFault {
+ insureFormDefaults(request, form);
+ return doExecute(request, mapping, form);
+ }
+
+ /**
+ * This is the guts of a search action - do what needs doing,
+ * and return what you think the next page should be
+ * @param request incoming HTTP request
+ * @param mapping incoming action-mapping
+ * @param form form associated with this mapping
+ * @return the desired desitination based on your processing
+ * @throws MalformedURLException
+ * @throws XmlRpcFault
+ */
+ protected abstract ActionForward doExecute(HttpServletRequest request,
+ ActionMapping mapping,
+ DynaActionForm form)
+ throws MalformedURLException, XmlRpcFault;
+
+ /**
+ * This gives the child-actions a chance to set up sane defaults no matter how
+ * the happen to be invoked. Set up the form here, so that it can be relied on
+ * by code later in the workflow.
+ *
+ * @param request incoming HTTP request
+ * @param form form associated with the request
+ */
+ protected abstract void insureFormDefaults(HttpServletRequest request,
+ DynaActionForm form);
+
+ /**
+ * Utility function to create options for the dropdown.
+ * @param options list containing all options.
+ * @param key resource bundle key used as the display value.
+ * @param value value to be submitted with form.
+ */
+ protected void addOption(List<Map<String, String>> options, String key, String value) {
+ addOption(options, key, value, false);
+ }
+
+ /**
+ * Utility function to create options for the dropdown.
+ * @param options list containing all options.
+ * @param key resource bundle key used as the display value.
+ * @param value value to be submitted with form.
+ * @param flag Flag the item with an asterisk (*) indicating it is *not*
+ * synch'd
+ */
+ public void addOption(List<Map<String, String>> options, String key, String value,
+ boolean flag) {
+ LocalizationService ls = LocalizationService.getInstance();
+ Map<String, String> selection = new HashMap<String, String>();
+ selection.put("display", (flag ? "*" : "") + ls.getMessage(key));
+ selection.put("value", StringEscapeUtils.escapeHtml(value));
+ options.add(selection);
+ }
+
+}
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 517c6f7..86b2699 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/SearchAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/SearchAction.java
@@ -14,30 +14,24 @@
*/
package com.redhat.rhn.frontend.action;
-import com.redhat.rhn.common.util.ServletUtils;
-import com.redhat.rhn.domain.org.OrgFactory;
-import com.redhat.rhn.domain.user.User;
-import com.redhat.rhn.frontend.action.channel.PackageSearchAction;
-import com.redhat.rhn.frontend.action.common.BadParameterException;
-import com.redhat.rhn.frontend.action.errata.ErrataSearchAction;
-import com.redhat.rhn.frontend.action.systems.SystemSearchSetupAction;
-import com.redhat.rhn.frontend.struts.RequestContext;
-import com.redhat.rhn.frontend.struts.RhnAction;
-import com.redhat.rhn.frontend.struts.RhnHelper;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.action.DynaActionForm;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import com.redhat.rhn.domain.org.OrgFactory;
+import com.redhat.rhn.domain.user.User;
+import com.redhat.rhn.frontend.action.common.BadParameterException;
+import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnAction;
+import com.redhat.rhn.frontend.struts.RhnHelper;
+import com.redhat.rhn.frontend.struts.StrutsDelegate;
/**
* SearchAction
@@ -58,83 +52,23 @@ public class SearchAction extends RhnAction {
DynaActionForm daForm = (DynaActionForm) formIn;
if (isSubmitted(daForm)) {
- String searchString = daForm.getString("search_string");
+ String searchString = daForm.getString(BaseSearchAction.SEARCH_STR);
String searchType = daForm.getString("search_type");
if (searchType == null) {
return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
- else if (searchType.equals("systems") &&
- (user.getOrg().getEntitlements().contains(
- OrgFactory.getEntitlementSwMgrPersonal()) ||
- user.getOrg().getEntitlements().contains(
- OrgFactory.getEntitlementEnterprise()))) {
- Map attributes = new HashMap();
- attributes.put(RhnAction.SUBMITTED, "true");
- attributes.put(SystemSearchSetupAction.WHERE_TO_SEARCH, "all");
- attributes.put(SystemSearchSetupAction.VIEW_MODE,
- "systemsearch_name_and_description");
- attributes.put(SystemSearchSetupAction.SEARCH_STRING, searchString);
- attributes.put(SystemSearchSetupAction.FINE_GRAINED, "on");
- performRedirect("/systems/Search.do",
- request.getContextPath(),
- response,
- attributes);
-
- return null;
+ else if (searchType.equals("systems") && systemSearchAllowed(user)) {
+ return doSystemSearch(mapping, request, searchString);
}
else if (searchType.equals("errata")) {
- Map attributes = new HashMap();
- attributes.put("view_mode", "errata_search_by_all_fields");
- attributes.put(SystemSearchSetupAction.SEARCH_STRING, searchString);
- attributes.put("optionIssueDateSearch", Boolean.FALSE);
- attributes.put("errata_type_bug", Boolean.TRUE);
- attributes.put("errata_type_security", Boolean.TRUE);
- attributes.put("errata_type_enhancement", Boolean.TRUE);
- attributes.put(ErrataSearchAction.FINE_GRAINED, "on");
- performRedirect("/errata/Search.do",
- request.getContextPath(),
- response,
- attributes);
-
- return null;
+ return doErrataSearch(mapping, request, searchString);
}
else if (searchType.equals("packages")) {
- Map attributes = new HashMap();
- attributes.put("view_mode", "search_name_and_summary");
- attributes.put(SystemSearchSetupAction.SEARCH_STRING, searchString);
- attributes.put(PackageSearchAction.WHERE_CRITERIA, "architecture");
-
- // select all the arches to make a better search
- List<String> defaultArches = new ArrayList<String>();
- defaultArches.add("channel-ia32");
- defaultArches.add("channel-ia64");
- defaultArches.add("channel-x86_64");
- defaultArches.add("channel-s390");
- defaultArches.add("channel-s390x");
- defaultArches.add("channel-ppc");
- defaultArches.add("channel-sparc-sun-solaris");
- defaultArches.add("channel-i386-sun-solaris");
-
- attributes.put("channel_arch", defaultArches);
- attributes.put(PackageSearchAction.FINE_GRAINED, "on");
- performRedirect("/channels/software/Search.do",
- request.getContextPath(),
- response,
- attributes);
-
- return null;
+ return doPackageSearch(mapping, request, searchString);
}
else if (searchType.equals("docs")) {
- Map attributes = new HashMap();
- attributes.put("view_mode", "search_content_title");
- attributes.put(SystemSearchSetupAction.SEARCH_STRING, searchString);
- performRedirect("/help/Search.do",
- request.getContextPath(),
- response,
- attributes);
-
- return null;
+ return doDocsSearch(mapping, request, searchString);
}
else {
return mapping.findForward("error");
@@ -143,17 +77,60 @@ public class SearchAction extends RhnAction {
return mapping.findForward("error");
}
- protected void performRedirect(String url,
- String contextPath,
- HttpServletResponse response,
- Map attributes) {
- try {
- response.sendRedirect(
- ServletUtils.pathWithParams(contextPath + url, attributes));
- }
- catch (IOException ioe) {
- throw new RuntimeException(
- "Exception while trying to redirect: " + ioe);
- }
+ private ActionForward doErrataSearch(ActionMapping mapping, HttpServletRequest request,
+ String searchString) {
+ Map<String, Object> params = new HashMap<String, Object>();
+ params.put(BaseSearchAction.VIEW_MODE, BaseSearchAction.OPT_ALL_FIELDS);
+ params.put(BaseSearchAction.SEARCH_STR, searchString);
+ params.put(BaseSearchAction.OPT_ISSUE_DATE, Boolean.FALSE);
+ params.put(BaseSearchAction.ERRATA_BUG, Boolean.TRUE);
+ params.put(BaseSearchAction.ERRATA_SEC, Boolean.TRUE);
+ params.put(BaseSearchAction.ERRATA_ENH, Boolean.TRUE);
+ params.put(BaseSearchAction.FINE_GRAINED, true);
+ return StrutsDelegate.getInstance().forwardParams(
+ mapping.findForward("errata"), params);
+ }
+
+ private boolean systemSearchAllowed(User user) {
+ return user.getOrg().getEntitlements().contains(
+ OrgFactory.getEntitlementSwMgrPersonal()) ||
+ user.getOrg().getEntitlements().contains(
+ OrgFactory.getEntitlementEnterprise());
+ }
+
+ private ActionForward doSystemSearch(ActionMapping mapping, HttpServletRequest request,
+ String searchString) {
+ Map<String, Object> params = new HashMap<String, Object>();
+ params.put(BaseSearchAction.WHERE_TO_SEARCH, BaseSearchAction.WHERE_ALL);
+ params.put(BaseSearchAction.VIEW_MODE,
+ "systemsearch_name_and_description");
+ params.put(BaseSearchAction.SEARCH_STR, searchString);
+ params.put(BaseSearchAction.FINE_GRAINED, true);
+ return StrutsDelegate.getInstance().forwardParams(
+ mapping.findForward("systems"), params);
+ }
+
+ private ActionForward doDocsSearch(ActionMapping mapping, HttpServletRequest request,
+ String searchString) {
+ Map<String, Object> params = new HashMap<String, Object>();
+ params.put(BaseSearchAction.VIEW_MODE, "search_content_title");
+ params.put(BaseSearchAction.SEARCH_STR, searchString);
+ return StrutsDelegate.getInstance().forwardParams(
+ mapping.findForward("docs"), params);
+ }
+
+ private ActionForward doPackageSearch(ActionMapping mapping,
+ HttpServletRequest request, String searchString) {
+ Map<String, Object> params = new HashMap<String, Object>();
+ params.put(BaseSearchAction.VIEW_MODE,
+ BaseSearchAction.OPT_NAME_AND_SUMMARY);
+ params.put(BaseSearchAction.SEARCH_STR, searchString);
+ params.put(BaseSearchAction.WHERE_CRITERIA, "architecture");
+ params.put(BaseSearchAction.CHANNEL_ARCH,
+ BaseSearchAction.DEFAULT_ARCHES);
+ params.put(BaseSearchAction.FINE_GRAINED, true);
+
+ return StrutsDelegate.getInstance().forwardParams(
+ mapping.findForward("packages"), params);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/audit/AuditSearchAction.java b/java/code/src/com/redhat/rhn/frontend/action/audit/AuditSearchAction.java
index 61bc7bb..13ee073 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/audit/AuditSearchAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/audit/AuditSearchAction.java
@@ -14,31 +14,12 @@
*/
package com.redhat.rhn.frontend.action.audit;
-import com.redhat.rhn.common.util.DatePicker;
-import com.redhat.rhn.frontend.action.common.DateRangePicker;
-import com.redhat.rhn.frontend.dto.AuditReviewDto;
-import com.redhat.rhn.frontend.struts.RequestContext;
-import com.redhat.rhn.frontend.struts.RhnAction;
-import com.redhat.rhn.frontend.struts.RhnHelper;
-import com.redhat.rhn.frontend.taglibs.list.ListTagHelper;
-import com.redhat.rhn.manager.audit.AuditManager;
-
-import org.apache.log4j.Logger;
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-import org.apache.struts.action.ActionMessage;
-import org.apache.struts.action.ActionMessages;
-import org.apache.struts.action.DynaActionForm;
-import org.stringtree.json.JSONWriter;
-
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.util.Calendar;
import java.util.Collections;
import java.util.Date;
-import java.util.Enumeration;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -47,6 +28,24 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
+import org.apache.log4j.Logger;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
+import org.apache.struts.action.DynaActionForm;
+import org.stringtree.json.JSONWriter;
+
+import com.redhat.rhn.common.util.DatePicker;
+import com.redhat.rhn.frontend.action.common.DateRangePicker;
+import com.redhat.rhn.frontend.dto.AuditReviewDto;
+import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnAction;
+import com.redhat.rhn.frontend.struts.RhnHelper;
+import com.redhat.rhn.frontend.taglibs.list.ListTagHelper;
+import com.redhat.rhn.manager.audit.AuditManager;
+
/**
* AuditSearchAction
* @version $Rev$
@@ -165,15 +164,13 @@ public class AuditSearchAction extends RhnAction {
Boolean parseDates, submitted, unrev;
DateRangePicker.DatePickerResults dpresults;
DynaActionForm dform = (DynaActionForm)form;
- Enumeration paramNames;
HttpSession session = request.getSession(true);
JSONWriter jsonwr = new JSONWriter();
List result = null;
Long start, end, seqno, cacheSeqno;
- Map forwardParams = makeParamMap(request);
Map<String, String[]> typemap;
RequestContext requestContext = new RequestContext(request);
- String machine, str;
+ String machine;
String[] autypes;
request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
@@ -208,7 +205,7 @@ public class AuditSearchAction extends RhnAction {
unrev = true;
request.setAttribute("unreviewable", "true");
}
- else if (!submitted && request.getParameter("machine") != null) {
+ else if (!submitted && request.getAttribute("machine") != null) {
log.debug("auto-submit!");
// this is a click-through from the review list.
// we skip the search dialog and return the default selection
@@ -277,14 +274,6 @@ public class AuditSearchAction extends RhnAction {
// add any accumulated messages to be displayed
addMessages(request, amsgs);
- // set up parameters to forward
- paramNames = request.getParameterNames();
-
- while (paramNames.hasMoreElements()) {
- str = (String) paramNames.nextElement();
- forwardParams.put(str, request.getParameter(str));
- }
-
// either the search had no results, so we go back to the search form,
// or this is what they asked for
if (result == null) {
@@ -300,14 +289,10 @@ public class AuditSearchAction extends RhnAction {
request.setAttribute("endDisp", ">>");
}
- return getStrutsDelegate().forwardParams(
- mapping.findForward(RhnHelper.DEFAULT_FORWARD),
- forwardParams);
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
- return getStrutsDelegate().forwardParams(
- mapping.findForward("view"),
- forwardParams);
+ return mapping.findForward("view");
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchAction.java b/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchAction.java
index 0b87f05..5850dc3 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchAction.java
@@ -18,123 +18,47 @@ import java.net.MalformedURLException;
import java.util.Calendar;
import java.util.Collections;
import java.util.Date;
-import java.util.Enumeration;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.StringUtils;
-import org.apache.struts.action.ActionErrors;
-import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.struts.action.ActionMessage;
-import org.apache.struts.action.ActionMessages;
import org.apache.struts.action.DynaActionForm;
-import org.directwebremoting.util.Logger;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcFault;
import com.redhat.rhn.common.db.datasource.DataResult;
import com.redhat.rhn.common.util.DatePicker;
+import com.redhat.rhn.frontend.action.BaseSearchAction;
import com.redhat.rhn.frontend.action.common.DateRangePicker;
import com.redhat.rhn.frontend.struts.RequestContext;
-import com.redhat.rhn.frontend.struts.RhnAction;
import com.redhat.rhn.frontend.struts.RhnHelper;
-import com.redhat.rhn.frontend.taglibs.list.ListTagHelper;
import com.redhat.rhn.frontend.taglibs.list.TagHelper;
import com.redhat.rhn.manager.audit.ScapManager;
/**
* XccdfSearchAction
*/
-public class XccdfSearchAction extends RhnAction {
+public class XccdfSearchAction extends BaseSearchAction {
- private static final String SEARCH_STRING = "search_string";
- private static final String WHERE_TO_SEARCH = "whereToSearch";
- private static final String SCAN_DATE_SEARCH = "optionScanDateSearch";
private static final String ANY_LABEL = "any";
private static final String SHOW_AS = "show_as";
private static final String TESTRESULT_ID = "tr";
private static final String RULERESULT_ID = "rr";
- private static Logger log = Logger.getLogger(XccdfSearchAction.class);
-
- /** {@inheritDoc} */
- public ActionForward execute(ActionMapping mapping, ActionForm formIn,
- HttpServletRequest request, HttpServletResponse response) {
- ActionErrors errors = new ActionErrors();
- DynaActionForm form = (DynaActionForm) formIn;
- String searchString = request.getParameter(SEARCH_STRING);
-
- request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
-
- if (!isSubmitted(form)) {
- try {
- setupForm(request, form);
- return getStrutsDelegate().forwardParams(
- mapping.findForward(RhnHelper.DEFAULT_FORWARD),
- request.getParameterMap());
- }
- catch (XmlRpcException xre) {
- log.error("Could not connect to search server.", xre);
- errors.add(ActionMessages.GLOBAL_MESSAGE,
- new ActionMessage("packages.search.connection_error"));
- }
- catch (XmlRpcFault e) {
- log.info("Caught Exception :" + e);
- log.info("ErrorCode = " + e.getErrorCode());
- e.printStackTrace();
- if (e.getErrorCode() == 100) {
- log.error("Invalid search query", e);
- errors.add(ActionMessages.GLOBAL_MESSAGE,
- new ActionMessage("packages.search.could_not_parse_query",
- searchString));
- }
- else if (e.getErrorCode() == 200) {
- log.error("Index files appear to be missing: ", e);
- errors.add(ActionMessages.GLOBAL_MESSAGE,
- new ActionMessage("packages.search.index_files_missing",
- searchString));
- }
- else {
- errors.add(ActionMessages.GLOBAL_MESSAGE,
- new ActionMessage("packages.search.could_not_execute_query",
- searchString));
- }
- }
- catch (MalformedURLException e) {
- log.error("Could not connect to server.", e);
- errors.add(ActionMessages.GLOBAL_MESSAGE,
- new ActionMessage("packages.search.connection_error"));
- }
- }
-
- if (!errors.isEmpty()) {
- addErrors(request, errors);
- return getStrutsDelegate().forwardParams(
- mapping.findForward(RhnHelper.DEFAULT_FORWARD),
- createForwardParams(request));
- }
- return getStrutsDelegate().forwardParams(
- mapping.findForward("success"),
- createForwardParams(request));
- }
- private void setupForm(HttpServletRequest request, DynaActionForm form)
+ protected ActionForward doExecute(HttpServletRequest request, ActionMapping mapping,
+ DynaActionForm form)
throws MalformedURLException, XmlRpcException, XmlRpcFault {
RequestContext context = new RequestContext(request);
- String searchString = request.getParameter(SEARCH_STRING);
- String whereToSearch = request.getParameter(WHERE_TO_SEARCH);
+ String searchString = form.getString(SEARCH_STR);
+ String whereToSearch = form.getString(WHERE_TO_SEARCH);
- request.setAttribute(SEARCH_STRING, searchString);
- form.set(WHERE_TO_SEARCH,
- "system_list".equals(whereToSearch) ? whereToSearch : "all");
- setupRuleResultLabelOptions(request);
- setupShowAsOption(form);
DateRangePicker picker = setupDatePicker(form, request);
if (!StringUtils.isBlank(searchString)) {
@@ -154,21 +78,7 @@ public class XccdfSearchAction extends RhnAction {
request.setAttribute(RequestContext.PAGE_LIST, Collections.EMPTY_LIST);
picker.processDatePickers(false, false);
}
- }
-
- private Map createForwardParams(HttpServletRequest request) {
- Map forwardParams = makeParamMap(request);
- // keep all params except submitted, in order for the new list
- // tag pagination to work we need to pass along all the formvars it
- // generated.
- Enumeration paramNames = request.getParameterNames();
- while (paramNames.hasMoreElements()) {
- String name = (String) paramNames.nextElement();
- if (!SUBMITTED.equals(name)) {
- forwardParams.put(name, request.getParameter(name));
- }
- }
- return forwardParams;
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
private Date getPickerDate(HttpServletRequest request, String paramName) {
@@ -182,8 +92,14 @@ public class XccdfSearchAction extends RhnAction {
}
private Boolean getOptionScanDateSearch(HttpServletRequest request) {
- String strDateSearch = request.getParameter(SCAN_DATE_SEARCH);
- return "on".equals(strDateSearch);
+ Object dateSrch = request.getAttribute(SCAN_DATE_SEARCH);
+ if (dateSrch instanceof Boolean) {
+ return ((Boolean)dateSrch).booleanValue();
+ }
+ else {
+ String strDateSearch = (String)request.getAttribute(SCAN_DATE_SEARCH);
+ return "on".equals(strDateSearch);
+ }
}
private DateRangePicker setupDatePicker(DynaActionForm form,
@@ -229,4 +145,22 @@ public class XccdfSearchAction extends RhnAction {
request.setAttribute("allResults", possibleResults);
}
+
+ @Override
+ protected void insureFormDefaults(HttpServletRequest request, DynaActionForm form) {
+ String searchString = form.getString(SEARCH_STR);
+ String whereToSearch = form.getString(WHERE_TO_SEARCH);
+
+ request.setAttribute(SEARCH_STR, searchString);
+ form.set(WHERE_TO_SEARCH,
+ "system_list".equals(whereToSearch) ? whereToSearch : "all");
+ setupRuleResultLabelOptions(request);
+ setupShowAsOption(form);
+ Map m = form.getMap();
+ Set<String> keys = (Set<String>)m.keySet();
+ for (String key : keys) {
+ Object vObj = m.get(key);
+ request.setAttribute(key, vObj);
+ }
+ }
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchAction.java
index 1a16714..b66bcbb 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchAction.java
@@ -15,173 +15,58 @@
package com.redhat.rhn.frontend.action.channel;
-import com.redhat.rhn.common.localization.LocalizationService;
-import com.redhat.rhn.common.validator.ValidatorException;
-import com.redhat.rhn.domain.channel.Channel;
-import com.redhat.rhn.domain.channel.ChannelArch;
-import com.redhat.rhn.domain.user.User;
-import com.redhat.rhn.frontend.dto.PackageDto;
-import com.redhat.rhn.frontend.dto.PackageOverview;
-import com.redhat.rhn.frontend.struts.RequestContext;
-import com.redhat.rhn.frontend.struts.RhnAction;
-import com.redhat.rhn.frontend.struts.RhnHelper;
-import com.redhat.rhn.frontend.taglibs.list.ListTagHelper;
-import com.redhat.rhn.frontend.xmlrpc.SearchServerIndexException;
-import com.redhat.rhn.manager.channel.ChannelManager;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
-import org.apache.struts.action.ActionErrors;
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-import org.apache.struts.action.ActionMessage;
-import org.apache.struts.action.ActionMessages;
-import org.apache.struts.action.DynaActionForm;
-
import java.net.MalformedURLException;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import redstone.xmlrpc.XmlRpcException;
+import org.apache.commons.lang.StringUtils;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.DynaActionForm;
+
import redstone.xmlrpc.XmlRpcFault;
+import com.redhat.rhn.domain.channel.Channel;
+import com.redhat.rhn.domain.channel.ChannelArch;
+import com.redhat.rhn.domain.user.User;
+import com.redhat.rhn.frontend.action.BaseSearchAction;
+import com.redhat.rhn.frontend.dto.PackageDto;
+import com.redhat.rhn.frontend.dto.PackageOverview;
+import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
+import com.redhat.rhn.frontend.xmlrpc.SearchServerIndexException;
+import com.redhat.rhn.manager.channel.ChannelManager;
+
/**
* PackageSearchAction
* @version $Rev$
*/
-public class PackageSearchAction extends RhnAction {
- private static Logger log = Logger.getLogger(PackageSearchAction.class);
- /** List of channel arches we don't really support any more. */
- private static final String[] EXCLUDE_ARCH_LABELS = {"channel-sparc",
- "channel-alpha",
- "channel-iSeries",
- "channel-pSeries"};
- public static final String WHERE_CRITERIA = "whereCriteria";
- public static final String FINE_GRAINED = "fineGrained";
-
- /** {@inheritDoc} */
- public ActionForward execute(ActionMapping mapping, ActionForm formIn,
- HttpServletRequest request, HttpServletResponse response) {
-
- ActionErrors errors = new ActionErrors();
- DynaActionForm form = (DynaActionForm)formIn;
- request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
- Map forwardParams = makeParamMap(request);
- String searchString = request.getParameter("search_string");
- String viewMode = form.getString("view_mode");
- String[] channelArches = form.getStrings("channel_arch");
-
- try {
- // handle setup, the submission setups the searchstring below
- // and redirects to this page which then performs the search.
- if (!isSubmitted(form)) {
- setupForm(request, form);
- return getStrutsDelegate().forwardParams(
- mapping.findForward(RhnHelper.DEFAULT_FORWARD),
- request.getParameterMap());
- }
- }
- catch (XmlRpcException xre) {
- log.error("Could not connect to search server.", xre);
- errors.add(ActionMessages.GLOBAL_MESSAGE,
- new ActionMessage("packages.search.connection_error"));
- }
- catch (XmlRpcFault e) {
- log.info("Caught Exception :" + e);
- log.info("ErrorCode = " + e.getErrorCode());
- e.printStackTrace();
- if (e.getErrorCode() == 100) {
- log.error("Invalid search query", e);
- errors.add(ActionMessages.GLOBAL_MESSAGE,
- new ActionMessage("packages.search.could_not_parse_query",
- searchString));
- }
- else if (e.getErrorCode() == 200) {
- log.error("Index files appear to be missing: ", e);
- errors.add(ActionMessages.GLOBAL_MESSAGE,
- new ActionMessage("packages.search.index_files_missing",
- searchString));
- }
- else {
- errors.add(ActionMessages.GLOBAL_MESSAGE,
- new ActionMessage("packages.search.could_not_execute_query",
- searchString));
- }
- }
- catch (MalformedURLException e) {
- log.error("Could not connect to server.", e);
- errors.add(ActionMessages.GLOBAL_MESSAGE,
- new ActionMessage("packages.search.connection_error"));
- }
- catch (ValidatorException ve) {
- errors.add(ActionMessages.GLOBAL_MESSAGE,
- new ActionMessage("packages.search.use_free_form"));
- }
- catch (SearchServerIndexException se) {
- log.error("Exception caught: " + se.getMessage());
- errors.add(ActionMessages.GLOBAL_MESSAGE,
- new ActionMessage("searchserver.index_out_of_sync_with_db"));
- }
-
- // keep all params except submitted, in order for the new list
- // tag pagination to work we need to pass along all the formvars it
- // generated.
- Enumeration paramNames = request.getParameterNames();
- while (paramNames.hasMoreElements()) {
- String name = (String) paramNames.nextElement();
- if (!SUBMITTED.equals(name)) {
- forwardParams.put(name, request.getParameter(name));
- }
- }
-
- forwardParams.put("search_string", searchString);
- forwardParams.put("view_mode", viewMode);
- forwardParams.put("channel_arch", channelArches);
-
- if (!errors.isEmpty()) {
- addErrors(request, errors);
- return getStrutsDelegate().forwardParams(
- mapping.findForward(RhnHelper.DEFAULT_FORWARD),
- forwardParams);
- }
-
- return getStrutsDelegate().forwardParams(
- mapping.findForward("success"),
- forwardParams);
- }
+public class PackageSearchAction extends BaseSearchAction {
- private void setupForm(HttpServletRequest request, DynaActionForm form)
+ protected ActionForward doExecute(HttpServletRequest request, ActionMapping mapping,
+ DynaActionForm form)
throws MalformedURLException, XmlRpcFault, SearchServerIndexException {
RequestContext ctx = new RequestContext(request);
- String searchString = form.getString("search_string");
- String viewmode = form.getString("view_mode");
+ String searchString = form.getString(SEARCH_STR);
+ String viewmode = form.getString(VIEW_MODE);
Boolean fineGrained = (Boolean) form.get(FINE_GRAINED);
- String searchCriteria = request.getParameter(WHERE_CRITERIA);
+ String searchCriteria = form.getString(WHERE_CRITERIA);
String[] selectedArches = null;
Long filterChannelId = null;
boolean relevantFlag = false;
- // Default to relevant channels if no search criteria was specified
- if (searchCriteria == null || searchCriteria.equals("")) {
- searchCriteria = "relevant";
- }
-
// Handle the radio button selection for channel filtering
- if (searchCriteria.equals("relevant")) {
+ if (searchCriteria.equals(RELEVANT)) {
relevantFlag = true;
}
- if (searchCriteria.equals("architecture")) {
+ if (searchCriteria.equals(ARCHITECTURE)) {
/* The search call will function as being scoped to architectures if the arch
list isn't null. In order to actually get radio-button-like functionality
we can't rely on the arch list coming in from the form to be null; the
@@ -189,100 +74,76 @@ public class PackageSearchAction extends RhnAction {
push off retrieving the arches until we know we want to use them, we can
get the desired functionality described by the UI.
*/
- selectedArches = form.getStrings("channel_arch");
+ selectedArches = form.getStrings(CHANNEL_ARCH);
}
- else if (searchCriteria.equals("channel")) {
- String sChannelId = form.getString("channel_filter");
+ else if (searchCriteria.equals(CHANNEL)) {
+ String sChannelId = form.getString(CHANNEL_FILTER);
filterChannelId = Long.parseLong(sChannelId);
}
- if (viewmode.equals("")) { //first time viewing page
- viewmode = PackageSearchHelper.OPT_NAME_AND_SUMMARY;
- }
-
- if (fineGrained == null) {
- fineGrained = false;
- }
- if (PackageSearchHelper.OPT_FREE_FORM.equals(viewmode)) {
- // adding a boolean of true to signify we want the results to be
- // constrained to closer matches, this will force the Lucene Queries
- // to use a "MUST" instead of the default "SHOULD". It will not
- // allow fuzzy matches as in spelling errors, but it will allow
- // free form searches to do more advanced options
- fineGrained = true;
- form.set(FINE_GRAINED, fineGrained);
- }
-
- List searchOptions = new ArrayList();
- // setup the option list for select box (view_mode).
- addOption(searchOptions, "packages.search.free_form",
- PackageSearchHelper.OPT_FREE_FORM);
- addOption(searchOptions, "packages.search.name",
- PackageSearchHelper.OPT_NAME_ONLY);
- addOption(searchOptions, "packages.search.name_and_desc",
- PackageSearchHelper.OPT_NAME_AND_DESC);
- addOption(searchOptions, "packages.search.both",
- PackageSearchHelper.OPT_NAME_AND_SUMMARY);
-
- List channelArches = new ArrayList();
- List<ChannelArch> arches = ChannelManager.getChannelArchitectures();
- List<String> archLabels = ChannelManager.getSyncdChannelArches();
- for (ChannelArch arch : arches) {
- boolean exclude = false;
- for (String s : EXCLUDE_ARCH_LABELS) {
- if (arch.getLabel().equals(s)) {
- exclude = true;
- break;
- }
- }
-
- if (!exclude) {
- // if the label does *NOT* exist, this channel arch has no
- // channels in the database. So we want to flag it.
- addOption(channelArches, arch.getName(), arch.getLabel(),
- !archLabels.contains(arch.getLabel()));
- }
- }
+ List<Map<String, String>> searchOptions = buildSearchOptions();
+ List<Map<String, String>> channelArches = buildChannelArches();
// Load list of available channels to select as filter
- List allChannels =
- ChannelManager.allChannelsTree(ctx.getLoggedInUser());
-
- request.setAttribute("search_string", searchString);
- request.setAttribute("view_mode", viewmode);
- request.setAttribute("searchOptions", searchOptions);
- request.setAttribute("channelArches", channelArches);
- request.setAttribute("channel_arch", selectedArches);
- request.setAttribute("allChannels", allChannels);
- request.setAttribute("channel_filter", form.getString("channel_filter"));
- request.setAttribute("relevant", relevantFlag ? "yes" : "no");
- request.setAttribute(FINE_GRAINED, fineGrained ? "yes" : "no");
+ List allChannels = ChannelManager.allChannelsTree(ctx.getLoggedInUser());
+
+ request.setAttribute(SEARCH_STR, searchString);
+ request.setAttribute(VIEW_MODE, viewmode);
+ request.setAttribute(SEARCH_OPT, searchOptions);
+ request.setAttribute(CHANNEL_ARCHES, channelArches);
+ request.setAttribute(CHANNEL_ARCH, selectedArches);
+ request.setAttribute(ALL_CHANNELS, allChannels);
+ request.setAttribute(CHANNEL_FILTER,
+ form.getString(CHANNEL_FILTER));
+ request.setAttribute(RELEVANT, relevantFlag ? "yes" : "no");
+ request.setAttribute(FINE_GRAINED, fineGrained);
// Default where to search criteria
- request.setAttribute("whereCriteria", searchCriteria);
+ request.setAttribute(WHERE_CRITERIA, searchCriteria);
if (!StringUtils.isBlank(searchString)) {
- List<PackageOverview> results =
- PackageSearchHelper.performSearch(ctx.getWebSession().getId(),
- searchString,
- viewmode,
- selectedArches, relevantFlag, fineGrained);
-
- // Perform any post-search logic that wasn't done by the search server
- results = removeDuplicateNames(results);
-
- if (filterChannelId != null) {
- User user = ctx.getLoggedInUser();
- results = filterByChannel(user, filterChannelId, results);
- }
-
- log.warn("GET search: " + results);
+ List<PackageOverview> results = performSearch(ctx, searchString, viewmode,
+ fineGrained, selectedArches, filterChannelId, relevantFlag);
request.setAttribute(RequestContext.PAGE_LIST,
- results != null ? results : Collections.EMPTY_LIST);
+ results != null ? results : Collections.emptyList());
}
else {
- request.setAttribute(RequestContext.PAGE_LIST, Collections.EMPTY_LIST);
+ request.setAttribute(RequestContext.PAGE_LIST, Collections.emptyList());
}
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
+ }
+
+ /**
+ * Actually do the package-search desired
+ * @param ctx incoming request context
+ * @param searchString string we're going to search on
+ * @param viewmode what kind-of search are we doing?
+ * @param fineGrained exact or fuzzy?
+ * @param selectedArches do we care about specific arches?
+ * @param filterChannelId do we care about a specific channel?
+ * @param relevantFlag do we only care about 'relevant to registered profiles"?
+ * @return list of package-overviews found
+ * @throws XmlRpcFault bad communication with search server
+ * @throws MalformedURLException possibly bad configuration for search server address
+ */
+ public List<PackageOverview> performSearch(RequestContext ctx, String searchString,
+ String viewmode, Boolean fineGrained, String[] selectedArches,
+ Long filterChannelId, boolean relevantFlag)
+ throws XmlRpcFault, MalformedURLException {
+ List<PackageOverview> results =
+ PackageSearchHelper.performSearch(ctx.getWebSession().getId(),
+ searchString,
+ viewmode,
+ selectedArches, relevantFlag, fineGrained);
+
+ // Perform any post-search logic that wasn't done by the search server
+ results = removeDuplicateNames(results);
+
+ if (filterChannelId != null) {
+ User user = ctx.getLoggedInUser();
+ results = filterByChannel(user, filterChannelId, results);
+ }
+ return results;
}
/**
@@ -342,23 +203,71 @@ public class PackageSearchAction extends RhnAction {
return newResult;
}
- private void addOption(List options, String key, String value) {
- addOption(options, key, value, false);
+ /**
+ * Make sure we have appropriate defaults no matter how we got here
+ * Set the defaults (where needed) back into the form so that the rest of the action
+ * can find them
+ * @param form where we expect values to end up
+ */
+ protected void insureFormDefaults(HttpServletRequest request, DynaActionForm form) {
+ String searchCriteria = form.getString(WHERE_CRITERIA);
+ // Default to relevant channels if no search criteria was specified
+ if (searchCriteria == null || searchCriteria.equals("")) {
+ form.set(WHERE_CRITERIA, RELEVANT);
+ }
+
+ String viewmode = form.getString("view_mode");
+ if (viewmode.equals("")) { //first time viewing page
+ form.set(VIEW_MODE, OPT_NAME_AND_SUMMARY);
+ }
+
+ Boolean fineGrained = (Boolean) form.get(FINE_GRAINED);
+ if (fineGrained == null) {
+ fineGrained = false;
+ }
+ if (OPT_FREE_FORM.equals(viewmode)) {
+ // adding a boolean of true to signify we want the results to be
+ // constrained to closer matches, this will force the Lucene Queries
+ // to use a "MUST" instead of the default "SHOULD". It will not
+ // allow fuzzy matches as in spelling errors, but it will allow
+ // free form searches to do more advanced options
+ fineGrained = true;
+ }
+ form.set(FINE_GRAINED, fineGrained);
}
/**
- * Utility function to create options for the dropdown.
- * @param options list containing all options.
- * @param key resource bundle key used as the display value.
- * @param value value to be submitted with form.
- * @param flag Flag the item with an asterisk (*) indicating it is *not*
- * synch'd
+ * Build the channel-arch-pulldown for all arches that are not in the 'excluded' list
+ * @return For each arch, a Map of localized display-name and value
*/
- private void addOption(List options, String key, String value, boolean flag) {
- LocalizationService ls = LocalizationService.getInstance();
- Map selection = new HashMap();
- selection.put("display", (flag ? "*" : "") + ls.getMessage(key));
- selection.put("value", value);
- options.add(selection);
+ private List<Map<String, String>> buildChannelArches() {
+ List<Map<String, String>> channelArches = new ArrayList<Map<String, String>>();
+ List<ChannelArch> arches = ChannelManager.getChannelArchitectures();
+ List<String> syncdLabels = ChannelManager.getSyncdChannelArches();
+ for (ChannelArch arch : arches) {
+ if (!EXCLUDED_ARCHES.contains(arch.getLabel())) {
+ // if the label does *NOT* exist, this channel arch has no
+ // channels in the database. So we want to flag it.
+ addOption(channelArches, arch.getName(), arch.getLabel(),
+ !syncdLabels.contains(arch.getLabel()));
+ }
+ }
+ return channelArches;
}
-}
+
+ /**
+ * Builds the package-search-option pulldown
+ * @return For each available option, a Map of localized display-name and value
+ */
+ private List<Map<String, String>> buildSearchOptions() {
+ List<Map<String, String>> searchOptions = new ArrayList<Map<String, String>>();
+ // setup the option list for select box (view_mode).
+ addOption(searchOptions, "packages.search.free_form", OPT_FREE_FORM);
+ addOption(searchOptions, "packages.search.name", OPT_NAME_ONLY);
+ addOption(searchOptions, "packages.search.name_and_desc", OPT_NAME_AND_DESC);
+ addOption(searchOptions, "packages.search.both", OPT_NAME_AND_SUMMARY);
+ return searchOptions;
+ }
+
+
+ }
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchHelper.java b/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchHelper.java
index 2015f79..3db8130 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchHelper.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchHelper.java
@@ -14,14 +14,6 @@
*/
package com.redhat.rhn.frontend.action.channel;
-import com.redhat.rhn.common.conf.ConfigDefaults;
-import com.redhat.rhn.common.validator.ValidatorException;
-import com.redhat.rhn.frontend.dto.PackageOverview;
-import com.redhat.rhn.frontend.xmlrpc.SearchServerIndexException;
-import com.redhat.rhn.manager.channel.ChannelManager;
-
-import org.apache.log4j.Logger;
-
import java.net.MalformedURLException;
import java.util.ArrayList;
import java.util.Arrays;
@@ -32,9 +24,18 @@ import java.util.List;
import java.util.ListIterator;
import java.util.Map;
+import org.apache.log4j.Logger;
+
import redstone.xmlrpc.XmlRpcClient;
import redstone.xmlrpc.XmlRpcFault;
+import com.redhat.rhn.common.conf.ConfigDefaults;
+import com.redhat.rhn.common.validator.ValidatorException;
+import com.redhat.rhn.frontend.action.BaseSearchAction;
+import com.redhat.rhn.frontend.dto.PackageOverview;
+import com.redhat.rhn.frontend.xmlrpc.SearchServerIndexException;
+import com.redhat.rhn.manager.channel.ChannelManager;
+
/**
* PackageSearchHelper
* @version $Rev$
@@ -42,11 +43,6 @@ import redstone.xmlrpc.XmlRpcFault;
public class PackageSearchHelper {
private static Logger log = Logger.getLogger(PackageSearchHelper.class);
- public static final String OPT_FREE_FORM = "search_free_form";
- public static final String OPT_NAME_AND_DESC = "search_name_and_description";
- public static final String OPT_NAME_AND_SUMMARY = "search_name_and_summary";
- public static final String OPT_NAME_ONLY = "search_name";
-
private PackageSearchHelper() {
}
@@ -92,7 +88,7 @@ public class PackageSearchHelper {
}
if (results.isEmpty()) {
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
// need to make the search server results usable by database
@@ -169,7 +165,7 @@ public class PackageSearchHelper {
String mode,
List<String> arches) {
- if (!OPT_FREE_FORM.equals(mode) && searchstring.indexOf(':') > 0) {
+ if (!BaseSearchAction.OPT_FREE_FORM.equals(mode) && searchstring.indexOf(':') > 0) {
throw new ValidatorException("Can't use free form and field search.");
}
@@ -199,15 +195,15 @@ public class PackageSearchHelper {
String query = buf.toString().trim();
// when searching the name field, we also want to include the filename
// field in case the user passed in version number.
- if (OPT_NAME_AND_SUMMARY.equals(mode)) {
+ if (BaseSearchAction.OPT_NAME_AND_SUMMARY.equals(mode)) {
return "(name:(" + query + ")^2 summary:(" + query +
") filename:(" + query + "))" + archBuf.toString();
}
- else if (OPT_NAME_AND_DESC.equals(mode)) {
+ else if (BaseSearchAction.OPT_NAME_AND_DESC.equals(mode)) {
return "(name:(" + query + ")^2 description:(" + query +
") filename:(" + query + "))" + archBuf.toString();
}
- else if (OPT_NAME_ONLY.equals(mode)) {
+ else if (BaseSearchAction.OPT_NAME_ONLY.equals(mode)) {
return "(name:(" + query + ")^2 filename:(" + query + "))" +
archBuf.toString();
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/common/DateRangePicker.java b/java/code/src/com/redhat/rhn/frontend/action/common/DateRangePicker.java
index 733c1b1..777df78 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/common/DateRangePicker.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/common/DateRangePicker.java
@@ -99,8 +99,11 @@ public class DateRangePicker {
retval.setEnd(end);
retval.setErrors(errors);
if (isSubmitted) {
+ // Make sure we can handle either url-params or form-vars; form wins if both
start.readMap(req.getParameterMap());
+ start.readMap(form.getMap());
end.readMap(req.getParameterMap());
+ end.readMap(form.getMap());
validateDates(errors, start, end);
}
else {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataSearchAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataSearchAction.java
index e70d454..889fe87 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataSearchAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataSearchAction.java
@@ -14,168 +14,68 @@
*/
package com.redhat.rhn.frontend.action.errata;
-import com.redhat.rhn.common.conf.ConfigDefaults;
-import com.redhat.rhn.common.db.datasource.DataResult;
-import com.redhat.rhn.common.localization.LocalizationService;
-import com.redhat.rhn.common.util.DatePicker;
-import com.redhat.rhn.common.validator.ValidatorException;
-import com.redhat.rhn.domain.org.Org;
-import com.redhat.rhn.frontend.action.common.DateRangePicker;
-import com.redhat.rhn.frontend.action.common.DateRangePicker.DatePickerResults;
-import com.redhat.rhn.frontend.dto.ErrataOverview;
-import com.redhat.rhn.frontend.struts.RequestContext;
-import com.redhat.rhn.frontend.struts.RhnAction;
-import com.redhat.rhn.frontend.struts.RhnHelper;
-import com.redhat.rhn.frontend.taglibs.list.ListTagHelper;
-import com.redhat.rhn.manager.errata.ErrataManager;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
-import org.apache.struts.action.ActionErrors;
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-import org.apache.struts.action.ActionMessage;
-import org.apache.struts.action.ActionMessages;
-import org.apache.struts.action.DynaActionForm;
-
import java.net.MalformedURLException;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collections;
import java.util.Date;
-import java.util.Enumeration;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.ListIterator;
import java.util.Map;
+import java.util.Set;
import java.util.TimeZone;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessages;
+import org.apache.struts.action.DynaActionForm;
import redstone.xmlrpc.XmlRpcClient;
-import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcFault;
+import com.redhat.rhn.common.conf.ConfigDefaults;
+import com.redhat.rhn.common.db.datasource.DataResult;
+import com.redhat.rhn.common.util.DatePicker;
+import com.redhat.rhn.domain.org.Org;
+import com.redhat.rhn.frontend.action.BaseSearchAction;
+import com.redhat.rhn.frontend.action.common.DateRangePicker;
+import com.redhat.rhn.frontend.action.common.DateRangePicker.DatePickerResults;
+import com.redhat.rhn.frontend.dto.ErrataOverview;
+import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
+import com.redhat.rhn.manager.errata.ErrataManager;
+
/**
* SearchAction
* @version $Rev$
*/
-public class ErrataSearchAction extends RhnAction {
-
- private static Logger log = Logger.getLogger(ErrataSearchAction.class);
- private static final String OPT_ADVISORY = "errata_search_by_advisory";
- private static final String OPT_PKG_NAME = "errata_search_by_package_name";
- private static final String OPT_CVE = "errata_search_by_cve";
- private static final String OPT_ALL_FIELDS = "errata_search_by_all_fields";
- public static final String FINE_GRAINED = "fineGrained";
-
- /** {@inheritDoc} */
- public ActionForward execute(ActionMapping mapping,
- ActionForm formIn,
- HttpServletRequest request,
- HttpServletResponse response) {
- ActionErrors errors = new ActionErrors();
- DynaActionForm form = (DynaActionForm)formIn;
- request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
- Map forwardParams = makeParamMap(request);
- String searchString = request.getParameter("search_string");
- String viewMode = form.getString("view_mode");
-
- try {
- // handle setup, the submission setups the searchstring below
- // and redirects to this page which then performs the search.
- if (!isSubmitted(form)) {
- setupForm(request, form);
- return getStrutsDelegate().forwardParams(
- mapping.findForward(RhnHelper.DEFAULT_FORWARD),
- request.getParameterMap());
- }
- }
- catch (XmlRpcException xre) {
- log.error("Could not connect to search server.", xre);
- errors.add(ActionMessages.GLOBAL_MESSAGE,
- new ActionMessage("packages.search.connection_error"));
- }
- catch (XmlRpcFault e) {
- log.info("Caught Exception :" + e);
- log.info("ErrorCode = " + e.getErrorCode());
- e.printStackTrace();
- if (e.getErrorCode() == 100) {
- log.error("Invalid search query", e);
- errors.add(ActionMessages.GLOBAL_MESSAGE,
- new ActionMessage("packages.search.could_not_parse_query",
- searchString));
- }
- else if (e.getErrorCode() == 200) {
- log.error("Index files appear to be missing: ", e);
- errors.add(ActionMessages.GLOBAL_MESSAGE,
- new ActionMessage("packages.search.index_files_missing",
- searchString));
- }
- else {
- errors.add(ActionMessages.GLOBAL_MESSAGE,
- new ActionMessage("packages.search.could_not_execute_query",
- searchString));
- }
- }
- catch (MalformedURLException e) {
- log.error("Could not connect to server.", e);
- errors.add(ActionMessages.GLOBAL_MESSAGE,
- new ActionMessage("packages.search.connection_error"));
- }
- catch (ValidatorException ve) {
- errors.add(ActionMessages.GLOBAL_MESSAGE,
- new ActionMessage("packages.search.use_free_form"));
- }
-
- // keep all params except submitted, in order for the new list
- // tag pagination to work we need to pass along all the formvars it
- // generated.
- Enumeration paramNames = request.getParameterNames();
- while (paramNames.hasMoreElements()) {
- String name = (String) paramNames.nextElement();
- if (!SUBMITTED.equals(name)) {
- forwardParams.put(name, request.getParameter(name));
- }
- }
-
- forwardParams.put("search_string", searchString);
- forwardParams.put("view_mode", viewMode);
- forwardParams.put(FINE_GRAINED, request.getParameter(FINE_GRAINED));
-
- if (!errors.isEmpty()) {
- addErrors(request, errors);
- return getStrutsDelegate().forwardParams(
- mapping.findForward(RhnHelper.DEFAULT_FORWARD),
- forwardParams);
- }
-
- return getStrutsDelegate().forwardParams(
- mapping.findForward("success"),
- forwardParams);
- }
+public class ErrataSearchAction extends BaseSearchAction {
- private void setupForm(HttpServletRequest request, DynaActionForm form)
+ protected ActionForward doExecute(HttpServletRequest request, ActionMapping mapping,
+ DynaActionForm form)
throws MalformedURLException, XmlRpcFault {
RequestContext ctx = new RequestContext(request);
- String search = request.getParameter("search_string");
- String viewmode = request.getParameter("view_mode");
- String fineGrained = request.getParameter(FINE_GRAINED);
+ String search = form.getString(SEARCH_STR);
+
+ String viewmode = form.getString(VIEW_MODE);
+ Boolean fineGrained = (Boolean)form.get(FINE_GRAINED);
List searchOptions = new ArrayList();
// setup the option list for select box (view_mode).
- addOption(searchOptions, "errata_search_by_all_fields", OPT_ALL_FIELDS);
- addOption(searchOptions, "errata_search_by_advisory", OPT_ADVISORY);
- addOption(searchOptions, "errata_search_by_package_name", OPT_PKG_NAME);
- addOption(searchOptions, "errata_search_by_cve", OPT_CVE);
-
- request.setAttribute("search_string", search);
- request.setAttribute("view_mode", viewmode);
- request.setAttribute("searchOptions", searchOptions);
+ addOption(searchOptions, OPT_ALL_FIELDS, OPT_ALL_FIELDS);
+ addOption(searchOptions, OPT_ADVISORY, OPT_ADVISORY);
+ addOption(searchOptions, OPT_PKG_NAME, OPT_PKG_NAME);
+ addOption(searchOptions, OPT_CVE, OPT_CVE);
+
+ request.setAttribute(SEARCH_STR, search);
+ request.setAttribute(VIEW_MODE, viewmode);
+ request.setAttribute(SEARCH_OPT, searchOptions);
request.setAttribute(FINE_GRAINED, fineGrained);
// Process the dates, default the start date to yesterday
@@ -218,7 +118,6 @@ public class ErrataSearchAction extends RhnAction {
List results = performSearch(request, ctx.getWebSession().getId(),
search, viewmode, form);
- log.warn("GET search: " + results);
request.setAttribute(RequestContext.PAGE_LIST,
results != null ? results : Collections.EMPTY_LIST);
}
@@ -231,43 +130,63 @@ public class ErrataSearchAction extends RhnAction {
log.debug("End Start Date = " + dates.getEnd().getDate());
}
request.setAttribute(RequestContext.PAGE_LIST, Collections.EMPTY_LIST);
- Map paramMap = request.getParameterMap();
- if (!paramMap.containsKey("optionIssueDateSearch")) {
- form.set("optionIssueDateSearch", Boolean.FALSE);
- }
- if (!paramMap.containsKey("errata_type_bug")) {
- form.set("errata_type_bug", Boolean.TRUE);
- }
- if (!paramMap.containsKey("errata_type_security")) {
- form.set("errata_type_security", Boolean.TRUE);
- }
- if (!paramMap.containsKey("errata_type_enhancement")) {
- form.set("errata_type_enhancement", Boolean.TRUE);
- }
+
}
ActionMessages dateErrors = dates.getErrors();
addErrors(request, dateErrors);
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
/**
- * Utility function to create options for the dropdown.
- * @param options list containing all options.
- * @param key resource bundle key used as the display value.
- * @param value value to be submitted with form.
+ * Make sure we have appropriate defaults no matter how we got here
+ * Set the defaults (where needed) back into the form so that the rest of the action
+ * can find them
+ * @param form where we expect values to be
*/
- private void addOption(List options, String key, String value) {
- LocalizationService ls = LocalizationService.getInstance();
- Map selection = new HashMap();
- selection.put("display", ls.getMessage(key));
- selection.put("value", value);
- options.add(selection);
+ protected void insureFormDefaults(HttpServletRequest request, DynaActionForm form) {
+ String viewmode = form.getString(VIEW_MODE);
+ if (viewmode.equals("")) { //first time viewing page
+ form.set(VIEW_MODE, "errata_search_by_all_fields");
+ }
+
+ Boolean fineGrained = (Boolean)form.get(FINE_GRAINED);
+ if (fineGrained == null) {
+ fineGrained = false;
+ form.set(FINE_GRAINED, fineGrained);
+ }
+
+ Boolean issueDateSrch = (Boolean)form.get(OPT_ISSUE_DATE);
+ if (issueDateSrch == null) {
+ form.set(OPT_ISSUE_DATE, Boolean.FALSE);
+ }
+
+ Boolean eTypeBug =
+ (form.get(ERRATA_BUG) == null ? Boolean.FALSE : (Boolean)form.get(ERRATA_BUG));
+ Boolean eTypeSec =
+ (form.get(ERRATA_SEC) == null ? Boolean.FALSE : (Boolean)form.get(ERRATA_SEC));
+ Boolean eTypeEnh =
+ (form.get(ERRATA_ENH) == null ? Boolean.FALSE : (Boolean)form.get(ERRATA_ENH));
+
+ // If no errata-type is set, set them all
+ if (!(eTypeBug || eTypeSec || eTypeEnh)) {
+ form.set(ERRATA_BUG, Boolean.TRUE);
+ form.set(ERRATA_SEC, Boolean.TRUE);
+ form.set(ERRATA_ENH, Boolean.TRUE);
+ }
+
+ Map m = form.getMap();
+ Set<String> keys = (Set<String>)m.keySet();
+ for (String key : keys) {
+ Object vObj = m.get(key);
+ request.setAttribute(key, vObj);
+ }
}
- private List performSearch(HttpServletRequest request, Long sessionId,
+ protected List performSearch(HttpServletRequest request, Long sessionId,
String searchString, String mode, DynaActionForm formIn)
throws XmlRpcFault, MalformedURLException {
- log.info("Performing errata search");
+ log.debug("Performing errata search");
RequestContext ctx = new RequestContext(request);
Org org = ctx.getCurrentUser().getOrg();
// call search server
@@ -323,10 +242,7 @@ public class ErrataSearchAction extends RhnAction {
path = "db.search";
}
else {
- Boolean fineGrained = (Boolean) formIn.get("fineGrained");
- if (fineGrained == null) {
- fineGrained = false;
- }
+ Boolean fineGrained = (Boolean) formIn.get(FINE_GRAINED);
args.add(fineGrained);
// Tells search server to use the lucene index
path = "index.search";
@@ -341,7 +257,7 @@ public class ErrataSearchAction extends RhnAction {
}
if (results.isEmpty()) {
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
// need to make the search server results usable by database
@@ -475,15 +391,15 @@ public class ErrataSearchAction extends RhnAction {
DynaActionForm formIn) {
if (log.isDebugEnabled()) {
log.debug("Filtering " + unfiltered.size() + " records based on Advisory type");
- log.debug("BugFixes = " + formIn.get("errata_type_bug"));
- log.debug("Security = " + formIn.get("errata_type_security"));
- log.debug("Enhancement = " + formIn.get("errata_type_enhancement"));
+ log.debug("BugFixes = " + formIn.get(ERRATA_BUG));
+ log.debug("Security = " + formIn.get(ERRATA_SEC));
+ log.debug("Enhancement = " + formIn.get(ERRATA_ENH));
}
List<ErrataOverview> filteredByType = new ArrayList<ErrataOverview>();
for (ErrataOverview eo : unfiltered) {
Boolean type = null;
if (eo.isBugFix()) {
- type = (Boolean)formIn.get("errata_type_bug");
+ type = (Boolean)formIn.get(ERRATA_BUG);
if (type != null) {
if (type) {
filteredByType.add(eo);
@@ -491,7 +407,7 @@ public class ErrataSearchAction extends RhnAction {
}
}
if (eo.isSecurityAdvisory()) {
- type = (Boolean)formIn.get("errata_type_security");
+ type = (Boolean)formIn.get(ERRATA_SEC);
if (type != null) {
if (type) {
filteredByType.add(eo);
@@ -499,7 +415,7 @@ public class ErrataSearchAction extends RhnAction {
}
}
if (eo.isProductEnhancement()) {
- type = (Boolean)formIn.get("errata_type_enhancement");
+ type = (Boolean)formIn.get(ERRATA_ENH);
if (type != null) {
if (type) {
filteredByType.add(eo);
@@ -510,8 +426,6 @@ public class ErrataSearchAction extends RhnAction {
return filteredByType;
}
-
-
private List<ErrataOverview> fleshOutErrataOverview(List<Long> idsIn, Org org) {
// Chunk the work to avoid issue with Oracle not liking
// an input parameter list to contain more than 1000 entries.
@@ -540,8 +454,6 @@ public class ErrataSearchAction extends RhnAction {
return unsorted;
}
-
-
private String getDateString(Date date) {
Calendar cal = Calendar.getInstance(TimeZone.getDefault());
cal.setTime(date);
@@ -553,7 +465,7 @@ public class ErrataSearchAction extends RhnAction {
return currentTime;
}
- private String preprocessSearchString(String searchstring, String mode) {
+ protected String preprocessSearchString(String searchstring, String mode) {
StringBuffer buf = new StringBuffer(searchstring.length());
String[] tokens = searchstring.split(" ");
@@ -613,12 +525,23 @@ public class ErrataSearchAction extends RhnAction {
}
private Boolean getOptionIssueDateSearch(HttpServletRequest request) {
- String strDateSearch = request.getParameter("optionIssueDateSearch");
- if ("on".equals(strDateSearch)) {
- return true;
+ Object dateSrch = request.getAttribute(OPT_ISSUE_DATE);
+ if (dateSrch == null) {
+ return false;
}
- return false;
- }
+ if (dateSrch instanceof Boolean) {
+ return (Boolean) dateSrch;
+ }
+ else if (dateSrch instanceof String) {
+ if ("on".equals(dateSrch)) {
+ return true;
+ }
+ return false;
+ }
+ else {
+ return false;
+ }
+ }
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/test/ErrataSearchActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/errata/test/ErrataSearchActionTest.java
index abf0daf..13ec7df 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/test/ErrataSearchActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/test/ErrataSearchActionTest.java
@@ -14,22 +14,24 @@
*/
package com.redhat.rhn.frontend.action.errata.test;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.collections.IteratorUtils;
+import org.apache.struts.action.ActionForward;
+
import com.redhat.rhn.domain.errata.Errata;
import com.redhat.rhn.domain.errata.test.ErrataFactoryTest;
+import com.redhat.rhn.frontend.action.BaseSearchAction;
import com.redhat.rhn.frontend.action.errata.ErrataSearchAction;
import com.redhat.rhn.frontend.struts.RhnAction;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.testing.ActionHelper;
import com.redhat.rhn.testing.RhnBaseTestCase;
import com.redhat.rhn.testing.UserTestUtils;
-import org.apache.commons.collections.IteratorUtils;
-import org.apache.struts.action.ActionForward;
-
-import java.util.HashMap;
-import java.util.Map;
-
/**
- * ErrataPackagesSetupActionTest
+ * ErrataSearchActionTest
* @version $Rev$
*/
public class ErrataSearchActionTest extends RhnBaseTestCase {
@@ -42,22 +44,24 @@ public class ErrataSearchActionTest extends RhnBaseTestCase {
this.getClass().getSimpleName()));
String name = e.getAdvisory();
- ah.setUpAction(action, "success");
- ah.getForm().set("view_mode", "errata_search_by_advisory");
+ ah.setUpAction(action, RhnHelper.DEFAULT_FORWARD);
+ ah.getForm().set(BaseSearchAction.VIEW_MODE, BaseSearchAction.OPT_ADVISORY);
ah.getForm().set(RhnAction.SUBMITTED, Boolean.TRUE);
// these are duplicated on PURPOSE! Because mockobjects SUCK ASS!
- ah.getRequest().setupAddParameter("search_string", name);
- ah.getRequest().setupAddParameter("search_string", name);
- ah.getRequest().setupAddParameter("view_mode", "errata_search_by_advisory");
- ah.getRequest().setupAddParameter("view_mode", "errata_search_by_advisory");
- ah.getRequest().setupAddParameter("fineGrained", "on");
- ah.getRequest().setupAddParameter("fineGrained", "on");
+ ah.getRequest().setupAddParameter(BaseSearchAction.SEARCH_STR, name);
+ ah.getRequest().setupAddParameter(BaseSearchAction.SEARCH_STR, name);
+ ah.getRequest().setupAddParameter(BaseSearchAction.VIEW_MODE,
+ BaseSearchAction.OPT_ADVISORY);
+ ah.getRequest().setupAddParameter(BaseSearchAction.VIEW_MODE,
+ BaseSearchAction.OPT_ADVISORY);
+ ah.getRequest().setupAddParameter(BaseSearchAction.FINE_GRAINED, "on");
+ ah.getRequest().setupAddParameter(BaseSearchAction.FINE_GRAINED, "on");
// I *HATE* Mockobjects
Map paramnames = new HashMap();
- paramnames.put("search_string", name);
- paramnames.put("view_mode", "errata_search_by_advisory");
- paramnames.put("fineGrained", "on");
+ paramnames.put(BaseSearchAction.SEARCH_STR, name);
+ paramnames.put(BaseSearchAction.VIEW_MODE, BaseSearchAction.OPT_ADVISORY);
+ paramnames.put(BaseSearchAction.FINE_GRAINED, "on");
paramnames.put(RhnAction.SUBMITTED, "true");
ah.getRequest().setupGetParameterNames(
IteratorUtils.asEnumeration(paramnames.keySet().iterator()));
@@ -65,10 +69,6 @@ public class ErrataSearchActionTest extends RhnBaseTestCase {
ah.setupClampListBounds();
ActionForward af = ah.executeAction();
-
- assertTrue(af.getPath().indexOf(name.replaceAll(" ", "+")) != -1);
- assertTrue(af.getPath().indexOf("errata_search_by_advisory") != -1);
-
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/help/DocSearchSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/help/DocSearchSetupAction.java
index 85ed1c9..aa9bd37 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/help/DocSearchSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/help/DocSearchSetupAction.java
@@ -14,158 +14,58 @@
*/
package com.redhat.rhn.frontend.action.help;
-import com.redhat.rhn.common.conf.ConfigDefaults;
-import com.redhat.rhn.common.localization.LocalizationService;
-import com.redhat.rhn.common.validator.ValidatorException;
-import com.redhat.rhn.common.validator.ValidatorWarning;
-import com.redhat.rhn.frontend.context.Context;
-import com.redhat.rhn.frontend.dto.HelpDocumentOverview;
-import com.redhat.rhn.frontend.struts.RequestContext;
-import com.redhat.rhn.frontend.struts.RhnAction;
-import com.redhat.rhn.frontend.struts.RhnHelper;
-import com.redhat.rhn.frontend.taglibs.list.ListTagHelper;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
-import org.apache.struts.action.ActionErrors;
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-import org.apache.struts.action.ActionMessage;
-import org.apache.struts.action.ActionMessages;
-import org.apache.struts.action.DynaActionForm;
-
import java.net.MalformedURLException;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.DynaActionForm;
import redstone.xmlrpc.XmlRpcClient;
-import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcFault;
+import com.redhat.rhn.common.conf.ConfigDefaults;
+import com.redhat.rhn.common.validator.ValidatorException;
+import com.redhat.rhn.common.validator.ValidatorWarning;
+import com.redhat.rhn.frontend.action.BaseSearchAction;
+import com.redhat.rhn.frontend.context.Context;
+import com.redhat.rhn.frontend.dto.HelpDocumentOverview;
+import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
+
/**
* DocSearchSetupAction
* @version $Rev$
*/
-public class DocSearchSetupAction extends RhnAction {
+public class DocSearchSetupAction extends BaseSearchAction {
private static Logger log = Logger.getLogger(DocSearchSetupAction.class);
- private static final String OPT_FREE_FORM = "search_free_form";
- private static final String OPT_CONTENT_ONLY = "search_content";
- private static final String OPT_TITLE_ONLY = "search_title";
- private static final String OPT_CONTENT_TITLE = "search_content_title";
-
- /** {@inheritDoc} */
- @Override
- public ActionForward execute(ActionMapping mapping, ActionForm formIn,
- HttpServletRequest request, HttpServletResponse response) {
-
- ActionErrors errors = new ActionErrors();
- DynaActionForm form = (DynaActionForm)formIn;
- request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
- Map forwardParams = makeParamMap(request);
- String searchString = request.getParameter("search_string");
- String viewMode = form.getString("view_mode");
-
- try {
- // handle setup, the submission setups the searchstring below
- // and redirects to this page which then performs the search.
- if (!isSubmitted(form)) {
- setupForm(request, form);
- return getStrutsDelegate().forwardParams(
- mapping.findForward(RhnHelper.DEFAULT_FORWARD),
- request.getParameterMap());
- }
- }
- catch (XmlRpcException xre) {
- log.error("Could not connect to search server.", xre);
- errors.add(ActionMessages.GLOBAL_MESSAGE,
- new ActionMessage("packages.search.connection_error"));
- }
- catch (XmlRpcFault e) {
- log.info("Caught Exception :" + e);
- log.info("ErrorCode = " + e.getErrorCode());
- e.printStackTrace();
- if (e.getErrorCode() == 100) {
- log.error("Invalid search query", e);
- errors.add(ActionMessages.GLOBAL_MESSAGE,
- new ActionMessage("packages.search.could_not_parse_query",
- searchString));
- }
- else if (e.getErrorCode() == 200) {
- log.error("Index files appear to be missing: ", e);
- errors.add(ActionMessages.GLOBAL_MESSAGE,
- new ActionMessage("packages.search.index_files_missing",
- searchString));
- }
- else {
- errors.add(ActionMessages.GLOBAL_MESSAGE,
- new ActionMessage("packages.search.could_not_execute_query",
- searchString));
- }
- }
- catch (MalformedURLException e) {
- log.error("Could not connect to server.", e);
- errors.add(ActionMessages.GLOBAL_MESSAGE,
- new ActionMessage("packages.search.connection_error"));
- }
- catch (ValidatorException ve) {
- errors.add(ActionMessages.GLOBAL_MESSAGE,
- new ActionMessage("packages.search.use_free_form"));
- }
-
- // keep all params except submitted, in order for the new list
- // tag pagination to work we need to pass along all the formvars it
- // generated.
- Enumeration paramNames = request.getParameterNames();
- while (paramNames.hasMoreElements()) {
- String name = (String) paramNames.nextElement();
- if (!SUBMITTED.equals(name)) {
- forwardParams.put(name, request.getParameter(name));
- }
- }
-
- forwardParams.put("search_string", searchString);
- forwardParams.put("view_mode", viewMode);
-
- if (!errors.isEmpty()) {
- addErrors(request, errors);
- return getStrutsDelegate().forwardParams(
- mapping.findForward(RhnHelper.DEFAULT_FORWARD),
- forwardParams);
- }
-
- return getStrutsDelegate().forwardParams(
- mapping.findForward("success"),
- forwardParams);
- }
-
- private void setupForm(HttpServletRequest request, DynaActionForm form)
+ protected ActionForward doExecute(HttpServletRequest request, ActionMapping mapping,
+ DynaActionForm form)
throws MalformedURLException, XmlRpcFault {
RequestContext ctx = new RequestContext(request);
- String searchString = form.getString("search_string");
- String viewmode = form.getString("view_mode");
-
- List searchOptions = new ArrayList();
+ String searchString = form.getString(SEARCH_STR);
+ String viewmode = form.getString(VIEW_MODE);
+ List<Map<String, String>> searchOptions = new ArrayList<Map<String, String>>();
addOption(searchOptions, "docsearch.content_title", OPT_CONTENT_TITLE);
addOption(searchOptions, "docsearch.free_form", OPT_FREE_FORM);
addOption(searchOptions, "docsearch.content", OPT_CONTENT_ONLY);
addOption(searchOptions, "docsearch.title", OPT_TITLE_ONLY);
- request.setAttribute("search_string", searchString);
- request.setAttribute("view_mode", viewmode);
- request.setAttribute("searchOptions", searchOptions);
+ request.setAttribute(SEARCH_STR, searchString);
+ request.setAttribute(VIEW_MODE, viewmode);
+ request.setAttribute(SEARCH_OPT, searchOptions);
if (!StringUtils.isBlank(searchString)) {
@@ -174,10 +74,16 @@ public class DocSearchSetupAction extends RhnAction {
viewmode, request);
log.debug("GET search: " + results);
request.setAttribute(RequestContext.PAGE_LIST,
- results != null ? results : Collections.EMPTY_LIST);
+ results != null ? results : Collections.emptyList());
}
else {
- request.setAttribute(RequestContext.PAGE_LIST, Collections.EMPTY_LIST);
+ request.setAttribute(RequestContext.PAGE_LIST, Collections.emptyList());
+ }
+ if (isSubmitted(form)) {
+ return mapping.findForward("success");
+ }
+ else {
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
@@ -208,7 +114,7 @@ public class DocSearchSetupAction extends RhnAction {
searchFreeForm = true;
}
args.add(searchFreeForm);
- List results = Collections.EMPTY_LIST;
+ List results = Collections.emptyList();
try {
results = (List)client.invoke("index.search", args);
}
@@ -237,7 +143,7 @@ public class DocSearchSetupAction extends RhnAction {
}
if (results.isEmpty()) {
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
List<HelpDocumentOverview> docs = new ArrayList<HelpDocumentOverview>();
@@ -290,28 +196,15 @@ public class DocSearchSetupAction extends RhnAction {
return "(content:(" + query + ") title:(" + query + "))";
}
-
// OPT_FREE_FORM send as is.
return buf.toString();
}
- private void addOption(List options, String key, String value) {
- addOption(options, key, value, false);
- }
+ @Override
+ protected void insureFormDefaults(HttpServletRequest request, DynaActionForm form) {
+ String searchString = request.getParameter(SEARCH_STR);
+ String viewmode = request.getParameter(VIEW_MODE);
- /**
- * Utility function to create options for the dropdown.
- * @param options list containing all options.
- * @param key resource bundle key used as the display value.
- * @param value value to be submitted with form.
- * @param flag Flag the item with an asterisk (*) indicating it is *not*
- * synch'd
- */
- private void addOption(List options, String key, String value, boolean flag) {
- LocalizationService ls = LocalizationService.getInstance();
- Map selection = new HashMap();
- selection.put("display", (flag ? "*" : "") + ls.getMessage(key));
- selection.put("value", value);
- options.add(selection);
}
+
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchAction.java
new file mode 100644
index 0000000..aad1edb
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchAction.java
@@ -0,0 +1,316 @@
+/**
+ * Copyright (c) 2009--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.
+ */
+package com.redhat.rhn.frontend.action.systems;
+
+import java.net.MalformedURLException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
+import org.apache.struts.action.ActionErrors;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
+import org.apache.struts.action.DynaActionForm;
+
+import redstone.xmlrpc.XmlRpcException;
+import redstone.xmlrpc.XmlRpcFault;
+
+import com.redhat.rhn.common.db.datasource.DataResult;
+import com.redhat.rhn.common.localization.LocalizationService;
+import com.redhat.rhn.frontend.action.BaseSearchAction;
+import com.redhat.rhn.frontend.action.common.BadParameterException;
+import com.redhat.rhn.frontend.dto.SystemSearchResult;
+import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
+import com.redhat.rhn.frontend.struts.StrutsDelegate;
+import com.redhat.rhn.frontend.taglibs.list.helper.ListRhnSetHelper;
+import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
+import com.redhat.rhn.manager.rhnset.RhnSetDecl;
+
+/**
+ * Action handling the advanced system search page.
+ */
+public class SystemSearchAction extends BaseSearchAction implements Listable {
+
+ public static final String DATA_SET = "searchResults";
+
+ public static final String[] OPT_GROUPS_TITLES = {"systemsearch.jsp.details",
+ "systemsearch.jsp.activity",
+ "systemsearch.jsp.hardware",
+ "systemsearch.jsp.devices",
+ "systemsearch.jsp.dmiinfo",
+ "systemsearch.jsp.networkinfo",
+ "systemsearch.jsp.packages",
+ "systemsearch.jsp.location"};
+
+ public static final String[][] OPT_GROUPS = {
+ /* details */
+ { SystemSearchHelper.NAME_AND_DESCRIPTION, SystemSearchHelper.ID,
+ SystemSearchHelper.CUSTOM_INFO,
+ SystemSearchHelper.SNAPSHOT_TAG,
+ SystemSearchHelper.RUNNING_KERNEL,
+ SystemSearchHelper.UUID },
+ /* activity group */
+ { SystemSearchHelper.CHECKIN, SystemSearchHelper.REGISTERED },
+ /* hardware group */
+ { SystemSearchHelper.CPU_MODEL, SystemSearchHelper.CPU_MHZ_LT,
+ SystemSearchHelper.CPU_MHZ_GT,
+ SystemSearchHelper.NUM_CPUS_LT,
+ SystemSearchHelper.NUM_CPUS_GT,
+ SystemSearchHelper.RAM_LT, SystemSearchHelper.RAM_GT },
+ /* device group */
+ { SystemSearchHelper.HW_DESCRIPTION, SystemSearchHelper.HW_DRIVER,
+ SystemSearchHelper.HW_DEVICE_ID,
+ SystemSearchHelper.HW_VENDOR_ID },
+ /* dmiinfo */
+ { SystemSearchHelper.DMI_SYSTEM, SystemSearchHelper.DMI_BIOS,
+ SystemSearchHelper.DMI_ASSET },
+ /* network info */
+ { SystemSearchHelper.HOSTNAME, SystemSearchHelper.IP,
+ SystemSearchHelper.IP6 },
+ /* packages */
+ { SystemSearchHelper.INSTALLED_PACKAGES,
+ SystemSearchHelper.NEEDED_PACKAGES },
+ /* location */
+ { SystemSearchHelper.LOC_ADDRESS, SystemSearchHelper.LOC_BUILDING,
+ SystemSearchHelper.LOC_ROOM,
+ SystemSearchHelper.LOC_RACK } };
+
+ public static final List<String> VALID_WHERE_STRINGS =
+ Arrays.asList(new String[] {WHERE_ALL, WHERE_SSM});
+
+ private final Logger log = Logger.getLogger(SystemSearchAction.class);
+
+ @Override
+ protected void insureFormDefaults(HttpServletRequest request, DynaActionForm form) {
+ String search = form.getString(SEARCH_STR).trim();
+ String where = form.getString(WHERE_TO_SEARCH);
+ String viewMode = form.getString(VIEW_MODE);
+
+ if (where == null || viewMode == null) {
+ throw new BadParameterException("An expected form var was null");
+ }
+
+ if ("".equals(viewMode)) { // first time viewing page
+ viewMode = "systemsearch_name_and_description";
+ form.set(VIEW_MODE, viewMode);
+ request.setAttribute(VIEW_MODE, viewMode);
+ }
+
+ if ("".equals(where) || !VALID_WHERE_STRINGS.contains(where)) {
+ form.set(WHERE_TO_SEARCH, "all");
+ request.setAttribute(WHERE_TO_SEARCH, "all");
+ }
+
+ Boolean fineGrained = (Boolean)form.get(FINE_GRAINED);
+ request.setAttribute(FINE_GRAINED, fineGrained == null ? false : fineGrained);
+
+ Boolean invert = (Boolean) form.get(INVERT_RESULTS);
+ if (invert == null) {
+ invert = Boolean.FALSE;
+ form.set(INVERT_RESULTS, invert);
+ }
+
+ if (invert) {
+ request.setAttribute(INVERT_RESULTS, "on");
+ }
+ else {
+ request.setAttribute(INVERT_RESULTS, "off");
+ }
+
+ /* Here we set up a hashmap using the string resources key for the various options
+ * group as a key into the hash, and the string resources/database mode keys as
+ * the values of the options that are contained within each opt group. The jsp
+ * uses this hashmap to setup a dropdown box
+ */
+ boolean matchingViewModeFound = false;
+ Map<String, List<Map<String, String>>> optGroupsMap =
+ new HashMap<String, List<Map<String, String>>>();
+ LocalizationService ls = LocalizationService.getInstance();
+ for (int j = 0; j < OPT_GROUPS_TITLES.length; ++j) {
+ List<Map<String, String>> options = new ArrayList<Map<String, String>>();
+
+ for (int k = 0; k < OPT_GROUPS[j].length; ++k) {
+ options.add(createDisplayMap(LocalizationService.getInstance()
+ .getMessage(OPT_GROUPS[j][k]),
+ OPT_GROUPS[j][k]));
+ if (OPT_GROUPS[j][k].equals(viewMode)) {
+ matchingViewModeFound = true;
+ }
+ }
+ optGroupsMap.put(OPT_GROUPS_TITLES[j], options);
+ }
+ if (viewMode != null && !matchingViewModeFound) {
+ throw new BadParameterException("Bad viewMode passed in from form");
+ }
+ request.setAttribute(OPT_GROUPS_MAP, optGroupsMap);
+ request.setAttribute(OPT_GROUPS_KEYS, optGroupsMap.keySet());
+ request.setAttribute(SEARCH_STR, search);
+ request.setAttribute(VIEW_MODE, viewMode);
+ request.setAttribute(WHERE_TO_SEARCH, where);
+ }
+
+ protected ActionForward doExecute(HttpServletRequest request, ActionMapping mapping,
+ DynaActionForm form) {
+ String viewMode = form.getString(VIEW_MODE);
+ String searchString = form.getString(SEARCH_STR).trim();
+
+ ActionErrors errs = new ActionErrors();
+ if (viewMode.equals(SystemSearchHelper.ID) ||
+ viewMode.equals(SystemSearchHelper.CPU_MHZ_LT) ||
+ viewMode.equals(SystemSearchHelper.CPU_MHZ_GT) ||
+ viewMode.equals(SystemSearchHelper.RAM_LT) ||
+ viewMode.equals(SystemSearchHelper.RAM_GT) ||
+ viewMode.equals(SystemSearchHelper.NUM_CPUS_LT) ||
+ viewMode.equals(SystemSearchHelper.NUM_CPUS_GT) ||
+ viewMode.equals(SystemSearchHelper.CHECKIN) ||
+ viewMode.equals(SystemSearchHelper.REGISTERED)) {
+ String regEx = "(\\d)*";
+ Pattern pattern = Pattern.compile(regEx);
+ Matcher matcher = pattern.matcher(searchString);
+ if (!matcher.matches()) {
+ errs.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("systemsearch.errors.numeric"));
+ }
+ }
+
+ // TODO: Set up combined-form validator
+// errs.add(RhnValidationHelper.validateDynaActionForm(this, daForm));
+ addErrors(request, errs);
+
+ ListRhnSetHelper helper = new ListRhnSetHelper(this, request, RhnSetDecl.SYSTEMS);
+ helper.setWillClearSet(false);
+ helper.setDataSetName(getDataSetName());
+ helper.setListName(getListName());
+ helper.execute();
+
+ List results = (List) request.getAttribute(getDataSetName());
+ log.debug("SystemSearch results.size() = " +
+ (results != null ? results.size() : "null results"));
+ if ((results != null) && (results.size() == 1)) {
+ SystemSearchResult s = (SystemSearchResult) results.get(0);
+ return StrutsDelegate.getInstance().forwardParam(mapping.findForward("single"),
+ "sid", s.getId().toString());
+ }
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
+ }
+
+ protected DataResult performSearch(RequestContext context) {
+ HttpServletRequest request = context.getRequest();
+ String searchString = (String)request.getAttribute(SEARCH_STR);
+ String viewMode = (String)request.getAttribute(VIEW_MODE);
+ String whereToSearch = (String)request.getAttribute(WHERE_TO_SEARCH);
+ Boolean invertResults = StringUtils.defaultString(
+ (String)request.getAttribute(INVERT_RESULTS)).equals("on");
+ Boolean isFineGrained = (Boolean)request.getAttribute(FINE_GRAINED);
+
+ ActionErrors errs = new ActionErrors();
+ DataResult dr = null;
+ try {
+ dr = SystemSearchHelper.systemSearch(context,
+ searchString,
+ viewMode,
+ invertResults,
+ whereToSearch, isFineGrained);
+ }
+ catch (MalformedURLException e) {
+ log.error("Caught Exception :" + e, e);
+ errs.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("packages.search.connection_error"));
+ }
+ catch (XmlRpcFault e) {
+ log.info("Caught Exception :" + e + ", code [" + e.getErrorCode() + "]", e);
+ if (e.getErrorCode() == 100) {
+ log.error("Invalid search query", e);
+ errs.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("packages.search.could_not_parse_query",
+ searchString));
+ }
+ else if (e.getErrorCode() == 200) {
+ log.error("Index files appear to be missing: ", e);
+ errs.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("packages.search.index_files_missing",
+ searchString));
+ }
+ else {
+ errs.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("packages.search.could_not_execute_query",
+ searchString));
+ }
+ }
+ catch (XmlRpcException e) {
+ log.error("Caught Exception :" + e, e);
+ errs.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("packages.search.connection_error"));
+ }
+ if (dr == null) {
+ ActionMessages messages = new ActionMessages();
+ messages.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("systemsearch_no_matches_found"));
+ getStrutsDelegate().saveMessages(request, messages);
+ }
+ if (!errs.isEmpty()) {
+ addErrors(request, errs);
+ }
+ return dr;
+ }
+
+ /** {@inheritDoc} */
+ private String getListName() {
+ return RequestContext.PAGE_LIST;
+ }
+
+ /** {@inheritDoc} */
+ private String getDataSetName() {
+ return DATA_SET;
+ }
+
+ /**
+ * Creates a Map with the keys display and value
+ * @param display the value for display
+ * @param value the value for value
+ * @return Returns the map.
+ */
+ private Map createDisplayMap(String display, String value) {
+ Map<String, String> selection = new HashMap<String, String>();
+ selection.put("display", display);
+ selection.put("value", value);
+ return selection;
+ }
+
+ /** {@inheritDoc} */
+ public List getResult(RequestContext context) {
+ String searchString = (String)context.getRequest().getAttribute(SEARCH_STR);
+
+ if (!StringUtils.isBlank(searchString)) {
+ log.debug("SystemSearchSetupAction.getResult() calling performSearch()");
+ return performSearch(context);
+ }
+ log.debug("SystemSearchSetupAction.getResult() returning Collections.EMPTY_LIST");
+ return Collections.emptyList();
+ }
+
+}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchHelper.java b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchHelper.java
index 0d33a18..51428dc 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchHelper.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchHelper.java
@@ -101,6 +101,48 @@ public class SystemSearchHelper {
protected SystemSearchHelper() { }
+ public static final String[] OPT_GROUPS_TITLES = {"systemsearch.jsp.details",
+ "systemsearch.jsp.activity",
+ "systemsearch.jsp.hardware",
+ "systemsearch.jsp.devices",
+ "systemsearch.jsp.dmiinfo",
+ "systemsearch.jsp.networkinfo",
+ "systemsearch.jsp.packages",
+ "systemsearch.jsp.location"};
+
+ public static final String[][] OPT_GROUPS = {
+ /* details */
+ { SystemSearchHelper.NAME_AND_DESCRIPTION, SystemSearchHelper.ID,
+ SystemSearchHelper.CUSTOM_INFO,
+ SystemSearchHelper.SNAPSHOT_TAG,
+ SystemSearchHelper.RUNNING_KERNEL,
+ SystemSearchHelper.UUID },
+ /* activity group */
+ { SystemSearchHelper.CHECKIN, SystemSearchHelper.REGISTERED },
+ /* hardware group */
+ { SystemSearchHelper.CPU_MODEL, SystemSearchHelper.CPU_MHZ_LT,
+ SystemSearchHelper.CPU_MHZ_GT,
+ SystemSearchHelper.NUM_CPUS_LT,
+ SystemSearchHelper.NUM_CPUS_GT,
+ SystemSearchHelper.RAM_LT, SystemSearchHelper.RAM_GT },
+ /* device group */
+ { SystemSearchHelper.HW_DESCRIPTION, SystemSearchHelper.HW_DRIVER,
+ SystemSearchHelper.HW_DEVICE_ID,
+ SystemSearchHelper.HW_VENDOR_ID },
+ /* dmiinfo */
+ { SystemSearchHelper.DMI_SYSTEM, SystemSearchHelper.DMI_BIOS,
+ SystemSearchHelper.DMI_ASSET },
+ /* network info */
+ { SystemSearchHelper.HOSTNAME, SystemSearchHelper.IP,
+ SystemSearchHelper.IP6 },
+ /* packages */
+ { SystemSearchHelper.INSTALLED_PACKAGES,
+ SystemSearchHelper.NEEDED_PACKAGES },
+ /* location */
+ { SystemSearchHelper.LOC_ADDRESS, SystemSearchHelper.LOC_BUILDING,
+ SystemSearchHelper.LOC_ROOM,
+ SystemSearchHelper.LOC_RACK } };
+
/**
* Returns a DataResult of SystemSearchResults which are based on the user's search
* criteria
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
deleted file mode 100644
index 48826b4..0000000
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchSetupAction.java
+++ /dev/null
@@ -1,433 +0,0 @@
-/**
- * Copyright (c) 2009--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.
- */
-package com.redhat.rhn.frontend.action.systems;
-
-import com.redhat.rhn.common.db.datasource.DataResult;
-import com.redhat.rhn.common.localization.LocalizationService;
-import com.redhat.rhn.frontend.action.common.BadParameterException;
-import com.redhat.rhn.frontend.dto.SystemSearchResult;
-import com.redhat.rhn.frontend.struts.RequestContext;
-import com.redhat.rhn.frontend.struts.RhnAction;
-import com.redhat.rhn.frontend.struts.RhnHelper;
-import com.redhat.rhn.frontend.struts.RhnValidationHelper;
-import com.redhat.rhn.frontend.taglibs.list.ListTagHelper;
-import com.redhat.rhn.frontend.taglibs.list.helper.ListRhnSetHelper;
-import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
-import com.redhat.rhn.manager.rhnset.RhnSetDecl;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
-import org.apache.struts.action.ActionErrors;
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-import org.apache.struts.action.ActionMessage;
-import org.apache.struts.action.ActionMessages;
-import org.apache.struts.action.DynaActionForm;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import redstone.xmlrpc.XmlRpcException;
-import redstone.xmlrpc.XmlRpcFault;
-
-/**
- * Action handling the advanced system search page.
- */
-public class SystemSearchSetupAction extends RhnAction implements Listable {
-
- public static final String DATA_SET = "searchResults";
-
- public static final String[] OPT_GROUPS_TITLES = { "systemsearch.jsp.details",
- "systemsearch.jsp.activity",
- "systemsearch.jsp.hardware",
- "systemsearch.jsp.devices",
- "systemsearch.jsp.dmiinfo",
- "systemsearch.jsp.networkinfo",
- "systemsearch.jsp.packages",
- "systemsearch.jsp.location"};
-
- public static final String[][] OPT_GROUPS =
- {
- /* details */
- { SystemSearchHelper.NAME_AND_DESCRIPTION,
- SystemSearchHelper.ID,
- SystemSearchHelper.CUSTOM_INFO,
- SystemSearchHelper.SNAPSHOT_TAG,
- SystemSearchHelper.RUNNING_KERNEL,
- SystemSearchHelper.UUID
- },
- /* activity group */
- { SystemSearchHelper.CHECKIN,
- SystemSearchHelper.REGISTERED
- },
- /* hardware group */
- {
- SystemSearchHelper.CPU_MODEL,
- SystemSearchHelper.CPU_MHZ_LT,
- SystemSearchHelper.CPU_MHZ_GT,
- SystemSearchHelper.NUM_CPUS_LT,
- SystemSearchHelper.NUM_CPUS_GT,
- SystemSearchHelper.RAM_LT,
- SystemSearchHelper.RAM_GT
- },
- /* device group */
- { SystemSearchHelper.HW_DESCRIPTION,
- SystemSearchHelper.HW_DRIVER,
- SystemSearchHelper.HW_DEVICE_ID,
- SystemSearchHelper.HW_VENDOR_ID
- },
- /* dmiinfo */
- {
- SystemSearchHelper.DMI_SYSTEM,
- SystemSearchHelper.DMI_BIOS,
- SystemSearchHelper.DMI_ASSET
- },
- /* network info */
- {
- SystemSearchHelper.HOSTNAME,
- SystemSearchHelper.IP,
- SystemSearchHelper.IP6
- },
- /* packages */
- {
- SystemSearchHelper.INSTALLED_PACKAGES,
- SystemSearchHelper.NEEDED_PACKAGES
- },
- /* location */
- {
- SystemSearchHelper.LOC_ADDRESS,
- SystemSearchHelper.LOC_BUILDING,
- SystemSearchHelper.LOC_ROOM,
- SystemSearchHelper.LOC_RACK
- }};
-
- public static final String SEARCH_STRING = "search_string";
- public static final String VIEW_MODE = "view_mode";
- public static final String WHERE_TO_SEARCH = "whereToSearch";
- public static final String INVERT_RESULTS = "invert";
- public static final String FINE_GRAINED = "fineGrained";
-
- private static final String FORM = "FORM";
- private static final String MAPPING = "MAPPING";
-
- private final Logger log = Logger.getLogger(SystemSearchSetupAction.class);
-
- /** {@inheritDoc} */
- public ActionForward execute(ActionMapping mapping,
- ActionForm formIn,
- HttpServletRequest request,
- HttpServletResponse response)
- throws BadParameterException {
-
-
- DynaActionForm daForm = (DynaActionForm) formIn;
- request.setAttribute(FORM, daForm);
- request.setAttribute(MAPPING, mapping);
-
- /*
- * Either the form was submitted (and it's a list action) or
- * we have GET arguments and so we can actually render the list
- */
- if (ListTagHelper.getListAction(getListName(), request) != null ||
- (!isSubmitted(daForm) &&
- request.getParameter(VIEW_MODE) != null)) {
-
- String whereToSearch = daForm.getString(WHERE_TO_SEARCH);
- Boolean invertResults = (Boolean) daForm.get(INVERT_RESULTS);
-
- if (invertResults == null) {
- invertResults = Boolean.FALSE;
- }
-
- request.setAttribute(VIEW_MODE, request.getParameter(VIEW_MODE));
- request.setAttribute(SEARCH_STRING, request.getParameter(SEARCH_STRING));
- request.setAttribute(WHERE_TO_SEARCH, whereToSearch);
- request.setAttribute(FINE_GRAINED, request.getParameter(FINE_GRAINED));
-
- if (invertResults) {
- request.setAttribute(INVERT_RESULTS, "on");
- }
- else {
- request.setAttribute(INVERT_RESULTS, "off");
- }
-
- setupForm(request, daForm, request.getParameter(VIEW_MODE));
-
- ListRhnSetHelper helper = new ListRhnSetHelper(this,
- request, RhnSetDecl.SYSTEMS);
- helper.setWillClearSet(false);
- helper.setDataSetName(getDataSetName());
- helper.setListName(getListName());
- helper.execute();
-
- List results = (List)request.getAttribute(getDataSetName());
- log.info("SystemSearch results.size() = " +
- (results != null ? results.size() : "null results"));
- if ((results != null) && (results.size() == 1)) {
- SystemSearchResult s = (SystemSearchResult) results.get(0);
- try {
- response.sendRedirect(
- "/rhn/systems/details/Overview.do?sid=" +
- s.getId().toString());
- return null;
- }
- catch (IOException ioe) {
- throw new RuntimeException(
- "Exception while trying to redirect: " + ioe);
- }
- }
- return getStrutsDelegate().forwardParams(
- mapping.findForward(RhnHelper.DEFAULT_FORWARD),
- request.getParameterMap());
- }
- /**
- * Else the form was submitted, so we need to parse the form and turn it into
- * GET parameters
- */
- else if (isSubmitted(daForm)) {
- String searchString = daForm.getString(SEARCH_STRING).trim();
- String viewMode = daForm.getString(VIEW_MODE);
- String whereToSearch = daForm.getString(WHERE_TO_SEARCH);
- Boolean invertResults = (Boolean) daForm.get(INVERT_RESULTS);
-
- if (invertResults == null) {
- invertResults = Boolean.FALSE;
- }
-
- setupForm(request, daForm, viewMode);
- if (whereToSearch == null || viewMode == null) {
- throw new BadParameterException("An expected form var was null");
- }
-
- request.setAttribute(SEARCH_STRING, searchString);
- request.setAttribute(VIEW_MODE, viewMode);
- request.setAttribute(WHERE_TO_SEARCH, whereToSearch);
-
- if (invertResults) {
- request.setAttribute(INVERT_RESULTS, "on");
- }
- else {
- request.setAttribute(INVERT_RESULTS, "off");
- }
-
- ActionErrors errs = new ActionErrors();
- if (viewMode.equals("systemsearch_id") ||
- viewMode.equals(SystemSearchHelper.CPU_MHZ_LT) ||
- viewMode.equals(SystemSearchHelper.CPU_MHZ_GT) ||
- viewMode.equals(SystemSearchHelper.RAM_LT) ||
- viewMode.equals(SystemSearchHelper.RAM_GT) ||
- viewMode.equals(SystemSearchHelper.NUM_CPUS_LT) ||
- viewMode.equals(SystemSearchHelper.NUM_CPUS_GT) ||
- viewMode.equals(SystemSearchHelper.CHECKIN) ||
- viewMode.equals(SystemSearchHelper.REGISTERED)) {
- String regEx = "(\\d)*";
- Pattern pattern = Pattern.compile(regEx);
- Matcher matcher = pattern.matcher(searchString);
- if (!matcher.matches()) {
- errs.add(ActionMessages.GLOBAL_MESSAGE,
- new ActionMessage("systemsearch.errors.numeric"));
- }
- }
-
- errs.add(RhnValidationHelper.validateDynaActionForm(this, daForm));
-
- if (!errs.isEmpty()) {
- addErrors(request, errs);
- request.setAttribute(SEARCH_STRING, null);
- daForm.set(SEARCH_STRING, null);
- return mapping.findForward("error");
- }
-
- Map forwardParams = makeParamMap(request);
- Enumeration paramNames = request.getParameterNames();
- while (paramNames.hasMoreElements()) {
- String name = (String) paramNames.nextElement();
- if (!SUBMITTED.equals(name)) {
- forwardParams.put(name, request.getParameter(name));
- }
-
- }
-
-
- return getStrutsDelegate().forwardParams(
- mapping.findForward("success"),
- forwardParams);
-
- }
- /**
- * Finally, if we're not actually going to display the list
- * and the form hasn't been submitted, then we're just displaying the
- * initial search page before a search has been initiated.
- */
- else {
- setupForm(request, daForm, null);
- request.setAttribute(VIEW_MODE, "systemsearch_name_and_description");
- daForm.set(WHERE_TO_SEARCH, "all");
- daForm.set(FINE_GRAINED, true);
- return getStrutsDelegate().forwardParams(
- mapping.findForward(RhnHelper.DEFAULT_FORWARD),
- request.getParameterMap());
- }
-
- }
-
- protected void setupForm(HttpServletRequest request,
- DynaActionForm form,
- String viewMode) {
- Map optGroupsMap = new HashMap();
- boolean matchingViewModeFound = false;
-
- /* Here we set up a hashmap using the string resources key for the various options
- * group as a key into the hash, and the string resources/database mode keys as
- * the values of the options that are contained within each opt group. The jsp
- * uses this hashmap to setup a dropdown box
- */
- for (int j = 0; j < OPT_GROUPS_TITLES.length; ++j) {
- List options = new ArrayList();
-
- for (int k = 0; k < OPT_GROUPS[j].length; ++k) {
- options.add(createDisplayMap(LocalizationService.getInstance()
- .getMessage(OPT_GROUPS[j][k]),
- OPT_GROUPS[j][k]));
-
- if (OPT_GROUPS[j][k].equals(viewMode)) {
- matchingViewModeFound = true;
- }
- }
-
- optGroupsMap.put(OPT_GROUPS_TITLES[j], options);
- }
-
- if (viewMode != null && !matchingViewModeFound) {
- throw new BadParameterException("Bad viewMode passed in from form");
- }
-
- request.setAttribute("optGroupsMap", optGroupsMap);
- request.setAttribute("optGroupsKeys", optGroupsMap.keySet());
- }
-
- protected DataResult performSearch(RequestContext context) {
-
- HttpServletRequest request = context.getRequest();
- String searchString = context.getParam(SEARCH_STRING, false);
- String viewMode = context.getParam(VIEW_MODE, false);
- String whereToSearch = context.getParam(WHERE_TO_SEARCH, false);
- Boolean invertResults = StringUtils.defaultString(
- context.getParam(INVERT_RESULTS, false)).equals("on");
- Boolean isFineGrained = StringUtils.defaultString(
- context.getParam(FINE_GRAINED, false)).equals("on");
-
- ActionErrors errs = new ActionErrors();
- DataResult dr = null;
- try {
- dr = SystemSearchHelper.systemSearch(context,
- searchString,
- viewMode,
- invertResults,
- whereToSearch, isFineGrained);
- }
- catch (MalformedURLException e) {
- log.info("Caught Exception :" + e);
- e.printStackTrace();
- errs.add(ActionMessages.GLOBAL_MESSAGE,
- new ActionMessage("packages.search.connection_error"));
- }
- catch (XmlRpcFault e) {
- log.info("Caught Exception :" + e);
- log.info("ErrorCode = " + e.getErrorCode());
- e.printStackTrace();
- if (e.getErrorCode() == 100) {
- log.error("Invalid search query", e);
- errs.add(ActionMessages.GLOBAL_MESSAGE,
- new ActionMessage("packages.search.could_not_parse_query",
- searchString));
- }
- else if (e.getErrorCode() == 200) {
- log.error("Index files appear to be missing: ", e);
- errs.add(ActionMessages.GLOBAL_MESSAGE,
- new ActionMessage("packages.search.index_files_missing",
- searchString));
- }
- else {
- errs.add(ActionMessages.GLOBAL_MESSAGE,
- new ActionMessage("packages.search.could_not_execute_query",
- searchString));
- }
- }
- catch (XmlRpcException e) {
- log.info("Caught Exception :" + e);
- e.printStackTrace();
- errs.add(ActionMessages.GLOBAL_MESSAGE,
- new ActionMessage("packages.search.connection_error"));
- }
- if (dr == null) {
- ActionMessages messages = new ActionMessages();
- messages.add(ActionMessages.GLOBAL_MESSAGE,
- new ActionMessage("systemsearch_no_matches_found"));
- getStrutsDelegate().saveMessages(request, messages);
- }
- if (!errs.isEmpty()) {
- addErrors(request, errs);
- }
- return dr;
- }
-
- /**
- * Creates a Map with the keys display and value
- * @param display the value for display
- * @param value the value for value
- * @return Returns the map.
- */
- private Map createDisplayMap(String display, String value) {
- Map<String, String> selection = new HashMap<String, String>();
- selection.put("display", display);
- selection.put("value", value);
- return selection;
- }
-
- /** {@inheritDoc} */
- public String getListName() {
- return RequestContext.PAGE_LIST;
- }
-
- /** {@inheritDoc} */
- public String getDataSetName() {
- return DATA_SET;
- }
-
- /** {@inheritDoc} */
- public List getResult(RequestContext context) {
- String searchString = context.getParam(SEARCH_STRING, false);
-
- if (!StringUtils.isBlank(searchString)) {
- log.info("SystemSearchSetupAction.getResult() calling performSearch()");
- return performSearch(context);
- }
- log.info("SystemSearchSetupAction.getResult() returning Collections.EMPTY_LIST");
- return Collections.EMPTY_LIST;
- }
-}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/test/SystemSearchActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/test/SystemSearchActionTest.java
new file mode 100644
index 0000000..cb036cb
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/test/SystemSearchActionTest.java
@@ -0,0 +1,152 @@
+/**
+ * Copyright (c) 2009--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.
+ */
+package com.redhat.rhn.frontend.action.systems.test;
+
+import org.apache.struts.action.DynaActionForm;
+
+import com.redhat.rhn.common.db.datasource.DataResult;
+import com.redhat.rhn.domain.org.OrgFactory;
+import com.redhat.rhn.domain.server.Server;
+import com.redhat.rhn.domain.server.ServerConstants;
+import com.redhat.rhn.domain.server.test.ServerFactoryTest;
+import com.redhat.rhn.frontend.action.BaseSearchAction;
+import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnAction;
+import com.redhat.rhn.frontend.struts.RhnHelper;
+import com.redhat.rhn.testing.RhnMockStrutsTestCase;
+
+/**
+ * SystemSearchActionTest
+ * @version $Rev: 1 $
+ */
+public class SystemSearchActionTest extends RhnMockStrutsTestCase {
+
+ private Server s;
+
+ public void setUp() throws Exception {
+ super.setUp();
+ setRequestPathInfo("/systems/Search");
+ user.getOrg().getEntitlements().add(OrgFactory.getEntitlementEnterprise());
+ s = ServerFactoryTest.createTestServer(user, true,
+ ServerConstants.getServerGroupTypeEnterpriseEntitled());
+
+ }
+
+ /**
+ * This test tests multiple search results. The system search page, if
+ * only one result is found, will forward you directly to that
+ * system's SDC page instead of showing a list with one member
+ * on the system search page. This test is expecting multiple systems to be found
+ * and the user to be forwarded to the system search page with a list of systems
+ * shown.
+ * @throws Exception
+ */
+ public void skipTestQueryWithResults() throws Exception {
+ /**
+ * SystemSearch now talks to a Lucene search server. This creates issues
+ * for testing...you can't use a test util to create a system put it in the
+ * DB and expect the search server to have the data indexed and ready to go.
+ *
+ * Will be marking this test to be skipped till a suitable test is implemented
+ */
+ s = ServerFactoryTest.createTestServer(user, true,
+ ServerConstants.getServerGroupTypeEnterpriseEntitled());
+ addRequestParameter(RhnAction.SUBMITTED, Boolean.TRUE.toString());
+ addRequestParameter(BaseSearchAction.SEARCH_STR, "redhat");
+ addRequestParameter(BaseSearchAction.WHERE_TO_SEARCH, "all");
+ addRequestParameter(BaseSearchAction.VIEW_MODE,
+ "systemsearch_name_and_description");
+ actionPerform();
+ verifyForward(RhnHelper.DEFAULT_FORWARD);
+ DataResult dr = (DataResult) request.getAttribute(RequestContext.PAGE_LIST);
+ assertNotNull(dr);
+ assertFalse(dr.isEmpty());
+ assertNotNull(request.getAttribute(BaseSearchAction.VIEW_MODE));
+ assertNotNull(request.getAttribute(BaseSearchAction.WHERE_TO_SEARCH));
+ assertNotNull(request.getAttribute(BaseSearchAction.SEARCH_STR));
+ }
+
+ /**
+ * This test is the case where only one system is found. It verfies
+ * that the user is redirected to that system's SDC page.
+ * @throws Exception
+ */
+ public void skipTestQueryWithOneResult() throws Exception {
+ /**
+ * SystemSearch now talks to a Lucene search server. This creates issues
+ * for testing...you can't use a test util to create a system put it in the
+ * DB and expect the search server to have the data indexed and ready to go.
+ *
+ * Will be marking this test to be skipped till a suitable test is implemented
+ */
+ addRequestParameter(RhnAction.SUBMITTED, Boolean.TRUE.toString());
+ addRequestParameter(BaseSearchAction.SEARCH_STR, s.getName());
+ addRequestParameter(BaseSearchAction.WHERE_TO_SEARCH, "all");
+ addRequestParameter(BaseSearchAction.VIEW_MODE,
+ "systemsearch_name_and_description");
+ actionPerform();
+ System.err.println("getMockResponse() = " + getMockResponse());
+ System.err.println("getMockResponse().getStatusCode() = " +
+ getMockResponse().getStatusCode());
+ assertTrue(getMockResponse().getStatusCode() == 302);
+ }
+
+ public void testQueryWithoutResults() throws Exception {
+ return;
+ }
+
+ /**
+ * This test verfies that if a bad view mode is passed in by the user,
+ * the system search handles and catches any underlying exceptions
+ * that might be caused by this, instead of allowing the exception to escalate
+ * beyond the SystemSearchAction.
+ * @throws Exception
+ */
+ public void testQueryWithBadParameter() throws Exception {
+ addRequestParameter(RhnAction.SUBMITTED, Boolean.TRUE.toString());
+ addRequestParameter(BaseSearchAction.SEARCH_STR, s.getName());
+ addRequestParameter(BaseSearchAction.WHERE_TO_SEARCH, "all");
+ addRequestParameter(BaseSearchAction.VIEW_MODE,
+ "all_your_systems_are_belong_to_us");
+ actionPerform();
+ }
+
+ public void testNoSubmit() throws Exception {
+ actionPerform();
+ DynaActionForm formIn = (DynaActionForm) getActionForm();
+ assertNotNull(formIn.get(BaseSearchAction.WHERE_TO_SEARCH));
+ assertNotNull(request.getAttribute(BaseSearchAction.VIEW_MODE));
+ }
+
+ public void testAlphaSubmitForNumericField() throws Exception {
+ addRequestParameter(RhnAction.SUBMITTED, Boolean.TRUE.toString());
+ addRequestParameter(BaseSearchAction.SEARCH_STR, "abc");
+ addRequestParameter(BaseSearchAction.WHERE_TO_SEARCH, "all");
+ addRequestParameter(BaseSearchAction.VIEW_MODE,
+ "systemsearch_cpu_mhz_lt");
+ actionPerform();
+ verifyActionErrors(new String[] { "systemsearch.errors.numeric" });
+ }
+
+ public void testSmallAlphaSubmitForNumericField() throws Exception {
+ addRequestParameter(RhnAction.SUBMITTED, Boolean.TRUE.toString());
+ addRequestParameter(BaseSearchAction.SEARCH_STR, "a");
+ addRequestParameter(BaseSearchAction.WHERE_TO_SEARCH, "all");
+ addRequestParameter(BaseSearchAction.VIEW_MODE,
+ "systemsearch_cpu_mhz_lt");
+ actionPerform();
+ verifyActionErrors(new String[] {"systemsearch.errors.numeric"});
+ }
+}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/test/SystemSearchSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/test/SystemSearchSetupActionTest.java
deleted file mode 100644
index 59b947d..0000000
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/test/SystemSearchSetupActionTest.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/**
- * Copyright (c) 2009--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.
- */
-package com.redhat.rhn.frontend.action.systems.test;
-
-import com.redhat.rhn.common.db.datasource.DataResult;
-import com.redhat.rhn.domain.org.OrgFactory;
-import com.redhat.rhn.domain.server.Server;
-import com.redhat.rhn.domain.server.ServerConstants;
-import com.redhat.rhn.domain.server.test.ServerFactoryTest;
-import com.redhat.rhn.frontend.action.systems.SystemSearchSetupAction;
-import com.redhat.rhn.frontend.struts.RequestContext;
-import com.redhat.rhn.frontend.struts.RhnAction;
-import com.redhat.rhn.frontend.struts.RhnHelper;
-import com.redhat.rhn.testing.RhnMockStrutsTestCase;
-
-import org.apache.struts.action.DynaActionForm;
-
-/**
- * SystemSearchActionTest
- * @version $Rev: 1 $
- */
-public class SystemSearchSetupActionTest extends RhnMockStrutsTestCase {
-
- private Server s;
-
- public void setUp() throws Exception {
- super.setUp();
- setRequestPathInfo("/systems/Search");
- user.getOrg().getEntitlements().add(OrgFactory.getEntitlementEnterprise());
- s = ServerFactoryTest.createTestServer(user, true,
- ServerConstants.getServerGroupTypeEnterpriseEntitled());
-
- }
-
- /**
- * This test tests multiple search results. The system search page, if
- * only one result is found, will forward you directly to that
- * system's SDC page instead of showing a list with one member
- * on the system search page. This test is expecting multiple systems to be found
- * and the user to be forwarded to the system search page with a list of systems
- * shown.
- * @throws Exception
- */
- public void skipTestQueryWithResults() throws Exception {
- /**
- * SystemSearch now talks to a Lucene search server. This creates issues
- * for testing...you can't use a test util to create a system put it in the
- * DB and expect the search server to have the data indexed and ready to go.
- *
- * Will be marking this test to be skipped till a suitable test is implemented
- */
- s = ServerFactoryTest.createTestServer(user, true,
- ServerConstants.getServerGroupTypeEnterpriseEntitled());
- addRequestParameter(RhnAction.SUBMITTED, Boolean.TRUE.toString());
- addRequestParameter(SystemSearchSetupAction.SEARCH_STRING, "redhat");
- addRequestParameter(SystemSearchSetupAction.WHERE_TO_SEARCH, "all");
- addRequestParameter(SystemSearchSetupAction.VIEW_MODE,
- "systemsearch_name_and_description");
- actionPerform();
- verifyForward(RhnHelper.DEFAULT_FORWARD);
- DataResult dr = (DataResult) request.getAttribute(RequestContext.PAGE_LIST);
- assertNotNull(dr);
- assertFalse(dr.isEmpty());
- assertNotNull(request.getAttribute(SystemSearchSetupAction.VIEW_MODE));
- assertNotNull(request.getAttribute(SystemSearchSetupAction.WHERE_TO_SEARCH));
- assertNotNull(request.getAttribute(SystemSearchSetupAction.SEARCH_STRING));
- }
-
- /**
- * This test is the case where only one system is found. It verfies
- * that the user is redirected to that system's SDC page.
- * @throws Exception
- */
- public void skipTestQueryWithOneResult() throws Exception {
- /**
- * SystemSearch now talks to a Lucene search server. This creates issues
- * for testing...you can't use a test util to create a system put it in the
- * DB and expect the search server to have the data indexed and ready to go.
- *
- * Will be marking this test to be skipped till a suitable test is implemented
- */
- addRequestParameter(RhnAction.SUBMITTED, Boolean.TRUE.toString());
- addRequestParameter(SystemSearchSetupAction.SEARCH_STRING, s.getName());
- addRequestParameter(SystemSearchSetupAction.WHERE_TO_SEARCH, "all");
- addRequestParameter(SystemSearchSetupAction.VIEW_MODE,
- "systemsearch_name_and_description");
- actionPerform();
- System.err.println("getMockResponse() = " + getMockResponse());
- System.err.println("getMockResponse().getStatusCode() = " +
- getMockResponse().getStatusCode());
- assertTrue(getMockResponse().getStatusCode() == 302);
- }
-
- public void testQueryWithoutResults() throws Exception {
- return;
- }
-
- /**
- * This test verfies that if a bad view mode is passed in by the user,
- * the system search handles and catches any underlying exceptions
- * that might be caused by this, instead of allowing the exception to escalate
- * beyond the SystemSearchAction.
- * @throws Exception
- */
- public void testQueryWithBadParameter() throws Exception {
- addRequestParameter(RhnAction.SUBMITTED, Boolean.TRUE.toString());
- addRequestParameter(SystemSearchSetupAction.SEARCH_STRING, s.getName());
- addRequestParameter(SystemSearchSetupAction.WHERE_TO_SEARCH, "all");
- addRequestParameter(SystemSearchSetupAction.VIEW_MODE,
- "all_your_systems_are_belong_to_us");
- actionPerform();
- }
-
- public void testNoSubmit() throws Exception {
- actionPerform();
- DynaActionForm formIn = (DynaActionForm) getActionForm();
- assertNotNull(formIn.get(SystemSearchSetupAction.WHERE_TO_SEARCH));
- assertNotNull(request.getAttribute(SystemSearchSetupAction.VIEW_MODE));
- }
-
- public void testAlphaSubmitForNumericField() throws Exception {
- addRequestParameter(RhnAction.SUBMITTED, Boolean.TRUE.toString());
- addRequestParameter(SystemSearchSetupAction.SEARCH_STRING, "abc");
- addRequestParameter(SystemSearchSetupAction.WHERE_TO_SEARCH, "all");
- addRequestParameter(SystemSearchSetupAction.VIEW_MODE,
- "systemsearch_cpu_mhz_lt");
- actionPerform();
- verifyActionErrors(new String[] { "systemsearch.errors.numeric" });
- }
-
- public void testSmallAlphaSubmitForNumericField() throws Exception {
- addRequestParameter(RhnAction.SUBMITTED, Boolean.TRUE.toString());
- addRequestParameter(SystemSearchSetupAction.SEARCH_STRING, "a");
- addRequestParameter(SystemSearchSetupAction.WHERE_TO_SEARCH, "all");
- addRequestParameter(SystemSearchSetupAction.VIEW_MODE,
- "systemsearch_cpu_mhz_lt");
- actionPerform();
- verifyActionErrors(new String[] {"systemsearch.errors.numeric"});
- }
-}
-
diff --git a/java/code/src/com/redhat/rhn/frontend/action/test/SearchActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/test/SearchActionTest.java
index 6e7cd8d..5cc6dd2 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/test/SearchActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/test/SearchActionTest.java
@@ -36,15 +36,15 @@ public class SearchActionTest extends RhnMockStrutsTestCase {
addRequestParameter("search_string", "test search");
addRequestParameter("search_type", "systems");
actionPerform();
- assertTrue(getMockResponse().getStatusCode() == 302);
+ verifyForward("systems");
}
public void testErrataRedirect() throws Exception {
addRequestParameter(RhnAction.SUBMITTED, Boolean.TRUE.toString());
addRequestParameter("search_string", "test search");
- addRequestParameter("search_type", "packages");
+ addRequestParameter("search_type", "errata");
actionPerform();
- assertTrue(getMockResponse().getStatusCode() == 302);
+ verifyForward("errata");
}
public void testPackageRedirect() throws Exception {
@@ -52,7 +52,15 @@ public class SearchActionTest extends RhnMockStrutsTestCase {
addRequestParameter("search_string", "test search");
addRequestParameter("search_type", "packages");
actionPerform();
- assertTrue(getMockResponse().getStatusCode() == 302);
+ verifyForward("packages");
+ }
+
+ public void testDocRedirect() throws Exception {
+ addRequestParameter(RhnAction.SUBMITTED, Boolean.TRUE.toString());
+ addRequestParameter("search_string", "test search");
+ addRequestParameter("search_type", "docs");
+ actionPerform();
+ verifyForward("docs");
}
public void testFaultySubmit() throws Exception {
diff --git a/java/code/src/com/redhat/rhn/frontend/security/PxtAuthenticationService.java b/java/code/src/com/redhat/rhn/frontend/security/PxtAuthenticationService.java
index 610e2ed..b6aaf7b 100644
--- a/java/code/src/com/redhat/rhn/frontend/security/PxtAuthenticationService.java
+++ b/java/code/src/com/redhat/rhn/frontend/security/PxtAuthenticationService.java
@@ -66,6 +66,8 @@ public class PxtAuthenticationService extends BaseAuthenticationService {
set = new TreeSet(set);
set.add("/rhn/common/DownloadFile");
+ // search (safe to be unprotected, since it has no modifying side-effects)
+ set.add("/rhn/Search.do");
POST_UNPROTECTED_URIS = UnmodifiableSet.decorate(set);
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/search/PackagesSearchHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/search/PackagesSearchHandler.java
index bf4282f..c4e06ef 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/search/PackagesSearchHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/search/PackagesSearchHandler.java
@@ -14,12 +14,25 @@
*/
package com.redhat.rhn.frontend.xmlrpc.packages.search;
+import java.net.MalformedURLException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
+
+import redstone.xmlrpc.XmlRpcFault;
+
import com.redhat.rhn.FaultException;
import com.redhat.rhn.domain.channel.Channel;
import com.redhat.rhn.domain.session.WebSession;
import com.redhat.rhn.domain.token.ActivationKey;
import com.redhat.rhn.domain.token.TokenPackage;
import com.redhat.rhn.domain.user.User;
+import com.redhat.rhn.frontend.action.BaseSearchAction;
import com.redhat.rhn.frontend.action.channel.PackageSearchHelper;
import com.redhat.rhn.frontend.dto.PackageDto;
import com.redhat.rhn.frontend.dto.PackageOverview;
@@ -32,18 +45,6 @@ import com.redhat.rhn.manager.channel.ChannelManager;
import com.redhat.rhn.manager.session.SessionManager;
import com.redhat.rhn.manager.token.ActivationKeyManager;
-import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
-
-import java.net.MalformedURLException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import redstone.xmlrpc.XmlRpcFault;
-
/**
* PackagesSearchHandler
@@ -75,7 +76,7 @@ public class PackagesSearchHandler extends BaseHandler {
* */
public List<PackageOverview> name(String sessionKey, String name)
throws FaultException {
- return performSearch(sessionKey, name, PackageSearchHelper.OPT_NAME_ONLY);
+ return performSearch(sessionKey, name, BaseSearchAction.OPT_NAME_ONLY);
}
/**
@@ -98,7 +99,7 @@ public class PackagesSearchHandler extends BaseHandler {
* */
public List<PackageOverview> nameAndDescription(String sessionKey, String query)
throws FaultException {
- return performSearch(sessionKey, query, PackageSearchHelper.OPT_NAME_AND_DESC);
+ return performSearch(sessionKey, query, BaseSearchAction.OPT_NAME_AND_DESC);
}
/**
@@ -121,7 +122,7 @@ public class PackagesSearchHandler extends BaseHandler {
* */
public List<PackageOverview> nameAndSummary(String sessionKey, String query)
throws FaultException {
- return performSearch(sessionKey, query, PackageSearchHelper.OPT_NAME_AND_SUMMARY);
+ return performSearch(sessionKey, query, BaseSearchAction.OPT_NAME_AND_SUMMARY);
}
/**
* Advanced method to search lucene indexes with a passed in query written in Lucene
@@ -156,7 +157,7 @@ public class PackagesSearchHandler extends BaseHandler {
public List<PackageOverview> advanced(String sessionKey, String luceneQuery)
throws FaultException {
- return performSearch(sessionKey, luceneQuery, PackageSearchHelper.OPT_FREE_FORM);
+ return performSearch(sessionKey, luceneQuery, BaseSearchAction.OPT_FREE_FORM);
}
@@ -202,7 +203,7 @@ public class PackagesSearchHandler extends BaseHandler {
throw new InvalidChannelLabelException();
}
List<PackageOverview> pkgs = performSearch(sessionKey, luceneQuery,
- PackageSearchHelper.OPT_FREE_FORM);
+ BaseSearchAction.OPT_FREE_FORM);
WebSession session = SessionManager.loadSession(sessionKey);
User user = session.getUser();
Channel channel = ChannelManager.lookupByLabelAndUser(channelLabel, user);
@@ -266,7 +267,7 @@ public class PackagesSearchHandler extends BaseHandler {
throw new MethodInvalidParamException();
}
List<PackageOverview> pkgs = performSearch(sessionKey, luceneQuery,
- PackageSearchHelper.OPT_FREE_FORM);
+ BaseSearchAction.OPT_FREE_FORM);
WebSession session = SessionManager.loadSession(sessionKey);
User user = session.getUser();
// Lookup what packages are in the activation key and filter
diff --git a/java/code/webapp/WEB-INF/includes/header.jsp b/java/code/webapp/WEB-INF/includes/header.jsp
index 824d83b..020f159 100644
--- a/java/code/webapp/WEB-INF/includes/header.jsp
+++ b/java/code/webapp/WEB-INF/includes/header.jsp
@@ -42,7 +42,9 @@
</li>
</ul>
- <form name="form1" class="form-inline hidden-xs" role="form" action="/rhn/Search.do" method="get">
+ <form name="form1" class="form-inline hidden-xs" role="form" action="/rhn/Search.do">
+ <rhn:csrf />
+ <rhn:submitted />
<div class="form-group">
<select name="search_type" class="form-control input-sm">
<rhn:require acl="org_entitlement(sw_mgr_enterprise)">
@@ -57,7 +59,6 @@
<input type="search" class="form-control input-sm" name="search_string" maxlength="40" size="20" accesskey="4" autofocus="autofocus" placeholder="<bean:message key='button.search'/>" />
</div>
<div class="form-group">
- <input type="hidden" name="submitted" value="true" />
<button type="submit" class="btn btn-info input-sm" id="search-btn">
<rhn:icon type="header-search" />
</button>
diff --git a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
index 7d02037..306f47f 100644
--- a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
@@ -112,7 +112,7 @@
</td>
</tr>
</table>
- <input type="hidden" name="submitted" value="true"/>
+ <html:hidden property="submitted" value="true"/>
</html:form>
</div>
</div>
@@ -140,24 +140,24 @@
</c:choose>
<!-- there are two forms here, need to keep the formvars around for pagination -->
- <input type="hidden" name="submitted" value="true"/>
- <input type="hidden" name="search_string" value="${search_string}"/>
- <input type="hidden" name="whereToSearch" value="${param.whereToSearch}"/>
- <input type="hidden" name="show_as" value="${param.show_as}"/>
- <input type="hidden" name="result_filter" value="${param.result_filter}"/>
- <input type="hidden" name="optionScanDateSearch" value="${param.optionScanDateSearch}"/>
- <input type="hidden" name="start_year" value="${param.start_year}"/>
- <input type="hidden" name="start_month" value="${param.start_month}"/>
- <input type="hidden" name="start_day" value="${param.start_day}"/>
- <input type="hidden" name="start_hour" value="${param.start_hour}"/>
- <input type="hidden" name="start_minute" value="${param.start_minute}"/>
- <input type="hidden" name="start_am_pm" value="${param.start_am_pm}"/>
- <input type="hidden" name="end_year" value="${param.end_year}"/>
- <input type="hidden" name="end_month" value="${param.end_month}"/>
- <input type="hidden" name="end_day" value="${param.end_day}"/>
- <input type="hidden" name="end_hour" value="${param.end_hour}"/>
- <input type="hidden" name="end_minute" value="${param.end_minute}"/>
- <input type="hidden" name="end_am_pm" value="${param.end_am_pm}"/>
+ <html:hidden property="submitted" value="true"/>
+ <html:hidden property="search_string" value="${search_string}"/>
+ <html:hidden property="whereToSearch" value="${param.whereToSearch}"/>
+ <html:hidden property="show_as" value="${param.show_as}"/>
+ <html:hidden property="result_filter" value="${param.result_filter}"/>
+ <html:hidden property="optionScanDateSearch" value="${param.optionScanDateSearch}"/>
+ <html:hidden property="start_year" value="${param.start_year}"/>
+ <html:hidden property="start_month" value="${param.start_month}"/>
+ <html:hidden property="start_day" value="${param.start_day}"/>
+ <html:hidden property="start_hour" value="${param.start_hour}"/>
+ <html:hidden property="start_minute" value="${param.start_minute}"/>
+ <html:hidden property="start_am_pm" value="${param.start_am_pm}"/>
+ <html:hidden property="end_year" value="${param.end_year}"/>
+ <html:hidden property="end_month" value="${param.end_month}"/>
+ <html:hidden property="end_day" value="${param.end_day}"/>
+ <html:hidden property="end_hour" value="${param.end_hour}"/>
+ <html:hidden property="end_minute" value="${param.end_minute}"/>
+ <html:hidden property="end_am_pm" value="${param.end_am_pm}"/>
</rl:listset>
</c:if>
</body>
diff --git a/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp b/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp
index 6a1e9cb..c7e5a26 100644
--- a/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp
@@ -112,7 +112,6 @@
</label>
</div>
</div>
- <input type="hidden" name="submitted" value="true" />
</html:form>
<c:if test="${search_string != null && search_string != ''}">
@@ -151,14 +150,13 @@
name="searchResults"
exportColumns="packageName,summary"/>
<!-- there are two forms here, need to keep the formvars around for pagination -->
- <input type="hidden" name="submitted" value="true" />
<html:hidden property="search_string" name="search_string" value="${search_string}" />
- <input type="hidden" name="view_mode" value="${view_mode}" />
- <input type="hidden" name="whereCriteria" value="${whereCriteria}" />
- <input type="hidden" name="channel_filter" value="${channel_filter}" />
- <input type="hidden" name="fineGrained" value="${fineGrained}" />
+ <html:hidden property="view_mode" value="${view_mode}" />
+ <html:hidden property="whereCriteria" value="${whereCriteria}" />
+ <html:hidden property="channel_filter" value="${channel_filter}" />
+ <html:hidden property="fineGrained" value="${fineGrained}" />
<c:forEach items="${requestScope.channel_arch}" var="item">
- <input type="hidden" name="channel_arch" value="${item}" />
+ <html:hidden property="channel_arch" value="${item}" />
</c:forEach>
</rl:listset>
</c:if>
diff --git a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
index e2f932e..725dc7b 100644
--- a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
@@ -150,7 +150,7 @@
</table>
</div> <!-- search choices group -->
</div> <!-- search choices -->
- <input type="hidden" name="submitted" value="true" />
+ <html:hidden property="submitted" value="true" />
</html:form>
<c:if test="${(search_string != null && search_string != '') || param.optionIssueDateSearch != null }">
@@ -194,14 +194,14 @@
<c:when test="${view_mode == 'errata_search_by_advisory'}">
<%--
If this is a errata_search_by_advisory, we display the synopsis
- column, but call it Errata Advisory
- --%>
- <rl:column bound="false" sortable="true" sortattr="advisorySynopsis"
- headerkey="erratasearch.jsp.errata_advisory">
+ column, but call it Errata Advisory
+ --%>
+ <rl:column bound="false" sortable="true" sortattr="advisorySynopsis"
+ headerkey="erratasearch.jsp.errata_advisory">
<rhn:highlight tag="strong" text="${search_string}">
${current.advisorySynopsis}
</rhn:highlight>
- </rl:column>
+ </rl:column>
</c:when>
<c:when test="${view_mode == 'errata_search_by_package_name'}">
<%--
@@ -256,27 +256,26 @@
name="searchResults"
exportColumns="advisoryType,advisoryName,advisorySynopsis,issueDate"/>
- <!-- there are two forms here, need to keep the formvars around for pagination -->
- <input type="hidden" name="submitted" value="true" />
- <html:hidden property="search_string" name="search_string" value="${search_string}" />
- <input type="hidden" name="view_mode" value="${view_mode}" />
- <input type="hidden" name="errata_type_bug" value="<%= request.getParameter("errata_type_bug") %>" />
- <input type="hidden" name="errata_type_security" value="<%= request.getParameter("errata_type_security") %>" />
- <input type="hidden" name="errata_type_enhancement" value="<%= request.getParameter("errata_type_enhancement") %>" />
- <input type="hidden" name="optionIssueDateSearch" value="<%= request.getParameter("optionIssueDateSearch") %>" />
- <input type="hidden" name="start_year" value="<%= request.getParameter("start_year") %>" />
- <input type="hidden" name="start_month" value="<%= request.getParameter("start_month") %>" />
- <input type="hidden" name="start_day" value="<%= request.getParameter("start_day") %>" />
- <input type="hidden" name="start_hour" value="<%= request.getParameter("start_hour") %>" />
- <input type="hidden" name="start_minute" value="<%= request.getParameter("start_minute") %>" />
- <input type="hidden" name="start_am_pm" value="<%= request.getParameter("start_am_pm") %>" />
- <input type="hidden" name="end_year" value="<%= request.getParameter("end_year") %>" />
- <input type="hidden" name="end_month" value="<%= request.getParameter("end_month") %>" />
- <input type="hidden" name="end_day" value="<%= request.getParameter("end_day") %>" />
- <input type="hidden" name="end_hour" value="<%= request.getParameter("end_hour") %>" />
- <input type="hidden" name="end_minute" value="<%= request.getParameter("end_minute") %>" />
- <input type="hidden" name="end_am_pm" value="<%= request.getParameter("end_am_pm") %>" />
- <input type="hidden" name="fineGrained" value="${fineGrained}" />
+ <!-- there are two forms here, need to keep the formvars around for pagination-->
+ <html:hidden property="search_string" value="${search_string}" />
+ <html:hidden property="view_mode" value="${view_mode}" />
+ <html:hidden property="errata_type_bug" value="${errata_type_bug}" />
+ <html:hidden property="errata_type_security" value="${errata_type_security}" />
+ <html:hidden property="errata_type_enhancement" value="${errata_type_enhancement}" />
+ <html:hidden property="optionIssueDateSearch" value="${optionIssueDateSearch}" />
+ <html:hidden property="start_year" value="${start_year}" />
+ <html:hidden property="start_month" value="${start_month}" />
+ <html:hidden property="start_day" value="${start_day}" />
+ <html:hidden property="start_hour" value="${start_hour}" />
+ <html:hidden property="start_minute" value="${start_minute}" />
+ <html:hidden property="start_am_pm" value="${start_am_pm}" />
+ <html:hidden property="end_year" value="${end_year}" />
+ <html:hidden property="end_month" value="${end_month}" />
+ <html:hidden property="end_day" value="${end_day}" />
+ <html:hidden property="end_hour" value="${end_hour}" />
+ <html:hidden property="end_minute" value="${end_minute}" />
+ <html:hidden property="end_am_pm" value="${end_am_pm}" />
+ <html:hidden property="fineGrained" value="${fineGrained}" />
</rl:listset>
diff --git a/java/code/webapp/WEB-INF/pages/help/docsearch.jsp b/java/code/webapp/WEB-INF/pages/help/docsearch.jsp
index c52041a..20d9e28 100644
--- a/java/code/webapp/WEB-INF/pages/help/docsearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/help/docsearch.jsp
@@ -61,7 +61,7 @@
</div>
</div>
- <input type="hidden" name="submitted" value="true" />
+ <html:hidden property="submitted" value="true" />
</html:form>
<c:if test="${search_string != null && search_string != ''}">
@@ -75,11 +75,11 @@
emptykey="docsearch.jsp.nopages" width="100%">
<rl:decorator name="PageSizeDecorator"/>
<rl:column bound="false" sortable="false" headerkey="docsearch.jsp.pagetitle">
- <a href="${current.url}">
- <rhn:highlight tag="strong" text="${search_string}">
- ${current.title}
- </rhn:highlight>
- </a>
+ <a href="${current.url}">
+ <rhn:highlight tag="strong" text="${search_string}">
+ ${current.title}
+ </rhn:highlight>
+ </a>
</rl:column>
<rl:column bound="false" sortable="false" headerkey="docsearch.jsp.summary">
<a href="${current.url}">
@@ -91,10 +91,10 @@
</rl:list>
<!-- there are two forms here, need to keep the formvars around for pagination -->
- <input type="hidden" name="submitted" value="true" />
+ <html:hidden property="submitted" value="true" />
<html:hidden property="search_string" name="search_string" value="${search_string}" />
- <input type="hidden" name="view_mode" value="${view_mode}" />
- <input type="hidden" name="relevant" value="${relevant}" />
+ <html:hidden property="view_mode" value="${view_mode}" />
+ <html:hidden property="relevant" value="${relevant}" />
</rl:listset>
diff --git a/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp b/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp
index ec6da4d..9ea85cd 100644
--- a/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp
@@ -92,19 +92,19 @@
</html:checkbox>
</div>
</div>
- <input type="hidden" name="submitted" value="true"/>
+ <html:hidden property="submitted" value="true"/>
</html:form>
<c:if test="${search_string != null && search_string != ''}">
<hr/>
<rl:listset name="searchSet">
<rhn:csrf />
- <input type="hidden" name="submitted" value="true"/>
+ <html:hidden property="submitted" value="true"/>
<html:hidden property="search_string" name="search_string" value="${search_string}" />
- <input type="hidden" name="view_mode" value="${view_mode}" />
- <input type="hidden" name="whereToSearch" value="${whereToSearch}" />
- <input type="hidden" name="invert" value="${invert}" />
- <input type="hidden" name="fineGrained" value="${fineGrained}" />
+ <html:hidden property="view_mode" value="${view_mode}" />
+ <html:hidden property="whereToSearch" value="${whereToSearch}" />
+ <html:hidden property="invert" value="${invert}" />
+ <html:hidden property="fineGrained" value="${fineGrained}" />
<rl:list name="pageList" dataset="searchResults"
emptykey="systemsearch.jsp.noresults" width="100%"
diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml
index f5da3e0..1c42f90 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -210,15 +210,14 @@
<form-property name="filter_value" type="java.lang.String"/>
<form-property name="prev_filter_value" type="java.lang.String"/>
</form-bean>
- <form-bean name="auditSearchForm"
+ <form-bean name="combinedSearchForm"
type="com.redhat.rhn.frontend.struts.ScrubbingDynaActionForm">
- <form-property name="machine" type="java.lang.String" />
- <form-property name="startMilli" type="java.lang.Long" />
- <form-property name="endMilli" type="java.lang.Long" />
- <form-property name="autypes" type="java.lang.String[]" />
- <form-property name="seqno" type="java.lang.Long" />
- <form-property name="unreviewable" type="java.lang.Boolean" />
- <form-property name="parseDates" type="java.lang.Boolean" />
+ <form-property name="no_scrub" type="java.lang.String" initial="search_string"/>
+ <!-- Multiple users -->
+ <form-property name="search_string" type="java.lang.String"/>
+ <form-property name="submitted" type="java.lang.Boolean" />
+ <form-property name="view_mode" type="java.lang.String" />
+ <form-property name="fineGrained" type="java.lang.Boolean" />
<form-property name="start_year" type="java.lang.Integer" />
<form-property name="start_month" type="java.lang.Integer" />
<form-property name="start_day" type="java.lang.Integer" />
@@ -231,56 +230,42 @@
<form-property name="end_hour" type="java.lang.Integer" />
<form-property name="end_minute" type="java.lang.Integer" />
<form-property name="end_am_pm" type="java.lang.Integer" />
- </form-bean>
- <form-bean name="xccdfSearchForm"
- type="com.redhat.rhn.frontend.struts.ScrubbingDynaActionForm">
- <form-property name="search_string" type="java.lang.String"/>
- <form-property name="whereToSearch" type="java.lang.String"/>
- <form-property name="submitted" type="java.lang.Boolean" />
+ <form-property name="whereToSearch" type="java.lang.String" />
+ <!-- Base search form -->
+ <form-property name="search_type" type="java.lang.String" />
+ <!-- Audit -->
+ <form-property name="machine" type="java.lang.String" />
+ <form-property name="startMilli" type="java.lang.Long" />
+ <form-property name="endMilli" type="java.lang.Long" />
+ <form-property name="autypes" type="java.lang.String[]" />
+ <form-property name="seqno" type="java.lang.Long" />
+ <form-property name="unreviewable" type="java.lang.Boolean" />
+ <form-property name="parseDates" type="java.lang.Boolean" />
+ <!-- XCCDF -->
<form-property name="result_filter" type="java.lang.String"/>
<form-property name="show_as" type="java.lang.String"/>
<form-property name="optionScanDateSearch" type="java.lang.Boolean" />
- <form-property name="start_year" type="java.lang.Integer"/>
- <form-property name="start_month" type="java.lang.Integer"/>
- <form-property name="start_day" type="java.lang.Integer"/>
- <form-property name="start_hour" type="java.lang.Integer"/>
- <form-property name="start_minute" type="java.lang.Integer"/>
- <form-property name="start_am_pm" type="java.lang.Integer"/>
- <form-property name="end_year" type="java.lang.Integer"/>
- <form-property name="end_month" type="java.lang.Integer"/>
- <form-property name="end_day" type="java.lang.Integer"/>
- <form-property name="end_hour" type="java.lang.Integer"/>
- <form-property name="end_minute" type="java.lang.Integer"/>
- <form-property name="end_am_pm" type="java.lang.Integer"/>
- </form-bean>
- <form-bean name="xccdfDiff"
- type="com.redhat.rhn.frontend.struts.ScrubbingDynaActionForm">
- <form-property name="first" type="java.lang.Long"/>
- <form-property name="second" type="java.lang.Long"/>
- </form-bean>
- <form-bean name="errataSearchForm"
- type="com.redhat.rhn.frontend.struts.ScrubbingDynaActionForm">
- <form-property name="search_string" type="java.lang.String"/>
- <form-property name="view_mode" type="java.lang.String"/>
- <form-property name="submitted" type="java.lang.Boolean" />
+ <!-- Errata -->
<form-property name="errata_type_bug" type="java.lang.Boolean" />
<form-property name="errata_type_security" type="java.lang.Boolean" />
<form-property name="errata_type_enhancement" type="java.lang.Boolean"/>
<form-property name="optionIssueDateSearch" type="java.lang.Boolean" />
- <form-property name="start_year" type="java.lang.Integer"/>
- <form-property name="start_month" type="java.lang.Integer"/>
- <form-property name="start_day" type="java.lang.Integer"/>
- <form-property name="start_hour" type="java.lang.Integer"/>
- <form-property name="start_minute" type="java.lang.Integer"/>
- <form-property name="start_am_pm" type="java.lang.Integer"/>
- <form-property name="end_year" type="java.lang.Integer"/>
- <form-property name="end_month" type="java.lang.Integer"/>
- <form-property name="end_day" type="java.lang.Integer"/>
- <form-property name="end_hour" type="java.lang.Integer"/>
- <form-property name="end_minute" type="java.lang.Integer"/>
- <form-property name="end_am_pm" type="java.lang.Integer"/>
- <form-property name="fineGrained" type="java.lang.Boolean"/>
+ <!-- Package -->
+ <form-property name="channel_arch" type="java.lang.String[]"/>
+ <form-property name="channel_filter" type="java.lang.String"/>
+ <form-property name="filter_value" type="java.lang.String"/>
+ <form-property name="prev_filter_value" type="java.lang.String"/>
+ <form-property name="relevant" type="java.lang.String" />
+ <form-property name="whereCriteria" type="java.lang.String" />
+ <!-- System -->
+ <form-property name="invert" type="java.lang.Boolean" />
+ <!-- Docs -->
+ </form-bean>
+ <form-bean name="xccdfDiff"
+ type="com.redhat.rhn.frontend.struts.ScrubbingDynaActionForm">
+ <form-property name="first" type="java.lang.Long"/>
+ <form-property name="second" type="java.lang.Long"/>
</form-bean>
<form-bean name="errataCreateForm"
type="com.redhat.rhn.frontend.struts.ScrubbingDynaActionForm">
@@ -333,44 +318,6 @@
type="com.redhat.rhn.frontend.struts.ScrubbingDynaActionForm">
<form-property name="submitted" type="java.lang.Boolean"/>
</form-bean>
- <form-bean name="packageSearchForm"
- type="com.redhat.rhn.frontend.struts.ScrubbingDynaActionForm">
- <form-property name="search_string" type="java.lang.String"/>
- <form-property name="view_mode" type="java.lang.String"/>
- <form-property name="channel_arch" type="java.lang.String[]"/>
- <form-property name="channel_filter" type="java.lang.String"/>
- <form-property name="filter_value" type="java.lang.String"/>
- <form-property name="prev_filter_value" type="java.lang.String"/>
- <form-property name="relevant" type="java.lang.String" />
- <form-property name="fineGrained" type="java.lang.Boolean" />
- <form-property name="submitted" type="java.lang.Boolean" />
- </form-bean>
-
- <form-bean name="systemSearchForm"
- type="com.redhat.rhn.frontend.struts.ScrubbingDynaActionForm">
- <form-property name="search_string" type="java.lang.String" />
- <form-property name="view_mode" type="java.lang.String" />
- <form-property name="whereToSearch" type="java.lang.String" />
- <form-property name="invert" type="java.lang.Boolean" />
- <form-property name="fineGrained" type="java.lang.Boolean" />
- <form-property name="submitted" type="java.lang.Boolean" />
- <form-property name="no_scrub" type="java.lang.String"
- initial="search_string"/>
- </form-bean>
-
- <form-bean name="docsSearchForm"
- type="com.redhat.rhn.frontend.struts.ScrubbingDynaActionForm">
- <form-property name="search_string" type="java.lang.String" />
- <form-property name="view_mode" type="java.lang.String" />
- <form-property name="submitted" type="java.lang.Boolean" />
- </form-bean>
-
- <form-bean name="searchForm"
- type="com.redhat.rhn.frontend.struts.ScrubbingDynaActionForm">
- <form-property name="search_type" type="java.lang.String" />
- <form-property name="search_string" type="java.lang.String" />
- <form-property name="submitted" type="java.lang.Boolean" />
- </form-bean>
<form-bean name="probeDetailsForm"
type="com.redhat.rhn.frontend.struts.ScrubbingDynaActionForm">
@@ -734,8 +681,8 @@
<form-property name="submitted" type="java.lang.Boolean"/>
<form-property name="no_scrub" type="java.lang.String" initial="contents"/>
</form-bean>
-
-
+
+
<form-bean name="kickstartScriptOrderForm"
type="com.redhat.rhn.frontend.struts.ScrubbingDynaActionForm">
<form-property name="preScripts" type="java.util.ArrayList"/>
@@ -1490,16 +1437,16 @@
</action>
<action path="/Search"
- name="searchForm"
+ name="combinedSearchForm"
scope="request"
type="com.redhat.rhn.frontend.action.SearchAction"
className="com.redhat.rhn.frontend.struts.RhnActionMapping">
- <forward name="default" path="/YourRhn.do" />
+ <forward name="default" path="/YourRhn.do"/>
<forward name="error" path="/YourRhn.do" />
- <forward name="systems" path="/systems/Search.do" />
- <forward name="errata" path="/errata/Search.do" />
- <forward name="packages" path="/channels/software/Search.do" />
- <forward name="docs" path="/help/Search.do" />
+ <forward name="systems" path="/systems/Search.do" redirect="true" />
+ <forward name="errata" path="/errata/Search.do" redirect="true" />
+ <forward name="packages" path="/channels/software/Search.do" redirect="true" />
+ <forward name="docs" path="/help/Search.do" redirect="true" />
</action>
@@ -2075,7 +2022,7 @@
<!-- ===== AUDIT ===== -->
<action path="/audit/Search"
- name="auditSearchForm"
+ name="combinedSearchForm"
scope="request"
input="/WEB-INF/pages/audit/auditsearch.jsp"
type="com.redhat.rhn.frontend.action.audit.AuditSearchAction"
@@ -2107,12 +2054,11 @@
</action>
<action path="/audit/scap/Search"
- name="xccdfSearchForm"
+ name="combinedSearchForm"
scope="request"
input="/WEB-INF/pages/audit/scap/xccdfsearch.jsp"
type="com.redhat.rhn.frontend.action.audit.scap.XccdfSearchAction">
<forward name="default" path="/WEB-INF/pages/audit/scap/xccdfsearch.jsp"/>
- <forward name="success" path="/audit/scap/Search.do" redirect="true" />
</action>
<action path="/audit/scap/Diff"
@@ -2134,13 +2080,12 @@
<!-- ===== ERRATA ===== -->
<action path="/errata/Search"
- name="errataSearchForm"
+ name="combinedSearchForm"
scope="request"
input="/WEB-INF/pages/errata/erratasearch.jsp"
type="com.redhat.rhn.frontend.action.errata.ErrataSearchAction"
className="com.redhat.rhn.frontend.struts.RhnActionMapping">
<forward name="default" path="/WEB-INF/pages/errata/erratasearch.jsp"/>
- <forward name="success" path="/errata/Search.do" redirect="true" />
</action>
<action path="/errata/AllErrata"
@@ -2739,13 +2684,11 @@
<action path="/channels/software/Search"
scope="request"
- name="packageSearchForm"
+ name="combinedSearchForm"
input="/WEB-INF/pages/channel/packagesearch.jsp"
type="com.redhat.rhn.frontend.action.channel.PackageSearchAction">
<forward name="default"
path="/WEB-INF/pages/channel/packagesearch.jsp"/>
- <forward name="success"
- path="/channels/software/Search.do" redirect="true"/>
</action>
<action path="/software/packages/NameOverview"
@@ -3065,18 +3008,17 @@
<action path="/systems/Search"
- name="systemSearchForm"
+ name="combinedSearchForm"
scope="request"
input="/WEB-INF/pages/systems/systemsearch.jsp"
- type="com.redhat.rhn.frontend.action.systems.SystemSearchSetupAction"
+ type="com.redhat.rhn.frontend.action.systems.SystemSearchAction"
className="com.redhat.rhn.frontend.struts.RhnActionMapping">
<set-property property="acls" value="org_entitlement(sw_mgr_enterprise)"/>
<forward name="default"
path="/WEB-INF/pages/systems/systemsearch.jsp"/>
- <forward name="success"
- path="/systems/Search.do" redirect="true"/>
- <forward name="error"
- path="/WEB-INF/pages/systems/systemsearch.jsp"/>
+ <forward name="single"
+ path="/systems/details/Overview.do"
+ redirect="true" />
</action>
<action path="/systems/WorkWithGroup"
@@ -8316,14 +8258,12 @@
<action path="/help/Search"
scope="request"
- name="docsSearchForm"
+ name="combinedSearchForm"
input="/WEB-INF/pages/help/docsearch.jsp"
type="com.redhat.rhn.frontend.action.help.DocSearchSetupAction"
className="com.redhat.rhn.frontend.struts.RhnActionMapping">
- <forward name="default"
- path="/WEB-INF/pages/help/docsearch.jsp"/>
- <forward name="success"
- path="/help/Search.do" redirect="true"/>
+ <forward name="default" path="/WEB-INF/pages/help/docsearch.jsp" />
+ <forward name="success" path="/help/Search.do" redirect="true"/>
</action>
<action path="/help/Chat"
commit cfda69feffd04cb3280ed4c87e420ef446777839
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Thu Nov 14 10:43:48 2013 -0500
1063915, CVE-2013-4415 - Fix XSS in new-list-tag by escaping _LABEL_SELECTED
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/PageSizeDecorator.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/PageSizeDecorator.java
index 08d4425..2991385 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/PageSizeDecorator.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/PageSizeDecorator.java
@@ -21,6 +21,7 @@ import java.util.List;
import javax.servlet.ServletRequest;
import javax.servlet.jsp.JspException;
+import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
@@ -135,8 +136,8 @@ public class PageSizeDecorator extends BaseListDecorator {
input.setAttribute("type", "hidden");
input.setAttribute("id", makeSelectionId(listName));
input.setAttribute("name", makeSelectionLabel(listName));
- input.setAttribute("value", pageContext.getRequest().getParameter
- (makeSelectionLabel(listName)));
+ input.setAttribute("value", StringEscapeUtils.escapeHtml(pageContext
+ .getRequest().getParameter(makeSelectionLabel(listName))));
stringBuild.append(input.render());
ListTagUtil.write(pageContext, stringBuild.toString());
}
@@ -205,7 +206,7 @@ public class PageSizeDecorator extends BaseListDecorator {
catch (NumberFormatException nfe) {
logger.warn("Number format exception encountered while parsing " +
ConfigDefaults.PAGE_SIZES + "=" + pageSizes);
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
}
}
commit 431663ba6b2d1631afc4bca018c31f1661fe1263
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Thu Oct 17 14:57:33 2013 -0400
1063915, CVE-2013-1871, Fix XSS in edit-address JSPs
diff --git a/java/code/webapp/WEB-INF/pages/admin/users/edit_address.jsp b/java/code/webapp/WEB-INF/pages/admin/users/edit_address.jsp
index 3e0d905..5475b12 100644
--- a/java/code/webapp/WEB-INF/pages/admin/users/edit_address.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/users/edit_address.jsp
@@ -7,7 +7,10 @@
<html>
<body>
<%@ include file="/WEB-INF/pages/common/fragments/user/user-header.jspf" %>
- <h2><bean:message key="message.Update"/> ${editAddressForm.map.typedisplay}</h2>
+ <h2>
+ <bean:message key="message.Update"/>
+ <c:out value="${editAddressForm.map.typedisplay}" escapeXml="true" />
+ </h2>
<p><bean:message key="edit_address.jsp.summary"/></p>
<html:form action="/users/EditAddressSubmit" styleClass="form-horizontal">
<rhn:csrf />
diff --git a/java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp b/java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp
index 7143b7f..9cb5b05 100644
--- a/java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp
+++ b/java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp
@@ -12,7 +12,7 @@
<div class="panel panel-default">
<div class="panel-heading">
<h4>
- ${editAddressForm.map.typedisplay}
+ <c:out value="${editAddressForm.map.typedisplay}" escapeXml="true" />
<bean:message key="your_edit_address_record.displayname"/>
</h4>
</div>
commit 6727a332466ef4339747b35fe5a639afefb8e584
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Wed Feb 5 13:44:02 2014 -0500
1063915, CVE-2013-1869, close header-injection hole
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/OverviewAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/OverviewAction.java
index 7837e3b..c30262b 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/OverviewAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/OverviewAction.java
@@ -33,6 +33,9 @@ import java.io.IOException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
/**
* OverviewAction
* @version $Rev$
@@ -45,7 +48,8 @@ public class OverviewAction extends RhnListAction {
private static final String[] ALLOWED_REDIRECTS = { "/rhn/", "/network/" };
//
- // Only follow redirects if they're "inside" the app
+ // Only follow redirects if they're "inside" the app (close open-redirecting)
+ // Make sure to ignore anything after a <CR><LF> in the string (close header-injection)
//
private String getLegalReturnUrl(String proposedRedirect) {
if (proposedRedirect == null) {
@@ -54,7 +58,10 @@ public class OverviewAction extends RhnListAction {
for (String dest : ALLOWED_REDIRECTS) {
if (proposedRedirect.startsWith(dest)) {
- return proposedRedirect;
+ // Punt if any control-characters found
+ Matcher m = Pattern.compile("\\p{Cntrl}").matcher(proposedRedirect);
+ boolean ctrlFound = m.find();
+ return ctrlFound ? null : proposedRedirect;
}
}
return null;
commit c41c87a9dc9dac771eb761dd63ada05b2f9104f9
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Tue Nov 5 10:57:13 2013 -0500
1063915, CVE-2010-2236, Cleanse backticks from monitoring-probes where appropriate
diff --git a/java/code/src/com/redhat/rhn/domain/monitoring/command/CommandParameter.java b/java/code/src/com/redhat/rhn/domain/monitoring/command/CommandParameter.java
index 188a90c..f8b453c 100644
--- a/java/code/src/com/redhat/rhn/domain/monitoring/command/CommandParameter.java
+++ b/java/code/src/com/redhat/rhn/domain/monitoring/command/CommandParameter.java
@@ -26,6 +26,7 @@ import java.util.Date;
* @version $Rev: 1 $
*/
public class CommandParameter implements Serializable {
+ private static final String[] BACKTICK_ALLOWED = {"command"};
private Command command;
private String paramName;
@@ -313,6 +314,25 @@ public class CommandParameter implements Serializable {
return validator;
}
+ /**
+ * As a general rules, backticks (`) are not allowed in probe-values,
+ * in order to decrease the possible attack-surface of the monitoring
+ * subsystem.
+ *
+ * For some probes' function, however, they *must* be allowed.
+ *
+ * @return 'true' if it's ok for a value to contain backticks,
+ * false otherwise.
+ */
+ public boolean isBackTickAllowed() {
+ for (String s : BACKTICK_ALLOWED) {
+ if (s.equals(this.paramName)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
private ParameterValidator createValidator() {
String dataType = getDataTypeName();
if ("checkbox".equals(dataType)) {
diff --git a/java/code/src/com/redhat/rhn/domain/monitoring/command/FloatValidator.java b/java/code/src/com/redhat/rhn/domain/monitoring/command/FloatValidator.java
index c276d0f..504310f 100644
--- a/java/code/src/com/redhat/rhn/domain/monitoring/command/FloatValidator.java
+++ b/java/code/src/com/redhat/rhn/domain/monitoring/command/FloatValidator.java
@@ -30,6 +30,7 @@ class FloatValidator extends ParameterValidator {
* {@inheritDoc}
*/
public String normalize(String value) {
+ value = super.normalize(value);
return StringUtils.stripToNull(value);
}
diff --git a/java/code/src/com/redhat/rhn/domain/monitoring/command/IntegerValidator.java b/java/code/src/com/redhat/rhn/domain/monitoring/command/IntegerValidator.java
index 4193617..5756d4a 100644
--- a/java/code/src/com/redhat/rhn/domain/monitoring/command/IntegerValidator.java
+++ b/java/code/src/com/redhat/rhn/domain/monitoring/command/IntegerValidator.java
@@ -44,6 +44,7 @@ class IntegerValidator extends ParameterValidator {
* {@inheritDoc}
*/
public String normalize(String value) {
+ value = super.normalize(value);
return StringUtils.stripToNull(value);
}
diff --git a/java/code/src/com/redhat/rhn/domain/monitoring/command/ParameterValidator.java b/java/code/src/com/redhat/rhn/domain/monitoring/command/ParameterValidator.java
index d3aa022..d707b3d 100644
--- a/java/code/src/com/redhat/rhn/domain/monitoring/command/ParameterValidator.java
+++ b/java/code/src/com/redhat/rhn/domain/monitoring/command/ParameterValidator.java
@@ -74,12 +74,16 @@ public abstract class ParameterValidator {
}
/**
- * Normalize <code>value</code>. Returns <code>null</code> if the
- * value is considered empty or not present.
+ * Normalize <code>value</code>. Removes all backticks unless param.isBacktickAllowed()
+ * returns true. Returns <code>null</code> if the value is considered empty
+ * or not present.
* @param value the value to normalized
* @return the normalized value
*/
public String normalize(String value) {
+ if (!param.isBackTickAllowed() && !StringUtils.isBlank(value)) {
+ value = value.replaceAll("`", "");
+ }
return StringUtils.isBlank(value) ? null : value;
}
diff --git a/java/code/src/com/redhat/rhn/domain/monitoring/command/ProbeStateValidator.java b/java/code/src/com/redhat/rhn/domain/monitoring/command/ProbeStateValidator.java
index d61117c..e2b8035 100644
--- a/java/code/src/com/redhat/rhn/domain/monitoring/command/ProbeStateValidator.java
+++ b/java/code/src/com/redhat/rhn/domain/monitoring/command/ProbeStateValidator.java
@@ -46,6 +46,7 @@ class ProbeStateValidator extends ParameterValidator {
* {@inheritDoc}
*/
public String normalize(String value) {
+ value = super.normalize(value);
if (value != null) {
value = value.toUpperCase();
}
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 d50f929..3fcee65 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
@@ -14,6 +14,12 @@
*/
package com.redhat.rhn.domain.monitoring.command.test;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
import com.redhat.rhn.domain.monitoring.MonitoringConstants;
import com.redhat.rhn.domain.monitoring.MonitoringFactory;
import com.redhat.rhn.domain.monitoring.Probe;
@@ -23,6 +29,7 @@ import com.redhat.rhn.domain.monitoring.command.Command;
import com.redhat.rhn.domain.monitoring.command.CommandGroup;
import com.redhat.rhn.domain.monitoring.command.CommandParameter;
import com.redhat.rhn.domain.monitoring.command.Metric;
+import com.redhat.rhn.domain.monitoring.command.ParameterValidator;
import com.redhat.rhn.domain.monitoring.command.ThresholdParameter;
import com.redhat.rhn.domain.monitoring.command.ThresholdType;
import com.redhat.rhn.domain.monitoring.test.MonitoringFactoryTest;
@@ -34,11 +41,6 @@ import com.redhat.rhn.testing.UserTestUtils;
import org.apache.commons.collections.Transformer;
import org.hibernate.HibernateException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
/**
* CommandTest
* @version $Rev: 52080 $
@@ -194,5 +196,29 @@ public class CommandTest extends RhnBaseTestCase {
}
+
+ public void testBacktickCleansing() throws Exception {
+ User user = UserTestUtils.findNewUser("testUser", "testOrg" +
+ this.getClass().getSimpleName());
+ Probe probe = MonitoringFactoryTest.createTestProbe(user);
+ assertNotNull(probe.getCommand().getCommandParameters());
+ assertTrue(probe.getCommand().getCommandParameters().size() > 0);
+
+ // Make sure that cmd-de-backticking works
+ Set<CommandParameter> cps = probe.getCommand().getCommandParameters();
+ for (CommandParameter cp : cps) {
+ ParameterValidator pv = cp.getValidator();
+ System.out.println(cp.getParamName() + "/" + cp.getParamType() + "(" +
+ pv.getClass().getName() + ") [" +
+ pv.normalize("`BACKTICKS`") + "]");
+ if (cp.isBackTickAllowed()) {
+ assertEquals("`HAS_BACKTICKS`", pv.normalize("`HAS_BACKTICKS`"));
+ }
+ else {
+ assertEquals("NO_BACKTICKS", pv.normalize("NO_BACKTICKS"));
+ assertEquals("REMOVE_BACKTICKS", pv.normalize("`REMOVE_BACKTICKS`"));
+ }
+ }
+ }
}
commit 041c2dd067f91f22087c9be6bb264d00c9ffdd0b
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Wed Oct 23 15:21:00 2013 -0400
1063915, CVE-2013-1869, Only follow internal return_urls
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/OverviewAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/OverviewAction.java
index 0e87f0f..7837e3b 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/OverviewAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/OverviewAction.java
@@ -41,6 +41,25 @@ public class OverviewAction extends RhnListAction {
private static Logger log = Logger.getLogger(OverviewAction.class);
+ // redirect_url can send us to the Java side or the Perl side, and *nowhere else*
+ private static final String[] ALLOWED_REDIRECTS = { "/rhn/", "/network/" };
+
+ //
+ // Only follow redirects if they're "inside" the app
+ //
+ private String getLegalReturnUrl(String proposedRedirect) {
+ if (proposedRedirect == null) {
+ return null;
+ }
+
+ for (String dest : ALLOWED_REDIRECTS) {
+ if (proposedRedirect.startsWith(dest)) {
+ return proposedRedirect;
+ }
+ }
+ return null;
+ }
+
/** {@inheritDoc} */
public ActionForward execute(ActionMapping mapping,
ActionForm formIn,
@@ -64,7 +83,7 @@ public class OverviewAction extends RhnListAction {
*/
String emptySet = request.getParameter("empty_set");
String setLabel = request.getParameter("set_label");
- String returnUrl = request.getParameter("return_url");
+ String returnUrl = getLegalReturnUrl(request.getParameter("return_url"));
if (emptySet != null && emptySet.equals("true")) {
//Set defaults if needed.
if (setLabel == null) {
commit 1d0f4b4a78ea03d9f2d05fbd52236b1f2ab68e85
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Thu Oct 17 14:55:40 2013 -0400
1063915, CVE-2012-6149, Fix XSS in notes.jsp
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/notes.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/notes.jsp
index f0be578..194e5a6 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/notes.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/notes.jsp
@@ -21,11 +21,11 @@
<rhn:column header="sdc.details.notes.subject" width="35%" sortProperty="subject"
url="/rhn/systems/details/EditNote.do?sid=${system.id}&nid=${current.id}">
- ${current.subject}
+ <c:out value="${current.subject}" escapeXml="true" />
</rhn:column>
<rhn:column header="sdc.details.notes.details" width="50%">
- <pre>${current.note}</pre>
+ <pre><c:out value="${current.note}" escapeXml="true" /></pre>
</rhn:column>
<rhn:column header="sdc.details.notes.updated" sortProperty="modified">
commit 05a950c07e4434da623ded137c970211f84d46e6
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Feb 11 15:07:38 2014 +0100
Automatic commit of package [spacewalk-schema] release [2.1.41-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index b41f0ad..e8fb97a 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-2.1.40-1 schema/spacewalk/
+2.1.41-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 5e2187e..1856fc5 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -4,7 +4,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 2.1.40
+Version: 2.1.41
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Tue Feb 11 2014 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.41-1
+- fix sha1 sums
+
* Tue Feb 11 2014 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.40-1
- 1063821 - deadlock fix
commit 4cd36c6e4fbd7d431a19002fe190ccfea834d07f
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Feb 11 15:07:21 2014 +0100
fix sha1 sums
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.postgresql
index 4ab5d2e..6708d12 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.postgresql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.postgresql
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 cc1b86fd8db5758d5f3a7ccc146f38954454def1
+-- oracle equivalent source sha1 2687a15d4354aa84c0af253684b234ed82900c66
--
-- Copyright (c) 2008--2013 Red Hat, Inc.
--
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/049-rhn_server.pkb.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/049-rhn_server.pkb.postgresql
index 87fa3e4..ee89929 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/049-rhn_server.pkb.postgresql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/049-rhn_server.pkb.postgresql
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 07b6ab3867e4d4ebf772b6ee9731f83e33f4d7ae
+-- oracle equivalent source sha1 d15b33804b83137c38edd4ca8b7981741cd93e98
--
-- Copyright (c) 2008--2012 Red Hat, Inc.
--
commit 1b6d0329d362b033e848f6d9169c99764bc90b72
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Feb 11 15:02:50 2014 +0100
Automatic commit of package [spacewalk-schema] release [2.1.40-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 8dc827e..b41f0ad 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-2.1.39-1 schema/spacewalk/
+2.1.40-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index bccf455..5e2187e 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -4,7 +4,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 2.1.39
+Version: 2.1.40
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Tue Feb 11 2014 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.40-1
+- 1063821 - deadlock fix
+
* Tue Feb 04 2014 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.39-1
- upgrade script for Fedora 20 GPG key
commit 79d339ffcd42e5e02b464097fea5be595fbe26c3
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Feb 11 14:59:28 2014 +0100
1063821 - schema upgrade scripts
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.oracle b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.oracle
new file mode 100644
index 0000000..74680f3
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.oracle
@@ -0,0 +1,1252 @@
+--
+-- Copyright (c) 2008--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.
+--
+
+CREATE OR REPLACE
+PACKAGE BODY rhn_channel
+IS
+ body_version varchar2(100) := '';
+
+ -- Cursor that fetches all the possible base channels for a
+ -- (server_arch_id, release, org_id) combination
+ cursor base_channel_cursor(
+ release_in in varchar2,
+ server_arch_id_in in number,
+ org_id_in in number
+ ) return rhnChannel%ROWTYPE is
+ select distinct c.*
+ from rhnOrgDistChannelMap odcm,
+ rhnServerChannelArchCompat scac,
+ rhnChannel c
+ where c.parent_channel is null
+ and c.id = odcm.channel_id
+ and c.channel_arch_id = odcm.channel_arch_id
+ and odcm.release = release_in
+ and odcm.for_org_id = org_id_in
+ and scac.server_arch_id = server_arch_id_in
+ and scac.channel_arch_id = c.channel_arch_id;
+
+ procedure obtain_read_lock(channel_family_id_in in number, org_id_in in number)
+ is
+ read_lock timestamp with local time zone;
+
+ begin
+ select created into read_lock
+ from rhnPrivateChannelFamily
+ where channel_family_id = channel_family_id_in and org_id = org_id_in
+ for update;
+ end obtain_read_lock;
+
+ PROCEDURE subscribe_server(server_id_in IN NUMBER, channel_id_in NUMBER, immediate_in NUMBER := 1, user_id_in in number := null, recalcfamily_in number := 1)
+ IS
+ channel_parent_val rhnChannel.parent_channel%TYPE;
+ parent_subscribed BOOLEAN;
+ server_has_base_chan BOOLEAN;
+ server_already_in_chan BOOLEAN;
+ channel_family_id_val NUMBER;
+ server_org_id_val NUMBER;
+ available_subscriptions NUMBER;
+ available_fve_subs NUMBER;
+ consenting_user NUMBER;
+ allowed number := 0;
+ is_fve CHAR(1) := 'N';
+ update_lock number;
+ BEGIN
+ select 1
+ into update_lock
+ from rhnServer
+ where id = server_id_in
+ for update;
+ if user_id_in is not null then
+ allowed := rhn_channel.user_role_check(channel_id_in, user_id_in, 'subscribe');
+ else
+ allowed := 1;
+ end if;
+
+ if allowed = 0 then
+ rhn_exception.raise_exception('no_subscribe_permissions');
+ end if;
+
+
+ SELECT parent_channel INTO channel_parent_val FROM rhnChannel WHERE id = channel_id_in;
+
+ IF channel_parent_val IS NOT NULL
+ THEN
+ -- child channel; if attempting to cross-subscribe a child to the wrong base, silently ignore
+ parent_subscribed := FALSE;
+
+ FOR check_subscription IN check_server_subscription(server_id_in, channel_parent_val)
+ LOOP
+ parent_subscribed := TRUE;
+ END LOOP check_subscription;
+
+ IF NOT parent_subscribed
+ THEN
+ RETURN;
+ END IF;
+ ELSE
+ -- base channel
+ server_has_base_chan := FALSE;
+ FOR base IN server_base_subscriptions(server_id_in)
+ LOOP
+ server_has_base_chan := TRUE;
+ END LOOP base;
+
+ IF server_has_base_chan
+ THEN
+ rhn_exception.raise_exception('channel_server_one_base');
+ END IF;
+ END IF;
+
+ FOR check_subscription IN check_server_subscription(server_id_in, channel_id_in)
+ LOOP
+ server_already_in_chan := TRUE;
+ END LOOP check_subscription;
+
+ IF server_already_in_chan
+ THEN
+ RETURN;
+ END IF;
+
+ channel_family_id_val := rhn_channel.family_for_channel(channel_id_in);
+ IF channel_family_id_val IS NULL
+ THEN
+ rhn_exception.raise_exception('channel_subscribe_no_family');
+ END IF;
+
+ --
+ -- Use the org_id of the server only if the org_id of the channel = NULL.
+ -- This is required for subscribing to shared channels.
+ --
+ SELECT NVL(org_id, (SELECT org_id FROM rhnServer WHERE id = server_id_in))
+ INTO server_org_id_val
+ FROM rhnChannel
+ WHERE id = channel_id_in;
+
+ begin
+ obtain_read_lock(channel_family_id_val, server_org_id_val);
+ exception
+ when no_data_found then
+ rhn_exception.raise_exception('channel_family_no_subscriptions');
+ end;
+
+ available_subscriptions := rhn_channel.available_family_subscriptions(channel_family_id_val, server_org_id_val);
+ available_fve_subs := rhn_channel.available_fve_family_subs(channel_family_id_val, server_org_id_val);
+
+ IF available_subscriptions IS NULL OR
+ available_subscriptions > 0 or
+ can_server_consume_virt_channl(server_id_in, channel_family_id_val) = 1 OR
+ (available_fve_subs > 0 AND can_server_consume_fve(server_id_in) = 1)
+ THEN
+ if can_server_consume_virt_channl(server_id_in, channel_family_id_val) = 0 AND available_fve_subs > 0 AND can_server_consume_fve(server_id_in) = 1 THEN
+ is_fve := 'Y';
+ END IF;
+ insert into rhnServerHistory (id,server_id,summary,details) (
+ select rhn_event_id_seq.nextval,
+ server_id_in,
+ 'subscribed to channel ' || SUBSTR(c.label, 0, 106),
+ c.label
+ from rhnChannel c
+ where c.id = channel_id_in
+ );
+ UPDATE rhnServer SET channels_changed = current_timestamp WHERE id = server_id_in;
+ INSERT INTO rhnServerChannel (server_id, channel_id, is_fve) VALUES (server_id_in, channel_id_in, is_fve);
+ IF recalcfamily_in > 0
+ THEN
+ rhn_channel.update_family_counts(channel_family_id_val, server_org_id_val);
+ END IF;
+ queue_server(server_id_in, immediate_in);
+ ELSE
+ rhn_exception.raise_exception('channel_family_no_subscriptions');
+ END IF;
+
+ END subscribe_server;
+
+
+
+ FUNCTION can_convert_to_fve(server_id_in IN NUMBER, channel_family_id_val IN NUMBER)
+ RETURN NUMBER
+ IS
+ CURSOR fve_convertible_entries IS
+ select 1 from
+ rhnServerFveCapable cap
+ where cap.server_id = server_id_in
+ AND cap.channel_family_id = channel_family_id_val;
+ BEGIN
+ FOR entry IN fve_convertible_entries LOOP
+ return 1;
+ END LOOP;
+ RETURN 0;
+ END can_convert_to_fve;
+
+
+
+ -- Converts server channel_family to use a flex entitlement
+ PROCEDURE convert_to_fve(server_id_in IN NUMBER, channel_family_id_val IN NUMBER)
+ IS
+ available_fve_subs NUMBER;
+ server_org_id_val NUMBER;
+ BEGIN
+
+ --
+ -- Use the org_id of the server only if the org_id of the channel = NULL.
+ -- This is required for subscribing to shared channels.
+ --
+ SELECT org_id
+ INTO server_org_id_val
+ FROM rhnServer
+ WHERE id = server_id_in;
+
+ begin
+ obtain_read_lock(channel_family_id_val, server_org_id_val);
+ exception
+ when no_data_found then
+ rhn_exception.raise_exception('channel_family_no_subscriptions');
+ end;
+ IF (can_convert_to_fve(server_id_in, channel_family_id_val ) = 0)
+ THEN
+ rhn_exception.raise_exception('server_cannot_convert_to_flex');
+ END IF;
+
+ available_fve_subs := rhn_channel.available_fve_family_subs(channel_family_id_val, server_org_id_val);
+
+ IF (available_fve_subs > 0)
+ THEN
+
+ insert into rhnServerHistory (id,server_id,summary,details) (
+ select rhn_event_id_seq.nextval,
+ server_id_in,
+ 'converted to flex entitlement' || SUBSTR(cf.label, 0, 99),
+ cf.label
+ from rhnChannelFamily cf
+ where cf.id = channel_family_id_val
+ );
+
+ UPDATE rhnServerChannel sc set sc.is_fve = 'Y'
+ where sc.server_id = server_id_in and
+ sc.channel_id in
+ (select cfm.channel_id from rhnChannelFamilyMembers cfm
+ where cfm.CHANNEL_FAMILY_ID = channel_family_id_val);
+
+ rhn_channel.update_family_counts(channel_family_id_val, server_org_id_val);
+ ELSE
+ rhn_exception.raise_exception('not_enough_flex_entitlements');
+ END IF;
+
+ END convert_to_fve;
+
+ function can_server_consume_virt_channl(
+ server_id_in in number,
+ family_id_in in number )
+ return number
+ is
+
+ cursor server_virt_families is
+ select vi.virtual_system_id, cfvsl.channel_family_id
+ from
+ rhnChannelFamilyVirtSubLevel cfvsl,
+ rhnSGTypeVirtSubLevel sgtvsl,
+ rhnVirtualInstance vi
+ where
+ vi.virtual_system_id = server_id_in
+ and sgtvsl.virt_sub_level_id = cfvsl.virt_sub_level_id
+ and cfvsl.channel_family_id = family_id_in
+ and exists (
+ select 1
+ from rhnServerEntitlementView sev
+ where vi.host_system_id = sev.server_id
+ and sev.server_group_type_id = sgtvsl.server_group_type_id );
+ begin
+
+ for server_virt_family in server_virt_families loop
+ return 1;
+ end loop;
+
+ return 0;
+
+ end;
+
+ FUNCTION can_server_consume_fve(server_id_in IN NUMBER)
+ RETURN NUMBER
+ IS
+ CURSOR vi_entries IS
+ SELECT 1
+ FROM rhnVirtualInstance vi
+ WHERE vi.virtual_system_id = server_id_in;
+ vi_count NUMBER;
+
+ BEGIN
+ FOR vi_entry IN VI_ENTRIES LOOP
+ return 1;
+ END LOOP;
+ RETURN 0;
+ END;
+
+ function guess_server_base(
+ server_id_in in number
+ ) RETURN number is
+ cursor server_cursor is
+ select s.server_arch_id, s.release, s.org_id
+ from rhnServer s
+ where s.id = server_id_in;
+ begin
+ for s in server_cursor loop
+ for channel in base_channel_cursor(s.release,
+ s.server_arch_id, s.org_id)
+ loop
+ return channel.id;
+ end loop base_channel_cursor;
+ end loop server_cursor;
+ -- Server not found, or no base channel applies to it
+ return null;
+ end;
+
+ -- Private function
+ function normalize_server_arch(server_arch_in in varchar2)
+ return varchar2
+ deterministic
+ is
+ suffix VARCHAR2(128) := '-redhat-linux';
+ suffix_len NUMBER := length(suffix);
+ begin
+ if server_arch_in is NULL then
+ return NULL;
+ end if;
+ if instr(server_arch_in, '-') > 0
+ then
+ -- Suffix already present
+ return server_arch_in;
+ end if;
+ return server_arch_in || suffix;
+ end normalize_server_arch;
+
+ --
+ --
+ -- Raises:
+ -- server_arch_not_found
+ -- no_subscribe_permissions
+ function base_channel_for_release_arch(
+ release_in in varchar2,
+ server_arch_in in varchar2,
+ org_id_in in number := -1,
+ user_id_in in number := null
+ ) return number is
+ server_arch varchar2(256) := normalize_server_arch(server_arch_in);
+ server_arch_id number;
+ begin
+ -- Look up the server arch
+ begin
+ select id
+ into server_arch_id
+ from rhnServerArch
+ where label = server_arch;
+ exception
+ when no_data_found then
+ rhn_exception.raise_exception('server_arch_not_found');
+ end;
+ return base_channel_rel_archid(release_in, server_arch_id,
+ org_id_in, user_id_in);
+ end base_channel_for_release_arch;
+
+ function base_channel_rel_archid(
+ release_in in varchar2,
+ server_arch_id_in in number,
+ org_id_in in number := -1,
+ user_id_in in number := null
+ ) return number is
+ denied_channel_id number := null;
+ valid_org_id number := org_id_in;
+ valid_user_id number := user_id_in;
+ channel_subscribable number;
+ begin
+ if org_id_in = -1 and user_id_in is not null then
+ -- Get the org id from the user id
+ begin
+ select org_id
+ into valid_org_id
+ from web_contact
+ where id = user_id_in;
+ exception
+ when no_data_found then
+ -- User doesn't exist
+ -- XXX Only list public stuff for now
+ valid_user_id := null;
+ valid_org_id := -1;
+ end;
+ end if;
+
+ for c in base_channel_cursor(release_in, server_arch_id_in, valid_org_id)
+ loop
+ -- This row is a possible match
+ if valid_user_id is null then
+ -- User ID not specified, so no user to channel permissions to
+ -- check
+ return c.id;
+ end if;
+
+ -- Check user to channel permissions
+ select loose_user_role_check(c.id, user_id_in, 'subscribe')
+ into channel_subscribable
+ from dual;
+
+ if channel_subscribable = 1 then
+ return c.id;
+ end if;
+
+ -- Base channel exists, but is not subscribable; keep trying
+ denied_channel_id := c.id;
+ end loop base_channel_fetch;
+
+ if denied_channel_id is not null then
+ rhn_exception.raise_exception('no_subscribe_permissions');
+ end if;
+ -- No base channel applies
+ return NULL;
+ end base_channel_rel_archid;
+
+ PROCEDURE clear_subscriptions(server_id_in IN NUMBER, deleting_server IN NUMBER := 0,
+ update_family_countsYN IN NUMBER := 1)
+ IS
+ cursor server_channels(server_id_in in number) is
+ select s.org_id, sc.channel_id, cfm.channel_family_id
+ from rhnServer s,
+ rhnServerChannel sc,
+ rhnChannelFamilyMembers cfm
+ where s.id = server_id_in
+ and s.id = sc.server_id
+ and sc.channel_id = cfm.channel_id
+ order by cfm.channel_family_id;
+ last_channel_family_id rhnChannelFamilyMembers.channel_family_id%type := -1;
+ last_channel_org_id rhnServer.org_id%type := -1;
+ BEGIN
+ for channel in server_channels(server_id_in)
+ loop
+ unsubscribe_server(server_id_in, channel.channel_id, 1, 1, deleting_server, 0);
+ if update_family_countsYN > 0
+ and channel.channel_family_id != last_channel_family_id then
+ -- update family counts only once
+ -- after all channels with same family has been fetched
+ if last_channel_family_id != -1 then
+ update_family_counts(last_channel_family_id, last_channel_org_id);
+ end if;
+ last_channel_family_id := channel.channel_family_id;
+ last_channel_org_id := channel.org_id;
+ end if;
+ end loop channel;
+ if update_family_countsYN > 0 and last_channel_family_id != -1 then
+ -- update the last family fetched
+ update_family_counts(last_channel_family_id, last_channel_org_id);
+ end if;
+ END clear_subscriptions;
+
+ PROCEDURE unsubscribe_server(server_id_in IN NUMBER, channel_id_in NUMBER, immediate_in NUMBER := 1, unsubscribe_children_in number := 0,
+ deleting_server IN NUMBER := 0,
+ update_family_countsYN IN NUMBER := 1)
+ IS
+ channel_family_id_val NUMBER;
+ server_org_id_val NUMBER;
+ available_subscriptions NUMBER;
+ server_already_in_chan BOOLEAN;
+ update_lock number;
+ cursor channel_family_is_proxy(channel_family_id_in in number) is
+ select 1
+ from rhnChannelFamily
+ where id = channel_family_id_in
+ and label = 'rhn-proxy';
+ cursor channel_family_is_satellite(channel_family_id_in in number) is
+ select 1
+ from rhnChannelFamily
+ where id = channel_family_id_in
+ and label = 'rhn-satellite';
+ -- this is *EXACTLY* like check_server_parent_membership, but if we recurse
+ -- with the package-level one, we get a "cursor already open", so we need a
+ -- copy on our call stack instead. GROAN.
+ cursor local_chk_server_parent_memb (
+ server_id_in number,
+ channel_id_in number ) is
+ select c.id
+ from rhnChannel c,
+ rhnServerChannel sc
+ where 1=1
+ and c.parent_channel = channel_id_in
+ and c.id = sc.channel_id
+ and sc.server_id = server_id_in;
+ BEGIN
+ select 1
+ into update_lock
+ from rhnServer
+ where id = server_id_in
+ for update;
+ FOR child IN local_chk_server_parent_memb(server_id_in, channel_id_in)
+ LOOP
+ if unsubscribe_children_in = 1 then
+ unsubscribe_server(server_id_in => server_id_in,
+ channel_id_in => child.id,
+ immediate_in => immediate_in,
+ unsubscribe_children_in => unsubscribe_children_in,
+ deleting_server => deleting_server,
+ update_family_countsYN => update_family_countsYN);
+ else
+ rhn_exception.raise_exception('channel_unsubscribe_child_exists');
+ end if;
+ END LOOP child;
+
+ server_already_in_chan := FALSE;
+
+ FOR check_subscription IN check_server_subscription(server_id_in, channel_id_in)
+ LOOP
+ server_already_in_chan := TRUE;
+ END LOOP check_subscription;
+
+ IF NOT server_already_in_chan
+ THEN
+ RETURN;
+ END IF;
+
+ if deleting_server = 0 then
+
+ insert into rhnServerHistory (id,server_id,summary,details) (
+ select rhn_event_id_seq.nextval,
+ server_id_in,
+ 'unsubscribed from channel ' || SUBSTR(c.label, 0, 106),
+ c.label
+ from rhnChannel c
+ where c.id = channel_id_in
+ );
+
+ UPDATE rhnServer SET channels_changed = current_timestamp WHERE id = server_id_in;
+ end if;
+
+ DELETE FROM rhnServerChannel WHERE server_id = server_id_in AND channel_id = channel_id_in;
+
+ if deleting_server = 0 then
+ queue_server(server_id_in, immediate_in);
+ end if;
+
+ channel_family_id_val := rhn_channel.family_for_channel(channel_id_in);
+ IF channel_family_id_val IS NULL
+ THEN
+ rhn_exception.raise_exception('channel_unsubscribe_no_family');
+ END IF;
+
+ for ignore in channel_family_is_satellite(channel_family_id_val) loop
+ delete from rhnSatelliteInfo where server_id = server_id_in;
+ end loop;
+
+ for ignore in channel_family_is_proxy(channel_family_id_val) loop
+ delete from rhnProxyInfo where server_id = server_id_in;
+ end loop;
+ SELECT org_id INTO server_org_id_val
+ FROM rhnServer
+ WHERE id = server_id_in;
+
+ if update_family_countsYN = 1 then
+ rhn_channel.update_family_counts(channel_family_id_val, server_org_id_val);
+ end if;
+ END unsubscribe_server;
+
+
+ FUNCTION family_for_channel(channel_id_in IN NUMBER)
+ RETURN NUMBER
+ IS
+ channel_family_id_val NUMBER;
+ BEGIN
+ SELECT channel_family_id INTO channel_family_id_val
+ FROM rhnChannelFamilyMembers
+ WHERE channel_id = channel_id_in;
+
+ RETURN channel_family_id_val;
+ EXCEPTION
+ WHEN NO_DATA_FOUND
+ THEN
+ RETURN NULL;
+ END family_for_channel;
+
+ FUNCTION available_family_subscriptions(channel_family_id_in IN NUMBER, org_id_in IN NUMBER)
+ RETURN NUMBER
+ IS
+ cfp channel_family_perm_cursor%ROWTYPE;
+ current_members_val NUMBER;
+ max_members_val NUMBER;
+ found NUMBER;
+ BEGIN
+ IF NOT channel_family_perm_cursor%ISOPEN
+ THEN
+ OPEN channel_family_perm_cursor(channel_family_id_in, org_id_in);
+ END IF;
+
+ FETCH channel_family_perm_cursor INTO cfp;
+
+ WHILE channel_family_perm_cursor%FOUND
+ LOOP
+ found := 1;
+
+ current_members_val := cfp.current_members;
+ max_members_val := cfp.max_members;
+
+ FETCH channel_family_perm_cursor INTO cfp;
+ END LOOP;
+
+ IF channel_family_perm_cursor%ISOPEN
+ THEN
+ CLOSE channel_family_perm_cursor;
+ END IF;
+
+ -- not found: either the channel fam doesn't have an entry in cfp, or the org doesn't have access to it.
+ -- either way, there are no available subscriptions
+
+ IF found IS NULL
+ THEN
+ RETURN 0;
+ END IF;
+
+ -- null max members? in that case, pass it on; NULL means infinite
+ IF max_members_val IS NULL
+ THEN
+ RETURN NULL;
+ END IF;
+
+ -- otherwise, return the delta
+ RETURN max_members_val - current_members_val;
+ END available_family_subscriptions;
+
+ FUNCTION available_fve_family_subs(channel_family_id_in IN NUMBER, org_id_in IN NUMBER)
+ RETURN NUMBER
+ IS
+ cfp channel_family_perm_cursor%ROWTYPE;
+ fve_current_members_val NUMBER;
+ fve_max_members_val NUMBER;
+ found NUMBER;
+
+ BEGIN
+ IF NOT channel_family_perm_cursor%ISOPEN THEN
+ OPEN channel_family_perm_cursor(channel_family_id_in, org_id_in);
+ END IF;
+
+ FETCH channel_family_perm_cursor INTO cfp;
+
+ WHILE channel_family_perm_cursor%FOUND LOOP
+ found := 1;
+ fve_current_members_val := cfp.fve_current_members;
+ fve_max_members_val := cfp.fve_max_members;
+ FETCH channel_family_perm_cursor INTO cfp;
+ END LOOP;
+
+ IF channel_family_perm_cursor%ISOPEN THEN
+ CLOSE channel_family_perm_cursor;
+ END IF;
+
+ IF found IS NULL THEN
+ RETURN 0;
+ END IF;
+
+ IF fve_max_members_val IS NULL THEN
+ RETURN NULL;
+ END IF;
+
+ RETURN fve_max_members_val - fve_current_members_val;
+
+ END available_fve_family_subs;
+
+
+ -- *******************************************************************
+ -- FUNCTION: channel_family_current_members
+ -- Calculates and returns the actual count of systems consuming
+ -- physical channel subscriptions.
+ -- Called by: update_family_counts
+ -- rhn_entitlements.repoll_virt_guest_entitlements
+ -- *******************************************************************
+ function channel_family_current_members(channel_family_id_in IN NUMBER,
+ org_id_in IN NUMBER)
+ return number
+ is
+ current_members_count number := 0;
+ begin
+ select count(distinct server_id)
+ into current_members_count
+ from rhnChannelFamilyServerPhysical cfsp
+ where cfsp.channel_family_id = channel_family_id_in
+ and cfsp.customer_id = org_id_in;
+ return current_members_count;
+ end;
+
+
+ function cfam_curr_fve_members(
+ channel_family_id_in IN NUMBER,
+ org_id_in IN NUMBER)
+ return number
+ is
+ current_members_count number := 0;
+
+ begin
+ select count(sc.server_id)
+ into current_members_count
+ from rhnServerChannel sc,
+ rhnChannelFamilyMembers cfm,
+ rhnServer s
+ where s.org_id = org_id_in
+ and s.id = sc.server_id
+ and cfm.channel_family_id = channel_family_id_in
+ and cfm.channel_id = sc.channel_id
+ and exists (
+ select 1
+ from rhnChannelFamilyServerFve cfsp
+ where cfsp.CHANNEL_FAMILY_ID = channel_family_id_in
+ and cfsp.server_id = s.id
+ );
+
+ return current_members_count;
+ end;
+ PROCEDURE update_family_counts(channel_family_id_in IN NUMBER,
+ org_id_in IN NUMBER)
+ IS
+ BEGIN
+ update rhnPrivateChannelFamily
+ set current_members = ( channel_family_current_members(channel_family_id_in, org_id_in)),
+ fve_current_members = ( cfam_curr_fve_members(channel_family_id_in, org_id_in))
+ where org_id = org_id_in
+ and channel_family_id = channel_family_id_in;
+ END update_family_counts;
+
+ PROCEDURE update_group_family_counts(group_label_in IN VARCHAR2,
+ org_id_in IN NUMBER)
+ IS
+ BEGIN
+ FOR i IN (
+ SELECT DISTINCT CFM.channel_family_id, SG.org_id
+ FROM rhnChannelFamilyMembers CFM
+ JOIN rhnServerChannel SC
+ ON SC.channel_id = CFM.channel_id
+ JOIN rhnServerGroupMembers SGM
+ ON SC.server_id = SGM.server_id
+ JOIN rhnServerGroup SG
+ ON SGM.server_group_id = SG.id
+ JOIN rhnServerGroupType SGT
+ ON SG.group_type = SGT.id
+ WHERE SGT.label = group_label_in
+ AND SG.org_id = org_id_in
+ AND SGT.is_base = 'Y'
+ ) LOOP
+ rhn_channel.update_family_counts(i.channel_family_id, i.org_id);
+ END LOOP;
+ END update_group_family_counts;
+
+ FUNCTION available_chan_subscriptions(channel_id_in IN NUMBER,
+ org_id_in IN NUMBER)
+ RETURN NUMBER
+ IS
+ channel_family_id_val NUMBER;
+ BEGIN
+ SELECT channel_family_id INTO channel_family_id_val
+ FROM rhnChannelFamilyMembers
+ WHERE channel_id = channel_id_in;
+
+ RETURN rhn_channel.available_family_subscriptions(
+ channel_family_id_val, org_id_in);
+ END available_chan_subscriptions;
+
+ FUNCTION available_fve_chan_subs(channel_id_in IN NUMBER,
+ org_id_in IN NUMBER)
+ RETURN NUMBER
+ IS
+ channel_family_id_val NUMBER;
+
+ BEGIN
+ SELECT channel_family_id INTO channel_family_id_val
+ FROM rhnChannelFamilyMembers
+ WHERE channel_id = channel_id_in;
+
+ RETURN rhn_channel.available_fve_family_subs( channel_family_id_val, org_id_in);
+ END available_fve_chan_subs;
+
+ procedure unsubscribe_server_from_family(server_id_in in number,
+ channel_family_id_in in number)
+ is
+ begin
+ delete
+ from rhnServerChannel rsc
+ where rsc.server_id = server_id_in
+ and channel_id in (
+ select rcfm.channel_id
+ from rhnChannelFamilyMembers rcfm
+ where rcfm.channel_family_id = channel_family_id_in);
+ end;
+
+ function get_org_id(channel_id_in in number)
+ return number
+ is
+ org_id_out number;
+ begin
+ select org_id into org_id_out
+ from rhnChannel
+ where id = channel_id_in;
+
+ return org_id_out;
+ end get_org_id;
+
+ function get_cfam_org_access(cfam_id_in in number, org_id_in in number)
+ return number
+ is
+ cursor families is
+ select 1
+ from rhnOrgChannelFamilyPermissions cfp
+ where cfp.org_id = org_id_in;
+ begin
+ -- the idea: if we get past this query,
+ -- the user has the role, else catch the exception and return 0
+ for family in families loop
+ return 1;
+ end loop;
+ return 0;
+ end;
+
+ function get_org_access(channel_id_in in number, org_id_in in number)
+ return number
+ is
+ throwaway number;
+ begin
+ -- the idea: if we get past this query,
+ -- the org has access to the channel, else catch the exception and return 0
+ select distinct 1 into throwaway
+ from rhnChannelFamilyMembers CFM,
+ rhnOrgChannelFamilyPermissions CFP
+ where cfp.org_id = org_id_in
+ and CFM.channel_family_id = CFP.channel_family_id
+ and CFM.channel_id = channel_id_in
+ and (CFP.max_members > 0 or CFP.max_members is null or CFP.fve_max_members > 0 or CFP.fve_max_members is null or CFP.org_id = 1);
+
+ return 1;
+ exception
+ when no_data_found
+ then
+ return 0;
+ end;
+
+ -- check if a user has a given role, or if such a role is inferrable
+ -- returns NULL if OK, error message otherwise
+ function user_role_check_debug(channel_id_in in number,
+ user_id_in in number,
+ role_in in varchar2)
+ return varchar2
+ is
+ org_id number;
+ begin
+ org_id := rhn_user.get_org_id(user_id_in);
+
+ -- channel might be shared
+ if role_in = 'subscribe' and
+ rhn_channel.shared_user_role_check(channel_id_in, user_id_in, role_in) = 1 then
+ return NULL;
+ end if;
+
+ if role_in = 'manage' and
+ NVL(rhn_channel.get_org_id(channel_id_in), -1) <> org_id then
+ return 'channel_not_owned';
+ end if;
+
+ if role_in = 'subscribe' and
+ rhn_channel.get_org_access(channel_id_in, org_id) = 0 then
+ return 'channel_not_available';
+ end if;
+
+ -- channel admins have all roles
+ if rhn_user.check_role_implied(user_id_in, 'channel_admin') = 1 then
+ return NULL;
+ end if;
+
+ -- the subscribe permission is inferred
+ -- UNLESS the not_globally_subscribable flag is set
+ if role_in = 'subscribe'
+ then
+ if rhn_channel.org_channel_setting(channel_id_in,
+ org_id,
+ 'not_globally_subscribable') = 0 then
+ return NULL;
+ end if;
+ end if;
+
+ -- all other roles (manage right now) are explicitly granted
+ if rhn_channel.direct_user_role_check(channel_id_in,
+ user_id_in, role_in) = 1 then
+ return NULL;
+ end if;
+ return 'direct_permission';
+ end;
+
+ -- same as above, but with 1/0 output; useful in views, etc
+ function user_role_check(channel_id_in in number, user_id_in in number, role_in in varchar2)
+ return number
+ is
+ begin
+ if rhn_channel.user_role_check_debug(channel_id_in,
+ user_id_in, role_in) is NULL then
+ return 1;
+ else
+ return 0;
+ end if;
+ end;
+
+ --
+ -- For multiorg phase II, this function simply checks to see if the user's
+ -- has a trust relationship that includes this channel by id.
+ --
+ function shared_user_role_check(channel_id in number, user_id in number, role in varchar2)
+ return number
+ is
+ n number;
+ oid number;
+ begin
+ oid := rhn_user.get_org_id(user_id);
+ select 1 into n
+ from rhnSharedChannelView s
+ where s.id = channel_id and s.org_trust_id = oid;
+ return 1;
+ exception
+ when no_data_found then
+ return 0;
+ end;
+
+ -- same as above, but returns 1 if user_id_in is null
+ -- This is useful in queries where user_id is not specified
+ function loose_user_role_check(channel_id_in in number, user_id_in in number, role_in in varchar2)
+ return number
+ is
+ begin
+ if user_id_in is null then
+ return 1;
+ end if;
+ return user_role_check(channel_id_in, user_id_in, role_in);
+ end loose_user_role_check;
+
+ -- directly checks the table, no inferred permissions
+ function direct_user_role_check(channel_id_in in number, user_id_in in number, role_in in varchar2)
+ return number
+ is
+ throwaway number;
+ begin
+ -- the idea: if we get past this query, the user has the role, else catch the exception and return 0
+ select 1 into throwaway
+ from rhnChannelPermissionRole CPR,
+ rhnChannelPermission CP
+ where CP.user_id = user_id_in
+ and CP.channel_id = channel_id_in
+ and CPR.label = role_in
+ and CP.role_id = CPR.id;
+
+ return 1;
+ exception
+ when no_data_found
+ then
+ return 0;
+ end;
+
+ -- check if an org has a certain setting
+ function org_channel_setting(channel_id_in in number, org_id_in in number, setting_in in varchar2)
+ return number
+ is
+ throwaway number;
+ begin
+ -- the idea: if we get past this query, the org has the setting, else catch the exception and return 0
+ select 1 into throwaway
+ from rhnOrgChannelSettingsType OCST,
+ rhnOrgChannelSettings OCS
+ where OCS.org_id = org_id_in
+ and OCS.channel_id = channel_id_in
+ and OCST.label = setting_in
+ and OCS.setting_id = OCST.id;
+
+ return 1;
+ exception
+ when no_data_found
+ then
+ return 0;
+ end;
+
+ FUNCTION channel_priority(channel_id_in IN number)
+ RETURN number
+ IS
+ channel_name varchar2(256);
+ priority number;
+ end_of_life_val timestamp with local time zone;
+ org_id_val number;
+ BEGIN
+
+ select name, end_of_life, org_id
+ into channel_name, end_of_life_val, org_id_val
+ from rhnChannel
+ where id = channel_id_in;
+
+ if end_of_life_val is not null then
+ return -400;
+ end if;
+
+ if channel_name like 'Red Hat Enterprise Linux%' or channel_name like 'RHEL%' then
+ priority := 1000;
+ if channel_name not like '%Beta%' then
+ priority := priority + 1000;
+ end if;
+
+ priority := priority +
+ case
+ when channel_name like '%v. 5%' then 600
+ when channel_name like '%v. 4%' then 500
+ when channel_name like '%v. 3%' then 400
+ when channel_name like '%v. 2%' then 300
+ when channel_name like '%v. 1%' then 200
+ else 0
+ end;
+
+ priority := priority +
+ case
+ when channel_name like 'Red Hat Enterprise Linux (v. 5%' then 60
+ when (channel_name like '%AS%' and channel_name not like '%Extras%') then 50
+ when (channel_name like '%ES%' and channel_name not like '%Extras%') then 40
+ when (channel_name like '%WS%' and channel_name not like '%Extras%') then 30
+ when (channel_name like '%Desktop%' and channel_name not like '%Extras%') then 20
+ when channel_name like '%Extras%' then 10
+ else 0
+ end;
+
+ priority := priority +
+ case
+ when channel_name like '%)' then 5
+ else 0
+ end;
+
+ priority := priority +
+ case
+ when channel_name like '%32-bit x86%' then 4
+ when channel_name like '%64-bit Intel Itanium%' then 3
+ when channel_name like '%64-bit AMD64/Intel EM64T%' then 2
+ else 0
+ end;
+ elsif channel_name like 'Red Hat Desktop%' then
+ priority := 900;
+
+ if channel_name not like '%Beta%' then
+ priority := priority + 50;
+ end if;
+
+ priority := priority +
+ case
+ when channel_name like '%v. 4%' then 40
+ when channel_name like '%v. 3%' then 30
+ when channel_name like '%v. 2%' then 20
+ when channel_name like '%v. 1%' then 10
+ else 0
+ end;
+
+ priority := priority +
+ case
+ when channel_name like '%32-bit x86%' then 4
+ when channel_name like '%64-bit Intel Itanium%' then 3
+ when channel_name like '%64-bit AMD64/Intel EM64T%' then 2
+ else 0
+ end;
+
+ elsif org_id_val is not null then
+ priority := 600;
+ else
+ priority := 500;
+ end if;
+
+ return -priority;
+
+ end channel_priority;
+
+ -- right now this only does the accounting changes; the cascade
+ -- actually does the rhnServerChannel delete.
+ procedure delete_server_channels(server_id_in in number)
+ is
+ begin
+ update rhnPrivateChannelFamily
+ set current_members = current_members -1
+ where org_id in (
+ select org_id
+ from rhnServer
+ where id = server_id_in
+ )
+ and channel_family_id in (
+ select rcfm.channel_family_id
+ from rhnChannelFamilyMembers rcfm,
+ rhnServerChannel rsc
+ where rsc.server_id = server_id_in
+ and rsc.channel_id = rcfm.channel_id
+ and not exists (
+ select 1
+ from
+ rhnChannelFamilyVirtSubLevel cfvsl,
+ rhnSGTypeVirtSubLevel sgtvsl,
+ rhnServerEntitlementView sev,
+ rhnVirtualInstance vi
+ where
+ -- system is a virtual instance
+ vi.virtual_system_id = server_id_in
+ and vi.host_system_id = sev.server_id
+ -- system's host has a virt ent
+ and sev.label in ('virtualization_host',
+ 'virtualization_host_platform')
+ and sev.server_group_type_id =
+ sgtvsl.server_group_type_id
+ -- the host's virt ent grants a cf virt sub level
+ and sgtvsl.virt_sub_level_id = cfvsl.virt_sub_level_id
+ -- the cf is in that virt sub level
+ and cfvsl.channel_family_id = rcfm.channel_family_id
+ )
+ );
+ end;
+
+ -- this could certainly be optimized to do updates if needs be
+ procedure refresh_newest_package(channel_id_in in number,
+ caller_in in varchar2 := '(unknown)',
+ package_name_id_in in number := null)
+ is
+ -- procedure refreshes rows for name_id = package_name_id_in or
+ -- all rows if package_name_id_in is null
+ begin
+ delete from rhnChannelNewestPackage
+ where channel_id = channel_id_in
+ and (package_name_id_in is null
+ or name_id = package_name_id_in);
+ insert into rhnChannelNewestPackage
+ (channel_id, name_id, evr_id, package_id, package_arch_id)
+ (select channel_id,
+ name_id, evr_id,
+ package_id, package_arch_id
+ from rhnChannelNewestPackageView
+ where channel_id = channel_id_in
+ and (package_name_id_in is null
+ or name_id = package_name_id_in)
+ );
+ insert into rhnChannelNewestPackageAudit (channel_id, caller)
+ values (channel_id_in, caller_in);
+ update rhnChannel
+ set last_modified = greatest(current_timestamp, last_modified + interval '1' second)
+ where id = channel_id_in;
+ end;
+
+ procedure update_channel ( channel_id_in in number, invalidate_ss in number := 0,
+ date_to_use in timestamp with local time zone := current_timestamp )
+ is
+
+ channel_last_modified timestamp with local time zone;
+ last_modified_value timestamp with local time zone;
+
+ cursor snapshots is
+ select snapshot_id id
+ from rhnSnapshotChannel
+ where channel_id = channel_id_in;
+
+ begin
+
+ select last_modified
+ into channel_last_modified
+ from rhnChannel
+ where id = channel_id_in;
+
+ last_modified_value := date_to_use;
+
+ if last_modified_value <= channel_last_modified then
+ last_modified_value := last_modified_value + 1/86400;
+ end if;
+
+ update rhnChannel set last_modified = last_modified_value
+ where id = channel_id_in;
+
+ if invalidate_ss = 1 then
+ for snapshot in snapshots loop
+ update rhnSnapshot
+ set invalid = lookup_snapshot_invalid_reason('channel_modified')
+ where id = snapshot.id;
+ end loop;
+ end if;
+
+ end update_channel;
+
+ procedure update_channels_by_package ( package_id_in in number, date_to_use in timestamp with local time zone := current_timestamp )
+ is
+
+ cursor channels is
+ select channel_id
+ from rhnChannelPackage
+ where package_id = package_id_in
+ order by channel_id;
+
+ begin
+ for channel in channels loop
+ -- we want to invalidate the snapshot assocated with the channel when we
+ -- do this b/c we know we've added or removed or packages
+ rhn_channel.update_channel ( channel.channel_id, 1, date_to_use );
+ end loop;
+ end update_channels_by_package;
+
+
+ procedure update_channels_by_errata ( errata_id_in number, date_to_use in timestamp with local time zone := current_timestamp )
+ is
+
+ cursor channels is
+ select channel_id
+ from rhnChannelErrata
+ where errata_id = errata_id_in
+ order by channel_id;
+
+ begin
+ for channel in channels loop
+ -- we won't invalidate snapshots, b/c just changing the errata associated with
+ -- a channel shouldn't invalidate snapshots
+ rhn_channel.update_channel ( channel.channel_id, 0, date_to_use );
+ end loop;
+ end update_channels_by_errata;
+
+ procedure update_needed_cache(channel_id_in in number)
+ is
+ -- update of needed cache ican be commited on a per server basis
+ -- b/c failure of update for a server means nothing for the other servers
+ begin
+ -- we intentionaly do a loop here instead of one huge select
+ -- b/c we want to break update into smaller transaction to unblock other sessions
+ -- querying rhnServerNeededCache
+ for server in (
+ select sc.server_id as id
+ from rhnServerChannel sc
+ where sc.channel_id = channel_id_in
+ order by id asc
+ ) loop
+ rhn_server.update_needed_cache(server.id);
+ commit;
+ end loop;
+ end update_needed_cache;
+
+ procedure set_comps(channel_id_in in number, path_in in varchar2, timestamp_in in varchar2)
+ is
+ begin
+ for row in (
+ select relative_filename, last_modified
+ from rhnChannelComps
+ where channel_id = channel_id_in
+ ) loop
+ if row.relative_filename = path_in
+ and row.last_modified = to_date(timestamp_in, 'YYYYMMDDHH24MISS') then
+ return;
+ end if;
+ end loop;
+ delete from rhnChannelComps
+ where channel_id = channel_id_in;
+ insert into rhnChannelComps (id, channel_id, relative_filename, last_modified, created, modified)
+ values (sequence_nextval('rhn_channelcomps_id_seq'), channel_id_in, path_in, to_date(timestamp_in, 'YYYYMMDDHH24MISS'), current_timestamp, current_timestamp);
+ end set_comps;
+
+END rhn_channel;
+/
+SHOW ERRORS
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.postgresql
new file mode 100644
index 0000000..4ab5d2e
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.postgresql
@@ -0,0 +1,1275 @@
+-- oracle equivalent source sha1 cc1b86fd8db5758d5f3a7ccc146f38954454def1
+--
+-- Copyright (c) 2008--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.
+--
+--
+--
+--
+
+-- create schema rhn_channel;
+
+--update pg_setting
+update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_path';
+
+ create or replace function obtain_read_lock(channel_family_id_in in numeric, org_id_in in numeric)
+ returns void as $$
+ declare
+ read_lock timestamptz;
+ begin
+ select created into read_lock
+ from rhnPrivateChannelFamily
+ where channel_family_id = channel_family_id_in and org_id = org_id_in
+ for update;
+ end$$ language plpgsql;
+
+ -- this "emulates" cursor server_base_subscriptions defined in oracle/rhn_channel.pks
+ create or replace function server_base_subscriptions(server_id_in NUMERIC)
+ returns boolean as $$
+ begin
+ return exists(SELECT C.id FROM rhnChannel C, rhnServerChannel SC
+ WHERE C.id = SC.channel_id
+ AND SC.server_id = server_id_in
+ AND C.parent_channel IS NULL);
+ end$$ language plpgsql;
+
+ -- this "emulates" cursor server_base_subscriptions defined in oracle/rhn_channel.pks
+ create or replace function check_server_subscription(server_id_in NUMERIC, channel_id_in NUMERIC)
+ returns boolean as $$
+ begin
+ return exists(SELECT channel_id FROM rhnServerChannel WHERE server_id = server_id_in AND channel_id = channel_id_in);
+ end$$ language plpgsql;
+
+
+ CREATE OR REPLACE FUNCTION subscribe_server(server_id_in IN NUMERIC, channel_id_in NUMERIC, immediate_in NUMERIC default 1, user_id_in in numeric default null, recalcfamily_in NUMERIC default 1) returns void
+ AS $$
+ declare
+ channel_parent_val rhnChannel.parent_channel%TYPE;
+ parent_subscribed BOOLEAN;
+ server_has_base_chan BOOLEAN;
+ server_already_in_chan BOOLEAN;
+ channel_family_id_val NUMERIC;
+ server_org_id_val NUMERIC;
+ available_subscriptions NUMERIC;
+ available_fve_subs numeric;
+ consenting_user NUMERIC;
+ allowed numeric;
+ is_fve_char char(1) := 'N';
+ update_lock numeric;
+ BEGIN
+ select 1
+ into update_lock
+ from rhnServer
+ where id = server_id_in
+ for update;
+ if user_id_in is not null then
+ allowed := rhn_channel.user_role_check(channel_id_in, user_id_in, 'subscribe');
+ else
+ allowed := 1;
+ end if;
+
+ if allowed = 0 then
+ perform rhn_exception.raise_exception('no_subscribe_permissions');
+ end if;
+
+
+ SELECT parent_channel INTO channel_parent_val FROM rhnChannel WHERE id = channel_id_in;
+
+ IF channel_parent_val IS NOT NULL
+ THEN
+ -- child channel; if attempting to cross-subscribe a child to the wrong base, silently ignore
+ parent_subscribed := rhn_channel.check_server_subscription(server_id_in, channel_parent_val);
+
+ IF NOT parent_subscribed
+ THEN
+ RETURN;
+ END IF;
+ ELSE
+ -- base channel
+ server_has_base_chan := rhn_channel.server_base_subscriptions(server_id_in);
+
+ IF server_has_base_chan
+ THEN
+ perform rhn_exception.raise_exception('channel_server_one_base');
+ END IF;
+ END IF;
+
+ server_already_in_chan := rhn_channel.check_server_subscription(server_id_in, channel_id_in);
+
+ IF server_already_in_chan
+ THEN
+ RETURN;
+ END IF;
+
+ channel_family_id_val := rhn_channel.family_for_channel(channel_id_in);
+ IF channel_family_id_val IS NULL
+ THEN
+ perform rhn_exception.raise_exception('channel_subscribe_no_family');
+ END IF;
+
+ --
+ -- Use the org_id of the server only if the org_id of the channel = NULL.
+ -- This is required for subscribing to shared channels.
+ --
+ SELECT COALESCE(org_id, (SELECT org_id FROM rhnServer WHERE id = server_id_in))
+ INTO server_org_id_val
+ FROM rhnChannel
+ WHERE id = channel_id_in;
+
+ begin
+ perform rhn_channel.obtain_read_lock(channel_family_id_val, server_org_id_val);
+ exception
+ when no_data_found then
+ perform rhn_exception.raise_exception('channel_family_no_subscriptions');
+ end;
+
+ available_subscriptions := rhn_channel.available_family_subscriptions(channel_family_id_val, server_org_id_val);
+ available_fve_subs := rhn_channel.available_fve_family_subs(channel_family_id_val, server_org_id_val);
+
+ IF available_subscriptions IS NULL OR
+ available_subscriptions > 0 or
+ rhn_channel.can_server_consume_virt_channl(server_id_in, channel_family_id_val) = 1 OR
+ (available_fve_subs > 0 AND rhn_channel.can_server_consume_fve(server_id_in) = 1)
+ THEN
+ if rhn_channel.can_server_consume_virt_channl(server_id_in, channel_family_id_val) = 0 AND available_fve_subs > 0 AND rhn_channel.can_server_consume_fve(server_id_in) = 1 THEN
+ is_fve_char := 'Y';
+ end if;
+
+ insert into rhnServerHistory (id,server_id,summary,details) (
+ select nextval('rhn_event_id_seq'),
+ server_id_in,
+ 'subscribed to channel ' || SUBSTR(c.label, 0, 106),
+ c.label
+ from rhnChannel c
+ where c.id = channel_id_in
+ );
+ UPDATE rhnServer SET channels_changed = current_timestamp WHERE id = server_id_in;
+ INSERT INTO rhnServerChannel (server_id, channel_id, is_fve) VALUES (server_id_in, channel_id_in, is_fve_char);
+ IF recalcfamily_in > 0
+ THEN
+ perform rhn_channel.update_family_counts(channel_family_id_val, server_org_id_val);
+ END IF;
+ perform queue_server(server_id_in, immediate_in);
+ ELSE
+ perform rhn_exception.raise_exception('channel_family_no_subscriptions');
+ END IF;
+
+ END$$ language plpgsql;
+
+
+
+ create or replace function can_convert_to_fve(server_id_in IN NUMERIC, channel_family_id_val IN NUMERIC)
+ RETURNS NUMERIC
+ as $$
+ declare
+ fve_convertible_entries cursor for
+ select 1 from
+ rhnServerFveCapable cap
+ where cap.server_id = server_id_in
+ AND cap.channel_family_id = channel_family_id_val;
+ BEGIN
+ FOR entry IN fve_convertible_entries LOOP
+ return 1;
+ END LOOP;
+ RETURN 0;
+ END$$ language plpgsql;
+
+
+
+ -- Converts server channel_family to use a flex entitlement
+ create or replace function convert_to_fve(server_id_in IN NUMERIC, channel_family_id_val IN NUMERIC)
+ returns void
+ as $$
+ declare
+ available_fve_subs NUMERIC;
+ server_org_id_val NUMERIC;
+ BEGIN
+
+ --
+ -- Use the org_id of the server only if the org_id of the channel = NULL.
+ -- This is required for subscribing to shared channels.
+ --
+ SELECT org_id
+ INTO server_org_id_val
+ FROM rhnServer
+ WHERE id = server_id_in;
+
+
+ perform rhn_channel.obtain_read_lock(channel_family_id_val, server_org_id_val);
+ if not found then
+ perform rhn_exception.raise_exception('channel_family_no_subscriptions');
+ end if;
+ IF (rhn_channel.can_convert_to_fve(server_id_in, channel_family_id_val ) = 0)
+ THEN
+ perform rhn_exception.raise_exception('server_cannot_convert_to_flex');
+ END IF;
+
+ available_fve_subs := rhn_channel.available_fve_family_subs(channel_family_id_val, server_org_id_val);
+
+ IF (available_fve_subs > 0)
+ THEN
+
+ insert into rhnServerHistory (id,server_id,summary,details) (
+ select nextval('rhn_event_id_seq'),
+ server_id_in,
+ 'converted to flex entitlement' || SUBSTR(cf.label, 0, 99),
+ cf.label
+ from rhnChannelFamily cf
+ where cf.id = channel_family_id_val
+ );
+
+ UPDATE rhnServerChannel sc set is_fve = 'Y'
+ where sc.server_id = server_id_in and
+ sc.channel_id in
+ (select cfm.channel_id from rhnChannelFamilyMembers cfm
+ where cfm.CHANNEL_FAMILY_ID = channel_family_id_val);
+
+ perform rhn_channel.update_family_counts(channel_family_id_val, server_org_id_val);
+ ELSE
+ perform rhn_exception.raise_exception('not_enough_flex_entitlements');
+ END IF;
+
+ END$$ language plpgsql;
+
+ create or replace function can_server_consume_virt_channl(
+ server_id_in in numeric,
+ family_id_in in numeric )
+ returns numeric
+ as $$
+ begin
+ if exists(
+ select 1
+ from
+ rhnChannelFamilyVirtSubLevel cfvsl,
+ rhnSGTypeVirtSubLevel sgtvsl,
+ rhnVirtualInstance vi
+ where
+ vi.virtual_system_id = server_id_in
+ and sgtvsl.virt_sub_level_id = cfvsl.virt_sub_level_id
+ and cfvsl.channel_family_id = family_id_in
+ and exists (
+ select 1
+ from rhnServerEntitlementView sev
+ where vi.host_system_id = sev.server_id
+ and sev.server_group_type_id = sgtvsl.server_group_type_id ))
+ then
+ return 1;
+ else
+ return 0;
+ end if;
+ end$$ language plpgsql;
+
+ create or replace function can_server_consume_fve(server_id_in in numeric) returns numeric
+ as $$
+ declare
+ vi_entries cursor for
+ SELECT 1
+ FROM rhnVirtualInstance vi
+ WHERE vi.virtual_system_id = server_id_in;
+ vi_count numeric;
+
+ begin
+ FOR vi_entry IN VI_ENTRIES LOOP
+ return 1;
+ END LOOP;
+ RETURN 0;
+ end$$ language plpgsql;
+
+ create or replace function guess_server_base(
+ server_id_in in numeric
+ ) RETURNS numeric as $$
+ declare
+ server_cursor cursor for
+ select s.server_arch_id, s.release, s.org_id
+ from rhnServer s
+ where s.id = server_id_in;
+ -- Cursor that fetches all the possible base channels for a
+ -- (server_arch_id, release, org_id) combination
+ base_channel_cursor cursor(
+ release_in varchar,
+ server_arch_id_in numeric,
+ org_id_in numeric
+ ) for
+ select distinct c.*
+ from rhnOrgDistChannelMap odcm,
+ rhnServerChannelArchCompat scac,
+ rhnChannel c
+ where c.parent_channel is null
+ and c.id = odcm.channel_id
+ and c.channel_arch_id = odcm.channel_arch_id
+ and odcm.release = release_in
+ and odcm.for_org_id = org_id_in
+ and scac.server_arch_id = server_arch_id_in
+ and scac.channel_arch_id = c.channel_arch_id;
+
+ begin
+ for s in server_cursor loop
+ for channel in base_channel_cursor(s.release,
+ s.server_arch_id, s.org_id)
+ loop
+ return channel.id;
+ end loop;
+ end loop;
+ -- Server not found, or no base channel applies to it
+ return null;
+ end$$ language plpgsql;
+
+ -- Private function
+ create or replace function normalize_server_arch(server_arch_in in varchar)
+ returns varchar
+ as $$
+ declare
+ suffix VARCHAR(128) := '-redhat-linux';
+ begin
+ if server_arch_in is NULL then
+ return NULL;
+ end if;
+ if position('-' IN server_arch_in) > 0
+ then
+ -- Suffix already present
+ return server_arch_in;
+ end if;
+ return server_arch_in || suffix;
+ end$$ language plpgsql;
+
+ --
+ -- Raises:
+ -- server_arch_not_found
+ -- no_subscribe_permissions
+ create or replace function base_channel_for_release_arch(
+ release_in in varchar,
+ server_arch_in in varchar,
+ org_id_in in numeric default -1,
+ user_id_in in numeric default null
+ ) returns numeric as $$
+ declare
+ server_arch varchar(256) := rhn_channel.normalize_server_arch(server_arch_in);
+ server_arch_id numeric;
+ begin
+ -- Look up the server arch
+ select id
+ into server_arch_id
+ from rhnServerArch
+ where label = server_arch;
+ if not found then
+ perform rhn_exception.raise_exception('server_arch_not_found');
+ end if;
+
+ return rhn_channel.base_channel_rel_archid(release_in, server_arch_id,
+ org_id_in, user_id_in);
+ end$$ language plpgsql;
+
+ create or replace function base_channel_rel_archid(
+ release_in in varchar,
+ server_arch_id_in in numeric,
+ org_id_in in numeric default -1,
+ user_id_in in numeric default null
+ ) returns numeric as $$
+ declare
+ denied_channel_id numeric := null;
+ valid_org_id numeric := org_id_in;
+ valid_user_id numeric := user_id_in;
+ channel_subscribable numeric;
+ -- Cursor that fetches all the possible base channels for a
+ -- (server_arch_id, release, org_id) combination
+ base_channel_cursor cursor(
+ release_in varchar,
+ server_arch_id_in numeric,
+ org_id_in numeric
+ ) for
+ select distinct c.*
+ from rhnOrgDistChannelMap odcm,
+ rhnServerChannelArchCompat scac,
+ rhnChannel c
+ where c.parent_channel is null
+ and c.id = odcm.channel_id
+ and c.channel_arch_id = odcm.channel_arch_id
+ and odcm.release = release_in
+ and odcm.for_org_id = org_id_in
+ and scac.server_arch_id = server_arch_id_in
+ and scac.channel_arch_id = c.channel_arch_id;
+
+ begin
+ if org_id_in = -1 and user_id_in is not null then
+ -- Get the org id from the user id
+
+ select org_id
+ into valid_org_id
+ from web_contact
+ where id = user_id_in;
+
+ if not found then
+ -- User doesn't exist
+ -- XXX Only list public stuff for now
+ valid_user_id := null;
+ valid_org_id := -1;
+ end if;
+ end if;
+
+ for c in base_channel_cursor(release_in, server_arch_id_in, valid_org_id)
+ loop
+ -- This row is a possible match
+ if valid_user_id is null then
+ -- User ID not specified, so no user to channel permissions to
+ -- check
+ return c.id;
+ end if;
+
+ -- Check user to channel permissions
+ select rhn_channel.loose_user_role_check(c.id, user_id_in, 'subscribe')
+ into channel_subscribable;
+
+ if channel_subscribable = 1 then
+ return c.id;
+ end if;
+
+ -- Base channel exists, but is not subscribable; keep trying
+ denied_channel_id := c.id;
+ end loop;
+
+ if denied_channel_id is not null then
+ perform rhn_exception.raise_exception('no_subscribe_permissions');
+ end if;
+ -- No base channel applies
+ return NULL;
+ end$$ language plpgsql;
+
+ CREATE OR REPLACE FUNCTION clear_subscriptions(server_id_in IN NUMERIC, deleting_server IN NUMERIC default 0,
+ update_family_countsYN IN NUMERIC default 1 ) returns void
+ AS $$
+ declare
+ server_channels cursor(server_id_in numeric) for
+ select s.org_id, sc.channel_id, cfm.channel_family_id
+ from rhnServer s,
+ rhnServerChannel sc,
+ rhnChannelFamilyMembers cfm
+ where s.id = server_id_in
+ and s.id = sc.server_id
+ and sc.channel_id = cfm.channel_id
+ order by cfm.channel_family_id;
+ last_channel_family_id rhnChannelFamilyMembers.channel_family_id%type := -1;
+ last_channel_org_id rhnServer.org_id%type := -1;
+ BEGIN
+ for channel in server_channels(server_id_in)
+ loop
+ perform rhn_channel.unsubscribe_server(server_id_in, channel.channel_id, 1, 1, deleting_server, 0);
+ if update_family_countsYN > 0
+ and channel.channel_family_id != last_channel_family_id then
+ -- update family counts only once
+ -- after all channels with same family has been fetched
+ if last_channel_family_id != -1 then
+ perform rhn_channel.update_family_counts(channel.channel_family_id, channel.org_id);
+ end if;
+ last_channel_family_id := channel.channel_family_id;
+ last_channel_org_id := channel.org_id;
+ end if;
+ end loop;
+ if update_family_countsYN > 0 and last_channel_family_id != -1 then
+ -- update the last family fetched
+ perform rhn_channel.update_family_counts(last_channel_family_id, last_channel_org_id);
+ end if;
+ END$$ language plpgsql;
+
+ CREATE OR REPLACE FUNCTION unsubscribe_server(server_id_in IN NUMERIC, channel_id_in NUMERIC, immediate_in NUMERIC default 1, unsubscribe_children_in numeric default 0,
+ deleting_server in numeric default 0,
+ update_family_countsYN in numeric default 1) returns void
+ AS $$
+ declare
+ channel_family_id_val NUMERIC;
+ server_org_id_val NUMERIC;
+ available_subscriptions NUMERIC;
+ server_already_in_chan BOOLEAN;
+ update_lock numeric;
+ channel_family_is_proxy cursor(channel_family_id_in numeric) for
+ select 1
+ from rhnChannelFamily
+ where id = channel_family_id_in
+ and label = 'rhn-proxy';
+ channel_family_is_satellite cursor(channel_family_id_in numeric) for
+ select 1
+ from rhnChannelFamily
+ where id = channel_family_id_in
+ and label = 'rhn-satellite';
+ child record;
+ BEGIN
+ select 1
+ into update_lock
+ from rhnServer
+ where id = server_id_in
+ for update;
+ -- In PostgreSQL recursion with opened cursors is not allowed so we use
+ -- FOR IN SELECT form which is ok.
+ FOR child IN select c.id
+ from rhnChannel c,
+ rhnServerChannel sc
+ where 1=1
+ and c.parent_channel = channel_id_in
+ and c.id = sc.channel_id
+ and sc.server_id = server_id_in
+ LOOP
+ if unsubscribe_children_in = 1 then
+ perform rhn_channel.unsubscribe_server(server_id_in,
+ child.id,
+ immediate_in,
+ unsubscribe_children_in,
+ deleting_server,
+ update_family_countsYN);
+ else
+ perform rhn_exception.raise_exception('channel_unsubscribe_child_exists');
+ end if;
+ END LOOP;
+
+ server_already_in_chan := rhn_channel.check_server_subscription(server_id_in, channel_id_in);
+
+ IF NOT server_already_in_chan
+ THEN
+ RETURN;
+ END IF;
+
+ if deleting_server = 0 then
+
+ insert into rhnServerHistory (id,server_id,summary,details) (
+ select nextval('rhn_event_id_seq'),
+ server_id_in,
+ 'unsubscribed from channel ' || SUBSTR(c.label, 0, 106),
+ c.label
+ from rhnChannel c
+ where c.id = channel_id_in
+ );
+
+ UPDATE rhnServer SET channels_changed = current_timestamp WHERE id = server_id_in;
+ end if;
+
+ DELETE FROM rhnServerChannel WHERE server_id = server_id_in AND channel_id = channel_id_in;
+
+ if deleting_server = 0 then
+ perform queue_server(server_id_in, immediate_in);
+ end if;
+
+ channel_family_id_val := rhn_channel.family_for_channel(channel_id_in);
+ IF channel_family_id_val IS NULL
+ THEN
+ perform rhn_exception.raise_exception('channel_unsubscribe_no_family');
+ END IF;
+
+ for ignore in channel_family_is_satellite(channel_family_id_val) loop
+ delete from rhnSatelliteInfo where server_id = server_id_in;
+ end loop;
+
+ for ignore in channel_family_is_proxy(channel_family_id_val) loop
+ delete from rhnProxyInfo where server_id = server_id_in;
+ end loop;
+ SELECT org_id INTO server_org_id_val
+ FROM rhnServer
+ WHERE id = server_id_in;
+
+ if update_family_countsYN = 1 then
+ perform rhn_channel.update_family_counts(channel_family_id_val, server_org_id_val);
+ end if;
+ END$$ language plpgsql;
+
+ CREATE OR REPLACE FUNCTION family_for_channel(channel_id_in IN NUMERIC)
+ RETURNS NUMERIC
+ AS $$
+ declare
+ channel_family_id_val NUMERIC;
+ BEGIN
+ SELECT channel_family_id INTO channel_family_id_val
+ FROM rhnChannelFamilyMembers
+ WHERE channel_id = channel_id_in;
+
+ IF NOT FOUND THEN
+ RETURN NULL;
+ END IF;
+
+ RETURN channel_family_id_val;
+ END$$ language plpgsql;
+
+ CREATE OR REPLACE FUNCTION available_family_subscriptions(channel_family_id_in IN NUMERIC, org_id_in IN NUMERIC)
+ RETURNS NUMERIC
+ AS $$
+ declare
+ cfp record;
+ current_members_val NUMERIC;
+ max_members_val NUMERIC;
+ found NUMERIC;
+ BEGIN
+ for cfp in SELECT * FROM rhnOrgChannelFamilyPermissions
+ WHERE channel_family_id = channel_family_id_in
+ AND org_id = org_id_in
+ LOOP
+ found := 1;
+ current_members_val := cfp.current_members;
+ max_members_val := cfp.max_members;
+ END LOOP;
+
+ -- not found: either the channel fam doesn't have an entry in cfp, or the org doesn't have access to it.
+ -- either way, there are no available subscriptions
+
+ IF found IS NULL
+ THEN
+ RETURN 0;
+ END IF;
+
+ -- null max members? in that case, pass it on; NULL means infinite
+ IF max_members_val IS NULL
+ THEN
+ RETURN NULL;
+ END IF;
+
+ -- otherwise, return the delta
+ RETURN max_members_val - current_members_val;
+ END$$ language plpgsql;
+
+ CREATE OR REPLACE FUNCTION available_fve_family_subs(channel_family_id_in IN NUMERIC, org_id_in IN NUMERIC)
+ RETURNS NUMERIC
+ AS $$
+ declare
+ cfp record;
+ fve_current_members_val NUMERIC;
+ fve_max_members_val NUMERIC;
+ found NUMERIC;
+ BEGIN
+ for cfp in SELECT * FROM rhnOrgChannelFamilyPermissions
+ WHERE channel_family_id = channel_family_id_in
+ AND org_id = org_id_in
+ LOOP
+ found := 1;
+ fve_current_members_val := cfp.fve_current_members;
+ fve_max_members_val := cfp.fve_max_members;
+ END LOOP;
+
+ -- not found: either the channel fam doesn't have an entry in cfp, or the org doesn't have access to it.
+ -- either way, there are no available subscriptions
+
+ IF found IS NULL
+ THEN
+ RETURN 0;
+ END IF;
+
+ -- null max members? in that case, pass it on; NULL means infinite
+ IF fve_max_members_val IS NULL
+ THEN
+ RETURN NULL;
+ END IF;
+
+ -- otherwise, return the delta
+ RETURN fve_max_members_val - fve_current_members_val;
+ END$$ language plpgsql;
+
+ -- *******************************************************************
+ -- FUNCTION: channel_family_current_members
+ -- Calculates and returns the actual count of systems consuming
+ -- physical channel subscriptions.
+ -- Called by: update_family_counts
+ -- rhn_entitlements.repoll_virt_guest_entitlements
+ -- *******************************************************************
+ create or replace function channel_family_current_members(channel_family_id_in IN NUMERIC,
+ org_id_in IN NUMERIC)
+ returns numeric
+ as $$
+ declare
+ current_members_count numeric := 0;
+ begin
+ select count(distinct server_id)
+ into current_members_count
+ from rhnChannelFamilyServerPhysical cfsp
+ where cfsp.channel_family_id = channel_family_id_in
+ and cfsp.customer_id = org_id_in;
+ return current_members_count;
+ end$$ language plpgsql;
+
+
+ create or replace function cfam_curr_fve_members(
+ channel_family_id_in IN NUMERIC,
+ org_id_in IN NUMERIC)
+ returns numeric
+ as $$
+ declare
+ current_members_count numeric := 0;
+
+ begin
+ select count(sc.server_id)
+ into current_members_count
+ from rhnServerChannel sc,
+ rhnChannelFamilyMembers cfm,
+ rhnServer s
+ where s.org_id = org_id_in
+ and s.id = sc.server_id
+ and cfm.channel_family_id = channel_family_id_in
+ and cfm.channel_id = sc.channel_id
+ and exists (
+ select 1
+ from rhnChannelFamilyServerFve cfsp
+ where cfsp.CHANNEL_FAMILY_ID = channel_family_id_in
+ and cfsp.server_id = s.id
+ );
+
+ return current_members_count;
+ end$$ language plpgsql;
+ CREATE OR REPLACE FUNCTION update_family_counts(channel_family_id_in IN NUMERIC,
+ org_id_in IN NUMERIC) returns void
+ AS $$
+ BEGIN
+ update rhnPrivateChannelFamily
+ set current_members = rhn_channel.channel_family_current_members(channel_family_id_in, org_id_in),
+ fve_current_members = rhn_channel.cfam_curr_fve_members(channel_family_id_in,org_id_in)
+ where org_id = org_id_in
+ and channel_family_id = channel_family_id_in;
+ END$$ language plpgsql;
+
+ create or replace function update_group_family_counts(group_label_in IN VARCHAR,
+ org_id_in IN NUMERIC)
+ returns void
+ as $$
+ declare
+ i record;
+ BEGIN
+ FOR i IN (
+ SELECT DISTINCT CFM.channel_family_id, SG.org_id
+ FROM rhnChannelFamilyMembers CFM
+ JOIN rhnServerChannel SC
+ ON SC.channel_id = CFM.channel_id
+ JOIN rhnServerGroupMembers SGM
+ ON SC.server_id = SGM.server_id
+ JOIN rhnServerGroup SG
+ ON SGM.server_group_id = SG.id
+ JOIN rhnServerGroupType SGT
+ ON SG.group_type = SGT.id
+ WHERE SGT.label = group_label_in
+ AND SG.org_id = org_id_in
+ AND SGT.is_base = 'Y'
+ ) LOOP
+ perform rhn_channel.update_family_counts(i.channel_family_id, i.org_id);
+ END LOOP;
+ END$$ language plpgsql;
+
+ CREATE OR REPLACE FUNCTION available_chan_subscriptions(channel_id_in IN NUMERIC,
+ org_id_in IN NUMERIC)
+ RETURNS NUMERIC
+ AS $$
+ declare
+ channel_family_id_val NUMERIC;
+ BEGIN
+ SELECT channel_family_id INTO STRICT channel_family_id_val
+ FROM rhnChannelFamilyMembers
+ WHERE channel_id = channel_id_in;
+
+ RETURN rhn_channel.available_family_subscriptions(
+ channel_family_id_val, org_id_in);
+ END$$ language plpgsql;
+
+ CREATE OR REPLACE FUNCTION available_fve_chan_subs(channel_id_in IN NUMERIC,
+ org_id_in IN NUMERIC)
+ RETURNS NUMERIC
+ AS $$
+ declare
+ channel_family_id_val NUMERIC;
+ BEGIN
+ SELECT channel_family_id INTO STRICT channel_family_id_val
+ FROM rhnChannelFamilyMembers
+ WHERE channel_id = channel_id_in;
+
+ RETURN rhn_channel.available_fve_family_subs(
+ channel_family_id_val, org_id_in);
+ END$$ language plpgsql;
+
+ create or replace function unsubscribe_server_from_family(server_id_in in numeric,
+ channel_family_id_in in numeric)
+ returns void
+ as $$
+ begin
+ delete
+ from rhnServerChannel rsc
+ where rsc.server_id = server_id_in
+ and channel_id in (
+ select rcfm.channel_id
+ from rhnChannelFamilyMembers rcfm
+ where rcfm.channel_family_id = channel_family_id_in);
+ end$$ language plpgsql;
+
+ create or replace function get_org_id(channel_id_in in numeric)
+ returns numeric
+ as $$
+ declare
+ org_id_out numeric;
+ begin
+ select org_id into strict org_id_out
+ from rhnChannel
+ where id = channel_id_in;
+
+ return org_id_out;
+ end$$ language plpgsql;
+
+ create or replace function get_cfam_org_access(cfam_id_in in numeric, org_id_in in numeric)
+ returns numeric
+ as $$
+ begin
+ if exists(
+ select 1
+ from rhnOrgChannelFamilyPermissions cfp
+ where cfp.org_id = org_id_in
+ ) then
+ return 1;
+ else
+ return 0;
+ end if;
+ end$$ language plpgsql;
+
+ create or replace function get_org_access(channel_id_in in numeric, org_id_in in numeric)
+ returns integer
+ as $$
+ begin
+ -- the idea: if we get past this query,
+ -- the org has access to the channel, else not
+ if exists(
+ select 1
+ from rhnChannelFamilyMembers CFM,
+ rhnOrgChannelFamilyPermissions CFP
+ where cfp.org_id = org_id_in
+ and CFM.channel_family_id = CFP.channel_family_id
+ and CFM.channel_id = channel_id_in
+ and (CFP.max_members > 0 or CFP.max_members is null or CFP.fve_max_members > 0 or CFP.fve_max_members is null or CFP.org_id = 1) )
+ then
+ return 1;
+ else
+ return 0;
+ end if;
+ end$$ language plpgsql;
+
+ -- check if a user has a given role, or if such a role is inferrable
+ -- returns NULL if OK, error message otherwise
+ create or replace function user_role_check_debug(channel_id_in in numeric,
+ user_id_in in numeric,
+ role_in in varchar)
+ returns varchar
+ as $$
+ declare
+ org_id numeric;
+ begin
+ org_id := rhn_user.get_org_id(user_id_in);
+
+ -- channel might be shared
+ if role_in = 'subscribe' and
+ rhn_channel.shared_user_role_check(channel_id_in, user_id_in, role_in) = 1 then
+ return NULL;
+ end if;
+
+ if role_in = 'manage' and
+ COALESCE(rhn_channel.get_org_id(channel_id_in), -1) <> org_id then
+ return 'channel_not_owned';
+ end if;
+
+ if role_in = 'subscribe' and
+ rhn_channel.get_org_access(channel_id_in, org_id) = 0 then
+ return 'channel_not_available';
+ end if;
+
+ -- channel admins have all roles
+ if rhn_user.check_role_implied(user_id_in, 'channel_admin') = 1 then
+ return NULL;
+ end if;
+
+ -- the subscribe permission is inferred
+ -- UNLESS the not_globally_subscribable flag is set
+ if role_in = 'subscribe'
+ then
+ if rhn_channel.org_channel_setting(channel_id_in,
+ org_id,
+ 'not_globally_subscribable') = 0 then
+ return NULL;
+ end if;
+ end if;
+
+ -- all other roles (manage right now) are explicitly granted
+ if rhn_channel.direct_user_role_check(channel_id_in,
+ user_id_in, role_in) = 1 then
+ return NULL;
+ end if;
+ return 'direct_permission';
+ end$$ language plpgsql;
+
+ -- same as above, but with 1/0 output; useful in views, etc
+ create or replace function user_role_check(channel_id_in in numeric, user_id_in in numeric, role_in in varchar)
+ returns numeric
+ as $$
+ begin
+ if rhn_channel.user_role_check_debug(channel_id_in,
+ user_id_in, role_in) is NULL then
+ return 1;
+ else
+ return 0;
+ end if;
+ end$$ language plpgsql;
+
+ --
+ -- For multiorg phase II, this function simply checks to see if the user's
+ -- has a trust relationship that includes this channel by id.
+ --
+ create or replace function shared_user_role_check(channel_id in numeric, user_id in numeric, role in varchar)
+ returns numeric
+ as $$
+ declare
+ n numeric;
+ oid numeric;
+ begin
+ oid := rhn_user.get_org_id(user_id);
+ select 1 into n
+ from rhnSharedChannelView s
+ where s.id = channel_id and s.org_trust_id = oid;
+
+ if not found then
+ return 0;
+ end if;
+
+ return 1;
+ end$$ language plpgsql;
+
+ -- same as above, but returns 1 if user_id_in is null
+ -- This is useful in queries where user_id is not specified
+ create or replace function loose_user_role_check(channel_id_in in numeric, user_id_in in numeric, role_in in varchar)
+ returns numeric
+ as $$
+ begin
+ if user_id_in is null then
+ return 1;
+ end if;
+ return rhn_channel.user_role_check(channel_id_in, user_id_in, role_in);
+ end$$ language plpgsql;
+
+ -- directly checks the table, no inferred permissions
+ create or replace function direct_user_role_check(channel_id_in in numeric, user_id_in in numeric, role_in in varchar)
+ returns numeric
+ as $$
+ declare
+ throwaway numeric;
+ begin
+ -- the idea: if we get past this query, the user has the role, else no
+ select 1 into throwaway
+ from rhnChannelPermissionRole CPR,
+ rhnChannelPermission CP
+ where CP.user_id = user_id_in
+ and CP.channel_id = channel_id_in
+ and CPR.label = role_in
+ and CP.role_id = CPR.id;
+
+ if not found then
+ return 0;
+ end if;
+
+ return 1;
+ end$$ language plpgsql;
+
+ -- check if an org has a certain setting
+ create or replace function org_channel_setting(channel_id_in in numeric, org_id_in in numeric, setting_in in varchar)
+ returns numeric
+ as $$
+ declare
+ throwaway numeric;
+ begin
+ -- the idea: if we get past this query, the org has the setting
+ select 1 into throwaway
+ from rhnOrgChannelSettingsType OCST,
+ rhnOrgChannelSettings OCS
+ where OCS.org_id = org_id_in
+ and OCS.channel_id = channel_id_in
+ and OCST.label = setting_in
+ and OCS.setting_id = OCST.id;
+
+ if not found then
+ return 0;
+ end if;
+
+ return 1;
+ end$$ language plpgsql;
+
+ CREATE OR REPLACE FUNCTION channel_priority(channel_id_in IN numeric)
+ RETURNS numeric
+ AS $$
+ declare
+ channel_name varchar(256);
+ priority numeric;
+ end_of_life_val timestamptz;
+ org_id_val numeric;
+ BEGIN
+
+ select name, end_of_life, org_id
+ into channel_name, end_of_life_val, org_id_val
+ from rhnChannel
+ where id = channel_id_in;
+
+ if end_of_life_val is not null then
+ return -400;
+ end if;
+
+ if channel_name like 'Red Hat Enterprise Linux%' or channel_name like 'RHEL%' then
+ priority := 1000;
+ if channel_name not like '%Beta%' then
+ priority := priority + 1000;
+ end if;
+
+ priority := priority +
+ case
+ when channel_name like '%v. 5%' then 600
+ when channel_name like '%v. 4%' then 500
+ when channel_name like '%v. 3%' then 400
+ when channel_name like '%v. 2%' then 300
+ when channel_name like '%v. 1%' then 200
+ else 0
+ end;
+
+ priority := priority +
+ case
+ when channel_name like 'Red Hat Enterprise Linux (v. 5%' then 60
+ when (channel_name like '%AS%' and channel_name not like '%Extras%') then 50
+ when (channel_name like '%ES%' and channel_name not like '%Extras%') then 40
+ when (channel_name like '%WS%' and channel_name not like '%Extras%') then 30
+ when (channel_name like '%Desktop%' and channel_name not like '%Extras%') then 20
+ when channel_name like '%Extras%' then 10
+ else 0
+ end;
+
+ priority := priority +
+ case
+ when channel_name like '%)' then 5
+ else 0
+ end;
+
+ priority := priority +
+ case
+ when channel_name like '%32-bit x86%' then 4
+ when channel_name like '%64-bit Intel Itanium%' then 3
+ when channel_name like '%64-bit AMD64/Intel EM64T%' then 2
+ else 0
+ end;
+ elsif channel_name like 'Red Hat Desktop%' then
+ priority := 900;
+
+ if channel_name not like '%Beta%' then
+ priority := priority + 50;
+ end if;
+
+ priority := priority +
+ case
+ when channel_name like '%v. 4%' then 40
+ when channel_name like '%v. 3%' then 30
+ when channel_name like '%v. 2%' then 20
+ when channel_name like '%v. 1%' then 10
+ else 0
+ end;
+
+ priority := priority +
+ case
+ when channel_name like '%32-bit x86%' then 4
+ when channel_name like '%64-bit Intel Itanium%' then 3
+ when channel_name like '%64-bit AMD64/Intel EM64T%' then 2
+ else 0
+ end;
+
+ elsif org_id_val is not null then
+ priority := 600;
+ else
+ priority := 500;
+ end if;
+
+ return -priority;
+
+ end$$ language plpgsql;
+
+ -- right now this only does the accounting changes; the cascade
+ -- actually does the rhnServerChannel delete.
+ create or replace function delete_server_channels(server_id_in in numeric) returns void
+ as $$
+ begin
+ update rhnPrivateChannelFamily
+ set current_members = current_members -1
+ where org_id in (
+ select org_id
+ from rhnServer
+ where id = server_id_in
+ )
+ and channel_family_id in (
+ select rcfm.channel_family_id
+ from rhnChannelFamilyMembers rcfm,
+ rhnServerChannel rsc
+ where rsc.server_id = server_id_in
+ and rsc.channel_id = rcfm.channel_id
+ and not exists (
+ select 1
+ from
+ rhnChannelFamilyVirtSubLevel cfvsl,
+ rhnSGTypeVirtSubLevel sgtvsl,
+ rhnServerEntitlementView sev,
+ rhnVirtualInstance vi
+ where
+ -- system is a virtual instance
+ vi.virtual_system_id = server_id_in
+ and vi.host_system_id = sev.server_id
+ -- system's host has a virt ent
+ and sev.label in ('virtualization_host',
+ 'virtualization_host_platform')
+ and sev.server_group_type_id =
+ sgtvsl.server_group_type_id
+ -- the host's virt ent grants a cf virt sub level
+ and sgtvsl.virt_sub_level_id = cfvsl.virt_sub_level_id
+ -- the cf is in that virt sub level
+ and cfvsl.channel_family_id = rcfm.channel_family_id
+ )
+ );
+ end$$ language plpgsql;
+
+ -- this could certainly be optimized to do updates if needs be
+ create or replace function refresh_newest_package(channel_id_in in numeric,
+ caller_in in varchar default '(unknown)',
+ package_name_id_in in numeric default null)
+ returns void
+ as $$
+ -- procedure refreshes rows for name_id = package_name_id_in or
+ -- all rows if package_name_id_in is null
+ begin
+ delete from rhnChannelNewestPackage
+ where channel_id = channel_id_in
+ and (package_name_id_in is null
+ or name_id = package_name_id_in);
+ insert into rhnChannelNewestPackage
+ (channel_id, name_id, evr_id, package_id, package_arch_id)
+ (select channel_id,
+ name_id, evr_id,
+ package_id, package_arch_id
+ from rhnChannelNewestPackageView
+ where channel_id = channel_id_in
+ and (package_name_id_in is null
+ or name_id = package_name_id_in)
+ );
+ insert into rhnChannelNewestPackageAudit (channel_id, caller)
+ values (channel_id_in, caller_in);
+ update rhnChannel
+ set last_modified = greatest(current_timestamp,
+ last_modified + interval '1 second')
+ where id = channel_id_in;
+ end$$ language plpgsql;
+
+ create or replace function update_channel ( channel_id_in in numeric, invalidate_ss in numeric default 0,
+ date_to_use in timestamptz default current_timestamp ) returns void
+ as $$
+ declare
+ channel_last_modified timestamptz;
+ last_modified_value timestamptz;
+
+ snapshots cursor for
+ select snapshot_id id
+ from rhnSnapshotChannel
+ where channel_id = channel_id_in;
+
+ begin
+
+ select last_modified
+ into channel_last_modified
+ from rhnChannel
+ where id = channel_id_in;
+
+ last_modified_value := date_to_use;
+
+ if last_modified_value <= channel_last_modified then
+ last_modified_value := last_modified_value + interval '1 second';
+ end if;
+
+ update rhnChannel set last_modified = last_modified_value
+ where id = channel_id_in;
+
+ if invalidate_ss = 1 then
+ for snapshot in snapshots loop
+ update rhnSnapshot
+ set invalid = lookup_snapshot_invalid_reason('channel_modified')
+ where id = snapshot.id;
+ end loop;
+ end if;
+
+ end$$ language plpgsql;
+
+ create or replace function update_channels_by_package ( package_id_in in numeric, date_to_use in timestamptz default current_timestamp ) returns void
+ as $$
+ declare
+ channels cursor for
+ select channel_id
+ from rhnChannelPackage
+ where package_id = package_id_in
+ order by channel_id;
+
+ begin
+ for channel in channels loop
+ -- we want to invalidate the snapshot assocated with the channel when we
+ -- do this b/c we know we've added or removed or packages
+ perform rhn_channel.update_channel ( channel.channel_id, 1, date_to_use );
+ end loop;
+ end$$ language plpgsql;
+
+
+ create or replace function update_channels_by_errata ( errata_id_in numeric, date_to_use in timestamptz default current_timestamp ) returns void
+ as $$
+ declare
+ channels cursor for
+ select channel_id
+ from rhnChannelErrata
+ where errata_id = errata_id_in
+ order by channel_id;
+
+ begin
+ for channel in channels loop
+ -- we won't invalidate snapshots, b/c just changing the errata associated with
+ -- a channel shouldn't invalidate snapshots
+ perform rhn_channel.update_channel ( channel.channel_id, 0, date_to_use );
+ end loop;
+ end$$ language plpgsql;
+
+ create or replace function update_needed_cache(channel_id_in in numeric) returns void
+ as $$
+ declare
+ server record;
+ begin
+ -- we intentionaly do a loop here instead of one huge select
+ -- b/c we want to break update into smaller transaction to unblock other sessions
+ -- querying rhnServerNeededCache
+ for server in (
+ select sc.server_id as id
+ from rhnServerChannel sc
+ where sc.channel_id = channel_id_in
+ order by id asc
+ ) loop
+ perform rhn_server.update_needed_cache(server.id);
+ end loop;
+ end$$ language plpgsql;
+
+ create or replace function set_comps(channel_id_in in numeric, path_in in varchar, timestamp_in in varchar) returns void
+ as $$
+ declare
+ row record;
+ begin
+ for row in (
+ select relative_filename, last_modified
+ from rhnChannelComps
+ where channel_id = channel_id_in
+ ) loop
+ if row.relative_filename = path_in
+ and row.last_modified = to_timestamp(timestamp_in, 'YYYYMMDDHH24MISS') then
+ return;
+ end if;
+ end loop;
+ delete from rhnChannelComps
+ where channel_id = channel_id_in;
+ insert into rhnChannelComps (id, channel_id, relative_filename, last_modified, created, modified)
+ values (sequence_nextval('rhn_channelcomps_id_seq'), channel_id_in, path_in, to_timestamp(timestamp_in, 'YYYYMMDDHH24MISS'), current_timestamp, current_timestamp);
+ end$$ language plpgsql;
+
+-- restore the original setting
+update pg_settings set setting = overlay( setting placing '' from 1 for (length('rhn_channel')+1) ) where name = 'search_path';
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/049-rhn_server.pkb.oracle b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/049-rhn_server.pkb.oracle
new file mode 100644
index 0000000..b910b56
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/049-rhn_server.pkb.oracle
@@ -0,0 +1,790 @@
+--
+-- Copyright (c) 2008--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.
+--
+--
+--
+--
+
+create or replace
+package body rhn_server
+is
+ function system_service_level(
+ server_id_in in number,
+ service_level_in in varchar2
+ ) return number is
+
+ cursor ents is
+ select label from rhnServerEntitlementView
+ where server_id = server_id_in;
+
+ retval number := 0;
+
+ begin
+ for ent in ents loop
+ retval := rhn_entitlements.entitlement_grants_service (ent.label, service_level_in);
+ if retval = 1 then
+ return retval;
+ end if;
+ end loop;
+
+ return retval;
+
+ end system_service_level;
+
+
+ function can_change_base_channel(server_id_in IN NUMBER)
+ return number
+ is
+ throwaway number;
+ begin
+ -- the idea: if we get past this query, the server is
+ -- neither sat nor proxy, so base channel is changeable
+
+ select 1 into throwaway
+ from rhnServer S
+ where S.id = server_id_in
+ and not exists (select 1 from rhnSatelliteInfo SI where SI.server_id = S.id)
+ and not exists (select 1 from rhnProxyInfo PI where PI.server_id = S.id);
+
+ return 1;
+ exception
+ when no_data_found
+ then
+ return 0;
+ end can_change_base_channel;
+
+ procedure set_custom_value(
+ server_id_in in number,
+ user_id_in in number,
+ key_label_in in varchar2,
+ value_in in varchar2
+ ) is
+ key_id_val number;
+ begin
+ select CDK.id into key_id_val
+ from rhnCustomDataKey CDK,
+ rhnServer S
+ where S.id = server_id_in
+ and S.org_id = CDK.org_id
+ and CDK.label = key_label_in;
+
+ begin
+ insert into rhnServerCustomDataValue (server_id, key_id, value, created_by, last_modified_by)
+ values (server_id_in, key_id_val, value_in, user_id_in, user_id_in);
+ exception
+ when DUP_VAL_ON_INDEX
+ then
+ update rhnServerCustomDataValue
+ set value = value_in,
+ last_modified_by = user_id_in
+ where server_id = server_id_in
+ and key_id = key_id_val;
+ end;
+
+ end set_custom_value;
+
+ function bulk_set_custom_value(
+ key_label_in in varchar2,
+ value_in in varchar2,
+ set_label_in in varchar2,
+ set_uid_in in number
+ )
+ return integer
+ is
+ i integer := 0;
+ begin
+ i := 0;
+ for server in (
+ SELECT user_id, label, element, element_two
+ FROM rhnSet
+ WHERE label = set_label_in
+ AND user_id = set_uid_in
+ ) loop
+ if rhn_server.system_service_level(server.element, 'provisioning') = 1 then
+ rhn_server.set_custom_value(server.element, set_uid_in, key_label_in, value_in);
+ i := i + 1;
+ end if;
+ end loop server;
+ return i;
+ end bulk_set_custom_value;
+
+ procedure bulk_snapshot_tag(
+ org_id_in in number,
+ tagname_in in varchar2,
+ set_label_in in varchar2,
+ set_uid_in in number
+ ) is
+ snapshot_id number;
+ begin
+ for server in (
+ SELECT user_id, label, element, element_two
+ FROM rhnSet
+ WHERE label = set_label_in
+ AND user_id = set_uid_in
+ ) loop
+ if rhn_server.system_service_level(server.element, 'provisioning') = 1 then
+ begin
+ select max(id) into snapshot_id
+ from rhnSnapshot
+ where server_id = server.element;
+ exception
+ when NO_DATA_FOUND then
+ rhn_server.snapshot_server(server.element, 'tagging system: ' || tagname_in);
+
+ select max(id) into snapshot_id
+ from rhnSnapshot
+ where server_id = server.element;
+ end;
+
+ -- now have a snapshot_id to work with...
+ begin
+ rhn_server.tag_snapshot(snapshot_id, org_id_in, tagname_in);
+ exception
+ when DUP_VAL_ON_INDEX
+ then
+ -- do nothing, be forgiving...
+ null;
+ end;
+ end if;
+ end loop server;
+ end bulk_snapshot_tag;
+
+ procedure tag_delete(
+ server_id_in in number,
+ tag_id_in in number
+ ) is
+ cursor snapshots is
+ select snapshot_id
+ from rhnSnapshotTag
+ where tag_id = tag_id_in;
+ tag_id_tmp number;
+ begin
+ select id into tag_id_tmp
+ from rhnTag
+ where id = tag_id_in
+ for update;
+
+ delete
+ from rhnSnapshotTag
+ where server_id = server_id_in
+ and tag_id = tag_id_in;
+ for snapshot in snapshots loop
+ return;
+ end loop;
+ delete
+ from rhnTag
+ where id = tag_id_in;
+ end tag_delete;
+
+ procedure tag_snapshot(
+ snapshot_id_in in number,
+ org_id_in in number,
+ tagname_in in varchar2
+ ) is
+ begin
+ insert into rhnSnapshotTag (snapshot_id, server_id, tag_id)
+ select snapshot_id_in, server_id, lookup_tag(org_id_in, tagname_in)
+ from rhnSnapshot
+ where id = snapshot_id_in;
+ end tag_snapshot;
+
+ procedure bulk_snapshot(
+ reason_in in varchar2,
+ set_label_in in varchar2,
+ set_uid_in in number
+ ) is
+ begin
+ for server in (
+ SELECT user_id, label, element, element_two
+ FROM rhnSet
+ WHERE label = set_label_in
+ AND user_id = set_uid_in
+ ) loop
+ if rhn_server.system_service_level(server.element, 'provisioning') = 1 then
+ rhn_server.snapshot_server(server.element, reason_in);
+ end if;
+ end loop server;
+ end bulk_snapshot;
+
+ procedure snapshot_server(
+ server_id_in in number,
+ reason_in in varchar2
+ ) is
+ snapshot_id number;
+ cursor revisions is
+ select distinct
+ cr.id
+ from rhnConfigRevision cr,
+ rhnConfigFileName cfn,
+ rhnConfigFile cf,
+ rhnConfigChannel cc,
+ rhnServerConfigChannel scc
+ where 1=1
+ and scc.server_id = server_id_in
+ and scc.config_channel_id = cc.id
+ and cc.id = cf.config_channel_id
+ and cf.id = cr.config_file_id
+ and cr.id = cf.latest_config_revision_id
+ and cf.config_file_name_id = cfn.id
+ and cf.id = lookup_first_matching_cf(scc.server_id, cfn.path);
+ locked integer;
+ begin
+ select rhn_snapshot_id_seq.nextval into snapshot_id from dual;
+
+ insert into rhnSnapshot (id, org_id, server_id, reason) (
+ select snapshot_id,
+ s.org_id,
+ server_id_in,
+ reason_in
+ from rhnServer s
+ where s.id = server_id_in
+ );
+ insert into rhnSnapshotChannel (snapshot_id, channel_id) (
+ select snapshot_id, sc.channel_id
+ from rhnServerChannel sc
+ where sc.server_id = server_id_in
+ );
+ insert into rhnSnapshotServerGroup (snapshot_id, server_group_id) (
+ select snapshot_id, sgm.server_group_id
+ from rhnServerGroupMembers sgm
+ where sgm.server_id = server_id_in
+ );
+ locked := 0;
+ while true loop
+ begin
+ insert into rhnPackageNEVRA (id, name_id, evr_id, package_arch_id)
+ select rhn_pkgnevra_id_seq.nextval, sp.name_id, sp.evr_id, sp.package_arch_id
+ from rhnServerPackage sp
+ where sp.server_id = server_id_in
+ and not exists
+ (select 1
+ from rhnPackageNEVRA nevra
+ where nevra.name_id = sp.name_id
+ and nevra.evr_id = sp.evr_id
+ and (nevra.package_arch_id = sp.package_arch_id
+ or (nevra.package_arch_id is null
+ and sp.package_arch_id is null)));
+ exit;
+ exception when dup_val_on_index then
+ if locked = 1 then
+ raise;
+ else
+ lock table rhnPackageNEVRA in exclusive mode;
+ locked := 1;
+ end if;
+ end;
+ end loop;
+ insert into rhnSnapshotPackage (snapshot_id, nevra_id) (
+ select distinct snapshot_id, nevra.id
+ from rhnServerPackage sp, rhnPackageNEVRA nevra
+ where sp.server_id = server_id_in
+ and nevra.name_id = sp.name_id
+ and nevra.evr_id = sp.evr_id
+ and (nevra.package_arch_id = sp.package_arch_id
+ or (nevra.package_arch_id is null
+ and sp.package_arch_id is null))
+ );
+
+ insert into rhnSnapshotConfigChannel ( snapshot_id, config_channel_id ) (
+ select snapshot_id, scc.config_channel_id
+ from rhnServerConfigChannel scc
+ where server_id = server_id_in
+ );
+
+ for revision in revisions loop
+ insert into rhnSnapshotConfigRevision (
+ snapshot_id, config_revision_id
+ ) values (
+ snapshot_id, revision.id
+ );
+ end loop;
+ end snapshot_server;
+
+ procedure remove_action(
+ server_id_in in number,
+ action_id_in in number
+ ) is
+ -- this really wants "nulls last", but 8.1.7.3.0 sucks ass.
+ -- instead, we make a local table that holds our
+ -- list of ids with null prereqs. There's surely a better way
+ -- (an array instead of a table maybe? who knows...)
+ -- but I've got code to do this handy that I can look at ;)
+ cursor chained_actions is
+ select id, prerequisite
+ from rhnAction
+ start with id = action_id_in
+ connect by prior id = prerequisite
+ order by prerequisite desc;
+ cursor sessions is
+ select s.id
+ from rhnKickstartSession s
+ where server_id_in in (s.old_server_id, s.new_server_id)
+ and s.action_id = action_id_in
+ and not exists (
+ select 1
+ from rhnKickstartSessionState ss
+ where ss.id = s.state_id
+ and ss.label in ('failed','complete')
+ );
+ type chain_end_type is table of number index by binary_integer;
+ chain_ends chain_end_type;
+ i number;
+ prereq number := 1;
+ begin
+ select prerequisite
+ into prereq
+ from rhnAction
+ where id = action_id_in;
+
+ if prereq is not null then
+ rhn_exception.raise_exception('action_is_child');
+ end if;
+
+ i := 0;
+ for action in chained_actions loop
+ if action.prerequisite is null then
+ chain_ends(i) := action.id;
+ i := i + 1;
+ else
+ delete from rhnServerAction
+ where server_id = server_id_in
+ and action_id = action.id;
+ end if;
+ end loop;
+ i := chain_ends.first;
+ while i is not null loop
+ delete from rhnServerAction
+ where server_id = server_id_in
+ and action_id = chain_ends(i);
+ i := chain_ends.next(i);
+ end loop;
+ for s in sessions loop
+ update rhnKickstartSession
+ set state_id = (
+ select id
+ from rhnKickstartSessionState
+ where label = 'failed'
+ ),
+ action_id = null
+ where id = s.id;
+ set_ks_session_history_message(s.id, 'failed', 'Kickstart cancelled due to action removal');
+ end loop;
+ end remove_action;
+
+ function check_user_access(server_id_in in number, user_id_in in number)
+ return number
+ is
+ has_access number;
+ begin
+ -- first check; if this returns no rows, then the server/user are in different orgs, and we bail
+ select 1 into has_access
+ from rhnServer S,
+ web_contact wc
+ where wc.org_id = s.org_id
+ and s.id = server_id_in
+ and wc.id = user_id_in;
+
+ -- okay, so they're in the same org. if we have an org admin, they get a free pass
+ if rhn_user.check_role(user_id_in, 'org_admin') = 1
+ then
+ return 1;
+ end if;
+
+ select 1 into has_access
+ from rhnServerGroupMembers SGM,
+ rhnUserServerGroupPerms USG
+ where SGM.server_group_id = USG.server_group_id
+ and SGM.server_id = server_id_in
+ and USG.user_id = user_id_in
+ and rownum = 1;
+
+ return 1;
+ exception
+ when no_data_found
+ then
+ return 0;
+ end check_user_access;
+
+ -- *******************************************************************
+ -- FUNCTION: can_server_consume_virt_slot
+ -- Returns 1 if the server id is eligible to consume a virtual slot,
+ -- else returns 0.
+ -- Called by: insert_into_servergroup, delete_from_servergroup
+ -- *******************************************************************
+ function can_server_consume_virt_slot(server_id_in in number,
+ group_type_in in
+ rhnServerGroupType.label%TYPE)
+ return number
+ is
+
+ cursor server_virt_slots is
+ select vi.VIRTUAL_SYSTEM_ID
+ from
+ rhnVirtualInstance vi
+ where
+ -- server id is a virtual instance
+ vi.VIRTUAL_SYSTEM_ID = server_id_in
+ -- server id's host is virt entitled
+ and exists ( select 1
+ from rhnServerEntitlementView sev
+ where vi.HOST_SYSTEM_ID = sev.server_id
+ and sev.label in ('virtualization_host',
+ 'virtualization_host_platform') )
+ -- server id's host also has the ent we want
+ and exists ( select 1
+ from rhnServerEntitlementView sev2
+ where vi.HOST_SYSTEM_ID = sev2.server_id
+ and sev2.label = group_type_in );
+
+ begin
+ for server_virt_slot in server_virt_slots loop
+ return 1;
+ end loop;
+ return 0;
+ end can_server_consume_virt_slot;
+
+
+ procedure insert_into_servergroup (
+ server_id_in in number,
+ server_group_id_in in number
+ ) is
+ used_slots number;
+ max_slots number;
+ org_id number;
+ mgmt_available number;
+ mgmt_upgrade number;
+ mgmt_sgid number;
+ prov_available number;
+ prov_upgrade number;
+ prov_sgid number;
+ group_label rhnServerGroupType.label%TYPE;
+ group_type number;
+ begin
+ -- frist, group_type = null, because it's easy...
+
+ -- this will rowlock the servergroup we're trying to change;
+ -- we probably need to lock the other one, but I think the chances
+ -- of it being a real issue are very small for now...
+ select sg.group_type, sg.org_id, sg.current_members, sg.max_members
+ into group_type, org_id, used_slots, max_slots
+ from rhnServerGroup sg
+ where sg.id = server_group_id_in
+ for update of sg.current_members;
+
+ if group_type is null then
+ if used_slots >= max_slots then
+ rhn_exception.raise_exception('servergroup_max_members');
+ end if;
+
+ insert into rhnServerGroupMembers(
+ server_id, server_group_id
+ ) values (
+ server_id_in, server_group_id_in
+ );
+ update rhnServerGroup
+ set current_members = current_members + 1
+ where id = server_group_id_in;
+
+ rhn_cache.update_perms_for_server_group(server_group_id_in);
+ return;
+ end if;
+
+ -- now for group_type != null
+ --
+ select label
+ into group_label
+ from rhnServerGroupType sgt
+ where sgt.id = group_type;
+
+ -- the naive easy path that gets hit most often and has to be quickest.
+ if group_label in ('sw_mgr_entitled',
+ 'enterprise_entitled',
+ 'monitoring_entitled',
+ 'provisioning_entitled',
+ 'virtualization_host',
+ 'virtualization_host_platform') then
+ if used_slots >= max_slots and
+ (can_server_consume_virt_slot(server_id_in, group_label) != 1)
+ then
+ rhn_exception.raise_exception('servergroup_max_members');
+ end if;
+
+ insert into rhnServerGroupMembers(
+ server_id, server_group_id
+ ) values (
+ server_id_in, server_group_id_in
+ );
+
+ -- Only update current members if the system in consuming a
+ -- physical slot.
+ if can_server_consume_virt_slot(server_id_in, group_label) = 0 then
+ update rhnServerGroup
+ set current_members = current_members + 1
+ where id = server_group_id_in;
+ end if;
+
+ return;
+ end if;
+ end;
+
+ function insert_into_servergroup_maybe (
+ server_id_in in number,
+ server_group_id_in in number
+ ) return number is
+ retval number := 0;
+ cursor servergroups is
+ select s.id server_id,
+ sg.id server_group_id
+ from rhnServerGroup sg,
+ rhnServer s
+ where s.id = server_id_in
+ and sg.id = server_group_id_in
+ and s.org_id = sg.org_id
+ and not exists (
+ select 1
+ from rhnServerGroupMembers sgm
+ where sgm.server_id = s.id
+ and sgm.server_group_id = sg.id
+ );
+ begin
+ for sgm in servergroups loop
+ rhn_server.insert_into_servergroup(sgm.server_id, sgm.server_group_id);
+ retval := retval + 1;
+ end loop;
+ return retval;
+ end insert_into_servergroup_maybe;
+
+ procedure insert_set_into_servergroup (
+ server_group_id_in in number,
+ user_id_in in number,
+ set_label_in in varchar2
+ ) is
+ cursor servers is
+ select st.element id
+ from rhnSet st
+ where st.user_id = user_id_in
+ and st.label = set_label_in
+ and exists (
+ select 1
+ from rhnUserManagedServerGroups umsg
+ where umsg.server_group_id = server_group_id_in
+ and umsg.user_id = user_id_in
+ )
+ and not exists (
+ select 1
+ from rhnServerGroupMembers sgm
+ where sgm.server_id = st.element
+ and sgm.server_group_id = server_group_id_in
+ );
+ begin
+ for s in servers loop
+ rhn_server.insert_into_servergroup(s.id, server_group_id_in);
+ end loop;
+ end insert_set_into_servergroup;
+
+ procedure delete_from_servergroup (
+ server_id_in in number,
+ server_group_id_in in number
+ ) is
+ cursor server_virt_groups is
+ select 1
+ from rhnServerEntitlementVirtual sev
+ where sev.server_id = server_id_in
+ and sev.server_group_id = server_group_id_in;
+
+ oid number;
+ mgmt_sgid number;
+ label rhnServerGroupType.label%TYPE;
+ group_type number;
+ begin
+ begin
+ select sg.group_type, sg.org_id
+ into group_type, oid
+ from rhnServerGroupMembers sgm,
+ rhnServerGroup sg
+ where sg.id = server_group_id_in
+ and sg.id = sgm.server_group_id
+ and sgm.server_id = server_id_in
+ for update of sg.current_members;
+ exception
+ when no_data_found then
+ rhn_exception.raise_exception('server_not_in_group');
+ end;
+
+ -- do group_type is null first
+ if group_type is null then
+ delete from rhnServerGroupMembers
+ where server_group_id = server_group_id_in
+ and server_id = server_id_in;
+ update rhnServerGroup
+ set current_members = current_members - 1
+ where id = server_group_id_in;
+ rhn_cache.update_perms_for_server_group(server_group_id_in);
+ return;
+ end if;
+
+ select sgt.label
+ into label
+ from rhnServerGroupType sgt
+ where sgt.id = group_type;
+
+ if label in ('sw_mgr_entitled',
+ 'enterprise_entitled',
+ 'provisioning_entitled',
+ 'monitoring_entitled',
+ 'virtualization_host',
+ 'virtualization_host_platform') then
+
+ -- Only update current members if the system is consuming
+ -- a physical slot.
+ for server_virt_group in server_virt_groups loop
+ delete from rhnServerGroupMembers
+ where server_group_id = server_group_id_in
+ and server_id = server_id_in;
+ return;
+ end loop;
+
+ delete from rhnServerGroupMembers
+ where server_group_id = server_group_id_in
+ and server_id = server_id_in;
+
+ update rhnServerGroup
+ set current_members = current_members - 1
+ where id = server_group_id_in;
+
+ end if;
+ end;
+
+ procedure delete_set_from_servergroup (
+ server_group_id_in in number,
+ user_id_in in number,
+ set_label_in in varchar2
+ ) is
+ cursor servergroups is
+ select sgm.server_id, sgm.server_group_id
+ from rhnSet st,
+ rhnServerGroupMembers sgm
+ where sgm.server_group_id = server_group_id_in
+ and st.user_id = user_id_in
+ and st.label = set_label_in
+ and sgm.server_id = st.element
+ and exists (
+ select 1
+ from rhnUserManagedServerGroups usgp
+ where usgp.server_group_id = server_group_id_in
+ and usgp.user_id = user_id_in
+ );
+ begin
+ for sgm in servergroups loop
+ rhn_server.delete_from_servergroup(sgm.server_id, server_group_id_in);
+ end loop;
+ end delete_set_from_servergroup;
+
+ procedure clear_servergroup (
+ server_group_id_in in number
+ ) is
+ cursor servers is
+ select sgm.server_id id
+ from rhnServerGroupMembers sgm
+ where sgm.server_group_id = server_group_id_in;
+ begin
+ for s in servers loop
+ rhn_server.delete_from_servergroup(s.id, server_group_id_in);
+ end loop;
+ end clear_servergroup;
+
+ procedure delete_from_org_servergroups (
+ server_id_in in number
+ ) is
+ cursor servergroups is
+ select sgm.server_group_id id
+ from rhnServerGroup sg,
+ rhnServerGroupMembers sgm
+ where sgm.server_id = server_id_in
+ and sgm.server_group_id = sg.id
+ and sg.group_type is null;
+ begin
+ for sg in servergroups loop
+ rhn_server.delete_from_servergroup(server_id_in, sg.id);
+ end loop;
+ end delete_from_org_servergroups;
+
+ function get_ip_address (
+ server_id_in in number
+ ) return varchar2 is
+ cursor interfaces is
+ select ni.name as name, na4.address as address
+ from rhnServerNetInterface ni,
+ rhnServerNetAddress4 na4
+ where ni.server_id = server_id_in
+ and ni.id = na4.interface_id
+ and na4.address != '127.0.0.1';
+ cursor addresses is
+ select ipaddr ip_addr
+ from rhnServerNetwork
+ where server_id = server_id_in
+ and ipaddr != '127.0.0.1';
+ begin
+ for addr in addresses loop
+ return addr.ip_addr;
+ end loop;
+ for iface in interfaces loop
+ return iface.address;
+ end loop;
+ return NULL;
+ end get_ip_address;
+
+ procedure update_needed_cache(server_id_in in number)
+ is
+ update_lock number;
+ begin
+ select 1
+ into update_lock
+ from rhnServer
+ where id = server_id_in
+ for update;
+ delete from rhnServerNeededCache
+ where server_id = server_id_in;
+ insert into rhnServerNeededCache
+ (server_id, errata_id, package_id, channel_id)
+ (select distinct sp.server_id, x.errata_id, p.id, x.channel_id
+ FROM (SELECT sp_sp.server_id, sp_sp.name_id,
+ sp_sp.package_arch_id, max(sp_pe.evr) AS max_evr
+ FROM rhnServerPackage sp_sp
+ join rhnPackageEvr sp_pe ON sp_pe.id = sp_sp.evr_id
+ GROUP BY sp_sp.server_id, sp_sp.name_id, sp_sp.package_arch_id) sp
+ join rhnPackage p ON p.name_id = sp.name_id
+ join rhnPackageEvr pe ON pe.id = p.evr_id
+ AND sp.max_evr < pe.evr
+ join rhnPackageUpgradeArchCompat puac
+ ON puac.package_arch_id = sp.package_arch_id
+ AND puac.package_upgrade_arch_id = p.package_arch_id
+ join rhnServerChannel sc ON sc.server_id = sp.server_id
+ join rhnChannelPackage cp ON cp.package_id = p.id
+ AND cp.channel_id = sc.channel_id
+ left join (SELECT ep.errata_id, ce.channel_id, ep.package_id
+ FROM rhnChannelErrata ce
+ join rhnErrataPackage ep
+ ON ep.errata_id = ce.errata_id
+ join rhnServerChannel sc_sc
+ ON sc_sc.channel_id = ce.channel_id
+ WHERE sc_sc.server_id = server_id_in) x
+ ON x.channel_id = sc.channel_id
+ AND x.package_id = cp.package_id
+ where sp.server_id = server_id_in);
+ end update_needed_cache;
+
+end rhn_server;
+/
+SHOW ERRORS
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/049-rhn_server.pkb.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/049-rhn_server.pkb.postgresql
new file mode 100644
index 0000000..87fa3e4
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/049-rhn_server.pkb.postgresql
@@ -0,0 +1,829 @@
+-- oracle equivalent source sha1 07b6ab3867e4d4ebf772b6ee9731f83e33f4d7ae
+--
+-- Copyright (c) 2008--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.
+--
+--
+--
+--
+
+-- create schema rhn_server;
+
+--update pg_setting
+update pg_settings set setting = 'rhn_server,' || setting where name = 'search_path';
+
+ create or replace function system_service_level(
+ server_id_in in numeric,
+ service_level_in in varchar
+ ) returns numeric as $$
+ declare
+ ents cursor is
+ select label from rhnServerEntitlementView
+ where server_id = server_id_in;
+
+ retval numeric := 0;
+
+ begin
+ for ent in ents loop
+ retval := rhn_entitlements.entitlement_grants_service (ent.label, service_level_in);
+ if retval = 1 then
+ return retval;
+ end if;
+ end loop;
+
+ return retval;
+
+ end$$ language plpgsql;
+
+
+ create or replace function can_change_base_channel(server_id_in IN NUMERIC)
+ returns numeric
+ as $$
+ declare
+ throwaway numeric;
+ begin
+ -- the idea: if we get past this query, the server is
+ -- neither sat nor proxy, so base channel is changeable
+
+ select 1 into throwaway
+ from rhnServer S
+ where S.id = server_id_in
+ and not exists (select 1 from rhnSatelliteInfo SI where SI.server_id = S.id)
+ and not exists (select 1 from rhnProxyInfo PI where PI.server_id = S.id);
+
+ if not found then
+ return 0;
+ end if;
+
+ return 1;
+ end$$ language plpgsql;
+
+ create or replace function set_custom_value(
+ server_id_in in numeric,
+ user_id_in in numeric,
+ key_label_in in varchar,
+ value_in in varchar
+ ) returns void
+ as $$
+ declare
+ key_id_val numeric;
+ begin
+ select CDK.id into strict key_id_val
+ from rhnCustomDataKey CDK,
+ rhnServer S
+ where S.id = server_id_in
+ and S.org_id = CDK.org_id
+ and CDK.label = key_label_in;
+
+ begin
+ insert into rhnServerCustomDataValue (server_id, key_id, value, created_by, last_modified_by)
+ values (server_id_in, key_id_val, value_in, user_id_in, user_id_in);
+ exception
+ when UNIQUE_VIOLATION
+ then
+ update rhnServerCustomDataValue
+ set value = value_in,
+ last_modified_by = user_id_in
+ where server_id = server_id_in
+ and key_id = key_id_val;
+ end;
+
+ end$$ language plpgsql;
+
+ create or replace function bulk_set_custom_value(
+ key_label_in in varchar,
+ value_in in varchar,
+ set_label_in in varchar,
+ set_uid_in in numeric
+ )
+ returns integer
+ as $$
+ declare
+ i integer;
+ server record;
+ begin
+ i := 0;
+ for server in (
+ SELECT user_id, label, element, element_two
+ FROM rhnSet
+ WHERE label = set_label_in
+ AND user_id = set_uid_in
+ ) loop
+ if rhn_server.system_service_level(server.element, 'provisioning') = 1 then
+ perform rhn_server.set_custom_value(server.element, set_uid_in, key_label_in, value_in);
+ i := i + 1;
+ end if;
+ end loop;
+ return i;
+ end$$ language plpgsql;
+
+ create or replace function bulk_snapshot_tag(
+ org_id_in in numeric,
+ tagname_in in varchar,
+ set_label_in in varchar,
+ set_uid_in in numeric
+ ) returns void
+ as $$
+ declare
+ server record;
+ snapshot_id numeric;
+ begin
+ for server in (
+ SELECT user_id, label, element, element_two
+ FROM rhnSet
+ WHERE label = set_label_in
+ AND user_id = set_uid_in
+ ) loop
+ if rhn_server.system_service_level(server.element, 'provisioning') = 1 then
+ select max(id) into snapshot_id
+ from rhnSnapshot
+ where server_id = server.element;
+
+ if snapshot_id is null then
+ perform rhn_server.snapshot_server(server.element, 'tagging system: ' || tagname_in);
+
+ select max(id) into snapshot_id
+ from rhnSnapshot
+ where server_id = server.element;
+ end if;
+
+ -- now have a snapshot_id to work with...
+ begin
+ perform rhn_server.tag_snapshot(snapshot_id, org_id_in, tagname_in);
+ exception
+ when UNIQUE_VIOLATION
+ then
+ -- do nothing, be forgiving...
+ null;
+ end;
+ end if;
+ end loop;
+ end$$ language plpgsql;
+
+ create or replace function tag_delete(
+ server_id_in in numeric,
+ tag_id_in in numeric
+ ) returns void
+ as $$
+ declare
+ snapshots cursor is
+ select snapshot_id
+ from rhnSnapshotTag
+ where tag_id = tag_id_in;
+ tag_id_tmp numeric;
+ begin
+ select id into tag_id_tmp
+ from rhnTag
+ where id = tag_id_in
+ for update;
+
+ delete
+ from rhnSnapshotTag
+ where server_id = server_id_in
+ and tag_id = tag_id_in;
+ for snapshot in snapshots loop
+ return;
+ end loop;
+ delete
+ from rhnTag
+ where id = tag_id_in;
+ end$$ language plpgsql;
+
+ create or replace function tag_snapshot(
+ snapshot_id_in in numeric,
+ org_id_in in numeric,
+ tagname_in in varchar
+ ) returns void
+ as $$
+ begin
+ insert into rhnSnapshotTag (snapshot_id, server_id, tag_id)
+ select snapshot_id_in, server_id, lookup_tag(org_id_in, tagname_in)
+ from rhnSnapshot
+ where id = snapshot_id_in;
+ end$$ language plpgsql;
+
+ create or replace function bulk_snapshot(
+ reason_in in varchar,
+ set_label_in in varchar,
+ set_uid_in in numeric
+ ) returns void
+ as $$
+ declare
+ server record;
+ begin
+ for server in (
+ SELECT user_id, label, element, element_two
+ FROM rhnSet
+ WHERE label = set_label_in
+ AND user_id = set_uid_in
+ ) loop
+ if rhn_server.system_service_level(server.element, 'provisioning') = 1 then
+ perform rhn_server.snapshot_server(server.element, reason_in);
+ end if;
+ end loop;
+ end$$ language plpgsql;
+
+ create or replace function snapshot_server(
+ server_id_in in numeric,
+ reason_in in varchar
+ ) returns void
+ as $$
+ declare
+ snapshot_id_v numeric;
+ revisions cursor is
+ select distinct
+ cr.id
+ from rhnConfigRevision cr,
+ rhnConfigFileName cfn,
+ rhnConfigFile cf,
+ rhnConfigChannel cc,
+ rhnServerConfigChannel scc
+ where 1=1
+ and scc.server_id = server_id_in
+ and scc.config_channel_id = cc.id
+ and cc.id = cf.config_channel_id
+ and cf.id = cr.config_file_id
+ and cr.id = cf.latest_config_revision_id
+ and cf.config_file_name_id = cfn.id
+ and cf.id = lookup_first_matching_cf(scc.server_id, cfn.path);
+ locked integer;
+ begin
+ select nextval('rhn_snapshot_id_seq') into snapshot_id_v;
+
+ insert into rhnSnapshot (id, org_id, server_id, reason) (
+ select snapshot_id_v,
+ s.org_id,
+ server_id_in,
+ reason_in
+ from rhnServer s
+ where s.id = server_id_in
+ );
+ insert into rhnSnapshotChannel (snapshot_id, channel_id) (
+ select snapshot_id_v, sc.channel_id
+ from rhnServerChannel sc
+ where sc.server_id = server_id_in
+ );
+ insert into rhnSnapshotServerGroup (snapshot_id, server_group_id) (
+ select snapshot_id_v, sgm.server_group_id
+ from rhnServerGroupMembers sgm
+ where sgm.server_id = server_id_in
+ );
+ locked := 0;
+ <<iloop>>
+ while true loop
+ begin
+ insert into rhnPackageNEVRA (id, name_id, evr_id, package_arch_id)
+ select nextval('rhn_pkgnevra_id_seq'), sp.name_id, sp.evr_id, sp.package_arch_id
+ from rhnServerPackage sp
+ where sp.server_id = server_id_in
+ and not exists
+ (select 1
+ from rhnPackageNEVRA nevra
+ where nevra.name_id = sp.name_id
+ and nevra.evr_id = sp.evr_id
+ and (nevra.package_arch_id = sp.package_arch_id
+ or (nevra.package_arch_id is null
+ and sp.package_arch_id is null)));
+ exit iloop;
+ exception when unique_violation then
+ if locked = 1 then
+ raise;
+ else
+ lock table rhnPackageNEVRA in exclusive mode;
+ locked := 1;
+ end if;
+ end;
+ end loop;
+ insert into rhnSnapshotPackage (snapshot_id, nevra_id) (
+ select distinct snapshot_id_v, nevra.id
+ from rhnServerPackage sp, rhnPackageNEVRA nevra
+ where sp.server_id = server_id_in
+ and nevra.name_id = sp.name_id
+ and nevra.evr_id = sp.evr_id
+ and (nevra.package_arch_id = sp.package_arch_id
+ or (nevra.package_arch_id is null
+ and sp.package_arch_id is null))
+ );
+
+ insert into rhnSnapshotConfigChannel ( snapshot_id, config_channel_id ) (
+ select snapshot_id_v, scc.config_channel_id
+ from rhnServerConfigChannel scc
+ where server_id = server_id_in
+ );
+
+ for revision in revisions loop
+ insert into rhnSnapshotConfigRevision (
+ snapshot_id, config_revision_id
+ ) values (
+ snapshot_id_v, revision.id
+ );
+ end loop;
+ end$$ language plpgsql;
+
+ create or replace function remove_action(
+ server_id_in in numeric,
+ action_id_in in numeric
+ ) returns void
+ as $$
+ declare
+ -- this really wants "nulls last", but 8.1.7.3.0 sucks ass.
+ -- instead, we make a local table that holds our
+ -- list of ids with null prereqs. There's surely a better way
+ -- (an array instead of a table maybe? who knows...)
+ -- but I've got code to do this handy that I can look at ;)
+ chained_actions cursor is
+ with recursive r(id, prerequisite) as (
+ select id, prerequisite
+ from rhnAction
+ where id = action_id_in
+ union all
+ select r1.id, r1.prerequisite
+ from rhnAction r1, r
+ where r.id = r1.prerequisite
+ )
+ select * from r
+ order by prerequisite desc;
+ sessions cursor is
+ select s.id
+ from rhnKickstartSession s
+ where server_id_in in (s.old_server_id, s.new_server_id)
+ and s.action_id = action_id_in
+ and not exists (
+ select 1
+ from rhnKickstartSessionState ss
+ where ss.id = s.state_id
+ and ss.label in ('failed','complete')
+ );
+ chain_ends numeric[];
+ i numeric;
+ prereq numeric := 1;
+ begin
+ select prerequisite
+ into prereq
+ from rhnAction
+ where id = action_id_in;
+
+ if prereq is not null then
+ perform rhn_exception.raise_exception('action_is_child');
+ end if;
+
+ chain_ends := '{}';
+ i := 1;
+ for action in chained_actions loop
+ if action.prerequisite is null then
+ chain_ends[i] := action.id;
+ i := i + 1;
+ else
+ delete from rhnServerAction
+ where server_id = server_id_in
+ and action_id = action.id;
+ end if;
+ end loop;
+
+ delete from rhnServerAction
+ where server_id = server_id_in
+ and action_id = any(chain_ends);
+
+ for s in sessions loop
+ update rhnKickstartSession
+ set state_id = (
+ select id
+ from rhnKickstartSessionState
+ where label = 'failed'
+ ),
+ action_id = null
+ where id = s.id;
+ perform set_ks_session_history_message(s.id, 'failed', 'Kickstart cancelled due to action removal');
+ end loop;
+ end$$ language plpgsql;
+
+ create or replace function check_user_access(server_id_in in numeric, user_id_in in numeric)
+ returns numeric
+ as $$
+ declare
+ has_access numeric;
+ begin
+ -- first check; if this returns no rows, then the server/user are in different orgs, and we bail
+ select 1 into has_access
+ from rhnServer S,
+ web_contact wc
+ where wc.org_id = s.org_id
+ and s.id = server_id_in
+ and wc.id = user_id_in;
+
+ if not found then
+ return 0;
+ end if;
+
+ -- okay, so they're in the same org. if we have an org admin, they get a free pass
+ if rhn_user.check_role(user_id_in, 'org_admin') = 1
+ then
+ return 1;
+ end if;
+
+ select 1 into has_access
+ from rhnServerGroupMembers SGM,
+ rhnUserServerGroupPerms USG
+ where SGM.server_group_id = USG.server_group_id
+ and SGM.server_id = server_id_in
+ and USG.user_id = user_id_in;
+
+ if not found then
+ return 0;
+ end if;
+
+ return 1;
+ end$$ language plpgsql;
+
+ -- *******************************************************************
+ -- FUNCTION: can_server_consume_virt_slot
+ -- Returns 1 if the server id is eligible to consume a virtual slot,
+ -- else returns 0.
+ -- Called by: insert_into_servergroup, delete_from_servergroup
+ -- *******************************************************************
+ create or replace function can_server_consume_virt_slot(server_id_in in numeric,
+ group_type_in in varchar)
+ returns numeric
+ as $$
+ declare
+ server_virt_slots cursor is
+ select vi.VIRTUAL_SYSTEM_ID
+ from
+ rhnVirtualInstance vi
+ where
+ -- server id is a virtual instance
+ vi.VIRTUAL_SYSTEM_ID = server_id_in
+ -- server id's host is virt entitled
+ and exists ( select 1
+ from rhnServerEntitlementView sev
+ where vi.HOST_SYSTEM_ID = sev.server_id
+ and sev.label in ('virtualization_host',
+ 'virtualization_host_platform') )
+ -- server id's host also has the ent we want
+ and exists ( select 1
+ from rhnServerEntitlementView sev2
+ where vi.HOST_SYSTEM_ID = sev2.server_id
+ and sev2.label = group_type_in );
+
+ begin
+ for server_virt_slot in server_virt_slots loop
+ return 1;
+ end loop;
+ return 0;
+ end$$ language plpgsql;
+
+
+ create or replace function insert_into_servergroup (
+ server_id_in in numeric,
+ server_group_id_in in numeric
+ ) returns void
+ as $$
+ declare
+ used_slots numeric;
+ max_slots numeric;
+ org_id numeric;
+ mgmt_available numeric;
+ mgmt_upgrade numeric;
+ mgmt_sgid numeric;
+ prov_available numeric;
+ prov_upgrade numeric;
+ prov_sgid numeric;
+ group_label varchar;
+ group_type numeric;
+ begin
+ -- first, group_type = null, because it's easy...
+
+ -- this will rowlock the servergroup we're trying to change;
+ -- we probably need to lock the other one, but I think the chances
+ -- of it being a real issue are very small for now...
+ select sg.group_type, sg.org_id, sg.current_members, sg.max_members
+ into group_type, org_id, used_slots, max_slots
+ from rhnServerGroup sg
+ where sg.id = server_group_id_in
+ for update of sg;
+
+ if group_type is null then
+ if used_slots >= max_slots then
+ perform rhn_exception.raise_exception('servergroup_max_members');
+ end if;
+
+ insert into rhnServerGroupMembers(
+ server_id, server_group_id
+ ) values (
+ server_id_in, server_group_id_in
+ );
+ update rhnServerGroup
+ set current_members = current_members + 1
+ where id = server_group_id_in;
+
+ perform rhn_cache.update_perms_for_server_group(server_group_id_in);
+ return;
+ end if;
+
+ -- now for group_type != null
+ --
+ select label
+ into group_label
+ from rhnServerGroupType sgt
+ where sgt.id = group_type;
+
+ -- the naive easy path that gets hit most often and has to be quickest.
+ if group_label in ('sw_mgr_entitled',
+ 'enterprise_entitled',
+ 'monitoring_entitled',
+ 'provisioning_entitled',
+ 'virtualization_host',
+ 'virtualization_host_platform') then
+ if used_slots >= max_slots and
+ (rhn_server.can_server_consume_virt_slot(server_id_in, group_label) != 1)
+ then
+ perform rhn_exception.raise_exception('servergroup_max_members');
+ end if;
+
+ insert into rhnServerGroupMembers(
+ server_id, server_group_id
+ ) values (
+ server_id_in, server_group_id_in
+ );
+
+ -- Only update current members if the system in consuming a
+ -- physical slot.
+ if rhn_server.can_server_consume_virt_slot(server_id_in, group_label) = 0 then
+ update rhnServerGroup
+ set current_members = current_members + 1
+ where id = server_group_id_in;
+ end if;
+
+ return;
+ end if;
+ end$$ language plpgsql;
+
+ create or replace function insert_into_servergroup_maybe (
+ server_id_in in numeric,
+ server_group_id_in in numeric
+ ) returns numeric as $$
+ declare
+ retval numeric := 0;
+ servergroups cursor is
+ select s.id server_id,
+ sg.id server_group_id
+ from rhnServerGroup sg,
+ rhnServer s
+ where s.id = server_id_in
+ and sg.id = server_group_id_in
+ and s.org_id = sg.org_id
+ and not exists (
+ select 1
+ from rhnServerGroupMembers sgm
+ where sgm.server_id = s.id
+ and sgm.server_group_id = sg.id
+ );
+ begin
+ for sgm in servergroups loop
+ perform rhn_server.insert_into_servergroup(sgm.server_id, sgm.server_group_id);
+ retval := retval + 1;
+ end loop;
+ return retval;
+ end$$ language plpgsql;
+
+ create or replace function insert_set_into_servergroup (
+ server_group_id_in in numeric,
+ user_id_in in numeric,
+ set_label_in in varchar
+ ) returns void
+ as $$
+ declare
+ servers cursor is
+ select st.element id
+ from rhnSet st
+ where st.user_id = user_id_in
+ and st.label = set_label_in
+ and exists (
+ select 1
+ from rhnUserManagedServerGroups umsg
+ where umsg.server_group_id = server_group_id_in
+ and umsg.user_id = user_id_in
+ )
+ and not exists (
+ select 1
+ from rhnServerGroupMembers sgm
+ where sgm.server_id = st.element
+ and sgm.server_group_id = server_group_id_in
+ );
+ begin
+ for s in servers loop
+ perform rhn_server.insert_into_servergroup(s.id, server_group_id_in);
+ end loop;
+ end$$ language plpgsql;
+
+ create or replace function delete_from_servergroup (
+ server_id_in in numeric,
+ server_group_id_in in numeric
+ ) returns void
+ as $$
+ declare
+ server_virt_groups cursor is
+ select 1
+ from rhnServerEntitlementVirtual sev
+ where sev.server_id = server_id_in
+ and sev.server_group_id = server_group_id_in;
+
+ oid numeric;
+ mgmt_sgid numeric;
+ label varchar;
+ group_type numeric;
+ begin
+ select sg.group_type, sg.org_id
+ into group_type, oid
+ from rhnServerGroupMembers sgm,
+ rhnServerGroup sg
+ where sg.id = server_group_id_in
+ and sg.id = sgm.server_group_id
+ and sgm.server_id = server_id_in
+ for update of sg;
+
+ if not found then
+ perform rhn_exception.raise_exception('server_not_in_group');
+ end if;
+
+ -- do group_type is null first
+ if group_type is null then
+ delete from rhnServerGroupMembers
+ where server_group_id = server_group_id_in
+ and server_id = server_id_in;
+ update rhnServerGroup
+ set current_members = current_members - 1
+ where id = server_group_id_in;
+ perform rhn_cache.update_perms_for_server_group(server_group_id_in);
+ return;
+ end if;
+
+ select sgt.label
+ into label
+ from rhnServerGroupType sgt
+ where sgt.id = group_type;
+
+ if label in ('sw_mgr_entitled',
+ 'enterprise_entitled',
+ 'provisioning_entitled',
+ 'monitoring_entitled',
+ 'virtualization_host',
+ 'virtualization_host_platform') then
+
+ -- Only update current members if the system is consuming
+ -- a physical slot.
+ for server_virt_group in server_virt_groups loop
+ delete from rhnServerGroupMembers
+ where server_group_id = server_group_id_in
+ and server_id = server_id_in;
+ return;
+ end loop;
+
+ delete from rhnServerGroupMembers
+ where server_group_id = server_group_id_in
+ and server_id = server_id_in;
+
+ update rhnServerGroup
+ set current_members = current_members - 1
+ where id = server_group_id_in;
+
+ end if;
+ end$$ language plpgsql;
+
+ create or replace function delete_set_from_servergroup (
+ server_group_id_in in numeric,
+ user_id_in in numeric,
+ set_label_in in varchar
+ ) returns void
+ as $$
+ declare
+ servergroups cursor is
+ select sgm.server_id, sgm.server_group_id
+ from rhnSet st,
+ rhnServerGroupMembers sgm
+ where sgm.server_group_id = server_group_id_in
+ and st.user_id = user_id_in
+ and st.label = set_label_in
+ and sgm.server_id = st.element
+ and exists (
+ select 1
+ from rhnUserManagedServerGroups usgp
+ where usgp.server_group_id = server_group_id_in
+ and usgp.user_id = user_id_in
+ );
+ begin
+ for sgm in servergroups loop
+ perform rhn_server.delete_from_servergroup(sgm.server_id, server_group_id_in);
+ end loop;
+ end$$ language plpgsql;
+
+ create or replace function clear_servergroup (
+ server_group_id_in in numeric
+ ) returns void
+ as $$
+ declare
+ servers cursor is
+ select sgm.server_id id
+ from rhnServerGroupMembers sgm
+ where sgm.server_group_id = server_group_id_in;
+ begin
+ for s in servers loop
+ perform rhn_server.delete_from_servergroup(s.id, server_group_id_in);
+ end loop;
+ end$$ language plpgsql;
+
+ create or replace function delete_from_org_servergroups (
+ server_id_in in numeric
+ ) returns void
+ as $$
+ declare
+ servergroups cursor is
+ select sgm.server_group_id id
+ from rhnServerGroup sg,
+ rhnServerGroupMembers sgm
+ where sgm.server_id = server_id_in
+ and sgm.server_group_id = sg.id
+ and sg.group_type is null;
+ begin
+ for sg in servergroups loop
+ perform rhn_server.delete_from_servergroup(server_id_in, sg.id);
+ end loop;
+ end$$ language plpgsql;
+
+ create or replace function get_ip_address (
+ server_id_in in numeric
+ ) returns varchar as $$
+ declare
+ interfaces cursor is
+ select ni.name as name, na4.address as address
+ from rhnServerNetInterface ni,
+ rhnServerNetAddress4 na4
+ where server_id = server_id_in
+ and ni.id = na4.interface_id
+ and na4.address != '127.0.0.1';
+ addresses cursor is
+ select ipaddr ip_addr
+ from rhnServerNetwork
+ where server_id = server_id_in
+ and ipaddr != '127.0.0.1';
+ begin
+ for addr in addresses loop
+ return addr.ip_addr;
+ end loop;
+ for iface in interfaces loop
+ return iface.address;
+ end loop;
+ return NULL;
+ end$$ language plpgsql;
+
+ create or replace function update_needed_cache(
+ server_id_in in numeric
+ ) returns void as $$
+ declare
+ update_lock numeric;
+ begin
+ select 1
+ into update_lock
+ from rhnServer
+ where id = server_id_in
+ for update;
+ delete from rhnServerNeededCache
+ where server_id = server_id_in;
+ insert into rhnServerNeededCache
+ (server_id, errata_id, package_id, channel_id)
+ (select distinct sp.server_id, x.errata_id, p.id, x.channel_id
+ FROM (SELECT sp_sp.server_id, sp_sp.name_id,
+ sp_sp.package_arch_id, max(sp_pe.evr) AS max_evr
+ FROM rhnServerPackage sp_sp
+ join rhnPackageEvr sp_pe ON sp_pe.id = sp_sp.evr_id
+ GROUP BY sp_sp.server_id, sp_sp.name_id, sp_sp.package_arch_id) sp
+ join rhnPackage p ON p.name_id = sp.name_id
+ join rhnPackageEvr pe ON pe.id = p.evr_id AND sp.max_evr < pe.evr
+ join rhnPackageUpgradeArchCompat puac
+ ON puac.package_arch_id = sp.package_arch_id
+ AND puac.package_upgrade_arch_id = p.package_arch_id
+ join rhnServerChannel sc ON sc.server_id = sp.server_id
+ join rhnChannelPackage cp ON cp.package_id = p.id
+ AND cp.channel_id = sc.channel_id
+ left join (SELECT ep.errata_id, ce.channel_id, ep.package_id
+ FROM rhnChannelErrata ce
+ join rhnErrataPackage ep
+ ON ep.errata_id = ce.errata_id
+ join rhnServerChannel sc_sc
+ ON sc_sc.channel_id = ce.channel_id
+ WHERE sc_sc.server_id = server_id_in) x
+ ON x.channel_id = sc.channel_id AND x.package_id = cp.package_id
+ where sp.server_id = server_id_in);
+ end$$ language plpgsql;
+-- restore the original setting
+update pg_settings set setting = overlay( setting placing '' from 1 for (length('rhn_server')+1) ) where name = 'search_path';
commit 2706a514bf2343681cdcf1e9f9c855a827e8b088
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Feb 11 14:54:38 2014 +0100
1063821 - fix rhn_channel.update_needed_cache() deadlock
Two parallel runs of rhn_channel.update_needed_cache (executed by
taskomatic) had the potential to deadlock each other.
diff --git a/schema/spacewalk/oracle/packages/rhn_channel.pkb b/schema/spacewalk/oracle/packages/rhn_channel.pkb
index 7ee39f2..57bfa05 100644
--- a/schema/spacewalk/oracle/packages/rhn_channel.pkb
+++ b/schema/spacewalk/oracle/packages/rhn_channel.pkb
@@ -1221,6 +1221,7 @@ IS
select sc.server_id as id
from rhnServerChannel sc
where sc.channel_id = channel_id_in
+ order by id asc
) loop
rhn_server.update_needed_cache(server.id);
commit;
diff --git a/schema/spacewalk/postgres/packages/rhn_channel.pkb b/schema/spacewalk/postgres/packages/rhn_channel.pkb
index b7d6111..7f9adec 100644
--- a/schema/spacewalk/postgres/packages/rhn_channel.pkb
+++ b/schema/spacewalk/postgres/packages/rhn_channel.pkb
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 9a8f9788f4fdeeeee56995bb10c9cacc8cceb700
+-- oracle equivalent source sha1 cc1b86fd8db5758d5f3a7ccc146f38954454def1
--
-- Copyright (c) 2008--2013 Red Hat, Inc.
--
@@ -1244,6 +1244,7 @@ update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_
select sc.server_id as id
from rhnServerChannel sc
where sc.channel_id = channel_id_in
+ order by id asc
) loop
perform rhn_server.update_needed_cache(server.id);
end loop;
commit 75b7f104508c05b6e8a5cb4533c8d8bc92893ddc
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Feb 11 14:46:53 2014 +0100
1063821 - avoid deadlocks when altering base channels via ssm
This fixes rhn_channel.update_needed_cache (executed by taskomatic)
vs. rhn_channel.(un)subscribe_server (executed by tomcat) deadlocks.
diff --git a/schema/spacewalk/oracle/packages/rhn_channel.pkb b/schema/spacewalk/oracle/packages/rhn_channel.pkb
index 325c18a..7ee39f2 100644
--- a/schema/spacewalk/oracle/packages/rhn_channel.pkb
+++ b/schema/spacewalk/oracle/packages/rhn_channel.pkb
@@ -61,7 +61,13 @@ IS
consenting_user NUMBER;
allowed number := 0;
is_fve CHAR(1) := 'N';
+ update_lock number;
BEGIN
+ select 1
+ into update_lock
+ from rhnServer
+ where id = server_id_in
+ for update;
if user_id_in is not null then
allowed := rhn_channel.user_role_check(channel_id_in, user_id_in, 'subscribe');
else
@@ -452,6 +458,7 @@ IS
server_org_id_val NUMBER;
available_subscriptions NUMBER;
server_already_in_chan BOOLEAN;
+ update_lock number;
cursor channel_family_is_proxy(channel_family_id_in in number) is
select 1
from rhnChannelFamily
@@ -476,6 +483,11 @@ IS
and c.id = sc.channel_id
and sc.server_id = server_id_in;
BEGIN
+ select 1
+ into update_lock
+ from rhnServer
+ where id = server_id_in
+ for update;
FOR child IN local_chk_server_parent_memb(server_id_in, channel_id_in)
LOOP
if unsubscribe_children_in = 1 then
diff --git a/schema/spacewalk/oracle/packages/rhn_server.pkb b/schema/spacewalk/oracle/packages/rhn_server.pkb
index 36b711c..40939b2 100644
--- a/schema/spacewalk/oracle/packages/rhn_server.pkb
+++ b/schema/spacewalk/oracle/packages/rhn_server.pkb
@@ -747,7 +747,13 @@ is
procedure update_needed_cache(server_id_in in number)
is
+ update_lock number;
begin
+ select 1
+ into update_lock
+ from rhnServer
+ where id = server_id_in
+ for update;
delete from rhnServerNeededCache
where server_id = server_id_in;
insert into rhnServerNeededCache
diff --git a/schema/spacewalk/postgres/packages/rhn_channel.pkb b/schema/spacewalk/postgres/packages/rhn_channel.pkb
index 5931562..b7d6111 100644
--- a/schema/spacewalk/postgres/packages/rhn_channel.pkb
+++ b/schema/spacewalk/postgres/packages/rhn_channel.pkb
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 e6fa92f40cfb0ac1645f53ecad5f2a8f99a616f7
+-- oracle equivalent source sha1 9a8f9788f4fdeeeee56995bb10c9cacc8cceb700
--
-- Copyright (c) 2008--2013 Red Hat, Inc.
--
@@ -65,7 +65,13 @@ update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_
consenting_user NUMERIC;
allowed numeric;
is_fve_char char(1) := 'N';
+ update_lock numeric;
BEGIN
+ select 1
+ into update_lock
+ from rhnServer
+ where id = server_id_in
+ for update;
if user_id_in is not null then
allowed := rhn_channel.user_role_check(channel_id_in, user_id_in, 'subscribe');
else
@@ -483,6 +489,7 @@ update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_
server_org_id_val NUMERIC;
available_subscriptions NUMERIC;
server_already_in_chan BOOLEAN;
+ update_lock numeric;
channel_family_is_proxy cursor(channel_family_id_in numeric) for
select 1
from rhnChannelFamily
@@ -495,6 +502,11 @@ update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_
and label = 'rhn-satellite';
child record;
BEGIN
+ select 1
+ into update_lock
+ from rhnServer
+ where id = server_id_in
+ for update;
-- In PostgreSQL recursion with opened cursors is not allowed so we use
-- FOR IN SELECT form which is ok.
FOR child IN select c.id
diff --git a/schema/spacewalk/postgres/packages/rhn_server.pkb b/schema/spacewalk/postgres/packages/rhn_server.pkb
index 41f2e9a..d47df86 100644
--- a/schema/spacewalk/postgres/packages/rhn_server.pkb
+++ b/schema/spacewalk/postgres/packages/rhn_server.pkb
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 b6947eea546edc7a66c7b53d0b62dc734ce3ca8a
+-- oracle equivalent source sha1 07b6ab3867e4d4ebf772b6ee9731f83e33f4d7ae
--
-- Copyright (c) 2008--2012 Red Hat, Inc.
--
@@ -789,7 +789,14 @@ update pg_settings set setting = 'rhn_server,' || setting where name = 'search_p
create or replace function update_needed_cache(
server_id_in in numeric
) returns void as $$
+ declare
+ update_lock numeric;
begin
+ select 1
+ into update_lock
+ from rhnServer
+ where id = server_id_in
+ for update;
delete from rhnServerNeededCache
where server_id = server_id_in;
insert into rhnServerNeededCache
commit b4919ac0ea942c20766da455bd6a8d2260939ba2
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Tue Feb 11 11:53:28 2014 +0100
Fix an ISE that could happen after clearing cookies (elaborator not bound)
diff --git a/java/code/src/com/redhat/rhn/frontend/action/ssm/ProvisioningRemoteCommand.java b/java/code/src/com/redhat/rhn/frontend/action/ssm/ProvisioningRemoteCommand.java
index 926055e..a908a5e 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/ssm/ProvisioningRemoteCommand.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/ssm/ProvisioningRemoteCommand.java
@@ -329,7 +329,7 @@ public class ProvisioningRemoteCommand extends RhnAction implements Listable {
public List<SystemOverview> getResult(RequestContext context) {
List<SystemOverview> dataset = new ArrayList<SystemOverview>();
List<SystemOverview> sysOvr = SystemManager.inSet(context.getLoggedInUser(),
- RhnSetDecl.SYSTEMS.getLabel());
+ RhnSetDecl.SYSTEMS.getLabel(), true);
for (int i = 0; i < sysOvr.size(); i++) {
Server server = SystemManager.lookupByIdAndUser(sysOvr.get(i).getId(),
context.getLoggedInUser());
diff --git a/java/code/webapp/WEB-INF/pages/ssm/provisioning-remote-command.jsp b/java/code/webapp/WEB-INF/pages/ssm/provisioning-remote-command.jsp
index ae1213f..2e4d85a 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/provisioning-remote-command.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/provisioning-remote-command.jsp
@@ -77,7 +77,6 @@
alphabarcolumn="name"
filter="com.redhat.rhn.frontend.taglibs.list.filters.SystemOverviewFilter">
- <rl:decorator name="ElaborationDecorator"/>
<rl:decorator name="SystemIconDecorator"/>
<rl:decorator name="PageSizeDecorator"/>
commit 6303cdfbff967d124c8113b1ecef534ca71c610c
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Mon Feb 10 18:09:24 2014 +0100
Removed duplicate colons
diff --git a/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp b/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp
index 4c1a07d..2f24151 100644
--- a/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp
@@ -37,7 +37,7 @@
</div>
<div class="form-group">
<label class="col-md-3 control-label">
- <bean:message key="schedule.jsp.at" />:
+ <bean:message key="schedule.jsp.at" />
</label>
<div class="col-md-6">
<jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
diff --git a/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp
index 821302e..81b89f7 100644
--- a/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp
@@ -42,7 +42,7 @@
<div class="form-horizontal">
<div class="form-group">
<label class="col-md-3 control-label">
- <bean:message key="schedule.jsp.at" />:
+ <bean:message key="schedule.jsp.at" />
</label>
<div class="col-md-6">
<jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
commit 31d358af3f9707771107ed6887989eeeed30e50f
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Mon Feb 10 18:08:42 2014 +0100
Unified space before slash in void tags
diff --git a/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp b/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp
index 0b3c796..4c1a07d 100644
--- a/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp
@@ -9,7 +9,7 @@
<body>
<%@ include file="/WEB-INF/pages/common/fragments/errata/errata-header.jspf" %>
<h2>
- <bean:message key="confirm.jsp.header"/> ${errata.advisoryName}
+ <bean:message key="confirm.jsp.header" /> ${errata.advisoryName}
</h2>
<p>
<bean:message key="confirm.jsp.summary" arg0="${errata.advisoryName}" />
@@ -37,22 +37,22 @@
</div>
<div class="form-group">
<label class="col-md-3 control-label">
- <bean:message key="schedule.jsp.at"/>:
+ <bean:message key="schedule.jsp.at" />:
</label>
<div class="col-md-6">
<jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
- <jsp:param name="widget" value="date"/>
+ <jsp:param name="widget" value="date" />
</jsp:include>
</div>
</div>
<div class="form-group">
<div class="col-md-offset-3 col-md-6">
<html:submit property="dispatch">
- <bean:message key="confirm.jsp.confirm"/>
+ <bean:message key="confirm.jsp.confirm" />
</html:submit>
</div>
</div>
- <html:hidden property="eid" value="${param.eid}"/>
+ <html:hidden property="eid" value="${param.eid}" />
<input type="hidden" name="use_date" value="true" />
</rhn:list>
</html:form>
diff --git a/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp
index 432ae2a..821302e 100644
--- a/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp
@@ -11,15 +11,15 @@
<body>
<%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
<h2>
- <rhn:icon type="header-errata" /><bean:message key="errataconfirm.jsp.header"/>
+ <rhn:icon type="header-errata" /><bean:message key="errataconfirm.jsp.header" />
</h2>
<rhn:systemtimemessage server="${system}" />
<rl:listset name="erratConfirmListSet">
<rhn:csrf />
<rhn:submitted />
<rl:list width="100%" styleclass="list" emptykey="erratalist.jsp.noerrata">
- <rl:decorator name="PageSizeDecorator"/>
- <rl:decorator name="ElaborationDecorator"/>
+ <rl:decorator name="PageSizeDecorator" />
+ <rl:decorator name="ElaborationDecorator" />
<rl:column headerkey="erratalist.jsp.type" styleclass="text-align: center;">
<c:if test="${current.securityAdvisory}">
<rhn:icon type="errata-security" />
@@ -42,23 +42,23 @@
<div class="form-horizontal">
<div class="form-group">
<label class="col-md-3 control-label">
- <bean:message key="schedule.jsp.at"/>:
+ <bean:message key="schedule.jsp.at" />:
</label>
<div class="col-md-6">
<jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
- <jsp:param name="widget" value="date"/>
+ <jsp:param name="widget" value="date" />
</jsp:include>
</div>
</div>
<div class="form-group">
<div class="col-md-offset-3 col-md-6">
<html:submit property="dispatch">
- <bean:message key="errataconfirm.jsp.confirm"/>
+ <bean:message key="errataconfirm.jsp.confirm" />
</html:submit>
</div>
</div>
</div>
- <html:hidden property="sid" value="${param.sid}"/>
+ <html:hidden property="sid" value="${param.sid}" />
<input type="hidden" name="use_date" value="true">
</rl:listset>
</body>
commit 1ae33e052ef7b449ed34b8bea9411bc45631c0e6
Author: Bo Maryniuk <bo(a)suse.de>
Date: Thu Feb 6 18:37:55 2014 +0100
Datepicker UI unification: Errata pages
Formatting fixes (empty spaces, idents)
diff --git a/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp b/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp
index 9d6c0ca..0b3c796 100644
--- a/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp
@@ -2,71 +2,59 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
-
-
<html>
-<head>
- <meta name="name" value="Systems Affected" />
-</head>
-<body>
-
-<%@ include file="/WEB-INF/pages/common/fragments/errata/errata-header.jspf" %>
-<h2><bean:message key="confirm.jsp.header"/> ${errata.advisoryName}</h2>
-
- <div class="page-summary">
- <p>
- <bean:message key="confirm.jsp.summary" arg0="${errata.advisoryName}" />
- </p>
- </div>
-
-<c:set var="pageList" value="${requestScope.pageList}" />
-<html:form method="POST" action="errata/details/ErrataConfirmSubmit.do">
-<rhn:csrf />
-<rhn:list pageList="${requestScope.pageList}" noDataText="nosystems.message">
- <rhn:listdisplay>
- <rhn:column header="actions.jsp.system">
- ${current.name}
- </rhn:column>
- <rhn:column header="actions.jsp.basechannel">
- ${current.channelLabels}
- </rhn:column>
- </rhn:listdisplay>
-
-
-
-<p><bean:message key="applyerrata.disclaimer" /></p>
-
-<table class="schedule-action-interface" align="center">
- <tr>
- <td><html:radio property="use_date" value="false" /></td>
- <th><bean:message key="syncprofile.jsp.now"/></th>
- </tr>
- <tr>
- <td><html:radio property="use_date" value="true" /></td>
- <th><bean:message key="syncprofile.jsp.than"/></th>
- </tr>
- <tr>
- <th><rhn:icon type="header-schedule" title="syncprofile.jsp.selection" />
- </th>
- <td>
- <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
- <jsp:param name="widget" value="date"/>
- </jsp:include>
- </td>
- </tr>
-</table>
-
-<div class="text-right">
- <hr />
- <html:submit property="dispatch">
- <bean:message key="confirm.jsp.confirm"/>
- </html:submit>
-</div>
-
-<html:hidden property="eid" value="${param.eid}"/>
-
-</rhn:list>
-</html:form>
-
-</body>
+ <head>
+ <meta name="name" value="Systems Affected" />
+ </head>
+ <body>
+ <%@ include file="/WEB-INF/pages/common/fragments/errata/errata-header.jspf" %>
+ <h2>
+ <bean:message key="confirm.jsp.header"/> ${errata.advisoryName}
+ </h2>
+ <p>
+ <bean:message key="confirm.jsp.summary" arg0="${errata.advisoryName}" />
+ </p>
+ <c:set var="pageList" value="${requestScope.pageList}" />
+ <html:form method="POST"
+ styleClass="form-horizontal"
+ action="errata/details/ErrataConfirmSubmit.do">
+ <rhn:csrf />
+ <rhn:list pageList="${requestScope.pageList}" noDataText="nosystems.message">
+ <rhn:listdisplay>
+ <rhn:column header="actions.jsp.system">
+ ${current.name}
+ </rhn:column>
+ <rhn:column header="actions.jsp.basechannel">
+ ${current.channelLabels}
+ </rhn:column>
+ </rhn:listdisplay>
+ <div class="form-group">
+ <div class="col-md-offset-3 col-md-6">
+ <span class="help-block">
+ <bean:message key="applyerrata.disclaimer" />
+ </span>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-md-3 control-label">
+ <bean:message key="schedule.jsp.at"/>:
+ </label>
+ <div class="col-md-6">
+ <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
+ <jsp:param name="widget" value="date"/>
+ </jsp:include>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-md-offset-3 col-md-6">
+ <html:submit property="dispatch">
+ <bean:message key="confirm.jsp.confirm"/>
+ </html:submit>
+ </div>
+ </div>
+ <html:hidden property="eid" value="${param.eid}"/>
+ <input type="hidden" name="use_date" value="true" />
+ </rhn:list>
+ </html:form>
+ </body>
</html>
diff --git a/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp
index 2ccbdb6..432ae2a 100644
--- a/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp
@@ -4,85 +4,62 @@
<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
-
<html>
-<head>
- <meta name="name" value="System Details" />
-</head>
-<body>
-
-<%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
-
-<h2><rhn:icon type="header-errata" /><bean:message key="errataconfirm.jsp.header"/></h2>
-
-<rhn:systemtimemessage server="${system}" />
-
-
-<rl:listset name="erratConfirmListSet">
- <rhn:csrf />
- <rhn:submitted />
- <rl:list
- width="100%"
- styleclass="list"
- emptykey="erratalist.jsp.noerrata">
-
- <rl:decorator name="PageSizeDecorator"/>
- <rl:decorator name="ElaborationDecorator"/>
-
- <rl:column headerkey="erratalist.jsp.type" styleclass="text-align: center;">
- <c:if test="${current.securityAdvisory}">
- <rhn:icon type="errata-security" />
- </c:if>
- <c:if test="${current.bugFix}">
- <rhn:icon type="errata-bugfix" />
- </c:if>
- <c:if test="${current.productEnhancement}">
- <rhn:icon type="errata-enhance" />
- </c:if>
- </rl:column>
-
- <rl:column headerkey="erratalist.jsp.advisory">
- <a href="/rhn/errata/details/Details.do?eid=${current.id}">
- ${current.advisoryName}</a>
- </rl:column>
-
- <rl:column headerkey="erratalist.jsp.synopsis">
- ${current.advisorySynopsis}
- </rl:column>
-
- <rl:column headerkey="erratalist.jsp.updated">
- ${current.updateDate}
- </rl:column>
- </rl:list>
-
- <table class="schedule-action-interface" align="center">
- <tr>
- <td><input type="radio" name="use_date" value="false" checked="checked"/></td>
- <th><bean:message key="syncprofile.jsp.now"/></th>
- </tr>
- <tr>
- <td><input type="radio" name="use_date" value="true" /></td>
- <th><bean:message key="syncprofile.jsp.than"/></th>
- </tr>
- <tr>
- <th><rhn:icon type="header-schedule" title="syncprofile.jsp.selection" />
- </th>
- <td>
- <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
- <jsp:param name="widget" value="date"/>
- </jsp:include>
- </td>
- </tr>
- </table>
-
- <div class="text-right">
- <hr />
- <html:submit property="dispatch">
- <bean:message key="errataconfirm.jsp.confirm"/>
- </html:submit>
- </div>
- <html:hidden property="sid" value="${param.sid}"/>
-
-</rl:listset>
-</body>
+ <head>
+ <meta name="name" value="System Details" />
+ </head>
+ <body>
+ <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
+ <h2>
+ <rhn:icon type="header-errata" /><bean:message key="errataconfirm.jsp.header"/>
+ </h2>
+ <rhn:systemtimemessage server="${system}" />
+ <rl:listset name="erratConfirmListSet">
+ <rhn:csrf />
+ <rhn:submitted />
+ <rl:list width="100%" styleclass="list" emptykey="erratalist.jsp.noerrata">
+ <rl:decorator name="PageSizeDecorator"/>
+ <rl:decorator name="ElaborationDecorator"/>
+ <rl:column headerkey="erratalist.jsp.type" styleclass="text-align: center;">
+ <c:if test="${current.securityAdvisory}">
+ <rhn:icon type="errata-security" />
+ </c:if>
+ <c:if test="${current.bugFix}">
+ <rhn:icon type="errata-bugfix" />
+ </c:if>
+ <c:if test="${current.productEnhancement}">
+ <rhn:icon type="errata-enhance" />
+ </c:if>
+ </rl:column>
+ <rl:column headerkey="erratalist.jsp.advisory">
+ <a href="/rhn/errata/details/Details.do?eid=${current.id}">
+ ${current.advisoryName}
+ </a>
+ </rl:column>
+ <rl:column headerkey="erratalist.jsp.synopsis">${current.advisorySynopsis}</rl:column>
+ <rl:column headerkey="erratalist.jsp.updated">${current.updateDate}</rl:column>
+ </rl:list>
+ <div class="form-horizontal">
+ <div class="form-group">
+ <label class="col-md-3 control-label">
+ <bean:message key="schedule.jsp.at"/>:
+ </label>
+ <div class="col-md-6">
+ <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
+ <jsp:param name="widget" value="date"/>
+ </jsp:include>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-md-offset-3 col-md-6">
+ <html:submit property="dispatch">
+ <bean:message key="errataconfirm.jsp.confirm"/>
+ </html:submit>
+ </div>
+ </div>
+ </div>
+ <html:hidden property="sid" value="${param.sid}"/>
+ <input type="hidden" name="use_date" value="true">
+ </rl:listset>
+ </body>
</html>
1
0
Branch 'master-bootstrap-css-fixes' - 3 commits - java/code web/html web/include
by Silvio Moioli 13 Feb '14
by Silvio Moioli 13 Feb '14
13 Feb '14
java/code/src/com/redhat/rhn/frontend/taglibs/LocalizedSubmitTag.java | 10 ++++++++++
java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp | 2 +-
java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp | 2 +-
java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filter-form.jspf | 2 +-
java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/method-create.jsp | 2 +-
java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp | 4 ++--
java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystemsedit.jsp | 2 +-
java/code/webapp/WEB-INF/pages/admin/multiorg/deletesatadmin.jsp | 2 +-
java/code/webapp/WEB-INF/pages/admin/multiorg/extgroup_delete.jsp | 2 +-
java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp | 2 +-
java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp | 2 +-
java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp | 2 +-
java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp | 4 ++--
java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp | 6 +++---
java/code/webapp/WEB-INF/pages/channel/manage/channelrepos.jsp | 2 +-
java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp | 2 +-
java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove.jsp | 2 +-
java/code/webapp/WEB-INF/pages/channel/manage/distchannelmap.jsp | 2 +-
java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp | 2 +-
java/code/webapp/WEB-INF/pages/channel/manage/errataremove.jsp | 2 +-
java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp | 2 +-
java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp | 2 +-
java/code/webapp/WEB-INF/pages/channel/manage/syncrepos.jsp | 4 ++--
java/code/webapp/WEB-INF/pages/channel/ssm/basesub.jsp | 2 +-
java/code/webapp/WEB-INF/pages/channel/ssm/childsubconfirm.jsp | 2 +-
java/code/webapp/WEB-INF/pages/channel/ssm/childsubs.jsp | 2 +-
java/code/webapp/WEB-INF/pages/channel/ssm/confirmnewbasechannels.jsp | 4 ++--
java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp | 2 +-
java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list.jspf | 4 ++--
java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablewidgets.jspf | 2 +-
java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deployglobal.jspf | 2 +-
java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf | 2 +-
java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/manage_header.jspf | 4 ++--
java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/upload.jspf | 2 +-
java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_confirm.jspf | 2 +-
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/clone.jspf | 2 +-
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/cobbler-variables.jspf | 2 +-
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/deleteconfirm.jspf | 2 +-
java/code/webapp/WEB-INF/pages/common/fragments/manage/managers.jspf | 2 +-
java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf | 4 ++--
java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf | 3 ++-
java/code/webapp/WEB-INF/pages/configuration/channel/channelfiles.jsp | 6 +++---
java/code/webapp/WEB-INF/pages/configuration/channel/deploy.jsp | 4 ++--
java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp | 2 +-
java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp | 2 +-
java/code/webapp/WEB-INF/pages/configuration/files/deletefile.jsp | 2 +-
java/code/webapp/WEB-INF/pages/configuration/files/deleterev.jsp | 2 +-
java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp | 2 +-
java/code/webapp/WEB-INF/pages/configuration/files/filedetails.jsp | 2 +-
java/code/webapp/WEB-INF/pages/configuration/files/manage.jsp | 2 +-
java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp | 2 +-
java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp | 2 +-
java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp | 2 +-
java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp | 2 +-
java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp | 2 +-
java/code/webapp/WEB-INF/pages/configuration/ssm/diffconfirm.jsp | 2 +-
java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp | 2 +-
java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp | 2 +-
java/code/webapp/WEB-INF/pages/errata/delete.jsp | 2 +-
java/code/webapp/WEB-INF/pages/errata/editchannels.jsp | 2 +-
java/code/webapp/WEB-INF/pages/errata/notify.jsp | 2 +-
java/code/webapp/WEB-INF/pages/groups/adminlist.jsp | 2 +-
java/code/webapp/WEB-INF/pages/groups/erratasystemsaffected.jsp | 2 +-
java/code/webapp/WEB-INF/pages/keys/key-form-disabled.jspf | 2 +-
java/code/webapp/WEB-INF/pages/kickstart/activationkeys.jsp | 2 +-
java/code/webapp/WEB-INF/pages/kickstart/cryptokeys.jsp | 2 +-
java/code/webapp/WEB-INF/pages/kickstart/file_preservation_lists.jsp | 2 +-
java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp | 2 +-
java/code/webapp/WEB-INF/pages/kickstart/packageprofiles.jsp | 4 ++--
java/code/webapp/WEB-INF/pages/kickstart/script-form.jspf | 2 +-
java/code/webapp/WEB-INF/pages/kickstart/scriptdelete.jsp | 2 +-
java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp | 2 +-
java/code/webapp/WEB-INF/pages/kickstart/ssm/kickstartablesystems.jsp | 2 +-
java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp | 2 +-
java/code/webapp/WEB-INF/pages/kickstart/treedelete-confirm.jsp | 2 +-
java/code/webapp/WEB-INF/pages/kickstart/troubleshooting.jsp | 2 +-
java/code/webapp/WEB-INF/pages/profiles/delete.jsp | 2 +-
java/code/webapp/WEB-INF/pages/ssm/packageremove.jsp | 3 ++-
java/code/webapp/WEB-INF/pages/ssm/packagescheduleremote.jsp | 6 +++---
java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp | 3 ++-
java/code/webapp/WEB-INF/pages/ssm/packageverify.jsp | 3 ++-
java/code/webapp/WEB-INF/pages/ssm/systems/misc/index.jsp | 2 +-
java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp | 4 ++--
java/code/webapp/WEB-INF/pages/ssm/systems/misc/reboot-system-confirm.jsp | 2 +-
java/code/webapp/WEB-INF/pages/ssm/systems/misc/reboot-system.jsp | 2 +-
java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata-confirm.jsp | 2 +-
java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp | 2 +-
java/code/webapp/WEB-INF/pages/ssm/systems/ssmdeleteconfirm.jsp | 2 +-
java/code/webapp/WEB-INF/pages/ssm/systems/ssmhwrefresh.jsp | 2 +-
java/code/webapp/WEB-INF/pages/ssm/systems/ssmswrefresh.jsp | 2 +-
java/code/webapp/WEB-INF/pages/systems/crashes.jsp | 2 +-
java/code/webapp/WEB-INF/pages/systems/crashnotedelete.jsp | 2 +-
java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdeleteconfirm.jsp | 2 +-
java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_cancel.jsp | 2 +-
java/code/webapp/WEB-INF/pages/systems/details/packages/packagesindex.jsp | 2 +-
java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchconfirm.jsp | 2 +-
java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstall.jsp | 2 +-
java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstallconfirm.jsp | 2 +-
java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchlist.jsp | 2 +-
java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/install_patchset.jsp | 2 +-
java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/compareprofiles.jsp | 2 +-
java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comparesystems.jsp | 2 +-
java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/delete.jsp | 2 +-
java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/missingpkgs.jsp | 6 +++---
java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncprofile.jsp | 2 +-
java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp | 2 +-
java/code/webapp/WEB-INF/pages/systems/details/packages/scheduleremote.jsp | 6 +++---
java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguests_confirm.jsp | 2 +-
java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguestslist.jsp | 4 ++--
java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemsdelete.jsp | 2 +-
java/code/webapp/WEB-INF/pages/systems/errata.jsp | 4 ++--
java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp | 2 +-
java/code/webapp/WEB-INF/pages/systems/probes/delete.jsp | 2 +-
java/code/webapp/WEB-INF/pages/systems/probes/index.jsp | 2 +-
java/code/webapp/WEB-INF/pages/systems/probes/probedelete.jsp | 2 +-
java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp | 2 +-
java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp | 2 +-
java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp | 4 ++--
java/code/webapp/WEB-INF/pages/systems/sdc/delete_confirm.jsp | 2 +-
java/code/webapp/WEB-INF/pages/systems/sdc/note_delete.jsp | 2 +-
web/html/network/software/channels/manage/patchsets/add.pxt | 2 +-
web/html/network/systems/ssm/groups/alter_membership_conf.pxt | 2 +-
web/html/network/systems/ssm/misc/change_sys_pref_conf.pxt | 2 +-
web/html/network/systems/ssm/misc/remove_value.pxt | 2 +-
web/html/network/systems/ssm/misc/set_value.pxt | 2 +-
web/include/network/components/monitoring/create_notification_method.pxi | 2 +-
web/include/network/components/monitoring/delete_notification_method.pxi | 2 +-
web/include/network/components/monitoring/edit_notification_method.pxi | 2 +-
web/include/network/components/systems/reschedule_action_form.pxi | 4 ++--
129 files changed, 166 insertions(+), 152 deletions(-)
New commits:
commit 16f127940713ecedd3688d45ac2b7d6968a4990b
Author: Maximilian Meister <mmeister(a)suse.de>
Date: Tue Feb 11 09:40:56 2014 +0100
Styling unstyled submit buttons.
diff --git a/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp b/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp
index 9f52034..df437d2 100644
--- a/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp
@@ -20,7 +20,7 @@
<c:out value="${bunchdescription}"/>
</div>
<div class="text-right">
- <input type="submit" name="dispatch"
+ <input class="btn btn-default" type="submit" name="dispatch"
value="<bean:message key='bunch.edit.jsp.button-schedule'/>" />
<rhn:csrf/>
<rhn:submitted/>
diff --git a/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp b/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp
index 9d6c0ca..ccc0e8d 100644
--- a/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp
@@ -58,7 +58,7 @@
<div class="text-right">
<hr />
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default" property="dispatch">
<bean:message key="confirm.jsp.confirm"/>
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filter-form.jspf b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filter-form.jspf
index 6220cf4..027037b 100644
--- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filter-form.jspf
+++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filter-form.jspf
@@ -202,7 +202,7 @@ function showDestination() {
</tr>
<tr>
<td></td>
- <td align="right"><html:submit><bean:message key="filtercreate.jsp.savefilter"/></html:submit></td>
+ <td align="right"><html:submit styleClass="btn btn-default"><bean:message key="filtercreate.jsp.savefilter"/></html:submit></td>
</tr>
</table>
diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/method-create.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/method-create.jsp
index 74eaebf..cf9e010 100644
--- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/method-create.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/method-create.jsp
@@ -47,7 +47,7 @@
</tr>
<tr>
<td></td>
- <td align="right"><html:submit><bean:message key="method-form.jspf.savemethod"/></html:submit></td>
+ <td align="right"><html:submit styleClass="btn btn-default"><bean:message key="method-form.jspf.savemethod"/></html:submit></td>
</tr>
</tr>
</table>
diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp
index bb0a1b6..99bc5e7 100644
--- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp
@@ -56,10 +56,10 @@
<c:if test="${not empty pageList}">
<div class="text-right">
<hr>
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default" property="dispatch">
<bean:message key="probesuitesystems.jsp.detachsystem"/>
</html:submit>
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default" property="dispatch">
<bean:message key="probesuitesystems.jsp.removesystem"/>
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystemsedit.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystemsedit.jsp
index 059d0cd..68c5cbd 100644
--- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystemsedit.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystemsedit.jsp
@@ -41,7 +41,7 @@
<option value="${cluster.id}">${cluster.description}</option>
</c:forEach>
</select>
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default" property="dispatch">
<bean:message key="probesuitesystemsedit.jsp.addsystem"/>
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/deletesatadmin.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/deletesatadmin.jsp
index dca50b2..373884d 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/deletesatadmin.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/deletesatadmin.jsp
@@ -20,7 +20,7 @@
<hr />
<html:hidden property="uid" value="${param.uid}" />
<html:hidden property="submitted" value="true" />
- <html:submit>
+ <html:submit styleClass="btn btn-default">
<bean:message key="confirm.displayname"/>
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/extgroup_delete.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/extgroup_delete.jsp
index a163a4d..867ed33 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/extgroup_delete.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/extgroup_delete.jsp
@@ -44,7 +44,7 @@
<div class="form-group">
<div class="col-lg-offset-3 col-lg-6">
- <html:submit><bean:message key="extgroup.jsp.delete"/></html:submit>
+ <html:submit styleClass="btn btn-default"><bean:message key="extgroup.jsp.delete"/></html:submit>
<html:hidden property="gid" value="${gid}" />
</div>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp
index 3dffea4..7659ecd 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp
@@ -54,7 +54,7 @@
<hr/>
<div class="text-right">
<rhn:submitted/>
- <input type="submit" name ="confirm" value="${rhn:localize('org.trust.modify')}" />
+ <input class="btn btn-default" type="submit" name ="confirm" value="${rhn:localize('org.trust.modify')}" />
</div>
</rl:listset>
</body>
diff --git a/java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp b/java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp
index d5b3faa..94ed441 100644
--- a/java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp
@@ -42,7 +42,7 @@
<div class="text-right">
<hr />
- <input type="submit" name="dispatch" value="<bean:message key='userconfirm.jsp.confirm'/>" />
+ <input class="btn btn-default" type="submit" name="dispatch" value="<bean:message key='userconfirm.jsp.confirm'/>" />
</div>
</rl:listset>
diff --git a/java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp b/java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp
index f8dbbb8..c270a32 100755
--- a/java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp
@@ -48,7 +48,7 @@
<rhn:submitted/>
<p align="right">
- <input type="submit" name="dispatch" value="<bean:message key='ssmchildsubs.jsp.subscribe'/>" </input>
+ <input class="btn btn-default" type="submit" name="dispatch" value="<bean:message key='ssmchildsubs.jsp.subscribe'/>" </input>
</p>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp
index ad64684..e92128f 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp
@@ -66,7 +66,7 @@
</td>
<td>
- <input type="submit" name="dispatch" value="<bean:message key='frontend.actions.channels.manager.add.viewErrata'/>">
+ <input class="btn btn-default" type="submit" name="dispatch" value="<bean:message key='frontend.actions.channels.manager.add.viewErrata'/>">
</td>
</tr>
</c:if>
@@ -129,7 +129,7 @@
</c:when>
</c:choose>
<p align="right">
- <input type="submit" name="dispatch" value="<bean:message key='frontend.actions.channels.manager.add.submit'/>"
+ <input class="btn btn-default" type="submit" name="dispatch" value="<bean:message key='frontend.actions.channels.manager.add.submit'/>"
<c:choose>
<c:when test="${empty pageList}">disabled</c:when>
</c:choose>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp
index 7cbcc3b..ec26c10 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp
@@ -58,7 +58,7 @@
</td>
<td>
- <input type="submit" name="dispatch" value="<bean:message key='frontend.actions.channels.manager.add.viewChannels'/>">
+ <input class="btn btn-default" type="submit" name="dispatch" value="<bean:message key='frontend.actions.channels.manager.add.viewChannels'/>">
</td>
</tr>
@@ -88,7 +88,7 @@
</td>
<td>
- <input type="submit" name="dispatch" value="<bean:message key='frontend.actions.channels.manager.add.viewErrata'/>">
+ <input class="btn btn-default" type="submit" name="dispatch" value="<bean:message key='frontend.actions.channels.manager.add.viewErrata'/>">
</td>
</tr>
</c:if>
@@ -152,7 +152,7 @@
</c:choose>
<p align="right">
- <input type="submit" name="dispatch" value="<bean:message key='frontend.actions.channels.manager.add.submit'/>"
+ <input class="btn btn-default" type="submit" name="dispatch" value="<bean:message key='frontend.actions.channels.manager.add.submit'/>"
<c:choose>
<c:when test="${empty pageList}">disabled</c:when>
</c:choose>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/channelrepos.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/channelrepos.jsp
index af5b068..cf04960 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/channelrepos.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/channelrepos.jsp
@@ -41,7 +41,7 @@
</rl:list>
<div class="text-right">
<hr />
- <input type="submit" name="dispatch"
+ <input class="btn btn-default" type="submit" name="dispatch"
value="<bean:message key='repos.jsp.update.channel'/>" />
</div>
<rhn:submitted/>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp
index 5e760dd..636fbea 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp
@@ -89,7 +89,7 @@
<hr />
<p align="right">
- <input type="submit" name="dispatch" value="<bean:message key='Clone Errata'/>"
+ <input class="btn btn-default" type="submit" name="dispatch" value="<bean:message key='Clone Errata'/>"
<c:choose>
<c:when test="${totalSize < 1}">disabled</c:when>
</c:choose>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove.jsp
index 9064649..321f89f 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove.jsp
@@ -65,7 +65,7 @@
</rl:list>
<p align="right">
- <input type="submit" name="dispatch" value="<bean:message key='channel.jsp.errata.confirmremove'/>">
+ <input class="btn btn-default" type="submit" name="dispatch" value="<bean:message key='channel.jsp.errata.confirmremove'/>">
</p>
<rhn:submitted/>
<input type="hidden" name="cid" value="${cid}">
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmap.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmap.jsp
index 16bfaa0..ebaa1e1 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmap.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmap.jsp
@@ -79,7 +79,7 @@
<!--
<div class="text-right">
<hr />
- <input type="submit" name="dispatch"
+ <input class="btn btn-default" type="submit" name="dispatch"
value="<bean:message key='distchannelmap.jsp.update'/>" />
</div>
<rhn:submitted/>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp
index c665bf8..1b8099a 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp
@@ -59,7 +59,7 @@
<div class="text-right">
<hr />
- <input type="submit" name="dispatch"
+ <input class="btn btn-default" type="submit" name="dispatch"
value="<bean:message key='confirm'/>" />
</div>
<rhn:submitted/>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/errataremove.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/errataremove.jsp
index e8ae981..4fabc61 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/errataremove.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/errataremove.jsp
@@ -96,7 +96,7 @@
</rl:list>
<p align="right">
- <input type="submit" name="dispatch" value="<bean:message key='channel.jsp.errata.remove'/>"
+ <input class="btn btn-default" type="submit" name="dispatch" value="<bean:message key='channel.jsp.errata.remove'/>"
<c:choose>
<c:when test="${empty errata_data}">disabled</c:when>
</c:choose>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp
index 9310f36..2da17b7 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp
@@ -88,7 +88,7 @@
<rhn:tooltip key="channel.jsp.errata.sync.note"/>
<p align="right">
- <input type="submit" name="dispatch" value="<bean:message key='header.jsp.errata.sync'/>">
+ <input class="btn btn-default" type="submit" name="dispatch" value="<bean:message key='header.jsp.errata.sync'/>">
</p>
<rhn:submitted/>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp
index 8db0fdc..0b001a1 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp
@@ -57,7 +57,7 @@
</rl:list>
<p align="right">
- <input type="submit" name="dispatch" value="<bean:message key='channel.manage.patchset.delete'/>" >
+ <input class="btn btn-default" type="submit" name="dispatch" value="<bean:message key='channel.manage.patchset.delete'/>" >
</p>
<rhn:submitted/>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/syncrepos.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/syncrepos.jsp
index 3f76b95..1d2b51f 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/syncrepos.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/syncrepos.jsp
@@ -41,7 +41,7 @@
</rl:list>
<div class="text-right">
<hr />
- <input type="submit" name="dispatch"
+ <input class="btn btn-default" type="submit" name="dispatch"
value="<bean:message key="repos.jsp.button-sync"/>" <c:if test="${inactive}">disabled="disabled"</c:if>/>
</div>
<rhn:submitted/>
@@ -53,7 +53,7 @@
</jsp:include>
<div class="text-right">
- <input type="submit" name="dispatch" <c:if test="${inactive}">disabled="disabled"</c:if>
+ <input class="btn btn-default" type="submit" name="dispatch" <c:if test="${inactive}">disabled="disabled"</c:if>
value="<bean:message key="schedule.button"/>" />
</div>
diff --git a/java/code/webapp/WEB-INF/pages/channel/ssm/basesub.jsp b/java/code/webapp/WEB-INF/pages/channel/ssm/basesub.jsp
index cbdc6d8..5d2cdd8 100644
--- a/java/code/webapp/WEB-INF/pages/channel/ssm/basesub.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/ssm/basesub.jsp
@@ -80,7 +80,7 @@
</rl:list>
<hr />
- <div class="text-right"><html:submit property="dispatch"><bean:message key="basesub.jsp.confirmSubscriptions"/></html:submit></div>
+ <div class="text-right"><html:submit styleClass="btn btn-default" property="dispatch"><bean:message key="basesub.jsp.confirmSubscriptions"/></html:submit></div>
</rl:listset>
</body>
</html>
diff --git a/java/code/webapp/WEB-INF/pages/channel/ssm/childsubconfirm.jsp b/java/code/webapp/WEB-INF/pages/channel/ssm/childsubconfirm.jsp
index de8d385..20369c1 100644
--- a/java/code/webapp/WEB-INF/pages/channel/ssm/childsubconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/ssm/childsubconfirm.jsp
@@ -58,7 +58,7 @@
</rl:list>
<hr />
- <div class="text-right"><html:submit property="dispatch"><bean:message key="ssmchildsubconfirm.jsp.submit"/></html:submit></div>
+ <div class="text-right"><html:submit styleClass="btn btn-default" property="dispatch"><bean:message key="ssmchildsubconfirm.jsp.submit"/></html:submit></div>
</rl:listset>
</body>
</html>
diff --git a/java/code/webapp/WEB-INF/pages/channel/ssm/childsubs.jsp b/java/code/webapp/WEB-INF/pages/channel/ssm/childsubs.jsp
index 0333a6a..b31f470 100644
--- a/java/code/webapp/WEB-INF/pages/channel/ssm/childsubs.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/ssm/childsubs.jsp
@@ -68,7 +68,7 @@
</c:forEach>
</table>
<hr />
- <div class="text-right"><html:submit property="dispatch"><bean:message key="ssmchildsubs.jsp.alter"/></html:submit></div>
+ <div class="text-right"><html:submit styleClass="btn btn-default" property="dispatch"><bean:message key="ssmchildsubs.jsp.alter"/></html:submit></div>
</rl:listset>
</body>
</html>
diff --git a/java/code/webapp/WEB-INF/pages/channel/ssm/confirmnewbasechannels.jsp b/java/code/webapp/WEB-INF/pages/channel/ssm/confirmnewbasechannels.jsp
index 8c39884..991f62d 100644
--- a/java/code/webapp/WEB-INF/pages/channel/ssm/confirmnewbasechannels.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/ssm/confirmnewbasechannels.jsp
@@ -141,11 +141,11 @@
<html:hidden property="base_channel_ids" value="${base_channel_ids}"/>
<html:hidden property="new_base_channel_ids" value="${new_base_channel_ids}"/>
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default" property="dispatch">
<bean:message key="basesub.jsp.confirm.cancel"/>
</html:submit>
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default" property="dispatch">
<bean:message key="basesub.jsp.confirm.alter"/>
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp b/java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp
index c938e4c..65b8bc4 100755
--- a/java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp
@@ -72,7 +72,7 @@
<rhn:submitted/>
<p align="right">
- <input type="submit" name="dispatch" value="<bean:message key='confirm'/>" </input>
+ <input class="btn btn-default" type="submit" name="dispatch" value="<bean:message key='confirm'/>" </input>
</p>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list.jspf
index 2fcfa67..8fdcd38 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list.jspf
@@ -44,12 +44,12 @@
exportColumns="xid,testResult,completed,pass,fail,error,unknown,notapplicable,notchecked,notselected,informational,fixed,sum"/>
<p align="right">
- <input type="submit" name="dispatch" value="<bean:message key='system.audit.listscap.jsp.diffbut'/>"
+ <input class="btn btn-default" type="submit" name="dispatch" value="<bean:message key='system.audit.listscap.jsp.diffbut'/>"
<c:choose>
<c:when test="${empty pageList}">disabled</c:when>
</c:choose>
>
- <input type="submit" name="dispatch" value="<bean:message key='system.audit.listscap.jsp.removebut'/>"
+ <input class="btn btn-success" type="submit" name="dispatch" value="<bean:message key='system.audit.listscap.jsp.removebut'/>"
<c:choose>
<c:when test="${empty pageList}">disabled</c:when>
</c:choose>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablewidgets.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablewidgets.jspf
index c83408b..bfd1b62 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablewidgets.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablewidgets.jspf
@@ -24,7 +24,7 @@
</div>
<div class="form-group">
<div class="col-md-offset-3 col-md-6">
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default" property="dispatch">
<bean:message key="targetsystems.jsp.enable" />
</html:submit>
<input type="hidden" name="use_date" value="true" />
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deployglobal.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deployglobal.jspf
index 718f538..0c95386 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deployglobal.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deployglobal.jspf
@@ -95,7 +95,7 @@
</div>
<hr />
<div class="text-right">
- <html:submit property="dispatch"><bean:message key="deploy.jsp.deploybutton" /></html:submit>
+ <html:submit styleClass="btn btn-default" property="dispatch"><bean:message key="deploy.jsp.deploybutton" /></html:submit>
</div>
</html:form>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf
index 8404dd9..b9551eb 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf
@@ -61,7 +61,7 @@
</tr>
</table>
<hr />
- <div class="text-right"><html:submit property="dispatch">
+ <div class="text-right"><html:submit styleClass="btn btn-default" property="dispatch">
<bean:message key="deploy.jsp.deploybutton" />
</html:submit></div>
</c:when>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/manage_header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/manage_header.jspf
index c0bae0a..bd3fbc9 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/manage_header.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/manage_header.jspf
@@ -32,7 +32,7 @@
<c:otherwise>
<c:choose>
<c:when test="${deleting}">
- <rhn:toolbar base="h1" img="/img/file-config.png" imgAlt="config.common.fileAlt"
+ <rhn:toolbar base="h1" icon="header-configuration" imgAlt="config.common.fileAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-configuration.jsp#configuration-files-local"
miscUrl="/rhn/configuration/file/FileDownload.do?crid=${file.latestConfigRevision.id}&cfid=${file.id}"
miscImg="action-download.gif"
@@ -45,7 +45,7 @@
</rhn:toolbar>
</c:when>
<c:otherwise>
- <rhn:toolbar base="h1" img="/img/file-config.png" imgAlt="config.common.fileAlt"
+ <rhn:toolbar base="h1" icon="header-configuration" imgAlt="config.common.fileAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-configuration.jsp#configuration-files-local"
deletionUrl="/rhn/configuration/file/DeleteFile.do?cfid=${file.id}"
deletionType="deletefile"
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/upload.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/upload.jspf
index 466adc9..e893173 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/upload.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/upload.jspf
@@ -15,7 +15,7 @@
</table>
<div class="text-right">
<hr />
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default" property="dispatch">
<bean:message key="manage.jsp.uploadbutton"/>
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_confirm.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_confirm.jspf
index 741bb0b..0d2fdef 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_confirm.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_confirm.jspf
@@ -35,7 +35,7 @@
<div class="text-right">
<hr />
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default" property="dispatch">
<bean:message key="${button}" />
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/clone.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/clone.jspf
index e36e10f..e2c037b 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/clone.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/clone.jspf
@@ -25,7 +25,7 @@
<td><html:text property="label" maxlength="64" size="32" /></td>
</tr>
<tr>
- <td align="right" colspan="2"><html:submit><bean:message key="kickstart.clone.jsp.clone"/></html:submit></td>
+ <td align="right" colspan="2"><html:submit styleClass="btn btn-default"><bean:message key="kickstart.clone.jsp.clone"/></html:submit></td>
</tr>
<html:hidden property="ksid" value="${ksdata.id}"/>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/cobbler-variables.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/cobbler-variables.jspf
index 5142e5b..73d2e81 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/cobbler-variables.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/cobbler-variables.jspf
@@ -37,7 +37,7 @@
<tr>
- <td align="right" colspan="2"><html:submit><bean:message key="kickstart.variable.jsp.update"/></html:submit></td>
+ <td align="right" colspan="2"><html:submit styleClass="btn btn-default"><bean:message key="kickstart.variable.jsp.update"/></html:submit></td>
</tr>
</table>
<input type="hidden" name="${param.name}" value = "${param.value}"/>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/deleteconfirm.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/deleteconfirm.jspf
index 7e9cede..cdf9b53 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/deleteconfirm.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/deleteconfirm.jspf
@@ -51,7 +51,7 @@
</c:if>
<tr>
<td align="right" colspan="2">
- <html:submit>
+ <html:submit styleClass="btn btn-default">
<bean:message key="kickstartdatadelete.jsp.confirmdelete"/>
</html:submit>
</td>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/manage/managers.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/manage/managers.jspf
index 1cad46f..d78d360 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/manage/managers.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/manage/managers.jspf
@@ -59,7 +59,7 @@
<hr />
<div class="text-right">
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default" property="dispatch">
<bean:message key="message.Update" />
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf
index 43c2754..4f0cd87 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf
@@ -99,7 +99,7 @@
exportColumns="id, name, groupAdmins, serverCount, monitoringStatus" />
<div class="text-right">
<hr />
- <input type="submit" name="union" value="${rhn:localize('grouplist.jsp.union')}" />
- <input type="submit" name="intersection" value="${rhn:localize('grouplist.jsp.intersection')}" />
+ <input class="btn btn-default" type="submit" name="union" value="${rhn:localize('grouplist.jsp.union')}" />
+ <input class="btn btn-default" type="submit" name="intersection" value="${rhn:localize('grouplist.jsp.intersection')}" />
</div>
<rhn:submitted/>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf
index a932251..e576226 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf
@@ -62,7 +62,8 @@
<div class="text-right">
<rhn:submitted/>
<hr/>
- <input type="submit"
+ <input class="btn btn-default"
+ type="submit"
name ="dispatch"
value='<bean:message key="${param.action_key}"/>'/>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/channelfiles.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/channelfiles.jsp
index 7421089..4fad843 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/channel/channelfiles.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/channel/channelfiles.jsp
@@ -55,11 +55,11 @@
<div class="text-right">
<rhn:require acl="config_channel_editable(channel.id)"
mixins="com.redhat.rhn.common.security.acl.ConfigAclHandler">
- <html:submit property="dispatch"><bean:message key="channelfiles.jsp.removeselected" /></html:submit>
+ <html:submit styleClass="btn btn-default" property="dispatch"><bean:message key="channelfiles.jsp.removeselected" /></html:submit>
</rhn:require>
- <html:submit property="dispatch"><bean:message key="channelfiles.jsp.copy2systems" /></html:submit>
+ <html:submit styleClass="btn btn-default" property="dispatch"><bean:message key="channelfiles.jsp.copy2systems" /></html:submit>
<rhn:require acl="user_role(config_admin)">
- <html:submit property="dispatch"><bean:message key="channelfiles.jsp.copy2channels" /></html:submit>
+ <html:submit styleClass="btn btn-default" property="dispatch"><bean:message key="channelfiles.jsp.copy2channels" /></html:submit>
</rhn:require>
</div>
</c:if>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/deploy.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/deploy.jsp
index 6fb3174..4a48648 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/channel/deploy.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/channel/deploy.jsp
@@ -46,8 +46,8 @@
<c:if test="${not empty requestScope.pageList}">
<hr />
<div class="text-right">
- <html:submit property="dispatch"><bean:message key="deploy.jsp.deployallbutton" /></html:submit>
- <html:submit property="dispatch"><bean:message key="deploy.jsp.deployselectedbutton" /></html:submit>
+ <html:submit styleClass="btn btn-default" property="dispatch"><bean:message key="deploy.jsp.deployallbutton" /></html:submit>
+ <html:submit styleClass="btn btn-default" property="dispatch"><bean:message key="deploy.jsp.deployselectedbutton" /></html:submit>
</div>
</c:if>
</html:form>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp
index 08b3c92..2c08a95 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp
@@ -92,7 +92,7 @@
</table>
<!-- DoIt Button -->
<div class="text-right">
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default" property="dispatch">
<bean:message key="deployconfirm.jsp.confirmbutton" />
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp
index 19eb345..0a6cd50 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp
@@ -38,7 +38,7 @@
</rhn:list>
<hr />
<div class="text-right">
- <html:submit property="dispatch"><bean:message key="deploysystems.jsp.deployconfirmbutton" /></html:submit>
+ <html:submit styleClass="btn btn-default" property="dispatch"><bean:message key="deploysystems.jsp.deployconfirmbutton" /></html:submit>
</div>
</div>
</html:form>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/deletefile.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/deletefile.jsp
index ff6b40c..22be599 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/files/deletefile.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/files/deletefile.jsp
@@ -33,7 +33,7 @@
</table>
<hr />
<div class="text-right">
- <html:submit><bean:message key="deletefile.jsp.submit" /></html:submit>
+ <html:submit styleClass="btn btn-default"><bean:message key="deletefile.jsp.submit" /></html:submit>
</div>
</html:form>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/deleterev.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/deleterev.jsp
index 2143b11..2c62474 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/files/deleterev.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/files/deleterev.jsp
@@ -33,7 +33,7 @@
</table>
<hr />
<div class="text-right">
- <html:submit><bean:message key="deleterev.jsp.submit" /></html:submit>
+ <html:submit styleClass="btn btn-default"><bean:message key="deleterev.jsp.submit" /></html:submit>
</div>
</html:form>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp
index d2bcaf3..9d08450 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp
@@ -55,7 +55,7 @@
</div>
<hr />
<div class="text-right">
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default" property="dispatch">
<bean:message key="deployconfirm.jsp.deploybutton" />
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/filedetails.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/filedetails.jsp
index fead9da..e49b122 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/files/filedetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/files/filedetails.jsp
@@ -39,7 +39,7 @@
<div class="submit-bar">
<hr />
<div class="text-right">
- <html:submit><bean:message key="filedetails.jsp.update" /></html:submit>
+ <html:submit styleClass="btn btn-default"><bean:message key="filedetails.jsp.update" /></html:submit>
</div>
</div>
</rhn:require>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/manage.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/manage.jsp
index 462dab6..320ad7c 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/files/manage.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/files/manage.jsp
@@ -66,7 +66,7 @@
<div class="text-right">
<hr />
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default" property="dispatch">
<bean:message key="manage.jsp.uploadbutton"/>
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp
index 7c4787a..69c66d0 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp
@@ -56,7 +56,7 @@
</rhn:listdisplay>
<div class="text-right">
<hr />
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default" property="dispatch">
<bean:message key="sdc.configlist.jsp.unsubscribe"/>
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp
index 95f019e..07d1bfc 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp
@@ -67,7 +67,7 @@
</rhn:list>
<div class="text-right">
<hr />
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default" property="dispatch">
<bean:message key="sdcimportfile.jsp.button"/>
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp
index 50b466f..d8e6ae1 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp
@@ -82,7 +82,7 @@
<div class="text-right">
<hr />
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default" property="dispatch">
<bean:message key="sdcimportconfirm.jsp.confirm" />
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp
index ef49282..3a75315 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp
@@ -45,7 +45,7 @@
</rhn:listdisplay>
<div class="text-right">
<hr />
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default" property="dispatch">
<bean:message key="sdc.config.subscriptions.jsp.continue"/>
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp
index acf28db..2b7c9af 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp
@@ -53,7 +53,7 @@
<div class="text-right">
<hr />
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default" property="dispatch">
<bean:message key="deployconfirm.jsp.confirm" />
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/diffconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/diffconfirm.jsp
index aa5f7e2..a7684db 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/ssm/diffconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/diffconfirm.jsp
@@ -32,7 +32,7 @@
<c:if test="${not empty requestScope.pageList}">
<div class="text-right">
<hr />
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default" property="dispatch">
<bean:message key="diffconfirm.jsp.confirm" />
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp
index deb3114..19a9d94 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp
@@ -111,7 +111,7 @@
<rhn:submitted />
<div class="text-right">
<hr />
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default" property="dispatch">
<bean:message key="ssm.config.subscribeconfirm.jsp.confirm" />
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp b/java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp
index 71536c8..6cbd967 100644
--- a/java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp
@@ -83,7 +83,7 @@
<div class="text-right">
<hr />
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default" property="dispatch">
<bean:message key="affectedsystems.jsp.apply"/>
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/errata/delete.jsp b/java/code/webapp/WEB-INF/pages/errata/delete.jsp
index b1736a2..c014482 100644
--- a/java/code/webapp/WEB-INF/pages/errata/delete.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/delete.jsp
@@ -42,7 +42,7 @@
<rhn:csrf />
<rhn:submitted />
<input type="hidden" name="eid" value="<c:out value="${param.eid}"/>" />
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default" property="dispatch">
<bean:message key="delete.jsp.delete"/>
</html:submit>
</form>
diff --git a/java/code/webapp/WEB-INF/pages/errata/editchannels.jsp b/java/code/webapp/WEB-INF/pages/errata/editchannels.jsp
index bceb62c..3c186da 100644
--- a/java/code/webapp/WEB-INF/pages/errata/editchannels.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/editchannels.jsp
@@ -45,7 +45,7 @@
<input type="hidden" name="eid" value="<c:out value="${param.eid}"/>" />
<input type="hidden" name="returnvisit" value="<c:out value="${param.returnvisit}"/>"/>
<div class="text-right">
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default" property="dispatch">
<bean:message key="errata.channels.updatechannels"/>
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/errata/notify.jsp b/java/code/webapp/WEB-INF/pages/errata/notify.jsp
index f6198e8..d69a37f 100644
--- a/java/code/webapp/WEB-INF/pages/errata/notify.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/notify.jsp
@@ -28,7 +28,7 @@
<form action="/rhn/errata/manage/NotifySubmit.do" method="POST">
<rhn:csrf />
<input type="hidden" name="eid" value="<c:out value="${param.eid}"/>"/>
- <html:submit>
+ <html:submit styleClass="btn btn-default">
<bean:message key="errata.edit.sendnotification"/>
</html:submit>
</form>
diff --git a/java/code/webapp/WEB-INF/pages/groups/adminlist.jsp b/java/code/webapp/WEB-INF/pages/groups/adminlist.jsp
index 990d386..c444004 100644
--- a/java/code/webapp/WEB-INF/pages/groups/adminlist.jsp
+++ b/java/code/webapp/WEB-INF/pages/groups/adminlist.jsp
@@ -63,7 +63,7 @@
<hr />
<div class="text-right">
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default" property="dispatch">
<bean:message key="message.Update" />
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/groups/erratasystemsaffected.jsp b/java/code/webapp/WEB-INF/pages/groups/erratasystemsaffected.jsp
index dd8329b..b2970fa 100644
--- a/java/code/webapp/WEB-INF/pages/groups/erratasystemsaffected.jsp
+++ b/java/code/webapp/WEB-INF/pages/groups/erratasystemsaffected.jsp
@@ -30,7 +30,7 @@
<rhn:submitted />
<hr />
<div class="text-right">
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default" property="dispatch">
<bean:message key="affectedsystems.jsp.apply" />
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/keys/key-form-disabled.jspf b/java/code/webapp/WEB-INF/pages/keys/key-form-disabled.jspf
index 01cc4a9..cfc8e7f 100644
--- a/java/code/webapp/WEB-INF/pages/keys/key-form-disabled.jspf
+++ b/java/code/webapp/WEB-INF/pages/keys/key-form-disabled.jspf
@@ -43,6 +43,6 @@
<html:hidden property="description" />
<html:hidden property="type" />
- <td align="right"><html:submit><bean:message key="keydelete.jsp.deletekey"/></html:submit></td>
+ <td align="right"><html:submit styleClass="btn btn-default"><bean:message key="keydelete.jsp.deletekey"/></html:submit></td>
</tr>
</table>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/activationkeys.jsp b/java/code/webapp/WEB-INF/pages/kickstart/activationkeys.jsp
index 2898214..1934bf2 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/activationkeys.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/activationkeys.jsp
@@ -63,7 +63,7 @@
<input type="hidden" name="ksid" value="<c:out value="${param.ksid}"/>" />
<input type="hidden" name="returnvisit" value="<c:out value="${param.returnvisit}"/>"/>
<div class="text-right">
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default" property="dispatch">
<bean:message key="kickstart.activationkeys.jsp.submit"/>
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/cryptokeys.jsp b/java/code/webapp/WEB-INF/pages/kickstart/cryptokeys.jsp
index f5d69dd..8e42d7a 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/cryptokeys.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/cryptokeys.jsp
@@ -40,7 +40,7 @@
<input type="hidden" name="ksid" value="<c:out value="${param.ksid}"/>" />
<input type="hidden" name="returnvisit" value="<c:out value="${param.returnvisit}"/>"/>
<div class="text-right">
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default" property="dispatch">
<bean:message key="kickstart.cryptokeys.jsp.submit"/>
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/file_preservation_lists.jsp b/java/code/webapp/WEB-INF/pages/kickstart/file_preservation_lists.jsp
index e51f447..5d04abb 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/file_preservation_lists.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/file_preservation_lists.jsp
@@ -39,7 +39,7 @@
<input type="hidden" name="ksid" value="<c:out value="${param.ksid}"/>" />
<input type="hidden" name="returnvisit" value="<c:out value="${param.returnvisit}"/>"/>
<div class="text-right">
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default" property="dispatch">
<bean:message key="kickstart.filelists.jsp.submit"/>
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp
index 2bf1a24..91e8131 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp
@@ -75,7 +75,7 @@
</div>
<div class="form-group">
- <div class="col-lg-6" align="right"><html:submit><bean:message key="kickstartdetails.jsp.updatekickstart"/></html:submit></div>
+ <div class="col-lg-6" align="right"><html:submit styleClass="btn btn-default"><bean:message key="kickstartdetails.jsp.updatekickstart"/></html:submit></div>
</div>
</html:form>
</c:when>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/packageprofiles.jsp b/java/code/webapp/WEB-INF/pages/kickstart/packageprofiles.jsp
index d8c2a02..240fe36 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/packageprofiles.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/packageprofiles.jsp
@@ -37,10 +37,10 @@
<hr />
<input type="hidden" name="ksid" value="<c:out value="${param.ksid}"/>" />
<div class="text-right">
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default" property="dispatch">
<bean:message key="kickstart.packageprofile.jsp.clear"/>
</html:submit>
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-success" property="dispatch">
<bean:message key="kickstart.packageprofile.jsp.submit"/>
</html:submit>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/script-form.jspf b/java/code/webapp/WEB-INF/pages/kickstart/script-form.jspf
index 3c26690..fc2d1b6 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/script-form.jspf
+++ b/java/code/webapp/WEB-INF/pages/kickstart/script-form.jspf
@@ -77,6 +77,6 @@
</td>
</tr>
<tr>
- <td align="right" colspan="2"><html:submit><bean:message key="kickstartdetails.jsp.updatekickstart"/></html:submit></td>
+ <td align="right" colspan="2"><html:submit styleClass="btn btn-default"><bean:message key="kickstartdetails.jsp.updatekickstart"/></html:submit></td>
</tr>
</table>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/scriptdelete.jsp b/java/code/webapp/WEB-INF/pages/kickstart/scriptdelete.jsp
index ad8ad8f..5c6c3dc 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/scriptdelete.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/scriptdelete.jsp
@@ -54,7 +54,7 @@
</tr>
<tr>
<td align="right" colspan="2">
- <html:submit>
+ <html:submit styleClass="btn btn-default">
<bean:message key="kickstart.scriptdelete.jsp.confirmdelete"/>
</html:submit>
</td>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp b/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp
index f0ea006..3afe865 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp
@@ -158,7 +158,7 @@ function clickNewestTree() {
</tr>
</c:if>
<tr>
- <td align="right" colspan="2"><html:submit><bean:message key="kickstartdetails.jsp.updatekickstart"/></html:submit></td>
+ <td align="right" colspan="2"><html:submit styleClass="btn btn-default"><bean:message key="kickstartdetails.jsp.updatekickstart"/></html:submit></td>
</tr>
</table>
<html:hidden property="url" value="${kickstartSoftwareForm.map.url}"/>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/ssm/kickstartablesystems.jsp b/java/code/webapp/WEB-INF/pages/kickstart/ssm/kickstartablesystems.jsp
index 9b9e3a5..0adec37 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/ssm/kickstartablesystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/ssm/kickstartablesystems.jsp
@@ -70,7 +70,7 @@
</table>
<div class="text-right">
<hr />
-<input type="submit" name="dispatch" value="${rhn:localize('ssm.config.subscribe.jsp.continue')}"
+<input class="btn btn-default" type="submit" name="dispatch" value="${rhn:localize('ssm.config.subscribe.jsp.continue')}"
<c:if test="${not empty disableProfiles}">disabled="true"</c:if>
/>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp b/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp
index f2f3a15..dcf3ab1 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp
@@ -116,7 +116,7 @@
</p>
<div class="text-right">
<hr />
-<input type="submit" name="dispatch" value="${rhn:localize('kickstart.schedule.button2.jsp')}"/>
+<input class="btn btn-default" type="submit" name="dispatch" value="${rhn:localize('kickstart.schedule.button2.jsp')}"/>
</div>
<rhn:submitted/>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/treedelete-confirm.jsp b/java/code/webapp/WEB-INF/pages/kickstart/treedelete-confirm.jsp
index a519c67..471f4cd 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/treedelete-confirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/treedelete-confirm.jsp
@@ -44,7 +44,7 @@
<c:otherwise>
<bean:message key="distro-delete.jsp.summary1"/>
<div style="text-align: right;">
- <html:submit>
+ <html:submit styleClass="btn btn-default">
<bean:message key="distro-delete.jsp.confirmdelete"/>
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/troubleshooting.jsp b/java/code/webapp/WEB-INF/pages/kickstart/troubleshooting.jsp
index 435f368..72abe40 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/troubleshooting.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/troubleshooting.jsp
@@ -57,7 +57,7 @@
</tr>
<tr>
- <td align="right" colspan="2"><html:submit><bean:message key="kickstart.troubleshooting.jsp.updatekickstart"/></html:submit></td>
+ <td align="right" colspan="2"><html:submit styleClass="btn btn-default"><bean:message key="kickstart.troubleshooting.jsp.updatekickstart"/></html:submit></td>
</tr>
</table>
<html:hidden property="ksid" value="${ksdata.id}"/>
diff --git a/java/code/webapp/WEB-INF/pages/profiles/delete.jsp b/java/code/webapp/WEB-INF/pages/profiles/delete.jsp
index 80fb315..dce0ce0 100644
--- a/java/code/webapp/WEB-INF/pages/profiles/delete.jsp
+++ b/java/code/webapp/WEB-INF/pages/profiles/delete.jsp
@@ -21,7 +21,7 @@
<hr />
<html:hidden property="prid" value="${param.prid}" />
<html:hidden property="submitted" value="true" />
- <html:submit>
+ <html:submit styleClass="btn btn-success">
<bean:message key="deleteconfirm.jsp.deleteprofile"/>
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageremove.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageremove.jsp
index 591099d..20f0cd0 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/packageremove.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/packageremove.jsp
@@ -54,7 +54,8 @@
<div class="text-right">
<rhn:submitted/>
<hr/>
- <input type="submit"
+ <input class="btn btn-success"
+ type="submit"
name="dispatch"
value='<bean:message key="ssm.package.remove.select.confirm"/>'/>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/packagescheduleremote.jsp b/java/code/webapp/WEB-INF/pages/ssm/packagescheduleremote.jsp
index 837778f..e1e0e61 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/packagescheduleremote.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/packagescheduleremote.jsp
@@ -60,17 +60,17 @@
<div class="text-right">
<hr />
<c:if test="${param.mode == 'remove'}">
- <html:submit>
+ <html:submit styleClass="btn btn-default">
<bean:message key="scheduleremote.jsp.schedulepackageremoval"/>
</html:submit>
</c:if>
<c:if test="${param.mode == 'upgrade'}">
- <html:submit>
+ <html:submit styleClass="btn btn-default">
<bean:message key="scheduleremote.jsp.schedulepackageupgrade"/>
</html:submit>
</c:if>
<c:if test="${param.mode == 'install'}">
- <html:submit>
+ <html:submit styleClass="btn btn-default">
<bean:message key="scheduleremote.jsp.schedulepackageinstall"/>
</html:submit>
</c:if>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp
index bb02107..bdf4d9a 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp
@@ -70,7 +70,8 @@
<div class="text-right">
<rhn:submitted/>
<hr/>
- <input type="submit"
+ <input class="btn btn-success"
+ type="submit"
name="dispatch"
value='<bean:message key="ssm.package.upgrade.select.confirm"/>'/>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageverify.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageverify.jsp
index 86378c4..8501637 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/packageverify.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/packageverify.jsp
@@ -54,7 +54,8 @@
<div class="text-right">
<rhn:submitted/>
<hr/>
- <input type="submit"
+ <input class="btn btn-success"
+ type="submit"
name="dispatch"
value='<bean:message key="ssm.package.verify.select.confirm"/>'/>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/misc/index.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/misc/index.jsp
index 3df38cf..c18ace0 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/systems/misc/index.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/systems/misc/index.jsp
@@ -72,7 +72,7 @@
<div class="text-right">
<hr />
- <input type="submit" name="sscd_change_system_prefs" value="<bean:message key='ssm.misc.index.syspref.changepreferences'/>" />
+ <input class="btn btn-default" type="submit" name="sscd_change_system_prefs" value="<bean:message key='ssm.misc.index.syspref.changepreferences'/>" />
<input type="hidden" name="do_nothing_redir" value="landing.pxt" />
<input type="hidden" name="pxt:trap" value="rhn:ssm_change_system_prefs_cb" />
</div>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp
index d8ec9a6..079db69 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp
@@ -73,8 +73,8 @@
</rl:column>
</rl:list>
<div class="text-right">
- <input type="submit" name="dispatch" value='<bean:message key="ssm.misc.lockunlock.dispatch.lock"/>'/>
- <input type="submit" name="dispatch" value='<bean:message key="ssm.misc.lockunlock.dispatch.unlock"/>'/>
+ <input class="btn btn-default" type="submit" name="dispatch" value='<bean:message key="ssm.misc.lockunlock.dispatch.lock"/>'/>
+ <input class="btn btn-default" type="submit" name="dispatch" value='<bean:message key="ssm.misc.lockunlock.dispatch.unlock"/>'/>
</div>
</rl:listset>
</body>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/misc/reboot-system-confirm.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/misc/reboot-system-confirm.jsp
index 95d1b38..dc61dfb 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/systems/misc/reboot-system-confirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/systems/misc/reboot-system-confirm.jsp
@@ -24,7 +24,7 @@ following systems will get rebooted...
</div>
<rhn:submitted />
<div class="text-right">
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-success" property="dispatch">
<bean:message key="ssm.misc.reboot.confirm" />
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/misc/reboot-system.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/misc/reboot-system.jsp
index 243c74a..674725f 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/systems/misc/reboot-system.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/systems/misc/reboot-system.jsp
@@ -23,7 +23,7 @@
<%@ include file="/WEB-INF/pages/common/fragments/systems/system_listdisplay.jspf" %>
<hr />
<div class="text-right">
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default" property="dispatch">
<bean:message key="ssm.misc.reboot.operationname" />
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata-confirm.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata-confirm.jsp
index 9fc24f7..7e0140d 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata-confirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata-confirm.jsp
@@ -30,7 +30,7 @@
</table>
<div class="text-right">
<hr />
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-success" property="dispatch">
<bean:message key="confirm.jsp.confirm" />
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp
index fcbcf97..20fdfc5 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp
@@ -30,7 +30,7 @@
<div class="text-right">
<hr />
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default" property="dispatch">
<bean:message key="errata.jsp.apply"/>
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/ssmdeleteconfirm.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/ssmdeleteconfirm.jsp
index 0cc4752..f677329 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/systems/ssmdeleteconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/systems/ssmdeleteconfirm.jsp
@@ -23,7 +23,7 @@
<%@ include file="/WEB-INF/pages/common/fragments/systems/system_listdisplay.jspf" %>
<div class="text-right">
<hr />
- <input type ="submit" name="dispatch" value="${rhn:localize('ssm.delete.systems.confirmbutton')}"/>
+ <input class="btn btn-default" type ="submit" name="dispatch" value="${rhn:localize('ssm.delete.systems.confirmbutton')}"/>
</div>
</rl:listset>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/ssmhwrefresh.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/ssmhwrefresh.jsp
index e1157d6..262efc6 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/systems/ssmhwrefresh.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/systems/ssmhwrefresh.jsp
@@ -34,7 +34,7 @@
<rhn:csrf />
<html:hidden property="submitted" value="true"/>
<div class="text-right">
- <html:submit>
+ <html:submit styleClass="btn btn-default">
<bean:message key="ssm.hw.systems.confirmbutton"/>
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/ssmswrefresh.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/ssmswrefresh.jsp
index d46a8c1..44d08e6 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/systems/ssmswrefresh.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/systems/ssmswrefresh.jsp
@@ -31,7 +31,7 @@
<html:hidden property="submitted" value="true"/>
<rhn:csrf />
<div class="text-right">
- <html:submit>
+ <html:submit styleClass="btn btn-default">
<bean:message key="ssm.sw.systems.confirmbutton"/>
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/systems/crashes.jsp b/java/code/webapp/WEB-INF/pages/systems/crashes.jsp
index ba04d8d..4618d87 100644
--- a/java/code/webapp/WEB-INF/pages/systems/crashes.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/crashes.jsp
@@ -77,7 +77,7 @@
<div class="text-right">
<hr />
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default" property="dispatch">
<bean:message key="crashes.jsp.delete.button"/>
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/systems/crashnotedelete.jsp b/java/code/webapp/WEB-INF/pages/systems/crashnotedelete.jsp
index 20d1fd5..2d52a26 100644
--- a/java/code/webapp/WEB-INF/pages/systems/crashnotedelete.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/crashnotedelete.jsp
@@ -47,7 +47,7 @@
<hr/>
<div class="text-right">
- <html:submit>
+ <html:submit styleClass="btn btn-default">
<bean:message key="sdc.details.notes.delete"/>
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdeleteconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdeleteconfirm.jsp
index e418ddb..4ec8dd8 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdeleteconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdeleteconfirm.jsp
@@ -36,7 +36,7 @@
</rl:list>
<p align="right">
- <input type="submit" name="dispatch" value="<bean:message key='confirm.jsp.confirm'/>">
+ <input class="btn btn-default" type="submit" name="dispatch" value="<bean:message key='confirm.jsp.confirm'/>">
</p>
</rl:listset>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_cancel.jsp b/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_cancel.jsp
index cfce89c..6a2f43d 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_cancel.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_cancel.jsp
@@ -28,7 +28,7 @@
<html:hidden property="submitted" value="true"/>
</table>
<hr>
- <div class="text-right"><html:submit><bean:message key="kickstart.session_cancel.jsp.cancel"/></html:submit></div>
+ <div class="text-right"><html:submit styleClass="btn btn-default"><bean:message key="kickstart.session_cancel.jsp.cancel"/></html:submit></div>
</html:form>
</body>
</html>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/packagesindex.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/packagesindex.jsp
index d082b3f..49bb0e6 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/packagesindex.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/packagesindex.jsp
@@ -55,7 +55,7 @@
<rhn:submitted />
<div class="text-right">
<hr />
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-success" property="dispatch">
<bean:message key="packagesindex.jsp.update"/>
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchconfirm.jsp
index 1c87bef..b6e8863 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchconfirm.jsp
@@ -35,7 +35,7 @@
</rhn:listdisplay>
<div class="text-right">
<hr />
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-success" property="dispatch">
<bean:message key="packagelist.jsp.confirmpatch"/>
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstall.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstall.jsp
index 79313a1..89c5bb9 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstall.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstall.jsp
@@ -41,7 +41,7 @@
</rhn:listdisplay>
<div class="text-right">
<hr />
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default" property="dispatch">
<bean:message key="packagelist.jsp.installpatch"/>
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstallconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstallconfirm.jsp
index d0b395f..9a796d8 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstallconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstallconfirm.jsp
@@ -35,7 +35,7 @@
</rhn:listdisplay>
<div class="text-right">
<hr />
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-success" property="dispatch">
<bean:message key="packagelist.jsp.confirmpatchinstall"/>
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchlist.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchlist.jsp
index 9d4ec8a..7234591 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchlist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchlist.jsp
@@ -46,7 +46,7 @@
</rhn:listdisplay>
<div class="text-right">
<hr />
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default" property="dispatch">
<bean:message key="packagelist.jsp.backoutpatch"/>
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/install_patchset.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/install_patchset.jsp
index e944c26..31ee64a 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/install_patchset.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/install_patchset.jsp
@@ -33,7 +33,7 @@
<div class="text-right">
<hr />
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-success" property="dispatch">
<bean:message key="install_patchset.jsp.installbutton" />
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/compareprofiles.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/compareprofiles.jsp
index 717e831..df28584 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/compareprofiles.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/compareprofiles.jsp
@@ -59,7 +59,7 @@
<div class="text-right">
<rhn:submitted/>
<hr />
- <input type="submit" name="dispatch"
+ <input class="btn btn-default" type="submit" name="dispatch"
value="<bean:message key="compare.jsp.syncpackageto" arg0="${requestScope.profilename}"/>" />
</div>
</rhn:require>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comparesystems.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comparesystems.jsp
index 1cde015..ce165de 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comparesystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comparesystems.jsp
@@ -59,7 +59,7 @@
<div class="text-right">
<rhn:submitted/>
<hr />
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default" property="dispatch">
<bean:message key="compare.jsp.syncpackageto" arg0="${fn:escapeXml(requestScope.systemname)}"/>
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/delete.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/delete.jsp
index c7f705a..8471edf 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/delete.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/delete.jsp
@@ -22,7 +22,7 @@
<html:hidden property="sid" value="${param.sid}" />
<html:hidden property="prid" value="${param.prid}" />
<html:hidden property="submitted" value="true" />
- <html:submit>
+ <html:submit styleClass="btn btn-default">
<bean:message key="deleteconfirm.jsp.deleteprofile"/>
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/missingpkgs.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/missingpkgs.jsp
index d9c1ec0..c0e1009 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/missingpkgs.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/missingpkgs.jsp
@@ -46,13 +46,13 @@
<rhn:submitted/>
<div class="text-right">
<hr />
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default" property="dispatch">
<bean:message key="missingpkgs.jsp.selectnewpackageprofile" />
</html:submit>
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default" property="dispatch">
<bean:message key="missingpkgs.jsp.removelistedpackagesfromsync" />
</html:submit>
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default" property="dispatch">
<bean:message key="missingpkgs.jsp.subscribetochannels" />
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncprofile.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncprofile.jsp
index 56a1bdd..e9a4a3f 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncprofile.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncprofile.jsp
@@ -70,7 +70,7 @@
<rhn:submitted/>
<div class="text-right">
<hr />
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default" property="dispatch">
<bean:message key="schedulesync.jsp.schedulesync"/>
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp
index 6ff8b16..a73b7a5 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp
@@ -67,7 +67,7 @@
<rhn:submitted/>
<div class="text-right">
<hr />
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default" property="dispatch">
<bean:message key="schedulesync.jsp.schedulesync" />
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/scheduleremote.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/scheduleremote.jsp
index 8e6b0fd..39d1693 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/scheduleremote.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/scheduleremote.jsp
@@ -60,17 +60,17 @@
<div class="text-right">
<hr />
<c:if test="${param.mode == 'remove'}">
- <html:submit>
+ <html:submit styleClass="btn btn-default">
<bean:message key="scheduleremote.jsp.schedulepackageremoval"/>
</html:submit>
</c:if>
<c:if test="${param.mode == 'upgrade'}">
- <html:submit>
+ <html:submit styleClass="btn btn-default">
<bean:message key="scheduleremote.jsp.schedulepackageupgrade"/>
</html:submit>
</c:if>
<c:if test="${param.mode == 'install'}">
- <html:submit>
+ <html:submit styleClass="btn btn-default">
<bean:message key="scheduleremote.jsp.schedulepackageinstall"/>
</html:submit>
</c:if>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguests_confirm.jsp b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguests_confirm.jsp
index 3d84105..1e183b0 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguests_confirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguests_confirm.jsp
@@ -73,7 +73,7 @@
<hr />
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-success" property="dispatch">
<bean:message key="virtualguests_confirm.jsp.confirm"/>
</html:submit>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguestslist.jsp b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguestslist.jsp
index 9243076..5d85489 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguestslist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguestslist.jsp
@@ -103,7 +103,7 @@
<html:optionsCollection name="actionOptions"/>
</html:select>
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default" property="dispatch">
<bean:message key="virtualguestslist.jsp.applyaction"/>
</html:submit>
@@ -115,7 +115,7 @@
</html:select>
<bean:message key="virtualguestslist.jsp.allocationtoequal"/>
<html:text property="guestSettingValue"/>
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default" property="dispatch">
<bean:message key="virtualguestslist.jsp.applychanges"/>
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemsdelete.jsp b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemsdelete.jsp
index 30cbc93..45b6206 100644
--- a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemsdelete.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemsdelete.jsp
@@ -46,7 +46,7 @@
<div class="text-right">
<hr />
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-success" property="dispatch">
<bean:message key="ssm.delete.systems.confirmbutton"/>
</html:submit>
diff --git a/java/code/webapp/WEB-INF/pages/systems/errata.jsp b/java/code/webapp/WEB-INF/pages/systems/errata.jsp
index 825bfed..3a533d0 100644
--- a/java/code/webapp/WEB-INF/pages/systems/errata.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/errata.jsp
@@ -50,7 +50,7 @@
</option>
</c:forEach>
</select>
- <html:submit property="show">
+ <html:submit styleClass="btn btn-default" property="show">
<bean:message key="system.errata.show"/>
</html:submit>
<br/>
@@ -140,7 +140,7 @@
<c:if test="${requestScope.showApplyErrata == 'true'}">
<div class="text-right">
<hr />
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-success" property="dispatch">
<bean:message key="errata.jsp.apply"/>
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp
index 2ccbdb6..fc79379 100644
--- a/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp
@@ -77,7 +77,7 @@
<div class="text-right">
<hr />
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-success" property="dispatch">
<bean:message key="errataconfirm.jsp.confirm"/>
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/systems/probes/delete.jsp b/java/code/webapp/WEB-INF/pages/systems/probes/delete.jsp
index 4a94b46..a43bd98 100644
--- a/java/code/webapp/WEB-INF/pages/systems/probes/delete.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/probes/delete.jsp
@@ -27,7 +27,7 @@
<div class="text-right">
<hr />
- <html:submit><bean:message key="probdelete.jsp.deleteprobe"/></html:submit></td>
+ <html:submit styleClass="btn btn-default"><bean:message key="probdelete.jsp.deleteprobe"/></html:submit></td>
<html:hidden property="sid" value="${param.sid}"/>
<html:hidden property="probe_id" value="${probe.id}"/>
diff --git a/java/code/webapp/WEB-INF/pages/systems/probes/index.jsp b/java/code/webapp/WEB-INF/pages/systems/probes/index.jsp
index 7742a34..25d4af8 100644
--- a/java/code/webapp/WEB-INF/pages/systems/probes/index.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/probes/index.jsp
@@ -81,7 +81,7 @@
<div class="text-right">
<hr/>
<input type="hidden" name="sid" value="${sid}" />
- <input type="submit" name="dispatch"
+ <input class="btn btn-default" type="submit" name="dispatch"
value='<bean:message key="probdelete.jsp.deleteprobes"/>'/>
</div>
<rl:csv exportColumns="id,description,stateString,stateOutputString"/>
diff --git a/java/code/webapp/WEB-INF/pages/systems/probes/probedelete.jsp b/java/code/webapp/WEB-INF/pages/systems/probes/probedelete.jsp
index b243c3b..708c7fe 100644
--- a/java/code/webapp/WEB-INF/pages/systems/probes/probedelete.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/probes/probedelete.jsp
@@ -60,7 +60,7 @@
<div class="text-right">
<hr/>
<html:hidden property="sid" value="${system.id}"/>
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-success" property="dispatch">
<bean:message key="deleteconfirm.jsp.confirm"/>
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp b/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp
index f7f0aff..4feec2c 100644
--- a/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp
@@ -31,7 +31,7 @@
</c:forEach>
</select>
- <html:submit>
+ <html:submit styleClass="btn btn-default">
<bean:message key="cloneerrata.jsp.view"/>
</html:submit>
<rhn:submitted/>
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp
index ecbd3dd..a8f8551 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp
@@ -107,7 +107,7 @@
</c:if>
</c:if>
<div class="form-group">
- <html:submit property="dispatch" styleClass="form-horizontal pull-right">
+ <html:submit property="dispatch" styleClass="btn btn-default form-horizontal pull-right">
<bean:message key="sdc.channels.edit.update_sub"/>
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp
index 02641d4..2d4594c 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp
@@ -58,11 +58,11 @@
<rhn:csrf />
<html:hidden property="submitted" value="true"/>
<html:hidden property="new_base_channel_id" value="${new_base_channel_id}"/>
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default" property="dispatch">
<bean:message key="sdc.channels.confirmNewBase.cancel"/>
</html:submit>
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-success" property="dispatch">
<bean:message key="sdc.channels.confirmNewBase.modifyBaseSoftwareChannel"/>
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/delete_confirm.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/delete_confirm.jsp
index cc91e30..771e3f0 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/delete_confirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/delete_confirm.jsp
@@ -16,7 +16,7 @@
<rhn:csrf />
<html:hidden property="submitted" value="true"/>
<div class="text-right">
- <html:submit property="button">
+ <html:submit property="button" styleClass="btn btn-default">
<bean:message key="delete_confirm.jsp.button"/>
</html:submit>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/note_delete.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/note_delete.jsp
index 1bc06ff..cba2378 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/note_delete.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/note_delete.jsp
@@ -34,7 +34,7 @@
<hr/>
<div class="text-right">
- <html:submit>
+ <html:submit styleClass="btn btn-default">
<bean:message key="sdc.details.notes.delete"/>
</html:submit>
</div>
diff --git a/web/html/network/systems/ssm/groups/alter_membership_conf.pxt b/web/html/network/systems/ssm/groups/alter_membership_conf.pxt
index 1893316..39c8911 100644
--- a/web/html/network/systems/ssm/groups/alter_membership_conf.pxt
+++ b/web/html/network/systems/ssm/groups/alter_membership_conf.pxt
@@ -56,7 +56,7 @@ value="rhn:alter_system_group_membership_cb" />
<div align="right">
<hr />
-<input class="btn btn-default" type="submit" name="confirm" value="Confirm" />
+<input class="btn btn-success" type="submit" name="confirm" value="Confirm" />
</div>
</pxt-form>
diff --git a/web/html/network/systems/ssm/misc/change_sys_pref_conf.pxt b/web/html/network/systems/ssm/misc/change_sys_pref_conf.pxt
index c44b16d..cd34742 100644
--- a/web/html/network/systems/ssm/misc/change_sys_pref_conf.pxt
+++ b/web/html/network/systems/ssm/misc/change_sys_pref_conf.pxt
@@ -34,7 +34,7 @@
<div align="right">
<hr />
- <input class="btn btn-default" type="submit" name="sscd_change_sys_prefs_conf" value="Confirm" />
+ <input class="btn btn-success" type="submit" name="sscd_change_sys_prefs_conf" value="Confirm" />
<input type="hidden" name="pxt:trap" value="rhn:server_prefs_form_cb" />
</div>
diff --git a/web/include/network/components/monitoring/delete_notification_method.pxi b/web/include/network/components/monitoring/delete_notification_method.pxi
index 6dcd384..e64e5c3 100644
--- a/web/include/network/components/monitoring/delete_notification_method.pxi
+++ b/web/include/network/components/monitoring/delete_notification_method.pxi
@@ -36,7 +36,7 @@
<pxt-hidden name="cmid" />
<input type="hidden" name="success_redirect" value="index.pxt?uid={formvar:uid}" />
<input type="hidden" name="pxt:trap" value="rhn:contact-method-delete-cb" />
- <input class="btn btn-default" type="submit" name="delete_cm_confirm" value="Confirm Deletion" />
+ <input class="btn btn-success" type="submit" name="delete_cm_confirm" value="Confirm Deletion" />
</pxt-form>
</div>
</rhn-if-method-dependencies>
commit 5b484514245ee69c1a097ff2803049432535e67b
Author: Maximilian Meister <mmeister(a)suse.de>
Date: Tue Feb 11 09:39:35 2014 +0100
Perl Pages: Styling unstyled submit buttons
diff --git a/web/html/network/software/channels/manage/patchsets/add.pxt b/web/html/network/software/channels/manage/patchsets/add.pxt
index fe7b993..2402e83 100644
--- a/web/html/network/software/channels/manage/patchsets/add.pxt
+++ b/web/html/network/software/channels/manage/patchsets/add.pxt
@@ -25,7 +25,7 @@
<pxt-form method="get">
<pxt-formvar>
View: <rhn-channel-select-options mode="channel_patchset_manager"/>
- <input type="submit" value="View" />
+ <input class="btn btn-default" type="submit" value="View" />
<input type="hidden" name="cid" value="{formvar:cid}" />
<input type="hidden" name="pxt:trap" value="rhn:channel_view_cb" />
</pxt-formvar>
diff --git a/web/html/network/systems/ssm/groups/alter_membership_conf.pxt b/web/html/network/systems/ssm/groups/alter_membership_conf.pxt
index 583b485..1893316 100644
--- a/web/html/network/systems/ssm/groups/alter_membership_conf.pxt
+++ b/web/html/network/systems/ssm/groups/alter_membership_conf.pxt
@@ -56,7 +56,7 @@ value="rhn:alter_system_group_membership_cb" />
<div align="right">
<hr />
-<input type="submit" name="confirm" value="Confirm" />
+<input class="btn btn-default" type="submit" name="confirm" value="Confirm" />
</div>
</pxt-form>
diff --git a/web/html/network/systems/ssm/misc/change_sys_pref_conf.pxt b/web/html/network/systems/ssm/misc/change_sys_pref_conf.pxt
index 6349438..c44b16d 100644
--- a/web/html/network/systems/ssm/misc/change_sys_pref_conf.pxt
+++ b/web/html/network/systems/ssm/misc/change_sys_pref_conf.pxt
@@ -34,7 +34,7 @@
<div align="right">
<hr />
- <input type="submit" name="sscd_change_sys_prefs_conf" value="Confirm" />
+ <input class="btn btn-default" type="submit" name="sscd_change_sys_prefs_conf" value="Confirm" />
<input type="hidden" name="pxt:trap" value="rhn:server_prefs_form_cb" />
</div>
diff --git a/web/html/network/systems/ssm/misc/remove_value.pxt b/web/html/network/systems/ssm/misc/remove_value.pxt
index b8f8bfb..4d919ac 100644
--- a/web/html/network/systems/ssm/misc/remove_value.pxt
+++ b/web/html/network/systems/ssm/misc/remove_value.pxt
@@ -38,7 +38,7 @@
<pxt-form method="POST">
<div align="right">
<hr />
- <input type="submit" value="Remove Values" />
+ <input class="btn btn-default" type="submit" value="Remove Values" />
<input type="hidden" name="cikid" value="{formvar:cikid}" />
<input type="hidden" name="pxt:trap" value="rhn:ssm_remove_custom_values_cb" />
</div>
diff --git a/web/html/network/systems/ssm/misc/set_value.pxt b/web/html/network/systems/ssm/misc/set_value.pxt
index 7f456c8..76e2b76 100644
--- a/web/html/network/systems/ssm/misc/set_value.pxt
+++ b/web/html/network/systems/ssm/misc/set_value.pxt
@@ -48,7 +48,7 @@
<div align="right">
<hr />
- <input type="submit" value="Set Values" />
+ <input class="btn btn-default" type="submit" value="Set Values" />
<input type="hidden" name="cikid" value="{formvar:cikid}" />
<input type="hidden" name="pxt:trap" value="rhn:ssm_set_custom_values_cb" />
</div>
diff --git a/web/include/network/components/monitoring/create_notification_method.pxi b/web/include/network/components/monitoring/create_notification_method.pxi
index e9230ad..53ed395 100644
--- a/web/include/network/components/monitoring/create_notification_method.pxi
+++ b/web/include/network/components/monitoring/create_notification_method.pxi
@@ -40,7 +40,7 @@
<hr />
<input type="hidden" name="pxt:trap" value="rhn:contact-method-create-cb" />
<input type="hidden" name="redirect_to" value="index.pxt?uid={formvar:uid}" />
- <input type="submit" name="create_method" value="Create Method" />
+ <input class="btn btn-default" type="submit" name="create_method" value="Create Method" />
<pxt-hidden name="uid" />
</div>
diff --git a/web/include/network/components/monitoring/delete_notification_method.pxi b/web/include/network/components/monitoring/delete_notification_method.pxi
index df76853..6dcd384 100644
--- a/web/include/network/components/monitoring/delete_notification_method.pxi
+++ b/web/include/network/components/monitoring/delete_notification_method.pxi
@@ -36,7 +36,7 @@
<pxt-hidden name="cmid" />
<input type="hidden" name="success_redirect" value="index.pxt?uid={formvar:uid}" />
<input type="hidden" name="pxt:trap" value="rhn:contact-method-delete-cb" />
- <input type="submit" name="delete_cm_confirm" value="Confirm Deletion" />
+ <input class="btn btn-default" type="submit" name="delete_cm_confirm" value="Confirm Deletion" />
</pxt-form>
</div>
</rhn-if-method-dependencies>
diff --git a/web/include/network/components/monitoring/edit_notification_method.pxi b/web/include/network/components/monitoring/edit_notification_method.pxi
index 53dce07..d005986 100644
--- a/web/include/network/components/monitoring/edit_notification_method.pxi
+++ b/web/include/network/components/monitoring/edit_notification_method.pxi
@@ -41,7 +41,7 @@
<hr />
<input type="hidden" name="pxt:trap" value="rhn:contact-method-edit-cb" />
<input type="hidden" name="redirect_to" value="index.pxt?uid={uid}" />
- <input type="submit" name="update_method" value="Update Method" />
+ <input class="btn btn-default" type="submit" name="update_method" value="Update Method" />
<pxt-hidden name="uid" />
<pxt-hidden name="cmid" />
</div>
diff --git a/web/include/network/components/systems/reschedule_action_form.pxi b/web/include/network/components/systems/reschedule_action_form.pxi
index 6ab61be..7088227 100644
--- a/web/include/network/components/systems/reschedule_action_form.pxi
+++ b/web/include/network/components/systems/reschedule_action_form.pxi
@@ -9,8 +9,8 @@
<input type="hidden" name="aid" value="{formvar:hid}" />
<input type="hidden" name="success_redirect" value="/network/systems/details/history/pending.pxt" />
<input type="hidden" name="pxt:trap" value="rhn:reschedule_action_cb" />
- <input type="submit" value="Reschedule" />
+ <input class="btn btn-default" type="submit" value="Reschedule" />
</pxt-formvar>
</pxt-form>
-</pxt-passthrough>
\ No newline at end of file
+</pxt-passthrough>
commit a80a753a99b51ce7e512078ee16559858d4af5c9
Author: Maximilian Meister <mmeister(a)suse.de>
Date: Tue Feb 11 09:38:45 2014 +0100
styling buttons. LocalizedSubmitTag can't access styleClass attribute. It is set as private in the parent class.
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/LocalizedSubmitTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/LocalizedSubmitTag.java
index acfa6a0..e7a725e 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/LocalizedSubmitTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/LocalizedSubmitTag.java
@@ -45,6 +45,16 @@ public class LocalizedSubmitTag extends SubmitTag {
return this.valueKey;
}
+ @Override
+ public String getStyleClass() {
+ if (super.getStyleClass() != null) {
+ return (super.getStyleClass() + " btn btn-default");
+ }
+ else {
+ return "btn btn-default";
+ }
+ }
+
/** {@inheritDoc}
* @throws JspException
*/
1
0
Branch 'master-pxe-default-image-no-powermanagement' - 2 commits - branding/fonts java/code
by Silvio Moioli 13 Feb '14
by Silvio Moioli 13 Feb '14
13 Feb '14
branding/fonts/font-spacewalk/css/spacewalk-font.css | 3 +
branding/fonts/font-spacewalk/font/spacewalk-icon.eot |binary
branding/fonts/font-spacewalk/font/spacewalk-icon.svg | 25 ++++++++--
branding/fonts/font-spacewalk/font/spacewalk-icon.ttf |binary
branding/fonts/font-spacewalk/font/spacewalk-icon.woff |binary
java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java | 2
java/code/webapp/WEB-INF/includes/legends/system-legend.jsp | 2
java/code/webapp/WEB-INF/pages/admin/config/bootstrapsystems.jsp | 2
java/code/webapp/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf | 2
java/code/webapp/WEB-INF/pages/systems/bootstrapsystemlist.jsp | 2
10 files changed, 30 insertions(+), 8 deletions(-)
New commits:
commit c8fdc270714c7e47c49c9b725f275dc866a67742
Author: Cynthia Sanchez <csanchez(a)suse.com>
Date: Mon Feb 10 16:52:42 2014 +0100
New Bare-metal icon added
Conflicts:
java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java
java/code/webapp/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf
java/code/webapp/WEB-INF/pages/systems/bootstrapsystemlist.jsp
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java
index a18b891..e49fc16 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java
@@ -140,6 +140,8 @@ public class IconTag extends TagSupport {
icons.put("system-virt-host", "fa fa-1-5x spacewalk-icon-virtual-host");
icons.put("system-warn", "fa fa-exclamation-triangle fa-1-5x text-warning");
icons.put("system-bootstrap", "fa fa-square-o fa-1-5x");
+ icons.put("system-bare-metal-legend", "fa fa-1-5x spacewalk-icon-bare-metal");
+ icons.put("system-bare-metal", "fa spacewalk-icon-bare-metal");
}
/**
diff --git a/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp b/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp
index 60ed7b8..842ebd2 100644
--- a/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp
+++ b/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp
@@ -22,6 +22,6 @@
<li><rhn:icon type="system-virt-host" /><bean:message key="systemlist.jsp.virthost"/></li>
<li><rhn:icon type="system-virt-guest" /><bean:message key="systemlist.jsp.virtguest"/></li>
<li><rhn:icon type="system-physical" /><bean:message key="systemlist.jsp.nonvirt"/></li>
- <li><rhn:icon type="system-bootstrap" /><bean:message key="systemlist.jsp.bootstrap"/></li>
+ <li><rhn:icon type="system-bare-metal-legend" /><bean:message key="systemlist.jsp.bootstrap"/></li>
</ul>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/admin/config/bootstrapsystems.jsp b/java/code/webapp/WEB-INF/pages/admin/config/bootstrapsystems.jsp
index f5d6696..5c01a00 100644
--- a/java/code/webapp/WEB-INF/pages/admin/config/bootstrapsystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/config/bootstrapsystems.jsp
@@ -5,7 +5,7 @@
<html:html xhtml="true">
<body>
- <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif" imgAlt="info.alt.img">
+ <rhn:toolbar base="h1" icon="system-bare-metal" >
<bean:message key="bootstrapsystems.jsp.toolbar"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf
index c5bbda5..60b160b 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf
@@ -1,7 +1,7 @@
<c:out value="<a href=\"/rhn/systems/details/Overview.do?sid=${current.id}\">" escapeXml="false" />
<c:choose>
<c:when test="${current.bootstrap && empty nosystemicons}">
- <i class="fa fa-square-o" title="<bean:message key="systemlist.jsp.bootstrap"/>"></i>
+ <rhn:icon type="system-bare-metal" title="<bean:message key='systemlist.jsp.bootstrap'/>" />
</c:when>
<c:when test="${current.virtualGuest && empty nosystemicons}">
<rhn:icon type="system-virt-guest" title="<bean:message key='systemlist.jsp.virtguest'/>" />
diff --git a/java/code/webapp/WEB-INF/pages/systems/bootstrapsystemlist.jsp b/java/code/webapp/WEB-INF/pages/systems/bootstrapsystemlist.jsp
index e650666..824b219 100644
--- a/java/code/webapp/WEB-INF/pages/systems/bootstrapsystemlist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/bootstrapsystemlist.jsp
@@ -9,7 +9,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
- <rhn:toolbar base="h1" icon="fa-square-o" imgAlt="system.common.systemAlt"
+ <rhn:toolbar base="h1" icon="system-bare-metal" imgAlt="system.common.systemAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-list-baremetal">
<bean:message key="bootstrapsystemlist.jsp.header"/>
</rhn:toolbar>
commit 52922d279920b8538d6cd06bb60920e27ee71120
Author: Cynthia Sanchez <csanchez(a)suse.com>
Date: Mon Feb 10 11:32:34 2014 +0100
New font adding the icon for Bare Metal Systems
diff --git a/branding/fonts/font-spacewalk/css/spacewalk-font.css b/branding/fonts/font-spacewalk/css/spacewalk-font.css
index 30d43c2..1e41464 100644
--- a/branding/fonts/font-spacewalk/css/spacewalk-font.css
+++ b/branding/fonts/font-spacewalk/css/spacewalk-font.css
@@ -194,3 +194,6 @@
.spacewalk-icon-unknown-system:before {
content: "\e633";
}
+.spacewalk-icon-bare-metal:before {
+ content: "\e623";
+}
\ No newline at end of file
diff --git a/branding/fonts/font-spacewalk/font/spacewalk-icon.eot b/branding/fonts/font-spacewalk/font/spacewalk-icon.eot
index 796441c..02412f1 100755
Binary files a/branding/fonts/font-spacewalk/font/spacewalk-icon.eot and b/branding/fonts/font-spacewalk/font/spacewalk-icon.eot differ
diff --git a/branding/fonts/font-spacewalk/font/spacewalk-icon.svg b/branding/fonts/font-spacewalk/font/spacewalk-icon.svg
index d99c454..48db366 100755
--- a/branding/fonts/font-spacewalk/font/spacewalk-icon.svg
+++ b/branding/fonts/font-spacewalk/font/spacewalk-icon.svg
@@ -1,7 +1,23 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>Generated by IcoMoon</metadata>
+<metadata>
+<json>
+{
+ "fontFamily": "spacewalk-icon",
+ "majorVersion": 1,
+ "minorVersion": 2,
+ "designer": "Cynthia Sanchez",
+ "designerURL": "http://cynt.co.nf/",
+ "version": "Version 1.2",
+ "fontId": "spacewalk-icon",
+ "psName": "spacewalk-icon",
+ "subFamily": "Regular",
+ "fullName": "spacewalk-icon",
+ "description": "Generated by IcoMoon"
+}
+</json>
+</metadata>
<defs>
<font id="spacewalk-icon" horiz-adv-x="1024">
<font-face units-per-em="1024" ascent="960" descent="-64" />
@@ -35,16 +51,17 @@
<glyph unicode="" d="M332.672 879.872l-327.872-128.704 151.36-113.152 327.872 128.704-151.36 113.152zM687.936 879.872l-151.36-113.152 327.744-128.704 151.36 113.152-327.744 128.704zM513.792 751.168v-0.128l-327.36-128.448-1.024-16.128c0.878-118.12 1.024-236.246 1.024-354.368l327.872-128.512 70.784 27.776c-4.051 17.485-6.208 35.619-6.208 54.336 0 132.61 107.518 240.128 240.128 240.128 7.907 0 15.713-0.341 23.424-1.088 0.75 54.225 1.781 108.461 2.688 162.688l-0.256 14.080-331.072 129.664zM820.288 403.712c-109.041 0-197.568-88.463-197.568-197.504s88.527-197.504 197.568-197.504c109.041 0 197.504 88.463 197.504 197.504 0 109.041-88.463 197.504-197.504 197.504zM825.408 337.92c44.234 0 93.632-35.241 93.632-82.304 0-39.090-26.791-54.030-46.336-65.088-12.087-6.944-19.52-19.557-19.52-25.472 0-4.629-3.627-8.192-8.256-8.192h-49.344c-4.629 0-8.256 3.563-8.256 8.192v9.28c0 24.946 24.941 46.298 43.2 54.528 15.688 7.201 22.656 13.891 22.656 27.264 0 11.316-15.157 21.824-31.616 21.824
-9.258 0-17.772-3.058-22.144-6.144-4.886-3.6-10.057-8.25-22.144-23.68-1.543-2.057-4.085-3.072-6.4-3.072-1.8 0-3.578 0.507-4.864 1.536l-33.984 25.728c-3.343 2.572-4.363 7.216-2.048 10.816 22.117 36.776 53.505 54.784 95.424 54.784zM795.584 140.416h49.344c4.629 0 8.256-3.627 8.256-8.256v-49.344c0-4.629-3.627-8.256-8.256-8.256h-49.344c-4.629 0-8.256 3.627-8.256 8.256v49.344c0 4.629 3.627 8.256 8.256 8.256z" />
<glyph unicode="" d="M848.022 957.115c-47.606-0.488-97.058-20.471-135.741-59.207l-134.993-135.118 248.92-248.422 134.868 134.993c72.814 72.916 79.212 183.884 14.21 248.796l-14.21 14.21c-30.47 30.427-71.050 45.179-113.055 44.748zM85.805 785.974c-30.797 0-55.593-24.796-55.593-55.593v-415.449l60.080 59.955v313.363c0 18.045 14.026 32.879 31.91 34.652 1.192 0.118 2.265 0 3.49 0h311.244l63.196 63.071h-414.327zM527.679 713.056l-284.071-284.445 248.92-248.547 283.946 284.445-248.796 248.546zM518.206 641.882c8.812 0.002 17.597-3.379 24.306-10.096 13.419-13.4 13.403-35.193 0-48.612-13.4-13.419-35.069-13.434-48.488 0-13.419 13.401-13.525 35.194-0.124 48.612 6.7 6.71 15.494 10.095 24.306 10.096zM989.746 595.139l-60.205-59.955v-313.363c0-18.045-14.026-33.003-31.91-34.777-1.192-0.118-2.265 0-3.49 0h-311.119l-63.196-62.947h414.327c30.797 0 55.593 24.796 55.593 55.593v415.449zM594.615 565.598c8.812 0.012 17.597-3.289 24.306-9.972 13.419-13.401 13.278-35.194-0.124-48.612-13.4-13.419-
35.069-13.435-48.488 0-13.396 13.377-13.455 35.063-0.124 48.488 6.7 6.709 15.618 10.086 24.431 10.096zM432.449 556c8.812 0.002 17.597-3.379 24.306-10.096 13.419-13.401 13.403-35.194 0-48.612-13.4-13.419-35.069-13.365-48.488 0-13.419 13.4-13.525 35.068-0.124 48.488v0.124c6.7 6.709 15.494 10.094 24.306 10.096zM668.032 492.181c8.794 0.024 17.597-3.27 24.306-9.972 13.419-13.4 13.403-35.193 0-48.612-13.4-13.419-35.069-13.434-48.488 0-13.419 13.4-13.523 35.068-0.124 48.488h0.124c6.7 6.71 15.387 10.072 24.182 10.096zM508.857 479.716c8.812 0.002 17.597-3.379 24.306-10.096 13.419-13.401 13.278-35.068-0.124-48.488-13.4-13.419-35.069-13.434-48.488 0-13.419 13.401-13.525 35.069-0.124 48.488 6.7 6.709 15.618 10.094 24.431 10.096zM346.691 470.118c8.812 0.012 17.597-3.289 24.306-9.972 13.419-13.4 13.403-35.193 0-48.612-13.4-13.419-35.069-13.489-48.488-0.124-13.419 13.401-13.525 35.194-0.124 48.612 6.7 6.71 15.494 10.086 24.306 10.096zM582.274 406.299c8.794 0.024 17.597-3.27 24.306-9.972 13
.419-13.401 13.403-35.193 0-48.612-13.4-13.419-35.069-13.365-48.488 0-13.419 13.401-13.398 35.069 0 48.488 6.7 6.709 15.387 10.072 24.182 10.096zM423.1 393.834c8.812 0.002 17.597-3.379 24.306-10.096 13.419-13.401 13.403-35.069 0-48.488-13.4-13.419-35.193-13.49-48.612-0.124-13.419 13.4-13.525 35.193-0.124 48.612 6.7 6.71 15.618 10.095 24.431 10.096zM193.874 378.877l-134.868-135.118c-72.814-72.916-79.088-183.884-14.085-248.796l14.21-14.21c65.003-64.912 175.982-58.457 248.796 14.459l134.868 135.118-248.92 248.547zM496.517 320.417c8.794 0.024 17.597-3.27 24.306-9.972 13.419-13.4 13.403-35.193 0-48.612-13.4-13.419-35.069-13.365-48.488 0-13.419 13.401-13.398 35.068 0 48.488 6.7 6.71 15.387 10.072 24.182 10.096z" />
<glyph unicode="" d="M734.375 960.188c-158.999 0-287.875-128.938-287.875-287.938 0-158.999 128.876-287.875 287.875-287.875 158.999 0 287.875 128.876 287.875 287.875 0 158.999-128.876 287.938-287.875 287.938zM702.063 810.875h64.688c5.456 0 9.875-4.419 9.875-9.875v-86.5h86.5c5.456 0 9.813-4.419 9.813-9.875v-64.688c0-5.456-4.357-9.875-9.813-9.875h-86.5v-86.5c0-5.456-4.419-9.875-9.875-9.875h-64.688c-5.456 0-9.875 4.419-9.875 9.875v86.5h-86.563c-5.456 0-9.813 4.419-9.813 9.875v64.688c0 5.456 4.357 9.875 9.813 9.875h86.563v86.5c0 5.456 4.419 9.875 9.875 9.875zM71.625 680.875c-39.393 0-71.625-32.232-71.625-71.625v-487c0-39.393 32.232-71.625 71.625-71.625h243.5c0-38.946-28.625-69.437-28.625-86 0-15.668 12.957-28.625 28.625-28.625h229.25c15.668 0 28.625 12.957 28.625 28.625s-28.625 47.95-28.625 86h243.5c39.393 0 71.625 32.232 71.625 71.625v212.313c-18.438-6.833-37.592-12.242-57.313-16v-81.75c0-7.61-6.702-14.313-14.313-14.313h-716.25c-7.61 0-14.313 6.702-14.313 14.313v372.438c
0 7.61 6.702 14.313 14.313 14.313h305.938c-2.156 15.937-3.25 32.16-3.25 48.688 0 2.878 0.058 5.763 0.125 8.625h-302.813z" />
-<glyph unicode="" d="M512 784.019c-112.035 0-202.875-90.84-202.875-202.875s90.84-202.875 202.875-202.875c112.035 0 202.875 90.84 202.875 202.875 0 112.035-90.84 202.875-202.875 202.875zM402.5 627.207h219v-92.125h-219v92.125zM955.733 357.257c0-9.067-8-17.067-17.067-17.067h-853.333c-9.067 0-17.067 8-17.067 17.067v443.733c0 9.067 8 17.067 17.067 17.067h853.333c9.067 0 17.067-8 17.067-17.067v-443.733M1024 800.99c0 46.933-38.4 85.333-85.333 85.333h-853.333c-46.933 0-85.333-38.4-85.333-85.333v-580.267c0-46.933 38.4-85.333 85.333-85.333h290.133c0-46.4-34.133-82.667-34.133-102.4 0-18.667 15.467-34.133 34.133-34.133h273.067c18.667 0 34.133 15.467 34.133 34.133 0 18.667-34.133 57.067-34.133 102.4h290.133c46.933 0 85.333 38.4 85.333 85.333v580.267" />
-<glyph unicode="" d="M435.391 611.416v57.457c0 42.195 34.414 76.609 76.609 76.609 42.195 0 76.609-34.414 76.609-76.609v-57.457h-153.218M684.37 582.688c0 15.86-12.868 28.728-28.728 28.728h-9.576v57.457c0 73.616-60.449 134.066-134.066 134.066-73.616 0-134.066-60.449-134.066-134.066v-57.457h-9.576c-15.86 0-28.728-12.868-28.728-28.728v-172.37c0-15.86 12.868-28.728 28.728-28.728h287.283c15.86 0 28.728 12.868 28.728 28.728v172.37M955.733 364.876c0-9.067-8-17.067-17.067-17.067h-853.333c-9.067 0-17.067 8-17.067 17.067v443.733c0 9.067 8 17.067 17.067 17.067h853.333c9.067 0 17.067-8 17.067-17.067v-443.733M1024 808.609c0 46.933-38.4 85.333-85.333 85.333h-853.333c-46.933 0-85.333-38.4-85.333-85.333v-580.267c0-46.933 38.4-85.333 85.333-85.333h290.133c0-46.4-34.133-82.667-34.133-102.4 0-18.667 15.467-34.133 34.133-34.133h273.067c18.667 0 34.133 15.467 34.133 34.133 0 18.667-34.133 57.067-34.133 102.4h290.133c46.933 0 85.333 38.4 85.333 85.333v580.267" />
+<glyph unicode="" d="M512 784.019c-112.035 0-202.875-90.84-202.875-202.875s90.84-202.875 202.875-202.875c112.035 0 202.875 90.84 202.875 202.875 0 112.035-90.84 202.875-202.875 202.875zM402.5 627.207h219v-92.125h-219v92.125zM955.733 357.257c0-9.067-8-17.067-17.067-17.067h-853.333c-9.067 0-17.067 8-17.067 17.067v443.733c0 9.067 8 17.067 17.067 17.067h853.333c9.067 0 17.067-8 17.067-17.067v-443.733zM1024 800.99c0 46.933-38.4 85.333-85.333 85.333h-853.333c-46.933 0-85.333-38.4-85.333-85.333v-580.267c0-46.933 38.4-85.333 85.333-85.333h290.133c0-46.4-34.133-82.667-34.133-102.4 0-18.667 15.467-34.133 34.133-34.133h273.067c18.667 0 34.133 15.467 34.133 34.133 0 18.667-34.133 57.067-34.133 102.4h290.133c46.933 0 85.333 38.4 85.333 85.333v580.267z" />
+<glyph unicode="" d="M435.391 611.416v57.457c0 42.195 34.414 76.609 76.609 76.609 42.195 0 76.609-34.414 76.609-76.609v-57.457h-153.218zM684.37 582.688c0 15.86-12.868 28.728-28.728 28.728h-9.576v57.457c0 73.616-60.449 134.066-134.066 134.066-73.616 0-134.066-60.449-134.066-134.066v-57.457h-9.576c-15.86 0-28.728-12.868-28.728-28.728v-172.37c0-15.86 12.868-28.728 28.728-28.728h287.283c15.86 0 28.728 12.868 28.728 28.728v172.37zM955.733 364.876c0-9.067-8-17.067-17.067-17.067h-853.333c-9.067 0-17.067 8-17.067 17.067v443.733c0 9.067 8 17.067 17.067 17.067h853.333c9.067 0 17.067-8 17.067-17.067v-443.733zM1024 808.609c0 46.933-38.4 85.333-85.333 85.333h-853.333c-46.933 0-85.333-38.4-85.333-85.333v-580.267c0-46.933 38.4-85.333 85.333-85.333h290.133c0-46.4-34.133-82.667-34.133-102.4 0-18.667 15.467-34.133 34.133-34.133h273.067c18.667 0 34.133 15.467 34.133 34.133 0 18.667-34.133 57.067-34.133 102.4h290.133c46.933 0 85.333 38.4 85.333 85.333v580.267z" />
<glyph unicode="" d="M514.625 956.062c-88.26 0.766-176.662-21.232-255.688-66-0.039-0.023-0.085-0.040-0.125-0.063-0.092-0.052-0.158-0.135-0.25-0.188-3.625-2.058-7.29-4.159-10.875-6.313-3.255-1.956-6.467-3.903-9.688-5.938-1.98-1.251-3.908-2.531-5.875-3.813-0.862-0.559-1.767-1.124-2.625-1.688-0.298-0.197-0.577-0.365-0.875-0.563-2.341-1.545-4.691-3.108-7-4.688-0.909-0.622-1.846-1.248-2.75-1.875-0.4-0.279-0.788-0.595-1.188-0.875-3.093-2.159-6.090-4.342-9.125-6.563-21.414-15.671-41.403-32.822-59.813-51.313-17.528-17.605-33.669-36.411-48.313-56.188-0.302-0.408-0.574-0.778-0.875-1.188-1.752-2.369-3.482-4.733-5.188-7.125-0.452-0.637-0.926-1.298-1.375-1.938-2.063-2.923-4.068-5.857-6.063-8.813-0.32-0.477-0.619-0.96-0.938-1.438-2.184-3.261-4.337-6.576-6.438-9.875-22.235-34.922-39.724-71.986-52.625-110.25-2.613-7.749-5.083-15.533-7.313-23.375-1.118-3.933-2.228-7.796-3.25-11.75-1.026-3.969-1.946-7.949-2.875-11.938-0.626-2.686-1.231-5.431-1.813-8.125-0.776-3.561-1.55-7.108-2.25-10.
688-0.693-3.543-1.382-7.065-2-10.625-0.155-0.9-0.288-1.786-0.438-2.688-0.605-3.599-1.097-7.261-1.625-10.875-0.591-4.046-1.194-8.061-1.688-12.125-0.493-4.056-0.917-8.114-1.313-12.188-4.292-44.182-2.855-89.317 4.813-134.25 0.688-4.030 1.462-8.036 2.25-12.063 0.78-3.985 1.559-7.958 2.438-11.938 0.071-0.327 0.178-0.673 0.25-1 0.637-2.859 1.312-5.707 2-8.563 0.965-4.040 1.936-8.042 3-12.063 10.998-41.542 27.409-81.964 49.063-120.188 0.075-0.132 0.113-0.243 0.188-0.375 2.058-3.625 4.159-7.228 6.313-10.813 1.956-3.255 3.903-6.53 5.938-9.75 1.25-1.987 2.538-3.91 3.813-5.875 0.756-1.161 1.483-2.344 2.25-3.5 1.545-2.341 3.108-4.691 4.688-7 0.898-1.307 1.838-2.637 2.75-3.938 2.159-3.093 4.342-6.090 6.563-9.125 28.985-39.607 63.187-74.185 101.188-103.25 139.034-106.34 329.102-138.288 502.875-67.375 89.645 36.582 163.308 95.735 217 168.25 0.59 0.797 1.165 1.575 1.75 2.375 1.849 2.516 3.641 5.021 5.438 7.563 0.072 0.104 0.115 0.209 0.188 0.313 2.063 2.923 4.131 5.857 6.125 8.813 0.225 0.3
33 0.464 0.728 0.688 1.063 0.095 0.143 0.154 0.296 0.25 0.438 2.184 3.261 4.274 6.513 6.375 9.813 22.235 34.922 39.786 71.986 52.688 110.25 2.613 7.749 5.083 15.533 7.313 23.375 1.118 3.933 2.165 7.858 3.188 11.813 1.026 3.969 2.009 7.949 2.938 11.938 0.528 2.249 1.064 4.493 1.563 6.75 0.096 0.441 0.155 0.871 0.25 1.313 0.776 3.561 1.55 7.108 2.25 10.688 0.693 3.543 1.32 7.128 1.938 10.688 0.082 0.471 0.232 0.903 0.313 1.375 0.072 0.428 0.116 0.884 0.188 1.313 0.605 3.599 1.097 7.198 1.625 10.813 0.591 4.046 1.131 8.061 1.625 12.125 0.493 4.056 0.979 8.177 1.375 12.25 4.292 44.182 2.855 89.255-4.813 134.188-0.688 4.030-1.462 8.036-2.25 12.063-0.78 3.985-1.559 8.020-2.438 12-0.002 0.016-0.059-0.018-0.063 0-0.666 3.045-1.34 6.152-2.063 9.188-0.028 0.118-0.096 0.195-0.125 0.313-0.965 4.040-1.998 8.042-3.063 12.063-22.271 84.121-66.349 163.724-132.313 229.688-98.432 98.432-227.067 148.193-356.063 149.313zM314.875 841.687l106.5-154.688c-34.195-11.814-66.326-31.389-93.625-58.688-2
6.757-26.757-46.124-58.133-58-91.563l-154.938 105.313c20.403 42.021 48.11 81.36 83 116.25 35.126 35.126 74.718 62.93 117.063 83.375zM512.25 646.125c50.463-0.538 100.742-20.117 139.25-58.625 42.833-42.833 62.158-100.234 58-156.25-0.016-0.207 0.016-0.418 0-0.625-0.070-0.898-0.167-1.792-0.25-2.688-0.14-1.546-0.261-3.082-0.438-4.625-0.012-0.103-0.051-0.209-0.063-0.313-0.27-2.333-0.648-4.676-1-7-0.368-2.427-0.793-4.835-1.25-7.25-0.457-2.415-0.953-4.85-1.5-7.25-0.536-2.355-1.065-4.662-1.688-7-0.012-0.045-0.051-0.080-0.063-0.125-0.262-0.973-0.536-1.969-0.813-2.938-0.154-0.544-0.279-1.082-0.438-1.625-0.438-1.489-0.903-3.023-1.375-4.5-0.107-0.336-0.203-0.664-0.313-1-0.38-1.172-0.786-2.334-1.188-3.5-0.101-0.292-0.21-0.584-0.313-0.875-0.664-1.9-1.34-3.742-2.063-5.625-0.141-0.366-0.295-0.76-0.438-1.125-0.362-0.925-0.749-1.893-1.125-2.813-0.187-0.459-0.372-0.917-0.563-1.375-19.784-47.382-57.646-87.131-108.938-108.063-100.671-41.082-215.445 5.849-258.813 104.875-0.688 1.572-1.285 3.090-1.
938 4.688-0.808 1.981-1.635 4.009-2.375 6-0.256 0.69-0.502 1.372-0.75 2.063-0.801 2.237-1.594 4.491-2.313 6.75-0.037 0.116-0.026 0.196-0.063 0.313-0.742 2.349-1.472 4.693-2.125 7.063-0.008 0.027 0.008 0.098 0 0.125-0.66 2.397-1.306 4.835-1.875 7.25-0.517 2.195-0.995 4.354-1.438 6.563-0.044 0.221-0.081 0.466-0.125 0.688-0.010 0.045-0.054 0.080-0.063 0.125-0.020 0.103-0.043 0.21-0.063 0.313-0.448 2.278-0.822 4.532-1.188 6.813-0.035 0.221-0.091 0.466-0.125 0.688-0.353 2.25-0.601 4.5-0.875 6.75-0.89 7.363-1.365 14.719-1.438 22.125-0.048 4.937 0.060 9.883 0.375 14.813 0.157 2.465 0.377 4.916 0.625 7.375 0.248 2.459 0.536 4.925 0.875 7.375 0.233 1.683 0.537 3.323 0.813 5 0.187 1.135 0.356 2.306 0.563 3.438 0.383 2.078 0.802 4.126 1.25 6.188 0.038 0.175 0.024 0.325 0.063 0.5 0.178 0.81 0.374 1.63 0.563 2.438 0.406 1.76 0.858 3.5 1.313 5.25 0.543 2.076 1.079 4.132 1.688 6.188 0.066 0.223 0.121 0.465 0.188 0.688 0.062 0.206 0.125 0.419 0.188 0.625 4.943 16.293 11.989 31.953 20.875 46
.5 2.483 4.065 5.101 8.050 7.875 11.938 0.086 0.12 0.164 0.193 0.25 0.313 1.128 1.567 2.321 3.146 3.5 4.688 0.396 0.52 0.723 1.046 1.125 1.563 0.642 0.822 1.343 1.623 2 2.438 1.203 1.493 2.435 2.972 3.688 4.438 1.377 1.611 2.813 3.235 4.25 4.813 0.897 0.987 1.77 1.967 2.688 2.938 1.018 1.074 2.016 2.131 3.063 3.188 0.233 0.236 0.516 0.453 0.75 0.688 1.088 1.088 2.206 2.192 3.313 3.25 39.166 37.435 89.786 55.913 140.25 55.375zM508.875 597.5c-30.465-0.253-60.869-9.605-86.75-28.125-0.52-0.371-1.048-0.748-1.563-1.125-0.372-0.273-0.755-0.535-1.125-0.813-1.605-1.198-3.202-2.433-4.75-3.688-0.064-0.052-0.061-0.135-0.125-0.188-0.096-0.079-0.217-0.171-0.313-0.25-1.315-1.074-2.602-2.136-3.875-3.25-0.908-0.796-1.857-1.616-2.75-2.438-1.097-1.009-2.113-2.077-3.188-3.125-0.563-0.548-1.197-1.068-1.75-1.625-2.47-2.484-4.783-5.051-7.063-7.688-2.938-3.387-5.725-6.864-8.313-10.438-0.259-0.359-0.557-0.702-0.813-1.063-0.073-0.102-0.115-0.21-0.188-0.313-1.127-1.6-2.25-3.235-3.313-4.875-1.128-1.736
-2.2-3.479-3.25-5.25-0.097-0.164-0.216-0.336-0.313-0.5-4.045-6.882-7.448-14.001-10.313-21.313-0.109-0.278-0.205-0.596-0.313-0.875-0.040-0.105-0.085-0.145-0.125-0.25-0.669-1.745-1.333-3.543-1.938-5.313-0.485-1.425-0.933-2.814-1.375-4.25-0.173-0.558-0.334-1.128-0.5-1.688-0.048-0.161-0.078-0.339-0.125-0.5-0.537-1.831-1.032-3.649-1.5-5.5-0.041-0.162-0.085-0.275-0.125-0.438-0.462-1.855-0.92-3.751-1.313-5.625-0.196-0.944-0.322-1.866-0.5-2.813-0.211-1.111-0.439-2.259-0.625-3.375-0.010-0.058 0.010-0.13 0-0.188-0.331-2-0.624-3.985-0.875-6-0.004-0.029 0.004-0.096 0-0.125-0.126-1.014-0.207-1.982-0.313-3-0.102-1.008-0.293-1.991-0.375-3-0.004-0.029 0.002-0.096 0-0.125-0.162-2.002-0.292-3.994-0.375-6-0.004-0.088 0.004-0.162 0-0.25-0.080-2.022-0.063-4.101-0.063-6.125 0-0.074-0.063-0.114-0.063-0.188 0.004-1.888 0.051-3.738 0.125-5.625 0.056-1.425 0.154-2.885 0.25-4.313 0.056-0.825 0.118-1.613 0.188-2.438 0.008-0.104-0.009-0.209 0-0.313 0.146-1.707 0.358-3.422 0.563-5.125 0.244-2.016 0.485-4
.047 0.813-6.063 0.247-1.522 0.58-3.042 0.875-4.563 0.207-1.074 0.395-2.179 0.625-3.25 0.016-0.073 0.046-0.114 0.063-0.188 0.435-2.009 0.92-4.007 1.438-6 0.054-0.207 0.070-0.418 0.125-0.625 0.525-1.988 1.080-3.968 1.688-5.938 0.644-2.089 1.389-4.185 2.125-6.25 0.644-1.805 1.286-3.591 2-5.375 0.118-0.294 0.255-0.581 0.375-0.875 0.060-0.148 0.127-0.29 0.188-0.438 0.926-2.252 1.898-4.473 2.938-6.688 1.027-2.187 2.113-4.354 3.25-6.5 0.070-0.134 0.117-0.242 0.188-0.375 0.913-1.711 1.829-3.443 2.813-5.125 0.018-0.008 0.045-0.056 0.063-0.063 37.386-64.155 117.276-92.674 188-63.813 30.888 12.605 55.361 34.249 71.625 60.625 0.016 0.008-0.017 0.053 0 0.063 0.62 1.007 1.216 2.042 1.813 3.063 0.241 0.411 0.513 0.775 0.75 1.188 0.236 0.413 0.455 0.835 0.688 1.25 0.766 1.366 1.53 2.741 2.25 4.125 0.061 0.116 0.127 0.259 0.188 0.375 0.882 1.705 1.687 3.395 2.5 5.125 0.836 1.78 1.612 3.632 2.375 5.438 0.026 0.060 0.1 0.065 0.125 0.125 0.28 0.664 0.542 1.333 0.813 2 0.189 0.468 0.378 0.968 0
.563 1.438 0.527 1.339 1.011 2.646 1.5 4 0.054 0.15 0.134 0.288 0.188 0.438 0.078 0.22 0.173 0.468 0.25 0.688 0.61 1.729 1.203 3.436 1.75 5.188 0.010 0.026-0.008 0.098 0 0.125 0.008 0.028-0.008 0.036 0 0.063 0.608 1.955 1.158 3.958 1.688 5.938 0.006 0.016 0.057 0.046 0.063 0.063 0.294 1.108 0.544 2.199 0.813 3.313 0.221 0.91 0.421 1.835 0.625 2.75 0.456 2.039 0.879 4.065 1.25 6.125 0.367 2.035 0.654 4.073 0.938 6.125 0.852 6.16 1.354 12.417 1.438 18.688 0.027 2.068-0.004 4.113-0.063 6.188-0.055 1.949-0.119 3.922-0.25 5.875-0.008 0.118 0.008 0.194 0 0.313-0.008 0.104-0.055 0.209-0.063 0.313-0.141 1.961-0.344 3.912-0.563 5.875-0.113 1.010-0.179 2.052-0.313 3.063-0.030 0.028-0.032 0.034-0.063 0.063-4.18 31.917-18.478 62.791-43 87.313-29.884 29.884-69.143 44.637-108.313 44.313zM510.063 537.562c23.406 0.011 46.826-8.951 64.688-26.813 15.614-15.614 24.357-35.487 26.313-55.875 0.088-0.92 0.19-1.828 0.25-2.75 0.020-0.305 0.045-0.632 0.063-0.938 0.048-0.875 0.102-1.749 0.125-2.625 0.
010-0.352-0.006-0.71 0-1.063 0.012-0.836 0.010-1.664 0-2.5-0.004-0.371 0.009-0.755 0-1.125-0.020-0.821-0.083-1.617-0.125-2.438-0.041-0.798-0.125-1.642-0.188-2.438-0.030-0.385-0.028-0.74-0.063-1.125-0.037-0.411-0.020-0.84-0.063-1.25-0.035-0.341-0.148-0.659-0.188-1-0.1-0.859-0.189-1.708-0.313-2.563-0.173-1.193-0.343-2.379-0.563-3.563-0.134-0.726-0.286-1.464-0.438-2.188-0.096-0.458-0.209-0.919-0.313-1.375-0.53-2.344-1.164-4.647-1.875-6.938-0.355-1.145-0.725-2.245-1.125-3.375-0.247-0.699-0.486-1.431-0.75-2.125-0.167-0.44-0.326-0.876-0.5-1.313-0.887-2.226-1.88-4.35-2.938-6.5-0.343-0.696-0.638-1.436-1-2.125-9.65-18.435-25.658-33.645-46.438-42.125-43.704-17.835-93.21 0.577-115.063 41.25 0.016 0.014 0.047 0.049 0.063 0.063-0.584 1.082-1.151 2.15-1.688 3.25-0.203 0.416-0.429 0.832-0.625 1.25-0.274 0.584-0.55 1.158-0.813 1.75-0.072 0.162-0.116 0.337-0.188 0.5-0.949 2.175-1.79 4.397-2.563 6.625-0.296 0.854-0.605 1.702-0.875 2.563-0.079 0.249-0.174 0.501-0.25 0.75-0.036 0.116-0.027 0.25
9-0.063 0.375-0.673 2.242-1.253 4.472-1.75 6.75-0.256 1.176-0.478 2.379-0.688 3.563-0.839 4.732-1.347 9.522-1.438 14.313-0.021 1.095-0.081 2.217-0.063 3.313 0.002 0.102 0.060 0.211 0.063 0.313 0.023 1.123 0.061 2.191 0.125 3.313 0.004 0.075-0.005 0.175 0 0.25 0.067 1.122 0.142 2.256 0.25 3.375 0.008 0.074 0.055 0.113 0.063 0.188 0.11 1.119 0.223 2.26 0.375 3.375 0.010 0.075 0.052 0.175 0.063 0.25 0.15 1.086 0.31 2.169 0.5 3.25 0.018 0.102 0.044 0.211 0.063 0.313 0.193 1.080 0.393 2.113 0.625 3.188 0.022 0.103 0.040 0.21 0.063 0.313 0.206 0.937 0.452 1.882 0.688 2.813 0.037 0.146 0.024 0.292 0.063 0.438 0.294 1.139 0.661 2.246 1 3.375 0.035 0.116 0.027 0.197 0.063 0.313 0.311 1.022 0.652 2.050 1 3.063 0.046 0.132 0.079 0.306 0.125 0.438 0.344 0.987 0.746 1.961 1.125 2.938 0.431 1.107 0.839 2.16 1.313 3.25 0.081 0.186 0.168 0.377 0.25 0.563 0.402 0.91 0.817 1.851 1.25 2.75 0.097 0.202 0.214 0.423 0.313 0.625 0.423 0.863 0.86 1.711 1.313 2.563 0.557 1.051 1.152 2.034 1.75 3.063
0.151 0.259 0.284 0.555 0.438 0.813 0.458 0.768 0.955 1.555 1.438 2.313 0.638 1.006 1.322 1.956 2 2.938 0.678 0.982 1.345 1.919 2.063 2.875 0.717 0.956 1.432 1.883 2.188 2.813 0.756 0.929 1.581 1.912 2.375 2.813 0.585 0.664 1.145 1.29 1.75 1.938 0.693 0.74 1.403 1.465 2.125 2.188 1.116 1.116 2.217 2.204 3.375 3.25 1.003 0.906 2.092 1.771 3.125 2.625 16.837 13.922 37.473 20.928 58.125 20.938zM750.938 357l154.688-106.188c-20.439-42.297-48.221-81.971-83.313-117.063-34.792-34.792-74.049-62.364-115.938-82.75l-104.688 155.125c33.092 11.902 64.171 31.108 90.688 57.625 27.213 27.213 46.737 59.176 58.563 93.25z" />
<glyph unicode="" d="M512 960c-282.77 0-512-229.23-512-512s229.23-512 512-512c66.303 0 129.662 12.622 187.813 35.563l-172.625 166.563c-9.401 9.612-22.223 26.804-13.188 52.063 4.518 12.629 15.405 22.31 24.75 26.563 9.345 4.252 17.402 4.981 24.813 4.938h0.188c13.183-0.152 26.138-0.162 39.188-0.25v47.688c-27.318-13.96-58.243-21.813-90.938-21.813-110.562 0-200.688 90.125-200.688 200.688 0 110.562 90.125 200.688 200.688 200.688 110.562 0 200.688-90.125 200.688-200.688 0-2.128-0.059-4.263-0.125-6.375h156.563c30.462 0 56.25-25.788 56.25-56.25v-163.625c11.789 0.041 23.915 0.113 35.375 0.125 0.062 0 0.125 0 0.188 0 3.413 0.019 6.771 0.036 10.375-0.313 33.721 68.272 52.688 145.139 52.688 226.438 0 282.77-229.23 512-512 512zM512 601.687c-85.133 0-153.688-68.555-153.688-153.688s68.555-153.625 153.688-153.625c34.087 0 65.515 10.993 90.938 29.625v61.375c0 30.462 25.788 56.25 56.25 56.25h6.313c0.085 2.111 0.125 4.243 0.125 6.375 0 85.133-68.492 153.688-153.625 153.688zM512 535.812c
48.514 0 87.813-39.298 87.813-87.813s-39.298-87.813-87.813-87.813c-48.514 0-87.813 39.298-87.813 87.813 0 48.514 39.298 87.813 87.813 87.813zM677.875 378.625c-7.352 0-13.25-5.898-13.25-13.25v-187.25c-21.552 0.088-43.273 0.245-65.313 0.5-11.289 0.066-12.123-6.619-6.188-12.688l152.375-147c9.536-10.132 27.469-10.712 36.813-0.813l149.875 146.5c9.989 10.041 8.127 14.215-6.875 14.125-19.968-0.020-40.895-0.093-62-0.188v186.813c0 7.352-5.96 13.25-13.313 13.25h-172.125z" />
<glyph unicode="" d="M510 958.875c-281.665 0-510-228.335-510-510 0-22.673 1.507-44.984 4.375-66.875 2.193 4.532 4.453 8.009 5.875 10l0.25 0.375c9.717 13.361 21.684 25.891 37.563 41.625 7.939 7.867 16.090 15.519 24.688 22.375 4.299 3.428 8.584 6.64 14.375 10 5.791 3.36 11.622 8.875 30.75 8.875 17.755 0 30.043-6.938 38.625-13.375l0.313-0.188 0.313-0.25 7.75-6c1.22 6.502 2.658 13.116 4.438 19.875 0.011 0.045 0.051 0.080 0.063 0.125 0.056 0.211 0.069 0.414 0.125 0.625h0.063c6.86 25.867 32.257 46.375 60.188 46.375h77.625c5.401 0 10.7-0.706 15.813-2 28.796 75.1 101.58 128.438 186.813 128.438 110.457 0 200-89.543 200-200 0-84.589-52.545-156.889-126.75-186.125 2.088-6.384 3.188-13.131 3.188-20.063v-77.625c0-15.769-4.929-26.967-12.5-37.188s-19.343-20.408-37.5-23.813l-0.875-0.188-0.813-0.125-16.188-2.438c1.813-2.219 3.447-4.356 5.313-6.625 0.214-0.261 0.41-0.488 0.625-0.75l-0.063-0.063c8.337-9.975 14.813-22.678 14.813-40 0-12.907-6.444-28.269-13.188-37.438l0.188-0.188c-0.525-0
.699-1.329-1.482-1.875-2.188-0.068-0.088-0.119-0.225-0.188-0.313-8.87-11.437-20.255-23.658-35.063-38.375-7.919-7.87-16.040-15.492-24.625-22.375-4.292-3.442-8.583-6.743-14.375-10.125-0.196-0.114-0.429-0.256-0.625-0.375 19.85-2.347 40.018-3.625 60.5-3.625 281.665 0 510 228.335 510 510 0 281.665-228.335 510-510 510zM510 600.312c-70.334 0-129.471-47.941-146.5-112.938 2.421-5.261 4.161-11.018 5.063-17.25h0.125l0.25-1.688 2.125-13.938 10.188 7.688 0.125-0.188c12.323 9.899 25.614 13.25 37.938 13.25 1.067 0 2.092-0.077 3.125-0.125 11.285 37.699 46.195 65.188 87.563 65.188 50.495 0 91.438-40.943 91.438-91.438 0-41.027-27.030-75.734-64.25-87.313 0.216-2.18 0.313-4.271 0.313-6.25 0-14.103-6.637-29.18-12-36.688l-0.25-0.313-0.188-0.313c-3.087-4.177-5.536-7.265-8.563-11.188l17.938-2.75 0.563-0.125 0.563-0.063c3.234-0.571 6.343-1.385 9.313-2.375 66.819 15.754 116.563 75.748 116.563 147.375 0 83.632-67.806 151.438-151.438 151.438zM229.75 473.125c-6.295 0-11.164-4.155-12.563-9.75-5.595-20.98
2-7.74-43.731-10.188-65.063-10.841-3.497-21.671-8.067-31.813-13.313l-48.25 37.438c-2.798 2.098-5.915 3.5-9.063 3.5-11.89 0-59.107-51.085-67.5-62.625-1.749-2.448-3.188-4.853-3.188-8 0-3.147 1.402-5.99 3.5-8.438 12.939-15.737 25.548-31.464 37.438-48.25-5.595-10.491-10.128-20.935-13.625-32.125l-65.063-9.813c-5.246-1.049-9.438-7.379-9.438-12.625v-77.625c0-5.945 4.18-11.513 10.125-12.563l64-9.438c3.497-11.89 8.43-23.435 14.375-34.625-11.89-16.436-24.86-31.851-36.75-47.938-1.749-2.448-2.813-4.853-2.813-8 0-2.798 0.751-5.615 2.5-8.063 14.687-20.283 39.153-41.964 57.688-58.75 2.448-2.448 5.603-3.875 8.75-3.875 3.147 0 6.24 1.089 8.688 3.188l49.313 37.375c10.141-5.246 20.659-9.44 31.5-12.938l9.813-64.313c0.699-5.945 6.268-10.5 12.563-10.5h77.625c6.295 0 11.226 4.217 12.625 9.813 5.595 20.982 7.677 43.668 10.125 65 10.841 3.497 21.671 8.067 31.813 13.313l48.25-37.75c2.798-1.749 5.978-3.188 9.125-3.188 11.89 0 59.107 51.435 67.5 62.625 2.098 2.448 3.125 4.915 3.125 8.063 0 3.147-1.402
6.24-3.5 8.688-12.939 15.737-25.548 31.177-37.438 48.313 5.595 10.141 9.841 20.622 13.688 31.813l64.688 9.75c5.595 1.049 9.75 7.379 9.75 12.625v77.625c0 5.945-4.18 11.513-10.125 12.563l-64 9.813c-3.497 11.54-8.368 23.060-14.313 34.25 11.89 16.436 24.798 31.851 36.688 47.938 1.749 2.448 2.813 4.915 2.813 8.063 0 2.798-0.689 5.589-2.438 7.688-14.687 20.632-39.153 42.302-57.688 59.438-2.448 2.098-5.603 3.5-8.75 3.5-3.147 0-6.339-1.027-8.438-3.125l-49.625-37.438c-10.141 5.246-20.659 9.44-31.5 12.938l-9.75 64.313c-0.699 5.945-6.33 10.5-12.625 10.5h-77.625zM268.563 294.125c49.308 0 89.563-40.255 89.563-89.563s-40.255-89.5-89.563-89.5c-49.308 0-89.5 40.192-89.5 89.5 0 49.308 40.192 89.563 89.5 89.563zM268.563 244.812c-22.502 0-40.188-17.686-40.188-40.188s17.686-40.25 40.188-40.25c22.502 0 40.25 17.748 40.25 40.25 0 22.502-17.748 40.188-40.25 40.188z" />
<glyph unicode="" d="M74.063 956.062c-19.457 0-35.125-21.011-35.125-47.063v-94.5h134.313v94.5c0 26.052-15.606 47.063-35.063 47.063h-64.125zM374.5 956.062c-19.457 0-35.125-21.011-35.125-47.063v-403h134.188c0.043 0.040 0.082 0.085 0.125 0.125v402.875c0 26.052-15.606 47.063-35.063 47.063h-64.125zM674.938 956.062c-19.457 0-35.125-21.011-35.125-47.063v-166h134.313v166c0 26.052-15.606 47.063-35.063 47.063h-64.125zM35.063 779.25c-19.457 0-35.063-21.011-35.063-47.063v-263.313c0-26.052 15.606-47.063 35.063-47.063h142.063c19.457 0 35.125 21.011 35.125 47.063v263.313c0 26.052-15.668 47.063-35.125 47.063h-142.063zM34.875 707.75h142.438v-21.5h-142.438v21.5zM635.938 707.75c-19.457 0-35.063-20.948-35.063-47v-104c15.662 24.321 43.503 41.438 73.438 41.438h83.938c20.164 0 39.537-6.703 54.875-18.813v81.375c0 26.052-15.668 47-35.125 47h-142.063zM635.75 636.25h142.438v-21.5h-142.438v21.5zM34.875 621.25h142.438v-21.563h-142.438v21.563zM34.875 534.687h142.438v-21.5h-142.438v21.5zM674.313 5
25.062c-6.803 0-12.051-4.578-13.563-10.625-6.047-22.678-8.354-47.194-11-70.25-11.717-3.78-23.414-8.706-34.375-14.375l-52.188 40.438c-3.024 2.268-6.411 3.75-9.813 3.75-12.851 0-63.866-55.152-72.938-67.625-1.89-2.646-3.375-5.286-3.375-8.688 0-3.402 1.482-6.417 3.75-9.063 13.985-17.008 27.587-34.045 40.438-52.188-6.047-11.339-10.97-22.655-14.75-34.75l-70.313-10.625c-5.669-1.134-10.188-7.893-10.188-13.563v-83.938c0-6.425 4.512-12.491 10.938-13.625l69.188-10.188c3.78-12.851 9.075-25.343 15.5-37.438-12.851-17.764-26.837-34.364-39.688-51.75-1.89-2.646-3-5.286-3-8.688 0-3.024 0.735-6.042 2.625-8.688 15.874-21.922 42.343-45.358 62.375-63.5 2.646-2.646 6.036-4.187 9.438-4.187 3.402 0 6.792 1.17 9.438 3.437l53.313 40.438c10.961-5.669 22.283-10.22 34-14l10.625-69.563c0.756-6.425 6.759-11.312 13.563-11.312h83.938c6.803 0 12.051 4.515 13.563 10.562 6.047 22.678 8.354 47.257 11 70.313 11.717 3.78 23.414 8.706 34.375 14.375l52.188-40.813c3.024-1.89 6.411-3.437 9.813-3.437 12.851 0 63.866 55
.593 72.938 67.688 2.268 2.646 3.375 5.286 3.375 8.688 0 3.402-1.482 6.792-3.75 9.438-13.985 17.008-27.587 33.667-40.438 52.188 6.047 10.961 10.592 22.28 14.75 34.375l69.938 10.563c6.047 1.134 10.563 7.956 10.563 13.625v83.875c0 6.425-4.575 12.491-11 13.625l-69.125 10.563c-3.78 12.473-9.075 24.968-15.5 37.063 12.851 17.764 26.837 34.426 39.688 51.813 1.89 2.646 3 5.286 3 8.688 0 3.024-0.735 6.045-2.625 8.313-15.874 22.3-42.343 45.73-62.375 64.25-2.646 2.268-6.036 3.75-9.438 3.75-3.402 0-6.795-1.107-9.063-3.375l-53.688-40.438c-10.961 5.669-22.283 10.22-34 14l-10.625 69.5c-0.756 6.425-6.759 11.375-13.563 11.375h-83.938zM335.5 470.75c-19.457 0-35.063-21.011-35.063-47.063v-263.313c0-26.052 15.606-47 35.063-47h69.938c-33.134 13.606-52.563 45.472-52.563 80.188v11.125h-17.563v21.5h17.563v51.25c0 4.934 0.315 9.522 0.938 13.813h-18.5v21.5h24.813c2.629 5.701 5.88 10.963 9.563 16.063 8.874 12.288 21.91 25.142 43.188 31.688-2.548 5.236-4.823 11.007-6.438 17.25h-71.125v21.5h68.625c0.507
24.321 12.526 43.361 17 49.625l0.375 0.5c5.712 7.854 11.32 14.66 17.375 21.375h-103.188zM38.938 386.562v-403.563c0-26.052 15.668-47 35.125-47h64.125c19.457 0 35.063 20.948 35.063 47v403.563h-134.313zM716.25 331.5c53.292 0 96.813-43.458 96.813-96.75s-43.52-96.75-96.813-96.75c-53.292 0-96.75 43.458-96.75 96.75 0 53.292 43.458 96.75 96.75 96.75zM716.25 258.375c-13.519 0-23.625-10.106-23.625-23.625s10.106-23.563 23.625-23.563c13.519 0 23.625 10.044 23.625 23.563 0 13.519-10.106 23.625-23.625 23.625zM339.375 78.062v-95.063c0-26.052 15.668-47 35.125-47h64.125c15.104 0 27.84 12.658 32.813 30.5-15.844 14.589-33.52 32.2-49.125 53.75l-0.125 0.188-0.125 0.25c-11.849 16.588-16.313 35.972-16.313 51.188 0 2.060 0.18 4.114 0.375 6.188h-66.75z" />
<glyph unicode="" d="M273.688 951.437c-33.519 0-60.75-27.231-60.75-60.75v-370c5.404 1.596 11.056 2.5 16.813 2.5h64.125v347.313h323.813v-263.125c0-33.519 27.231-60.688 60.75-60.688h263.063v-485.75h-402c0.246-2.283 0.438-4.601 0.438-7.063 0-13.068-6.55-28.614-13.375-37.875l0.25-0.188c-0.527-0.702-1.328-1.48-1.875-2.188-0.068-0.088-0.119-0.225-0.188-0.313-7.839-10.11-17.7-20.887-30-33.313h467c33.519 0 60.75 27.168 60.75 60.688v566.688c0 33.519-19.6 80.35-43 103.75l-197.375 197.313c-23.4 23.4-70.168 43-103.688 43h-404.75zM698.688 865.437c10.751-3.795 21.51-9.51 25.938-13.938l197.938-197.938c4.427-4.427 10.080-15.186 13.875-25.938h-237.75v237.813zM229.75 473.125c-6.295 0-11.164-4.155-12.563-9.75-5.595-20.982-7.74-43.731-10.188-65.063-10.841-3.497-21.671-8.067-31.813-13.313l-48.25 37.438c-2.798 2.098-5.915 3.5-9.063 3.5-11.89 0-59.107-51.085-67.5-62.625-1.749-2.448-3.188-4.853-3.188-8 0-3.147 1.402-5.99 3.5-8.438 12.939-15.737 25.548-31.464 37.438-48.25-5.595-10.491-10.128
-20.935-13.625-32.125l-65.063-9.813c-5.246-1.049-9.438-7.379-9.438-12.625v-77.625c0-5.945 4.18-11.513 10.125-12.563l64-9.438c3.497-11.89 8.43-23.435 14.375-34.625-11.89-16.436-24.86-31.851-36.75-47.938-1.749-2.448-2.813-4.853-2.813-8 0-2.798 0.751-5.615 2.5-8.063 14.687-20.283 39.153-41.964 57.688-58.75 2.448-2.448 5.603-3.875 8.75-3.875 3.147 0 6.24 1.089 8.688 3.188l49.313 37.375c10.141-5.246 20.659-9.44 31.5-12.938l9.813-64.313c0.699-5.945 6.268-10.5 12.563-10.5h77.625c6.295 0 11.226 4.217 12.625 9.813 5.595 20.982 7.677 43.668 10.125 65 10.841 3.497 21.671 8.067 31.813 13.313l48.25-37.75c2.798-1.749 5.978-3.188 9.125-3.188 11.89 0 59.107 51.435 67.5 62.625 2.098 2.448 3.125 4.915 3.125 8.063 0 3.147-1.402 6.24-3.5 8.688-12.939 15.737-25.548 31.177-37.438 48.313 5.595 10.141 9.841 20.622 13.688 31.813l64.688 9.75c5.595 1.049 9.75 7.379 9.75 12.625v77.625c0 5.945-4.18 11.513-10.125 12.563l-64 9.813c-3.497 11.54-8.368 23.060-14.313 34.25 11.89 16.436 24.798 31.851 36.688 47
.938 1.749 2.448 2.813 4.915 2.813 8.063 0 2.798-0.689 5.589-2.438 7.688-14.687 20.632-39.153 42.302-57.688 59.438-2.448 2.098-5.603 3.5-8.75 3.5-3.147 0-6.339-1.027-8.438-3.125l-49.625-37.438c-10.141 5.246-20.659 9.44-31.5 12.938l-9.75 64.313c-0.699 5.945-6.33 10.5-12.625 10.5h-77.625zM453.563 465.687c2.478-1.648 4.81-3.373 7-5.25l0.75-0.625 0.688-0.625c17.199-15.901 42.155-37.161 62.125-64.188 0.045-0.061 0.080-0.127 0.125-0.188 0.719-0.976 1.545-1.821 2.25-2.813l-0.25-0.188c1.709-2.338 3.219-4.718 4.5-7.063h309.563c11.384 0 20.25 8.866 20.25 20.25v40.5c0 11.384-8.866 20.188-20.25 20.188h-386.75zM539.125 303.812c29.88-6.9 48-32.732 48-61.125v-19.813h253.188c11.384 0 20.25 8.866 20.25 20.25v40.438c0 11.384-8.866 20.25-20.25 20.25h-301.188zM268.563 294.125c49.308 0 89.563-40.255 89.563-89.563s-40.255-89.5-89.563-89.5c-49.308 0-89.5 40.192-89.5 89.5 0 49.308 40.192 89.563 89.5 89.563z" />
+<glyph unicode="" d="M225.682 958.491c-10.901 0-19.745-8.756-19.745-19.657v-127.108c0-10.901 8.844-19.657 19.745-19.657h570.045c10.901 0 19.657 8.756 19.657 19.657v127.108c0 10.901-8.756 19.657-19.657 19.657h-570.045zM275.662 904.545c16.145 0 29.265-13.119 29.265-29.265 0-16.145-13.119-29.265-29.265-29.265-16.145 0-29.265 13.119-29.265 29.265 0 16.145 13.119 29.265 29.265 29.265zM225.682 776.997c-10.901 0-19.745-8.756-19.745-19.657v-127.108c0-10.901 8.844-19.657 19.745-19.657h570.045c10.901 0 19.657 8.756 19.657 19.657v127.108c0 10.901-8.756 19.657-19.657 19.657h-570.045zM275.662 723.051c16.145 0 29.265-13.119 29.265-29.265 0-16.145-13.119-29.265-29.265-29.265-16.145 0-29.265 13.119-29.265 29.265 0 16.145 13.119 29.265 29.265 29.265zM225.682 594.886c-10.901 0-19.745-8.844-19.745-19.745v-127.019c0-10.901 8.844-19.657 19.745-19.657h570.045c10.901 0 19.657 8.756 19.657 19.657v127.019c0 10.901-8.756 19.745-19.657 19.745h-570.045zM275.662 540.852c16.145 0 29.265-13.031 29
.265-29.177s-13.119-29.265-29.265-29.265c-16.145 0-29.265 13.119-29.265 29.265 0 16.145 13.119 29.177 29.265 29.177zM225.682 414.273c-10.901 0-19.745-8.756-19.745-19.657v-437.737c0-10.901 8.844-19.657 19.745-19.657h570.045c10.901 0 19.657 8.756 19.657 19.657v437.737c0 10.901-8.756 19.657-19.657 19.657h-570.045zM253.008 20.574c-4.328 0-7.845-3.517-7.845-7.845v-26.444c0-4.328 3.517-7.845 7.845-7.845h88.235c4.328 0 7.845 3.517 7.845 7.845v26.444c0 4.328-3.517 7.845-7.845 7.845h-88.235zM395.365 20.574c-4.328 0-7.845-3.517-7.845-7.845v-26.444c0-4.328 3.517-7.845 7.845-7.845h88.235c4.328 0 7.845 3.517 7.845 7.845v26.444c0 4.328-3.517 7.845-7.845 7.845h-88.235zM537.722 20.574c-4.328 0-7.845-3.517-7.845-7.845v-26.444c0-4.328 3.517-7.845 7.845-7.845h88.235c4.328 0 7.845 3.517 7.845 7.845v26.444c0 4.328-3.517 7.845-7.845 7.845h-88.235zM680.079 20.574c-4.328 0-7.845-3.517-7.845-7.845v-26.444c0-4.328 3.517-7.845 7.845-7.845h88.235c4.328 0 7.845 3.517 7.845 7.845v26.444c0 4.328-3.517 7.8
45-7.845 7.845h-88.235z" />
<glyph unicode="" d="M553.438 957.687c-31.069-0.319-63.38-13.345-88.625-38.625l-88-88.125 162.438-162.25 88 88.188c47.52 47.587 51.672 120.012 9.25 162.375l-9.313 9.25c-19.885 19.857-46.337 29.469-73.75 29.188zM344.313 798.437l-185.313-185.625 162.438-162.188 185.313 185.563-162.438 162.25zM878.938 779.437c-39.322-0.403-80.174-16.941-112.125-48.938l-111.375-111.563 205.563-205.313 111.438 111.625c60.144 60.228 65.317 151.883 11.625 205.5l-11.75 11.688c-25.168 25.133-58.679 37.356-93.375 37zM338.188 751.937c5.751 0.001 11.496-2.179 15.875-6.563 8.758-8.745 8.747-22.992 0-31.75-8.745-8.757-22.93-8.767-31.688 0-8.758 8.746-8.808 22.993-0.063 31.75 4.373 4.379 10.124 6.561 15.875 6.563zM388 702.187c5.751 0.006 11.559-2.139 15.938-6.5 8.758-8.746 8.684-22.993-0.063-31.75-8.745-8.758-22.867-8.768-31.625 0-8.746 8.734-8.836 22.927-0.125 31.688 4.373 4.379 10.124 6.556 15.875 6.563zM282.25 695.875c5.751 0.001 11.496-2.179 15.875-6.563 8.758-8.746 8.747-22.93 0-31.688-8.745-8
.758-22.93-8.785-31.688-0.063-8.758 8.745-8.808 22.93-0.063 31.688v0.063c4.373 4.379 10.124 6.561 15.875 6.563zM436 654.25c5.739 0.016 11.496-2.126 15.875-6.5 8.758-8.745 8.684-22.93-0.063-31.688-8.745-8.758-22.867-8.767-31.625 0-8.758 8.745-8.807 22.867-0.063 31.625 4.373 4.379 10.136 6.547 15.875 6.563zM332.063 646.125c5.751 0.001 11.496-2.179 15.875-6.563 8.758-8.746 8.747-22.93 0-31.688-8.745-8.757-22.93-8.767-31.688 0-8.758 8.746-8.808 22.93-0.063 31.688 4.373 4.379 10.124 6.561 15.875 6.563zM226.25 639.875c5.751 0.006 11.559-2.201 15.938-6.563 8.758-8.745 8.685-22.93-0.063-31.688-8.745-8.757-22.867-8.785-31.625-0.063-8.758 8.746-8.87 22.93-0.125 31.688 4.373 4.379 10.124 6.618 15.875 6.625zM380.063 598.25c5.739 0.016 11.434-2.189 15.813-6.563 8.758-8.746 8.747-22.93 0-31.688-8.745-8.757-22.93-8.785-31.688-0.063-8.758 8.746-8.744 22.93 0 31.688 4.373 4.379 10.136 6.609 15.875 6.625zM276.125 590.125c5.751 0.001 11.496-2.241 15.875-6.625 8.758-8.746 8.685-22.93-0.063-31.6
88-8.745-8.758-22.867-8.785-31.625-0.063-8.758 8.745-8.808 22.992-0.063 31.75 4.373 4.379 10.124 6.624 15.875 6.625zM614.313 577.812l-136.75-136.938c10.954-3.684 21.212-8.931 30.438-15.438 1.067 5.224 3.575 10.194 7.625 14.25v0.063c5.534 5.542 12.846 8.311 20.125 8.313s14.52-2.764 20.063-8.313c11.084-11.069 11.070-29.041 0-40.125-3.538-3.543-7.76-5.906-12.25-7.188l27.938-27.938c1.264 4.482 3.662 8.72 7.188 12.25 5.534 5.542 12.846 8.311 20.125 8.313 7.279 0.002 14.52-2.764 20.063-8.313 11.084-11.069 11.070-29.041 0-40.125-3.557-3.562-7.796-5.976-12.313-7.25l25.688-25.625c1.268 4.495 3.647 8.767 7.188 12.313v0.063c5.534 5.542 12.799 8.293 20.063 8.313s14.52-2.714 20.063-8.25c11.084-11.069 11.070-29.041 0-40.125-3.587-3.592-7.878-5.982-12.438-7.25l24.625-24.625 128.188 128.313-205.625 205.313zM324.063 542.187c5.739 0.016 11.496-2.126 15.875-6.5 8.758-8.745 8.684-22.992-0.063-31.75-8.745-8.757-22.867-8.785-31.625-0.063-8.758 8.746-8.744 22.93 0 31.688 4.373 4.379 10.073 6.609 1
5.813 6.625zM168.938 538c3.885-11.584 5.563-23.321 5.563-34.563 0-20.381-2.096-28.36-2-24.438l-0.063-0.5c-0.978-13.36-1.563-25.919-1.563-37.75 0-68.022 10.894-76.887 28.125-88 4.033-2.601 9.774-5.152 17.125-7.563l72.875 72.938-120.063 119.875zM606.563 519c7.279 0.002 14.583-2.764 20.125-8.313 11.084-11.068 11.008-29.041-0.063-40.125-11.069-11.084-28.978-11.096-40.063 0-11.084 11.069-11.131 29.041-0.063 40.125 5.534 5.542 12.784 8.311 20.063 8.313zM69.625 516.125c-5.076 0-7.65-2.562-10.188-6.188-5.439-7.614-9.387-19.223-13.375-27.563-20.666-46.409-46.063-112.74-46.063-163.5 0-40.608 3.96-82.318 19.188-120.75 50.397-125.087 198.327-146.125 317.25-146.125h81.25v-92.812c0-12.69 10.498-23.188 23.188-23.188 6.164 0 11.962 2.524 16.313 6.875l185.625 185.625c4.351 4.351 6.938 10.149 6.938 16.313s-2.587 11.962-6.938 16.313l-185.625 185.688c-4.351 4.351-10.149 6.875-16.313 6.875-12.69 0-23.188-10.498-23.188-23.188v-92.813h-81.25c-156.268 0-258.875 30.054-258.875 203 0 14.865 0.725 29.
76 1.813 44.625 0.363 5.801 1.813 12.324 1.813 18.125 0 6.889-4.311 12.688-11.563 12.688zM669.625 456c7.279 0.008 14.583-2.73 20.125-8.25 11.084-11.069 11.008-29.041-0.063-40.125-11.069-11.084-28.978-11.097-40.063 0-11.073 11.058-11.098 28.975-0.063 40.063 5.534 5.542 12.784 8.304 20.063 8.313zM730.375 395.375c7.264 0.020 14.52-2.714 20.063-8.25 11.084-11.068 11.008-29.041-0.063-40.125-11.069-11.084-28.978-11.096-40.063 0-11.073 11.057-11.034 28.913 0 40 5.534 5.542 12.799 8.355 20.063 8.375z" />
<glyph unicode="" d="M510.464 956.992c-281.96 0-510.464-228.504-510.464-510.464 0-281.925 228.504-510.528 510.464-510.528 281.96 0 510.464 228.602 510.464 510.528 0 281.96-228.504 510.464-510.464 510.464zM377.412 740.695c12.768-1.834 285.282-42.285 399.914-109.159 14.214-8.289 21.276-16.969 30.024-26.105 31.674-32.767 73.645-169.124 78.125-197.271l-1.707-2.908c-1.658-0.635-5.679-3.383-10.935-7.016-26.595-18.764-89.209-62.601-169.523-55.37-72.201 6.419-166.344 47.678-279.883 122.559 4.903-11.816 28.629-67.716 32.615-77.24l1.517-1.896c16.401-8.43 174.247-88.94 252.514-87.353 63.101 1.199 130.826 32.066 157.703 48.291 2.751 1.658 5.979 3.407 8.659 1.643 2.187-1.869 1.851-5.519 1.075-8.975-1.658-7.76-5.333-21.89-7.838-28.38l-2.149-5.562c-3.245-8.218-5.957-16.026-11.883-20.859-15.837-14.32-41.274-25.873-81.095-43.297-61.443-26.701-161.113-43.791-253.842-43.297-33.226 0.882-65.224 4.466-93.547 7.711-85.004 9.594-146.825 16.494-160.863-58.846-83.488 79.855-135.707 192.154-1
35.707 316.733 0 95.409 30.623 183.644 82.296 255.422 83.488-19.011 145.826-39.287 160.358-44.119 0.141 6.243 1.327 62.828 1.327 62.828l0.822 1.959 2.023 0.506zM676.131 625.342c-29.009-0.361-56.447-11.285-77.809-31.225-22.68-21.233-35.842-49.986-36.724-81.095-2.257-64.229 48.083-118.343 112.383-120.6 31.039-1.058 60.606 10.019 83.497 31.288 22.715 21.092 35.714 49.978 36.913 81.159 2.257 64.088-48.358 118.118-112.446 120.41-1.947 0.071-3.881 0.087-5.815 0.063zM676.953 591.146c1.347 0.018 2.69-0.014 4.045-0.063 44.865-1.587 80.028-39.426 78.441-84.256-0.705-21.621-9.818-41.729-25.725-56.508-15.837-14.849-36.452-22.527-58.214-21.68-44.865 1.587-80.028 39.334-78.441 84.129 0.564 21.692 9.747 41.757 25.725 56.571 14.847 13.822 33.966 21.54 54.169 21.807zM694.272 550.188c-19.964 0-36.155-10.764-36.155-23.956 0-13.262 16.191-23.956 36.155-23.956 19.893 0 35.965 10.694 35.965 23.956 0 13.192-16.072 23.956-35.965 23.956zM625.545 1086.061v0z" />
-<glyph unicode="" d="M604.101 811.165h-189.14v88.12h189.14v-88.12zM927.651 582.955h-286.179v68.426h286.179v-68.426zM927.651 487.349h-286.179v34.239h286.179v-34.239zM927.651 416.216h-286.179v34.293h286.179v-34.293zM927.651 86.403h-286.179v51.439h286.179v-51.439zM552.238 125.207c0-23.251-19.058-42.308-42.256-42.308h-381.358c-23.198 0-42.203 19.058-42.203 42.308v498.675c0 23.251 19.005 42.202 42.203 42.202h381.358c23.198 0 42.256-18.951 42.256-42.202v-498.675zM641.472 380.331h190.733v-34.133h-190.733v34.133zM907.213 758.983h-795.524c-61.684 0-111.69-49.952-111.69-111.637v-539.55c0-61.79 50.006-111.796 111.69-111.796h795.524c61.684 0 111.689 50.005 111.689 111.796v539.55c0 61.684-50.006 111.637-111.689 111.637M319.090 344.287c-36.309 0-69.327 13.165-95.817 34.293-33.655-27.763-55.632-69.381-55.632-116.414v-141.629h303.005v141.629c0 47.033-21.977 88.651-55.738 116.414-26.437-21.128-59.401-34.293-95.818-34.293M319.090 381.074c65.029 0 117.901 52.766 117.901 117.794 0 64.97
5-52.872 117.847-117.901 117.847-64.974 0-117.847-52.872-117.847-117.847 0-65.028 52.872-117.794 117.847-117.794" />
+<glyph unicode="" d="M604.101 811.165h-189.14v88.12h189.14v-88.12zM927.651 582.955h-286.179v68.426h286.179v-68.426zM927.651 487.349h-286.179v34.239h286.179v-34.239zM927.651 416.216h-286.179v34.293h286.179v-34.293zM927.651 86.403h-286.179v51.439h286.179v-51.439zM552.238 125.207c0-23.251-19.058-42.308-42.256-42.308h-381.358c-23.198 0-42.203 19.058-42.203 42.308v498.675c0 23.251 19.005 42.202 42.203 42.202h381.358c23.198 0 42.256-18.951 42.256-42.202v-498.675zM641.472 380.331h190.733v-34.133h-190.733v34.133zM907.213 758.983h-795.524c-61.684 0-111.69-49.952-111.69-111.637v-539.55c0-61.79 50.006-111.796 111.69-111.796h795.524c61.684 0 111.689 50.005 111.689 111.796v539.55c0 61.684-50.006 111.637-111.689 111.637zM319.090 344.287c-36.309 0-69.327 13.165-95.817 34.293-33.655-27.763-55.632-69.381-55.632-116.414v-141.629h303.005v141.629c0 47.033-21.977 88.651-55.738 116.414-26.437-21.128-59.401-34.293-95.818-34.293zM319.090 381.074c65.029 0 117.901 52.766 117.901 117.794 0 64.
975-52.872 117.847-117.901 117.847-64.974 0-117.847-52.872-117.847-117.847 0-65.028 52.872-117.794 117.847-117.794z" />
<glyph unicode="" d="M173.521 956.047c-19.457 0-35.093-20.974-35.093-47.026v-94.522h134.317v94.522c0 26.052-15.636 47.026-35.093 47.026h-64.131zM473.957 956.047c-19.457 0-35.093-20.974-35.093-47.026v-403.011h134.317v403.011c0 26.052-15.636 47.026-35.093 47.026h-64.131zM774.392 956.047c-19.457 0-35.093-20.974-35.093-47.026v-166.001h134.317v166.001c0 26.052-15.636 47.026-35.093 47.026h-64.131zM134.548 779.231c-19.457 0-35.093-20.974-35.093-47.026v-263.344c0-26.052 15.636-47.026 35.093-47.026h142.077c19.457 0 35.093 20.974 35.093 47.026v263.344c0 26.052-15.636 47.026-35.093 47.026h-142.077zM134.372 707.751h142.429v-21.514h-142.429v21.514zM735.42 707.751c-19.457 0-35.093-20.974-35.093-47.026v-263.344c0-26.052 15.636-47.026 35.093-47.026h142.077c19.457 0 35.093 20.974 35.093 47.026v263.344c0 26.052-15.636 47.026-35.093 47.026h-142.077zM735.244 636.272h142.429v-21.514h-142.429v21.514zM134.372 621.224h142.429v-21.514h-142.429v21.514zM735.244 549.745h142.429v-21.514h-142.429
v21.514zM134.372 534.697h142.429v-21.514h-142.429v21.514zM434.984 470.742c-19.457 0-35.093-20.974-35.093-47.026v-263.344c0-26.052 15.636-47.026 35.093-47.026h142.077c19.457 0 35.093 20.974 35.093 47.026v263.344c0 26.052-15.636 47.026-35.093 47.026h-142.077zM735.244 463.218h142.429v-21.514h-142.429v21.514zM434.808 399.262h142.429v-21.514h-142.429v21.514zM138.428 386.566v-403.54c0-26.052 15.636-47.026 35.093-47.026h64.131c19.457 0 35.093 20.974 35.093 47.026v403.54h-134.317zM739.3 315.086v-332.061c0-26.052 15.636-47.026 35.093-47.026h64.131c19.457 0 35.093 20.974 35.093 47.026v332.061h-134.317zM434.808 312.735h142.429v-21.514h-142.429v21.514zM434.808 226.208h142.429v-21.514h-142.429v21.514zM438.864 78.077v-95.051c0-26.052 15.636-47.026 35.093-47.026h64.131c19.457 0 35.093 20.974 35.093 47.026v95.051h-134.317z" />
<glyph unicode="" d="M544.813 951.75l-188.563-478.438 160.75-0.75-106.125-409.75 291.125 510.375-144.188-0.563 172.125 375.75-185.125 3.375zM459.625 899.812c-1.977-0.248-3.968-0.478-5.938-0.75-1.941-0.268-3.872-0.583-5.813-0.875-1.579-0.236-3.173-0.498-4.75-0.75-1.029-0.166-2.034-0.328-3.063-0.5-0.653-0.109-1.285-0.201-1.938-0.313-2.559-0.44-5.193-0.893-7.75-1.375-4.628-0.873-9.254-1.8-13.875-2.813-0.397-0.087-0.728-0.162-1.125-0.25-0.653-0.144-1.347-0.291-2-0.438-1.995-0.451-4.007-0.897-6-1.375-0.042-0.010-0.021-0.053-0.062-0.062-4.721-1.126-9.496-2.356-14.188-3.625-5.201-1.407-10.402-2.917-15.563-4.5-0.274-0.084-0.538-0.165-0.813-0.25-30.775-9.502-60.746-22.153-89.5-37.938-1.875-1.029-3.761-2.006-5.625-3.063-0.037-0.021-0.087-0.042-0.125-0.062-0.088-0.050-0.162-0.138-0.25-0.187-1.363-0.774-2.695-1.588-4.063-2.375-0.299-0.173-0.639-0.326-0.938-0.5-1.782-1.030-3.556-2.069-5.313-3.125-1.334-0.802-2.677-1.569-4-2.375-0.402-0.246-0.787-0.566-1.188-0.813-1.335-0.819-2.66
6-1.594-4-2.438-1.455-0.92-2.877-1.81-4.313-2.75-0.396-0.255-0.793-0.557-1.188-0.813-0.023-0.016-0.040-0.048-0.062-0.062-0.301-0.195-0.575-0.367-0.875-0.563-0.534-0.341-1.105-0.658-1.625-1-0.283-0.187-0.53-0.375-0.813-0.563-2.184-1.442-4.407-2.902-6.563-4.375-0.036-0.025-0.089-0.038-0.125-0.062-0.862-0.59-1.705-1.155-2.563-1.75-0.379-0.264-0.746-0.61-1.125-0.875-0.865-0.604-1.71-1.205-2.563-1.813-1.87-1.323-3.716-2.653-5.563-4-0.173-0.126-0.389-0.248-0.563-0.375-0.996-0.729-1.948-1.452-2.938-2.188-1.498-1.113-2.955-2.246-4.438-3.375-0.101-0.077-0.212-0.173-0.313-0.25-4.827-3.682-9.65-7.406-14.313-11.25-0.152-0.125-0.286-0.25-0.438-0.375-2.348-1.941-4.632-3.957-6.938-5.938-2.375-2.040-4.733-4.043-7.063-6.125-2.131-1.904-4.283-3.812-6.375-5.75-2.516-2.328-4.978-4.685-7.438-7.063-1.536-1.485-3.049-2.997-4.563-4.5-0.623-0.619-1.318-1.253-1.938-1.875-0.197-0.198-0.366-0.364-0.563-0.563-1.882-1.896-3.715-3.826-5.563-5.75-1.901-1.98-3.761-3.99-5.625-6-2.188-2.359-4.425-4.726-6.563-
7.125-0.55-0.618-1.016-1.255-1.563-1.875-1.889-2.143-3.776-4.326-5.625-6.5-0.973-1.143-1.976-2.286-2.938-3.438-0.549-0.658-1.080-1.277-1.625-1.938-1.702-2.061-3.397-4.163-5.063-6.25-1.824-2.286-3.595-4.559-5.375-6.875-0.886-1.153-1.75-2.34-2.625-3.5-0.883-1.17-1.816-2.323-2.688-3.5-0.287-0.387-0.527-0.737-0.813-1.125-0.785-1.067-1.599-2.114-2.375-3.188-0.859-1.178-1.716-2.375-2.563-3.563-0.429-0.604-0.887-1.206-1.313-1.813-0.526-0.746-0.981-1.502-1.5-2.25-1.411-2.031-2.867-4.076-4.25-6.125-0.304-0.452-0.573-0.922-0.875-1.375-0.366-0.546-0.699-1.076-1.063-1.625-0.403-0.609-0.788-1.264-1.188-1.875-1.285-1.96-2.624-3.91-3.875-5.875-0.5-0.788-0.943-1.522-1.438-2.313-3.989-6.348-7.776-12.824-11.438-19.313-0.222-0.394-0.467-0.793-0.688-1.188-1.639-2.924-3.302-5.862-4.875-8.813-0.254-0.477-0.498-0.96-0.75-1.438-1.633-3.088-3.189-6.197-4.75-9.313-1.714-3.421-3.372-6.86-5-10.313-1.635-3.468-3.264-6.939-4.813-10.438-1.55-3.502-3.037-7.032-4.5-10.563-0.709-1.71-1.374-3.409-2.063-5.125-
0.589-1.464-1.238-2.906-1.813-4.375-0.222-0.57-0.405-1.179-0.625-1.75-0.784-2.027-1.555-4.025-2.313-6.063-0.833-2.241-1.638-4.559-2.438-6.813-0.67-1.888-1.353-3.729-2-5.625-0.129-0.38-0.247-0.745-0.375-1.125-0.311-0.922-0.569-1.827-0.875-2.75-0.629-1.897-1.332-3.783-1.938-5.688-0.409-1.279-0.789-2.594-1.188-3.875-0.979-3.17-1.898-6.372-2.813-9.563-0.029-0.102-0.096-0.148-0.125-0.25-0.53-1.865-1.046-3.774-1.563-5.625-0.19-0.694-0.376-1.367-0.563-2.063-0.318-1.163-0.634-2.325-0.938-3.5-0.238-0.92-0.46-1.828-0.688-2.75-0.238-0.963-0.458-1.973-0.688-2.938-0.463-1.871-0.934-3.748-1.375-5.625-0.531-2.259-1.064-4.545-1.563-6.813-0.064-0.295-0.124-0.582-0.188-0.875-0.711-3.265-1.419-6.531-2.063-9.813-0.023-0.118-0.039-0.194-0.063-0.313-0.182-0.93-0.32-1.885-0.5-2.813-0.123-0.649-0.255-1.288-0.375-1.938-0.339-1.776-0.69-3.587-1-5.375-0.147-0.854-0.295-1.645-0.438-2.5-0.115-0.686-0.205-1.435-0.313-2.125-0.996-6.087-1.861-12.181-2.625-18.313-0.061-0.475-0.13-0.961-0.188-1.438-0.067-0.5
53-0.122-1.072-0.188-1.625-0.388-3.291-0.742-6.635-1.063-9.938-0.256-2.632-0.475-5.237-0.688-7.875-0.415-5.146-0.75-10.27-1-15.438-0.014-0.295 0.014-0.58 0-0.875-0.114-2.446-0.236-4.925-0.313-7.375-0.083-2.648-0.149-5.285-0.188-7.938-0.026-1.801-0.056-3.572-0.063-5.375-0.003-0.851-0.001-1.712 0-2.563 0.005-2.643 0.014-5.291 0.063-7.938 0.049-2.673 0.156-5.324 0.25-8 0.093-2.643 0.176-5.355 0.313-8 0.095-1.835 0.196-3.664 0.313-5.5 0.052-0.829 0.131-1.671 0.188-2.5 0.182-2.667 0.398-5.332 0.625-8 0.611-7.174 1.311-14.323 2.25-21.5 0.006-0.043-0.005-0.082 0-0.125 0.013-0.1 0.050-0.213 0.063-0.313 0.088-0.67 0.223-1.328 0.313-2 0.024-0.177 0.039-0.323 0.063-0.5 0.423-3.081 0.891-6.17 1.375-9.25 0.326-2.072 0.647-4.179 1-6.25 0.246-1.474 0.421-2.956 0.688-4.438 0.394-2.187 0.887-4.315 1.313-6.5 0.031-0.16 0.094-0.34 0.125-0.5 0.151-0.808 0.279-1.64 0.438-2.438 0.067-0.332 0.12-0.605 0.188-0.938 0.524-2.608 0.997-5.22 1.563-7.813 0.223-1.020 0.521-2.107 0.75-3.125 0.102-0.451 0.1
46-0.862 0.25-1.313 0.795-3.488 1.692-6.916 2.563-10.375 0.489-1.944 1.051-3.878 1.563-5.813 0.657-2.482 1.306-4.971 2-7.438 0.693-2.462 1.394-4.929 2.125-7.375 5.129-17.175 11.186-33.941 18.125-50.25 9.226-21.683 19.962-42.641 32.125-62.563 0.251-0.411 0.498-0.715 0.75-1.125 1.057-1.728 2.116-3.416 3.188-5.125 0.407-0.65 0.776-1.29 1.188-1.938 0.399-0.625 0.848-1.315 1.25-1.938 1.091-1.698 2.202-3.325 3.313-5 0.757-1.141 1.485-2.3 2.25-3.438 0.305-0.452 0.631-0.924 0.938-1.375 0.16-0.236 0.34-0.514 0.5-0.75 0.255-0.376 0.494-0.751 0.75-1.125 0.852-1.239 1.76-2.454 2.625-3.688 0.841-1.202 1.654-2.436 2.5-3.625 4.597-6.46 9.431-12.757 14.313-18.938 3.587-4.541 7.204-8.986 10.938-13.375 1.878-2.208 3.773-4.393 5.688-6.563 1.898-2.15 3.818-4.326 5.75-6.438 0.029-0.031 0.034-0.094 0.063-0.125 1.917-2.094 3.862-4.068 5.813-6.125 3.945-4.159 7.985-8.309 12.063-12.313 4.087-4.013 8.223-7.895 12.438-11.75 1.894-1.733 3.768-3.487 5.688-5.188 0.211-0.187 0.414-0.376 0.625-0.563 1.587-
1.401 3.209-2.808 4.813-4.188 0.546-0.47 1.14-0.907 1.688-1.375 2.165-1.845 4.305-3.696 6.5-5.5 3.211-2.657 6.406-5.316 9.688-7.875 3.059-2.385 6.076-4.754 9.188-7.063 3.123-2.317 6.326-4.512 9.5-6.75 1.25-0.881 2.542-1.75 3.813-2.625 0.904-0.622 1.79-1.264 2.688-1.875 2.853-1.951 5.666-3.921 8.563-5.812 2.867-1.872 5.779-3.688 8.688-5.5 0.736-0.457 1.449-0.922 2.188-1.375 2.947-1.815 5.949-3.56 8.938-5.313 3.346-1.962 6.666-3.929 10.063-5.812 3.39-1.879 6.811-3.7 10.25-5.5 16-8.373 32.512-15.859 49.5-22.438l18.313 71.813 49 222.937c-1.167 0.797-2.288 1.677-3.438 2.5-0.899 0.643-1.8 1.278-2.688 1.938-0.216 0.161-0.41 0.339-0.625 0.5-0.283 0.212-0.593 0.411-0.875 0.625-1.012 0.76-2.005 1.526-3 2.313-0.11 0.087-0.265 0.162-0.375 0.25-0.937 0.744-1.827 1.55-2.75 2.313-0.517 0.426-1.050 0.88-1.563 1.313-0.747 0.633-1.513 1.23-2.25 1.875-1.222 1.063-2.429 2.091-3.625 3.188-1.063 0.978-2.085 1.998-3.125 3-0.051 0.049-0.137 0.014-0.187 0.062-1.034 0.999-1.988 2.103-3 3.125-0.765 0.
77-1.56 1.528-2.313 2.313-0.213 0.223-0.476 0.401-0.688 0.625-1.182 1.244-2.287 2.533-3.438 3.813-1.35 1.503-2.636 3.017-3.938 4.563-0.632 0.75-1.317 1.49-1.938 2.25-0.52 0.637-0.988 1.231-1.5 1.875-0.229 0.288-0.46 0.649-0.688 0.938-1.159 1.475-2.319 2.923-3.438 4.438-0.929 1.255-1.788 2.473-2.688 3.75-0.245 0.349-0.508 0.774-0.75 1.125-0.637 0.918-1.254 1.82-1.875 2.75-0.85 1.279-1.741 2.571-2.563 3.875-0.008 0.014 0.008 0.048 0 0.062-0.984 1.562-1.871 3.152-2.813 4.75-0.087 0.148-0.222 0.234-0.313 0.375-0.56 0.956-1.143 1.969-1.688 2.938-0.156 0.277-0.283 0.534-0.438 0.813-0.362 0.652-0.708 1.28-1.063 1.938-0.362 0.669-0.708 1.387-1.063 2.063-0.145 0.276-0.294 0.535-0.438 0.813-0.463 0.892-0.921 1.776-1.375 2.688-0.455 0.911-0.934 1.828-1.375 2.75-0.245 0.51-0.444 1.056-0.688 1.563-0.293 0.626-0.588 1.244-0.875 1.875-0.381 0.838-0.753 1.663-1.125 2.5-0.332 0.757-0.632 1.502-0.938 2.25-0.309 0.73-0.633 1.448-0.938 2.188-0.656 1.608-1.318 3.251-1.938 4.875-0.104 0.273-0.211
0.541-0.313 0.813-0.081 0.218-0.171 0.47-0.25 0.688-0.16 0.435-0.281 0.814-0.438 1.25-0.105 0.294-0.208 0.643-0.313 0.938-0.532 1.502-1.071 2.993-1.563 4.5-0.111 0.338-0.205 0.662-0.313 1-0.014 0.042 0.006 0.089 0 0.125-0.020 0.060-0.043 0.128-0.062 0.187-0.704 2.228-1.38 4.44-2 6.688-0.008 0.026 0.008 0.099 0 0.125-0.626 2.273-1.273 4.584-1.813 6.875-0.491 2.082-0.956 4.093-1.375 6.188-0.044 0.217-0.082 0.47-0.125 0.688-0.010 0.043-0.054 0.082-0.062 0.125-0.020 0.097 0.018 0.153 0 0.25-0.031 0.157-0.032 0.343-0.062 0.5-0.385 2.001-0.741 3.994-1.063 6-0.033 0.21-0.092 0.415-0.125 0.625-0.016 0.1-0.047 0.213-0.062 0.313-0.311 2.034-0.564 4.090-0.813 6.125-0.525 4.344-0.839 8.647-1.063 13h-0.938l-52.625 0.25 18.438 49.313 164.313 440.25zM743.125 849l-101-216.688 163.063 0.625-101.188-167.563c0.010-0.037-0.010-0.088 0-0.125 0.171-0.695 0.337-1.364 0.5-2.063 0.083-0.356 0.169-0.706 0.25-1.063 0.265-1.162 0.507-2.33 0.75-3.5 0.004-0.018-0.004-0.043 0-0.062 0.212-1.025 0.43-2.035
0.625-3.063 0.101-0.531 0.216-1.092 0.313-1.625 0.201-1.107 0.382-2.202 0.563-3.313 0.074-0.457 0.179-0.917 0.25-1.375 0.079-0.51 0.175-0.99 0.25-1.5 0.156-1.064 0.236-2.18 0.375-3.25 0.15-1.155 0.309-2.339 0.438-3.5 0.014-0.119 0.049-0.194 0.062-0.313 0.034-0.315 0.092-0.622 0.125-0.938 0.139-1.336 0.264-2.662 0.375-4 0.023-0.278 0.041-0.535 0.062-0.813 0.239-3.044 0.407-6.105 0.5-9.188 0.006-0.179-0.004-0.384 0-0.563 0.041-1.485 0.056-2.952 0.062-4.438 0.001-0.158 0-0.342 0-0.5 0.002-1.505-0.030-2.995-0.062-4.5-0.002-0.099 0.002-0.151 0-0.25-0.037-1.565-0.112-3.124-0.187-4.688-0.002-0.039 0.002-0.086 0-0.125-0.038-0.792-0.139-1.583-0.187-2.375-0.048-0.793-0.004-1.585-0.062-2.375-0.002-0.039 0.002-0.086 0-0.125-0.077-1.048-0.156-2.082-0.25-3.125-0.044-0.492-0.077-1.009-0.125-1.5-0.033-0.376-0.090-0.75-0.125-1.125-0.072-0.695-0.17-1.37-0.25-2.063-0.057-0.495-0.127-1.006-0.187-1.5-0.23-1.723-0.49-3.411-0.75-5.125-0.349-2.302-0.754-4.584-1.188-6.875-0.434-2.291-0.919-4.598-1.
438-6.875-0.509-2.234-0.972-4.47-1.563-6.688-0.012-0.043-0.051-0.082-0.062-0.125-0.248-0.923-0.551-1.831-0.813-2.75-0.146-0.516-0.224-1.047-0.375-1.563-0.178-0.608-0.379-1.207-0.563-1.813-0.248-0.818-0.494-1.637-0.75-2.438-0.102-0.319-0.209-0.619-0.313-0.938-0.103-0.318-0.207-0.682-0.313-1-0.267-0.793-0.539-1.52-0.813-2.313-0.096-0.277-0.216-0.599-0.313-0.875-0.63-1.802-1.252-3.527-1.938-5.313-0.133-0.347-0.302-0.716-0.438-1.063-0.344-0.877-0.706-1.815-1.063-2.688-0.081-0.197-0.106-0.366-0.187-0.563-0.097-0.238-0.213-0.512-0.313-0.75-0.486-1.163-0.991-2.348-1.5-3.5-0.104-0.235-0.208-0.453-0.313-0.688-0.512-1.146-1.029-2.241-1.563-3.375-0.12-0.255-0.254-0.496-0.375-0.75-0.528-1.109-1.076-2.278-1.625-3.375-0.127-0.255-0.184-0.496-0.313-0.75-0.554-1.094-1.176-2.168-1.75-3.25-0.137-0.258-0.237-0.492-0.375-0.75-0.574-1.070-1.156-2.193-1.75-3.25-0.155-0.277-0.344-0.536-0.5-0.813-0.586-1.031-1.145-2.044-1.75-3.063-0.175-0.296-0.386-0.58-0.563-0.875-0.596-0.993-1.198-2.019-1.813-3-0
.185-0.297-0.313-0.579-0.5-0.875-3.027-4.776-6.321-9.4-9.75-13.875-9.693-12.65-20.917-24.083-33.438-33.938-0.411-0.324-0.836-0.617-1.25-0.938-2.064-1.597-4.12-3.175-6.25-4.688-0.313-0.222-0.686-0.405-1-0.625-0.978-0.682-1.944-1.335-2.938-2-0.258-0.174-0.491-0.39-0.75-0.563-1.058-0.701-2.175-1.381-3.25-2.063-0.669-0.426-1.326-0.832-2-1.25-0.676-0.417-1.317-0.841-2-1.25-0.123-0.074-0.252-0.176-0.375-0.25-1.247-0.743-2.481-1.471-3.75-2.188-1.346-0.766-2.759-1.516-4.125-2.25-0.039-0.021-0.086-0.042-0.125-0.062-2.837-1.509-5.685-2.935-8.625-4.313-2.94-1.378-5.959-2.697-9-3.938-8.702-3.551-17.574-6.428-26.438-8.625l-134.188-222.063-35.25-61.312c6.574-1.742 13.132-3.407 19.813-4.875 3.787-0.832 7.555-1.57 11.375-2.313 3.78-0.735 7.626-1.478 11.438-2.125 0.313-0.052 0.625-0.072 0.938-0.124 2.74-0.459 5.495-0.9 8.25-1.312 1.423-0.217 2.832-0.354 4.25-0.563 2.464-0.362 4.891-0.746 7.375-1.062 15.552-1.978 31.289-3.186 47.063-3.625 4.732-0.132 9.442-0.196 14.188-0.188 0.494 0.001 1.006
0 1.5 0 0.516 0.002 1.046 0 1.563 0 2.093 0.020 4.155 0.082 6.25 0.124 2.051 0.042 4.134 0.058 6.188 0.124 0.574 0.020 1.113 0.040 1.688 0.062 1.995 0.072 4.004 0.152 6 0.25 1.62 0.080 3.255 0.154 4.875 0.25 1.641 0.098 3.296 0.26 4.938 0.375 1.899 0.132 3.788 0.282 5.688 0.437 0.728 0.060 1.459 0.062 2.188 0.124 7.125 0.614 14.246 1.375 21.375 2.313 0.178 0.024 0.385 0.038 0.563 0.062 0.593 0.078 1.157 0.168 1.75 0.25 3.164 0.432 6.337 0.941 9.5 1.438 2.103 0.33 4.206 0.657 6.313 1 0.138 0.024 0.3 0.038 0.438 0.062 1.32 0.216 2.683 0.388 4 0.625 2.192 0.39 4.318 0.83 6.5 1.25 1.29 0.251 2.586 0.551 3.875 0.813 0.338 0.068 0.662 0.18 1 0.25 2.273 0.459 4.556 0.82 6.813 1.312 1.469 0.323 2.97 0.662 4.438 1 1.516 0.346 3.002 0.761 4.5 1.125 1.948 0.473 3.92 0.946 5.875 1.438 36.198 9.106 70.699 22.309 103.125 39.062 0.433 0.222 0.88 0.464 1.313 0.688 2.061 1.073 4.144 2.149 6.188 3.25 0.462 0.248 0.914 0.501 1.375 0.75 1.999 1.086 4.018 2.137 6 3.25 0.495 0.276 0.944 0.597 1.
438 0.875 0.393 0.223 0.795 0.401 1.188 0.625 2.075 1.175 4.135 2.422 6.188 3.625 57.225 33.532 105.524 77.63 143.375 128.75 0.56 0.756 1.132 1.491 1.688 2.25 1.754 2.386 3.421 4.777 5.125 7.188 0.069 0.098 0.119 0.214 0.187 0.313 0.607 0.86 1.207 1.7 1.813 2.563 1.347 1.918 2.695 3.816 4 5.75 0.214 0.316 0.475 0.746 0.688 1.063 0.090 0.136 0.096 0.241 0.187 0.375 1.28 1.911 2.515 3.833 3.75 5.75 0.774 1.191 1.549 2.364 2.313 3.563 0.625 0.982 1.258 2.014 1.875 3 1.382 2.206 2.72 4.402 4.063 6.625 1.343 2.224 2.696 4.447 4 6.688 0.495 0.849 0.948 1.71 1.438 2.563 0.803 1.4 1.587 2.781 2.375 4.188 2.543 4.537 5.053 9.087 7.438 13.688 0.229 0.44 0.46 0.872 0.688 1.313 0.961 1.867 1.94 3.748 2.875 5.625 0.145 0.291 0.23 0.583 0.375 0.875 0.86 1.735 1.725 3.507 2.563 5.25 0.211 0.437 0.478 0.875 0.688 1.313 0.149 0.312 0.227 0.625 0.375 0.938 1.674 3.52 3.347 7.058 4.938 10.625 0.237 0.532 0.452 1.030 0.688 1.563 0.104 0.235 0.209 0.514 0.313 0.75 0.869 1.977 1.719 3.947 2.563 5
.938 0.177 0.419 0.324 0.769 0.5 1.188 2.611 6.21 5.082 12.536 7.438 18.875 0.389 1.049 0.806 2.074 1.188 3.125 0.438 1.206 0.883 2.415 1.313 3.625 0.014 0.041 0.048 0.084 0.062 0.125 2.073 5.852 4.023 11.797 5.875 17.75 1.152 3.702 2.248 7.386 3.313 11.125 2.115 7.431 4.049 14.928 5.813 22.5 0.46 1.956 0.874 3.914 1.313 5.875 0.039 0.178 0.086 0.384 0.125 0.563 0.091 0.418 0.16 0.832 0.25 1.25 0.439 2.017 0.889 4.046 1.313 6.063 0.276 1.363 0.548 2.695 0.813 4.063 0.246 1.259 0.519 2.546 0.75 3.813 0.149 0.807 0.23 1.629 0.375 2.438 0.232 1.307 0.524 2.572 0.75 3.875 0.078 0.447 0.174 0.865 0.25 1.313 0.068 0.406 0.12 0.844 0.187 1.25 0.365 2.172 0.685 4.324 1 6.5 0.026 0.177 0.037 0.386 0.062 0.563 0.161 1.068 0.346 2.117 0.5 3.188 0.234 1.603 0.407 3.215 0.625 4.813 0.042 0.316 0.083 0.622 0.125 0.938 0.257 1.914 0.578 3.822 0.813 5.75 0.468 3.848 0.937 7.762 1.313 11.625 4.071 41.907 2.648 84.631-4.625 127.25-0.652 3.822-1.378 7.681-2.125 11.5-0.058 0.295-0.13 0.579-0.18
7 0.875-0.313 1.604-0.609 3.215-0.938 4.813-0.223 1.11-0.454 2.205-0.688 3.313-0.166 0.789-0.327 1.59-0.5 2.375-0.002 0.016-0.059-0.018-0.062 0-0.413 1.888-0.82 3.785-1.25 5.688-0.228 1.008-0.45 2.003-0.688 3-0.027 0.112-0.098 0.201-0.125 0.313-0.042 0.177-0.082 0.323-0.125 0.5-0.877 3.655-1.791 7.315-2.75 10.938-0.531 2.006-1.069 4.005-1.625 6-0.138 0.496-0.298 0.942-0.438 1.438-0.157 0.555-0.279 1.133-0.438 1.688-0.549 1.921-1.178 3.839-1.75 5.75-0.74 2.471-1.472 4.984-2.25 7.438-0.788 2.485-1.611 4.908-2.438 7.375-0.318 0.949-0.614 1.928-0.938 2.875-0.514 1.502-0.972 3.005-1.5 4.5-0.112 0.319-0.262 0.619-0.375 0.938-0.753 2.117-1.531 4.209-2.313 6.313-0.908 2.442-1.867 4.889-2.813 7.313-0.946 2.423-1.892 4.846-2.875 7.25-0.555 1.361-1.119 2.706-1.688 4.063-0.107 0.255-0.143 0.558-0.25 0.813-0.936 2.223-1.967 4.413-2.938 6.625-1.087 2.478-2.182 4.912-3.313 7.375-1.118 2.436-2.277 4.891-3.438 7.313-3.471 7.239-7.149 14.405-11 21.5-0.341 0.627-0.656 1.312-1 1.938-0.951 1.733
-1.901 3.401-2.875 5.125-2.917 5.164-5.941 10.298-9.063 15.375-0.172 0.28-0.39 0.533-0.563 0.813-1.556 2.519-3.143 5.066-4.75 7.563-1.849 2.872-3.709 5.721-5.625 8.563-0.040 0.059-0.085 0.129-0.125 0.187-0.212 0.317-0.474 0.684-0.688 1-7.608 11.212-15.721 22.196-24.375 32.875-0.364 0.45-0.697 0.864-1.063 1.313-1.165 1.427-2.379 2.896-3.563 4.313-0.562 0.674-1.060 1.33-1.625 2-0.998 1.182-2.051 2.325-3.063 3.5-1.593 1.849-3.187 3.669-4.813 5.5-0.966 1.090-1.9 2.17-2.875 3.25-0.646 0.714-1.287 1.414-1.938 2.125-1.198 1.31-2.414 2.642-3.625 3.938-0.438 0.468-0.872 0.971-1.313 1.438-1.446 1.534-2.911 3.049-4.375 4.563-0.213 0.22-0.474 0.405-0.688 0.625-1.426 1.469-2.807 2.926-4.25 4.375-0.256 0.257-0.493 0.556-0.75 0.813l-0.125 0.125c-1.667 1.667-3.377 3.237-5.063 4.875-1.265 1.226-2.536 2.476-3.813 3.688-0.467 0.444-0.907 0.871-1.375 1.313-1.047 0.986-2.132 2.024-3.188 3-0.707 0.655-1.415 1.287-2.125 1.938-0.776 0.709-1.532 1.421-2.313 2.125-1.002 0.906-1.992 1.791-3 2.688-7.62
5 6.783-15.438 13.283-23.375 19.5-14.060 11.013-28.578 21.075-43.5 30.313-10.162 6.291-20.5 12.163-31 17.625zM376.5 409.812c0.049-0.77 0.122-1.545 0.187-2.313 0.303-3.545 0.738-7.018 1.313-10.563 0.401-2.475 0.902-4.969 1.438-7.438 0.016-0.070 0.048-0.118 0.062-0.187 0.211-0.966 0.331-1.911 0.563-2.875 0.14-0.59 0.29-1.226 0.438-1.813 0.108-0.425 0.201-0.888 0.313-1.313 0.027-0.103 0.098-0.147 0.125-0.25 0.457-1.735 0.918-3.481 1.438-5.188 0.014-0.046 0.034-0.093 0.062-0.125 0.018-0.020 0.054-0.034 0.062-0.062 0.029-0.096 0.033-0.154 0.062-0.25 0.008-0.024 0.055-0.040 0.062-0.062 0.262-0.848 0.524-1.715 0.813-2.563 0.217-0.67 0.456-1.331 0.688-2 0.154-0.437 0.283-0.879 0.438-1.313 0.232-0.666 0.443-1.349 0.688-2 0.337-0.9 0.688-1.804 1.063-2.688 0.055-0.14 0.131-0.297 0.187-0.438 0.117-0.278 0.198-0.531 0.313-0.813 0.057-0.14 0.13-0.297 0.187-0.438 0.213-0.567 0.453-1.138 0.688-1.688 1.303-3.057 2.683-5.994 4.188-8.938 0.276-0.543 0.593-1.024 0.875-1.563 0.050-0.094 0.075-0.
219 0.125-0.313 0.067-0.127 0.12-0.249 0.187-0.375 0.356-0.667 0.701-1.33 1.063-2 0.318-0.58 0.675-1.113 1-1.688 0.208-0.37 0.411-0.759 0.625-1.125 0.018-0.008 0.046-0.056 0.062-0.062 0.29-0.498 0.579-1.006 0.875-1.5 0.474-0.795 0.948-1.593 1.438-2.375 0.223-0.355 0.399-0.772 0.625-1.125 0.064-0.1 0.186-0.212 0.25-0.313 0.076-0.119 0.173-0.194 0.25-0.313 0.932-1.442 1.832-2.911 2.813-4.313 0.268-0.385 0.541-0.745 0.813-1.125 0.865-1.21 1.725-2.442 2.625-3.625 0.109-0.143 0.265-0.232 0.375-0.375 0.309-0.403 0.624-0.789 0.938-1.188 1.328-1.692 2.666-3.383 4.063-5 1.396-1.617 2.852-3.205 4.313-4.75 1.301-1.377 2.587-2.678 3.938-4 0.338-0.332 0.659-0.671 1-1 0.251-0.241 0.56-0.511 0.813-0.75 0.205-0.195 0.419-0.369 0.625-0.563 0.078-0.073 0.11-0.177 0.187-0.25 0.612-0.572 1.241-1.134 1.875-1.688l16.125 73.5c-0.654 1.593-1.252 3.133-1.813 4.75-0.281 0.81-0.556 1.621-0.813 2.438-0.075 0.236-0.178 0.513-0.25 0.75-0.034 0.11-0.029 0.202-0.062 0.313-0.638 2.127-1.216 4.277-1.688 6.43
8-0.243 1.115-0.426 2.253-0.625 3.375-0.291 1.645-0.542 3.289-0.75 4.938l-57.25 0.187zM661.188 394.5l-53.25-88.125c0.676 0.528 1.334 1.089 2 1.625 1.629 1.312 3.251 2.624 4.813 4 1.573 1.386 3.121 2.865 4.625 4.313 3.045 2.93 5.994 5.959 8.75 9.125 1.387 1.594 2.688 3.226 4 4.875 1.281 1.61 2.542 3.153 3.75 4.813 0.025 0.035 0.037 0.090 0.062 0.125 1.236 1.701 2.467 3.5 3.625 5.25 0.848 1.281 1.695 2.506 2.5 3.813 0.016 0.008-0.018 0.054 0 0.062 0.060 0.098 0.065 0.214 0.125 0.313 0.529 0.86 1.051 1.753 1.563 2.625 0.051 0.086 0.135 0.167 0.187 0.25 0.186 0.291 0.388 0.57 0.563 0.875 0.224 0.392 0.405 0.794 0.625 1.188 0.32 0.571 0.622 1.113 0.938 1.688 0.063 0.117 0.125 0.258 0.187 0.375 0.335 0.614 0.679 1.195 1 1.813 0.057 0.11 0.13 0.265 0.187 0.375 0.295 0.571 0.532 1.18 0.813 1.75 0.226 0.459 0.529 0.852 0.75 1.313 0.285 0.585 0.535 1.223 0.813 1.813 0.090 0.191 0.161 0.369 0.25 0.563 0.71 1.527 1.405 3.070 2.063 4.625 0.010 0.024 0.053 0.039 0.062 0.062 0.265 0.629 0.
494 1.304 0.75 1.938 0.18 0.444 0.387 0.867 0.563 1.313 0.494 1.256 0.915 2.539 1.375 3.813 0.016 0.042 0.044 0.085 0.062 0.125 0.036 0.1 0.089 0.212 0.125 0.313 0.074 0.208 0.177 0.416 0.25 0.625 0.307 0.87 0.581 1.757 0.875 2.625 0.033 0.101 0.092 0.212 0.125 0.313 0.224 0.668 0.476 1.322 0.688 2 0.010 0.025-0.008 0.1 0 0.125 0.008 0.026-0.008 0.037 0 0.062 0.018 0.059 0.044 0.128 0.062 0.187 0.557 1.803 1.013 3.605 1.5 5.438 0.006 0.016 0.058 0.047 0.062 0.062 0.279 1.051 0.558 2.069 0.813 3.125 0.208 0.865 0.37 1.754 0.563 2.625 0.425 1.924 0.84 3.861 1.188 5.813z" />
<glyph unicode="" d="M848 957.125c-47.606-0.488-97.005-20.451-135.688-59.188l-135-135.125 226.563-226.188c12.747-0.334 25.134-3.101 36.5-8.063l120.688 120.813c72.814 72.916 79.253 183.9 14.25 248.813l-14.25 14.188c-30.47 30.427-71.057 45.181-113.063 44.75zM85.813 786c-30.797 0-55.625-24.828-55.625-55.625v-415.438l60.125 59.938v313.375c0 18.045 13.991 32.852 31.875 34.625 1.192 0.118 2.275 0 3.5 0h311.25l63.188 63.125h-414.313zM527.688 713.062l-284.063-284.438 179.75-179.563c2.456 16.178 8.74 28.453 17.125 40.063 7.125 9.866 16.797 20.090 30.813 27.688-2.031 7.388-3.5 15.241-3.5 23.813 0 27.452 13.667 49.034 18.375 55.625 5.605 8.405 12.42 15.495 20.289 21.227-15.558-14.675-11.505-9.69-7.476-4.977-5.281 1.576-10.259 4.442-14.438 8.625-13.419 13.401-13.526 35.081-0.125 48.5 6.7 6.709 15.625 10.061 24.438 10.063 8.812 0.002 17.603-3.345 24.313-10.063 4.079-4.073 6.918-8.924 8.5-14.063 3.633 3.247 7.389 6.522 11.438 9.75 4.985 3.975 10.173 7.949 18.125 12.563 7.952 4.614
16.205 13.313 47.125 13.313 9.685 0 17.874-1.638 25.438-3.75 13.303 23.013 36.44 40.822 62.75 46.938l-178.875 178.688zM518.188 641.875c8.812 0.002 17.603-3.345 24.313-10.063 13.419-13.4 13.403-35.205 0-48.625-13.4-13.419-35.081-13.434-48.5 0-13.419 13.401-13.525 35.206-0.125 48.625 6.7 6.71 15.5 10.061 24.313 10.063zM989.75 595.125l-60.188-59.938v-46.125c17.162-3.636 30.619-11.637 41.688-21.125 7.602-6.554 13.921-14.345 18.698-23.099-11.69 16.695-6.15 11.744-0.198 6.286v144zM594.625 565.625c8.812 0.012 17.603-3.318 24.313-10 13.419-13.401 13.277-35.206-0.125-48.625-13.4-13.419-35.081-13.435-48.5 0-13.396 13.377-13.456 35.075-0.125 48.5 6.7 6.709 15.625 10.114 24.438 10.125zM432.438 556c8.812 0.002 17.603-3.408 24.313-10.125 13.419-13.401 13.403-35.144 0-48.563-13.4-13.419-35.081-13.365-48.5 0-13.419 13.4-13.526 35.018-0.125 48.438v0.125c6.7 6.709 15.5 10.123 24.313 10.125zM346.688 470.125c8.812 0.012 17.603-3.317 24.313-10 13.419-13.4 13.403-35.143 0-48.563-13.4-13.419-35.0
81-13.49-48.5-0.125-13.419 13.401-13.526 35.144-0.125 48.563 6.7 6.71 15.5 10.114 24.313 10.125zM726.313 454.312c-6.074 0-10.775-4.101-12.125-9.5-5.399-20.246-7.451-42.167-9.813-62.75-10.46-3.374-20.902-7.751-30.688-12.813l-46.563 36.125c-2.699 2.025-5.713 3.375-8.75 3.375-11.473 0-57.027-49.302-65.125-60.438-1.687-2.362-3.063-4.713-3.063-7.75 0-3.037 1.35-5.701 3.375-8.063 12.485-15.184 24.652-30.366 36.125-46.563-5.399-10.123-9.813-20.265-13.188-31.063l-62.75-9.438c-5.061-1.012-9.125-7.126-9.125-12.188v-74.875c0-5.736 4.076-11.175 9.813-12.188l61.75-9.063c3.374-11.473 8.076-22.64 13.813-33.438-11.473-15.859-23.965-30.666-35.438-46.188-1.687-2.362-2.688-4.776-2.688-7.813 0-2.699 0.688-5.388 2.375-7.75 14.172-19.571 37.804-40.491 55.688-56.688 2.362-2.362 5.401-3.688 8.438-3.688 3.037 0 6.013 0.975 8.375 3l47.625 36.125c9.785-5.061 19.915-9.126 30.375-12.5l9.438-62.063c0.675-5.736 6.051-10.125 12.125-10.125h74.938c6.074 0 10.775 4.039 12.125 9.438 5.399 20.246 7.451 42.167 9
.813 62.75 10.46 3.374 20.902 7.814 30.688 12.875l46.563-36.5c2.699-1.687 5.713-3 8.75-3 11.473 0 57.027 49.577 65.125 60.375 2.025 2.362 3.063 4.713 3.063 7.75 0 3.037-1.35 6.076-3.375 8.438-12.485 15.184-24.652 30.028-36.125 46.563 5.399 9.785 9.476 19.952 13.188 30.75l62.438 9.438c5.399 1.012 9.438 7.064 9.438 12.125v74.938c0 5.736-4.076 11.113-9.813 12.125l-61.75 9.438c-3.374 11.135-8.076 22.265-13.813 33.063 11.473 15.859 23.965 30.728 35.438 46.25 1.687 2.362 2.688 4.713 2.688 7.75 0 2.699-0.688 5.413-2.375 7.438-14.172 19.908-37.804 40.841-55.688 57.375-2.362 2.025-5.401 3.375-8.438 3.375-3.037 0-6.038-1.038-8.063-3.063l-47.938-36.063c-9.785 5.061-19.915 9.063-30.375 12.438l-9.438 62.125c-0.675 5.736-6.051 10.125-12.125 10.125h-74.938zM423.125 393.812c8.812 0.002 17.603-3.345 24.313-10.063 13.419-13.401 13.403-35.081 0-48.5-13.4-13.419-35.206-13.491-48.625-0.125-13.419 13.4-13.525 35.206-0.125 48.625 6.7 6.71 15.625 10.061 24.438 10.063zM193.875 378.875l-134.875-135.1
25c-72.814-72.916-79.065-183.901-14.063-248.813l14.188-14.188c65.003-64.912 175.998-58.479 248.813 14.438l122.875 123.125c-4.561 10.006-7.356 20.887-8.25 32.188l-228.688 228.375zM763.75 281.5c47.577 0 86.438-38.798 86.438-86.375s-38.86-86.375-86.438-86.375c-47.577 0-86.375 38.798-86.375 86.375 0 47.577 38.798 86.375 86.375 86.375z" />
diff --git a/branding/fonts/font-spacewalk/font/spacewalk-icon.ttf b/branding/fonts/font-spacewalk/font/spacewalk-icon.ttf
index 8d2aa30..787514f 100755
Binary files a/branding/fonts/font-spacewalk/font/spacewalk-icon.ttf and b/branding/fonts/font-spacewalk/font/spacewalk-icon.ttf differ
diff --git a/branding/fonts/font-spacewalk/font/spacewalk-icon.woff b/branding/fonts/font-spacewalk/font/spacewalk-icon.woff
index 8d81d0e..1516530 100755
Binary files a/branding/fonts/font-spacewalk/font/spacewalk-icon.woff and b/branding/fonts/font-spacewalk/font/spacewalk-icon.woff differ
1
0
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml | 7 -------
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 7 -------
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 6 ------
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 7 -------
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 7 -------
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml | 7 -------
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml | 7 -------
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 7 -------
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 7 -------
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 7 -------
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml | 7 -------
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 7 -------
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 7 -------
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml | 7 -------
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 7 -------
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 7 -------
16 files changed, 111 deletions(-)
New commits:
commit dc13f62f059627e1824a7ffe458f83a599305410
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Thu Feb 13 14:02:37 2014 +0100
remove unused localization string
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
index 4e37278..7b9406f 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
@@ -7222,13 +7222,6 @@ organization management tools if you choose to remove this role from your login.
</context-group>
<target>উল্লিখিত সময়ের পরে কর্ম নির্ধারণ করুন:</target>
</trans-unit>
- <trans-unit id="syncprofile.jsp.now">
- <source>Schedule action as soon as possible</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/packages/profiles/SyncProfiles.do</context>
- </context-group>
- <target>কর্ম যথাশীঘ্র সময়ে সঞ্চালনের জন্য নির্ধারণ করুন</target>
- </trans-unit>
<trans-unit id="missingpkgs.jsp.channels">
<source>Channels</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
index 9791355..25a38be 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
@@ -7940,13 +7940,6 @@ und Organisationsmanagement-Tools haben, sollten Sie diese Rolle aus Ihrem Login
</context-group>
<target>Ablauf einplanen für nicht früher als:</target>
</trans-unit>
- <trans-unit id="syncprofile.jsp.now">
- <source>Schedule action as soon as possible</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/packages/profiles/SyncProfiles.do</context>
- </context-group>
- <target>Ablauf für so bald wie möglich einplanen</target>
- </trans-unit>
<trans-unit id="missingpkgs.jsp.channels">
<source>Channels</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index 4cfa044..09117f4 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -7000,12 +7000,6 @@ organization management tools if you choose to remove this role from your login.
<context context-type="sourcefile">/rhn/systems/details/packages/profiles/SyncProfiles.do</context>
</context-group>
</trans-unit>
- <trans-unit id="syncprofile.jsp.now">
- <source>Schedule action as soon as possible</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/packages/profiles/SyncProfiles.do</context>
- </context-group>
- </trans-unit>
<trans-unit id="missingpkgs.jsp.channels">
<source>Channels</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
index cb99a58..b42cd2f 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
@@ -7939,13 +7939,6 @@ organización si decide borrar este rol de su inicio de sesión.
</context-group>
<target>Programar acción para después de:</target>
</trans-unit>
- <trans-unit id="syncprofile.jsp.now">
- <source>Schedule action as soon as possible</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/packages/profiles/SyncProfiles.do</context>
- </context-group>
- <target>Programar una acción tan pronto como sea posible</target>
- </trans-unit>
<trans-unit id="missingpkgs.jsp.channels">
<source>Channels</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
index ea04363..da7367a 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
@@ -7940,13 +7940,6 @@ ni aux outils de gestion d'organisation si vous choisissez de supprimer ce rôle
</context-group>
<target>Programmer l'action pas avant :</target>
</trans-unit>
- <trans-unit id="syncprofile.jsp.now">
- <source>Schedule action as soon as possible</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/packages/profiles/SyncProfiles.do</context>
- </context-group>
- <target>Programmer l'action dès que possible</target>
- </trans-unit>
<trans-unit id="missingpkgs.jsp.channels">
<source>Channels</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
index e3019a8..0ec225c 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
@@ -7222,13 +7222,6 @@ organization management tools if you choose to remove this role from your login.
</context-group>
<target>આનાં કરતાંની જલદી નહિં તેવી રીતે ક્રિયા સુનિશ્ચિત કરો:</target>
</trans-unit>
- <trans-unit id="syncprofile.jsp.now">
- <source>Schedule action as soon as possible</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/packages/profiles/SyncProfiles.do</context>
- </context-group>
- <target>શક્ય હોય એટલી જલદી ક્રિયા સુનિશ્ચિત કરો</target>
- </trans-unit>
<trans-unit id="missingpkgs.jsp.channels">
<source>Channels</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
index dcd3204..8c96c57 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
@@ -7222,13 +7222,6 @@ organization management tools if you choose to remove this role from your login.
</context-group>
<target>इससे पहले क्रिया अनुसूचित न करें:</target>
</trans-unit>
- <trans-unit id="syncprofile.jsp.now">
- <source>Schedule action as soon as possible</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/packages/profiles/SyncProfiles.do</context>
- </context-group>
- <target>अनुसूचित यथासंभव जल्दी</target>
- </trans-unit>
<trans-unit id="missingpkgs.jsp.channels">
<source>Channels</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
index c692ed5..4864e21 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
@@ -7935,13 +7935,6 @@ organization management tools if you choose to remove this role from your login.
</context-group>
<target>Programma azione non prima di:</target>
</trans-unit>
- <trans-unit id="syncprofile.jsp.now">
- <source>Schedule action as soon as possible</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/packages/profiles/SyncProfiles.do</context>
- </context-group>
- <target>Programma azione appena possibile</target>
- </trans-unit>
<trans-unit id="missingpkgs.jsp.channels">
<source>Channels</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
index c49dbf2..62de520 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
@@ -7941,13 +7941,6 @@ organization management tools if you choose to remove this role from your login.
</context-group>
<target>次の日付以降に動作をスケジュール:</target>
</trans-unit>
- <trans-unit id="syncprofile.jsp.now">
- <source>Schedule action as soon as possible</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/packages/profiles/SyncProfiles.do</context>
- </context-group>
- <target>可能な限り早く動作をスケジュール</target>
- </trans-unit>
<trans-unit id="missingpkgs.jsp.channels">
<source>Channels</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
index 68d2bb3..522baac 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
@@ -7938,13 +7938,6 @@ organization management tools if you choose to remove this role from your login.
</context-group>
<target>다음 날짜 이후에 작업을 스케줄: </target>
</trans-unit>
- <trans-unit id="syncprofile.jsp.now">
- <source>Schedule action as soon as possible</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/packages/profiles/SyncProfiles.do</context>
- </context-group>
- <target>최대한 빨리 작업을 스케줄 </target>
- </trans-unit>
<trans-unit id="missingpkgs.jsp.channels">
<source>Channels</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
index 9b49170..c82ae7a 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
@@ -7222,13 +7222,6 @@ organization management tools if you choose to remove this role from your login.
</context-group>
<target>ਇਸ ਤੋਂ ਪਹਿਲਾਂ ਕਾਰਵਾਈ ਲਈ ਸਮਾਂ-ਤਹਿ ਨਾ ਕਰੋ:</target>
</trans-unit>
- <trans-unit id="syncprofile.jsp.now">
- <source>Schedule action as soon as possible</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/packages/profiles/SyncProfiles.do</context>
- </context-group>
- <target>ਜਿੰਨਾ ਵੀ ਛੇਤੇ ਹੋਵੇ, ਕਾਰਵਾਈ ਲਈ ਸਮਾਂ-ਤਹਿ ਕਰੋ</target>
- </trans-unit>
<trans-unit id="missingpkgs.jsp.channels">
<source>Channels</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
index 59ea111..1c16bb4 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
@@ -7935,13 +7935,6 @@ organization management tools if you choose to remove this role from your login.
</context-group>
<target>Agendar ação para depois de:</target>
</trans-unit>
- <trans-unit id="syncprofile.jsp.now">
- <source>Schedule action as soon as possible</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/packages/profiles/SyncProfiles.do</context>
- </context-group>
- <target>Agendar ação o mais rápido possível</target>
- </trans-unit>
<trans-unit id="missingpkgs.jsp.channels">
<source>Channels</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
index cc24095..ecf3e20 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
@@ -7934,13 +7934,6 @@ organization management tools if you choose to remove this role from your login.
</context-group>
<target>Назначить действие не раньше чем:</target>
</trans-unit>
- <trans-unit id="syncprofile.jsp.now">
- <source>Schedule action as soon as possible</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/packages/profiles/SyncProfiles.do</context>
- </context-group>
- <target>Назначить действие как можно раньше</target>
- </trans-unit>
<trans-unit id="missingpkgs.jsp.channels">
<source>Channels</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
index e98b6f2..a805991 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
@@ -7222,13 +7222,6 @@ organization management tools if you choose to remove this role from your login.
</context-group>
<target>செயல்களை அவரசமாக திட்டமிட வேண்டாம்:</target>
</trans-unit>
- <trans-unit id="syncprofile.jsp.now">
- <source>Schedule action as soon as possible</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/packages/profiles/SyncProfiles.do</context>
- </context-group>
- <target>செயலை எவ்வளவு சீக்கிரம் முடியுமோ அவ்வளவுக்குள் திட்டமிடவும்</target>
- </trans-unit>
<trans-unit id="missingpkgs.jsp.channels">
<source>Channels</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
index 7741ea8..af81531 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
@@ -7938,13 +7938,6 @@ organization management tools if you choose to remove this role from your login.
</context-group>
<target>调度动作不晚于：</target>
</trans-unit>
- <trans-unit id="syncprofile.jsp.now">
- <source>Schedule action as soon as possible</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/packages/profiles/SyncProfiles.do</context>
- </context-group>
- <target>尽快调度动作</target>
- </trans-unit>
<trans-unit id="missingpkgs.jsp.channels">
<source>Channels</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
index 6b338c6..2f0a32a 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
@@ -7936,13 +7936,6 @@ organization management tools if you choose to remove this role from your login.
</context-group>
<target>排程動作不晚於：</target>
</trans-unit>
- <trans-unit id="syncprofile.jsp.now">
- <source>Schedule action as soon as possible</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/packages/profiles/SyncProfiles.do</context>
- </context-group>
- <target>立即排程動作</target>
- </trans-unit>
<trans-unit id="missingpkgs.jsp.channels">
<source>Channels</source>
<context-group name="ctx">
1
0