4 commits - branding/spacewalk-branding.spec java/spacewalk-java.spec monitoring/PerlModules rel-eng/packages web/spacewalk-web.spec
by Jan Pazdziora
branding/spacewalk-branding.spec | 5 ++++-
java/spacewalk-java.spec | 11 ++++++++++-
monitoring/PerlModules/NP/Probe/perl-NOCpulse-Probe.spec | 5 ++++-
rel-eng/packages/perl-NOCpulse-Probe | 2 +-
rel-eng/packages/spacewalk-branding | 2 +-
rel-eng/packages/spacewalk-java | 2 +-
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 5 ++++-
8 files changed, 26 insertions(+), 8 deletions(-)
New commits:
commit 056ddeefe82a15b8b55b417f5ab2ca42d0d6ff05
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Apr 19 17:16:04 2012 +0200
Automatic commit of package [perl-NOCpulse-Probe] release [1.184.16-1].
diff --git a/monitoring/PerlModules/NP/Probe/perl-NOCpulse-Probe.spec b/monitoring/PerlModules/NP/Probe/perl-NOCpulse-Probe.spec
index f546309..dbe8190 100644
--- a/monitoring/PerlModules/NP/Probe/perl-NOCpulse-Probe.spec
+++ b/monitoring/PerlModules/NP/Probe/perl-NOCpulse-Probe.spec
@@ -2,7 +2,7 @@ Name: perl-NOCpulse-Probe
Summary: Monitoring probes for Spacewalk
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 1.184.15
+Version: 1.184.16
Release: 1%{?dist}
BuildArch: noarch
Group: Development/Libraries
@@ -145,6 +145,9 @@ rm -rf $RPM_BUILD_ROOT
%{perl_vendorlib}/NOCpulse/Probe/DataSource/test/TestOracle.pm
%changelog
+* Thu Apr 19 2012 Jan Pazdziora 1.184.16-1
+- 808118 - ignore fuse.gvfs-fuse-daemon in df (msuchy(a)redhat.com)
+
* Fri Mar 02 2012 Jan Pazdziora 1.184.15-1
- Update the copyright year info.
diff --git a/rel-eng/packages/perl-NOCpulse-Probe b/rel-eng/packages/perl-NOCpulse-Probe
index d970446..8dd013a 100644
--- a/rel-eng/packages/perl-NOCpulse-Probe
+++ b/rel-eng/packages/perl-NOCpulse-Probe
@@ -1 +1 @@
-1.184.15-1 monitoring/PerlModules/NP/Probe/
+1.184.16-1 monitoring/PerlModules/NP/Probe/
commit 2a2c84f015df911106015f64a163fb698c303aff
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Apr 19 17:15:40 2012 +0200
Automatic commit of package [spacewalk-branding] release [1.8.1-1].
diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec
index b255f4d..f76ae47 100644
--- a/branding/spacewalk-branding.spec
+++ b/branding/spacewalk-branding.spec
@@ -1,5 +1,5 @@
Name: spacewalk-branding
-Version: 1.8.0
+Version: 1.8.1
Release: 1%{?dist}
Summary: Spacewalk branding data
@@ -83,6 +83,9 @@ rm -rf %{buildroot}
%doc LICENSE
%changelog
+* Thu Apr 19 2012 Jan Pazdziora 1.8.1-1
+- Update the copyright year info on .pxt pages.
+
* Mon Feb 27 2012 Jan Pazdziora 1.7.1-1
- automatically focus search form (msuchy(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-branding b/rel-eng/packages/spacewalk-branding
index c86e38b..c922cb5 100644
--- a/rel-eng/packages/spacewalk-branding
+++ b/rel-eng/packages/spacewalk-branding
@@ -1 +1 @@
-1.7.1-1 branding/
+1.8.1-1 branding/
commit 1297c763e9d19c8b1114b28423037a26df8344f8
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Apr 19 17:15:27 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.50-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index f2d3aa6..f1b9e16 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -22,7 +22,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.49
+Version: 1.8.50
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -605,6 +605,15 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Apr 19 2012 Jan Pazdziora 1.8.50-1
+- Removed double-dash from WebUI copyright notice.
+- fix has_errata_with_keyword_applied_since_last_reboot query (mc(a)suse.de)
+- fix PackageEvr handling III (tlestach(a)redhat.com)
+- increase taskomatic memory (tlestach(a)redhat.com)
+- 803353 - fixing another two broken documentation links (tlestach(a)redhat.com)
+- Show systems that need reboot because of an errata. (dmacvicar(a)suse.de)
+- modify SecurityErrataOverview.callaback (tlestach(a)redhat.com)
+
* Tue Apr 17 2012 Jan Pazdziora 1.8.49-1
- Revert "removing unused string with trans-id Certificate Administrators,
Monitoring Administrators, and Configuration Administrators"
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 9ebc91b..7412ceb 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.49-1 java/
+1.8.50-1 java/
commit 0c0edf5fdf23b7f87f20a7e6a16215a919d10aae
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Apr 19 17:15:19 2012 +0200
Automatic commit of package [spacewalk-web] release [1.8.11-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 689297e..4d20a7f 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.8.10-1 web/
+1.8.11-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 68a0ea5..685d78a 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 1.8.10
+Version: 1.8.11
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk/
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -254,6 +254,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Thu Apr 19 2012 Jan Pazdziora 1.8.11-1
+- Removed double-dash from copyright notice on error pages.
+
* Tue Apr 17 2012 Jan Pazdziora 1.8.10-1
- Broken link patch submitted on behalf of Michael Calmer (sherr(a)redhat.com)
12 years, 2 months
monitoring/PerlModules
by Miroslav Suchý
monitoring/PerlModules/NP/Probe/DataSource/UnixCommand.pm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 5927ed33b158e95d3fc98f9d2884c62e50da2935
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Apr 19 16:35:37 2012 +0200
808118 - ignore fuse.gvfs-fuse-daemon in df
it is owned by different user and nocpulse user do not have access to this
addressing:
df: `/root/.gvfs': Permission denied
diff --git a/monitoring/PerlModules/NP/Probe/DataSource/UnixCommand.pm b/monitoring/PerlModules/NP/Probe/DataSource/UnixCommand.pm
index 231d584..135bd78 100644
--- a/monitoring/PerlModules/NP/Probe/DataSource/UnixCommand.pm
+++ b/monitoring/PerlModules/NP/Probe/DataSource/UnixCommand.pm
@@ -144,7 +144,7 @@ sub cpu {
# has a for_filesystem hash indexed by filesystem name.
sub df {
my $self = shift;
- my $args = '-k';
+ my $args = '-k --exclude-type=fuse.gvfs-fuse-daemon';
if (os_matches($self->shell_os_name, PROBE_HPUX)){
$args = '-Pk';
@@ -192,7 +192,7 @@ sub inodes {
LINUX() =>
{
binary => '/bin/df',
- args => "-i $fs",
+ args => "--exclude-type=fuse.gvfs-fuse-daemon -i $fs",
parse =>
sub {
my (@fields) = @_;
12 years, 2 months
web/html
by Jan Pazdziora
web/html/errors/403.html | 2 +-
web/html/errors/404.html | 2 +-
web/html/errors/413.html | 2 +-
web/html/errors/500.html | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 70e8be368146664fdb73aaf528e6922cfd12d4d0
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Apr 19 13:55:33 2012 +0200
Removed double-dash from copyright notice on error pages, fixing typo.
diff --git a/web/html/errors/403.html b/web/html/errors/403.html
index 7fd8b29..f0c0a2f 100644
--- a/web/html/errors/403.html
+++ b/web/html/errors/403.html
@@ -127,7 +127,7 @@
</tbody></table>
<div id="footer">
- Copyright © 2002#x2012;12 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a>
+ Copyright © 2002‒12 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a>
</div>
</div> <!-- close content -->
diff --git a/web/html/errors/404.html b/web/html/errors/404.html
index becf70e..8bde7ed 100644
--- a/web/html/errors/404.html
+++ b/web/html/errors/404.html
@@ -114,7 +114,7 @@
</tbody></table>
<div id="footer">
- Copyright © 2002#x2012;12 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a>
+ Copyright © 2002‒12 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a>
</div>
</div> <!-- close content -->
diff --git a/web/html/errors/413.html b/web/html/errors/413.html
index 2490bc4..49f4669 100644
--- a/web/html/errors/413.html
+++ b/web/html/errors/413.html
@@ -122,7 +122,7 @@
</tbody></table>
<div id="footer">
- Copyright © 2002#x2012;12 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a>
+ Copyright © 2002‒12 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a>
</div>
</div> <!-- close content -->
diff --git a/web/html/errors/500.html b/web/html/errors/500.html
index 44020f9..4c2ba64 100644
--- a/web/html/errors/500.html
+++ b/web/html/errors/500.html
@@ -120,7 +120,7 @@
</tbody></table>
<div id="footer">
- Copyright © 2002#x2012;12 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a>
+ Copyright © 2002‒12 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a>
</div>
</div> <!-- close content -->
12 years, 2 months
web/html
by Jan Pazdziora
web/html/errors/403.html | 2 +-
web/html/errors/404.html | 2 +-
web/html/errors/413.html | 2 +-
web/html/errors/500.html | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit b5c5953c038922c6214618e85c6558b29b26729b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Apr 19 13:29:30 2012 +0200
Removed double-dash from copyright notice on error pages.
diff --git a/web/html/errors/403.html b/web/html/errors/403.html
index a867e25..7fd8b29 100644
--- a/web/html/errors/403.html
+++ b/web/html/errors/403.html
@@ -127,7 +127,7 @@
</tbody></table>
<div id="footer">
- Copyright © 2002--2012 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a>
+ Copyright © 2002#x2012;12 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a>
</div>
</div> <!-- close content -->
diff --git a/web/html/errors/404.html b/web/html/errors/404.html
index f559250..becf70e 100644
--- a/web/html/errors/404.html
+++ b/web/html/errors/404.html
@@ -114,7 +114,7 @@
</tbody></table>
<div id="footer">
- Copyright © 2002--2012 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a>
+ Copyright © 2002#x2012;12 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a>
</div>
</div> <!-- close content -->
diff --git a/web/html/errors/413.html b/web/html/errors/413.html
index d0f9f7d..2490bc4 100644
--- a/web/html/errors/413.html
+++ b/web/html/errors/413.html
@@ -122,7 +122,7 @@
</tbody></table>
<div id="footer">
- Copyright © 2002--2012 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a>
+ Copyright © 2002#x2012;12 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a>
</div>
</div> <!-- close content -->
diff --git a/web/html/errors/500.html b/web/html/errors/500.html
index 82451de..44020f9 100644
--- a/web/html/errors/500.html
+++ b/web/html/errors/500.html
@@ -120,7 +120,7 @@
</tbody></table>
<div id="footer">
- Copyright © 2002--2012 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a>
+ Copyright © 2002#x2012;12 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a>
</div>
</div> <!-- close content -->
12 years, 2 months
2 commits - branding/templates java/code
by Jan Pazdziora
branding/templates/footer.pxt | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml | 2 +-
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 | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 4 ++--
17 files changed, 30 insertions(+), 30 deletions(-)
New commits:
commit 5a0ab02b4f7bfdd22cd20c63aa79e8aea4c02a56
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Apr 19 12:25:43 2012 +0200
Update the copyright year info on .pxt pages.
diff --git a/branding/templates/footer.pxt b/branding/templates/footer.pxt
index 34dce1e..10b8d70 100644
--- a/branding/templates/footer.pxt
+++ b/branding/templates/footer.pxt
@@ -4,7 +4,7 @@
<pxt-use class="Sniglets::Utils" />
<pxt-use class="Sniglets::Users" />
<div id="footer">
- Copyright © 2002-11 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html" accesskey="8">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a>
+ Copyright © 2002‒12 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html" accesskey="8">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a>
<div style="color: black">
Spacewalk release <a href="/rhn/help/dispatcher/release_notes"><pxt-config var="version" /></a>
</div>
commit 5f1aae8e594514f57a49b2cca20036ab96c73c7f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Apr 19 12:24:37 2012 +0200
Removed double-dash from WebUI copyright notice.
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 b6080e7..5ac2d19 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
@@ -1161,7 +1161,7 @@
<target>{0}-টি সিস্টেম নির্বাচন করা হয়েছে</target></trans-unit>
<!-- footer.jsp -->
<trans-unit id="footer.jsp.copyright">
-<source>Copyright &#169; 2002--12 Red Hat, Inc. All rights reserved.</source>
+<source>Copyright &#169; 2002&#x2012;12 Red Hat, Inc. All rights reserved.</source>
<context-group name="ctx">
<context context-type="sourcefile">./includes/footer.jsp</context>
</context-group>
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 a18064b..1e16e2a 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
@@ -1161,11 +1161,11 @@
<target>{0} Systeme ausgew&auml;hlt</target></trans-unit>
<!-- footer.jsp -->
<trans-unit id="footer.jsp.copyright">
-<source>Copyright &#169; 2002--12 Red Hat, Inc. All rights reserved.</source>
+<source>Copyright &#169; 2002&#x2012;12 Red Hat, Inc. All rights reserved.</source>
<context-group name="ctx">
<context context-type="sourcefile">./includes/footer.jsp</context>
</context-group>
- <target>Copyright &#169; 2002--12 Red Hat, Inc. All rights reserved.</target></trans-unit>
+ <target>Copyright &#169; 2002&#x2012;12 Red Hat, Inc. All rights reserved.</target></trans-unit>
<trans-unit id="footer.jsp.legalStatement">
<source>Legal statement</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 6ed1aac..29e44ee 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
@@ -1177,7 +1177,7 @@
</trans-unit>
<!-- footer.jsp -->
<trans-unit id="footer.jsp.copyright">
-<source>Copyright &#169; 2002--12 Red Hat, Inc. All rights reserved.</source>
+<source>Copyright &#169; 2002&#x2012;12 Red Hat, Inc. All rights reserved.</source>
<context-group name="ctx">
<context context-type="sourcefile">./includes/footer.jsp</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 bd5c9b9..d031d3c 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
@@ -1161,11 +1161,11 @@
<target>{0} sistemas seleccionados</target></trans-unit>
<!-- footer.jsp -->
<trans-unit id="footer.jsp.copyright">
-<source>Copyright &#169; 2002--12 Red Hat, Inc. All rights reserved.</source>
+<source>Copyright &#169; 2002&#x2012;12 Red Hat, Inc. All rights reserved.</source>
<context-group name="ctx">
<context context-type="sourcefile">./includes/footer.jsp</context>
</context-group>
- <target>Copyright &#169; 2002--12 Red Hat, Inc. Todos los derechos reservados.</target></trans-unit>
+ <target>Copyright &#169; 2002&#x2012;12 Red Hat, Inc. Todos los derechos reservados.</target></trans-unit>
<trans-unit id="footer.jsp.legalStatement">
<source>Legal statement</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 001343a..94a39d4 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
@@ -1161,11 +1161,11 @@
<target>{0} systèmes sélectionnés</target></trans-unit>
<!-- footer.jsp -->
<trans-unit id="footer.jsp.copyright">
-<source>Copyright &#169; 2002--12 Red Hat, Inc. All rights reserved.</source>
+<source>Copyright &#169; 2002&#x2012;12 Red Hat, Inc. All rights reserved.</source>
<context-group name="ctx">
<context context-type="sourcefile">./includes/footer.jsp</context>
</context-group>
- <target>Copyright &#169; 2002--12 Red Hat, Inc. Tous droits réservés.</target></trans-unit>
+ <target>Copyright &#169; 2002&#x2012;12 Red Hat, Inc. Tous droits réservés.</target></trans-unit>
<trans-unit id="footer.jsp.legalStatement">
<source>Legal statement</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 7ca6f57..5caeaaa 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
@@ -1161,11 +1161,11 @@
<target>{0} સિસ્ટમો પસંદ થયેલ છે</target></trans-unit>
<!-- footer.jsp -->
<trans-unit id="footer.jsp.copyright">
-<source>Copyright &#169; 2002--12 Red Hat, Inc. All rights reserved.</source>
+<source>Copyright &#169; 2002&#x2012;12 Red Hat, Inc. All rights reserved.</source>
<context-group name="ctx">
<context context-type="sourcefile">./includes/footer.jsp</context>
</context-group>
- <target>Copyright &#169; 2002--12 Red Hat, Inc. All rights reserved.</target></trans-unit>
+ <target>Copyright &#169; 2002&#x2012;12 Red Hat, Inc. All rights reserved.</target></trans-unit>
<trans-unit id="footer.jsp.legalStatement">
<source>Legal statement</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 a5bb60b..004d4d3 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
@@ -1161,11 +1161,11 @@
<target>{0} सिस्टम चुना गया</target></trans-unit>
<!-- footer.jsp -->
<trans-unit id="footer.jsp.copyright">
-<source>Copyright &#169; 2002--12 Red Hat, Inc. All rights reserved.</source>
+<source>Copyright &#169; 2002&#x2012;12 Red Hat, Inc. All rights reserved.</source>
<context-group name="ctx">
<context context-type="sourcefile">./includes/footer.jsp</context>
</context-group>
- <target>कॉपीराइट &#169; 2002--12 Red Hat, Inc. सर्वाधिकार सुरक्षित.</target></trans-unit>
+ <target>कॉपीराइट &#169; 2002&#x2012;12 Red Hat, Inc. सर्वाधिकार सुरक्षित.</target></trans-unit>
<trans-unit id="footer.jsp.legalStatement">
<source>Legal statement</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 2885d8f..d150f09 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
@@ -1161,11 +1161,11 @@
<target>{0} sistemi selezionati</target></trans-unit>
<!-- footer.jsp -->
<trans-unit id="footer.jsp.copyright">
-<source>Copyright &#169; 2002--12 Red Hat, Inc. All rights reserved.</source>
+<source>Copyright &#169; 2002&#x2012;12 Red Hat, Inc. All rights reserved.</source>
<context-group name="ctx">
<context context-type="sourcefile">./includes/footer.jsp</context>
</context-group>
- <target>Copyright &#169; 2002--12 Red Hat, Inc. Tutti i diritti riservati.</target></trans-unit>
+ <target>Copyright &#169; 2002&#x2012;12 Red Hat, Inc. Tutti i diritti riservati.</target></trans-unit>
<trans-unit id="footer.jsp.legalStatement">
<source>Legal statement</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 cccc705..01170f9 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
@@ -1161,11 +1161,11 @@
<target>{0} システムが選択されました</target></trans-unit>
<!-- footer.jsp -->
<trans-unit id="footer.jsp.copyright">
-<source>Copyright &#169; 2002--12 Red Hat, Inc. All rights reserved.</source>
+<source>Copyright &#169; 2002&#x2012;12 Red Hat, Inc. All rights reserved.</source>
<context-group name="ctx">
<context context-type="sourcefile">./includes/footer.jsp</context>
</context-group>
- <target>Copyright &#169; 2002--12 Red Hat, Inc. All rights reserved.</target></trans-unit>
+ <target>Copyright &#169; 2002&#x2012;12 Red Hat, Inc. All rights reserved.</target></trans-unit>
<trans-unit id="footer.jsp.legalStatement">
<source>Legal statement</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 8fe4236..053a33a 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
@@ -1161,11 +1161,11 @@
<target>{0} 시스템이 선택되었습니다</target></trans-unit>
<!-- footer.jsp -->
<trans-unit id="footer.jsp.copyright">
-<source>Copyright &#169; 2002--12 Red Hat, Inc. All rights reserved.</source>
+<source>Copyright &#169; 2002&#x2012;12 Red Hat, Inc. All rights reserved.</source>
<context-group name="ctx">
<context context-type="sourcefile">./includes/footer.jsp</context>
</context-group>
- <target>Copyright &#169; 2002--12 Red Hat, Inc. All rights reserved.</target></trans-unit>
+ <target>Copyright &#169; 2002&#x2012;12 Red Hat, Inc. All rights reserved.</target></trans-unit>
<trans-unit id="footer.jsp.legalStatement">
<source>Legal statement</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 fbadf2d..3afa7bb 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
@@ -1161,11 +1161,11 @@
<target>{0} ਸਿਸਟਮ ਚੁਣੇ ਗਏ</target></trans-unit>
<!-- footer.jsp -->
<trans-unit id="footer.jsp.copyright">
-<source>Copyright &#169; 2002--12 Red Hat, Inc. All rights reserved.</source>
+<source>Copyright &#169; 2002&#x2012;12 Red Hat, Inc. All rights reserved.</source>
<context-group name="ctx">
<context context-type="sourcefile">./includes/footer.jsp</context>
</context-group>
- <target>ਕਾਪੀਰਾਈਟ &#169; 2002--12 Red Hat, Inc. ਸਭ ਹੱਕ ਰਾਖਵੇਂ ਹਨ।</target></trans-unit>
+ <target>ਕਾਪੀਰਾਈਟ &#169; 2002&#x2012;12 Red Hat, Inc. ਸਭ ਹੱਕ ਰਾਖਵੇਂ ਹਨ।</target></trans-unit>
<trans-unit id="footer.jsp.legalStatement">
<source>Legal statement</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 ff43a13..5fa0740 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
@@ -1161,11 +1161,11 @@
<target>{0} sistemas selecionados</target></trans-unit>
<!-- footer.jsp -->
<trans-unit id="footer.jsp.copyright">
-<source>Copyright &#169; 2002--12 Red Hat, Inc. All rights reserved.</source>
+<source>Copyright &#169; 2002&#x2012;12 Red Hat, Inc. All rights reserved.</source>
<context-group name="ctx">
<context context-type="sourcefile">./includes/footer.jsp</context>
</context-group>
- <target>Direitos Autorais &#169; 2002--12 Red Hat, Inc. Todos os direitos reservados.</target></trans-unit>
+ <target>Direitos Autorais &#169; 2002&#x2012;12 Red Hat, Inc. Todos os direitos reservados.</target></trans-unit>
<trans-unit id="footer.jsp.legalStatement">
<source>Legal statement</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 3634959..a28c158 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
@@ -1161,11 +1161,11 @@
<target>{0} систем(ы) выбрано</target></trans-unit>
<!-- footer.jsp -->
<trans-unit id="footer.jsp.copyright">
-<source>Copyright &#169; 2002--12 Red Hat, Inc. All rights reserved.</source>
+<source>Copyright &#169; 2002&#x2012;12 Red Hat, Inc. All rights reserved.</source>
<context-group name="ctx">
<context context-type="sourcefile">./includes/footer.jsp</context>
</context-group>
- <target>&#169; 2002--12 Red Hat, Inc. Все права защищены.</target></trans-unit>
+ <target>&#169; 2002&#x2012;12 Red Hat, Inc. Все права защищены.</target></trans-unit>
<trans-unit id="footer.jsp.legalStatement">
<source>Legal statement</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 9b3826c..ec787cc 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
@@ -1161,11 +1161,11 @@
<target>{0} கணினிகள் தேர்வு செய்யப்பட்டன</target></trans-unit>
<!-- footer.jsp -->
<trans-unit id="footer.jsp.copyright">
-<source>Copyright &#169; 2002--12 Red Hat, Inc. All rights reserved.</source>
+<source>Copyright &#169; 2002&#x2012;12 Red Hat, Inc. All rights reserved.</source>
<context-group name="ctx">
<context context-type="sourcefile">./includes/footer.jsp</context>
</context-group>
- <target>பதிப்புரிமை &#169; 2002--12 Red Hat, Inc. அனைத்து உரிமைகளும் உள்ளடக்கியது.</target></trans-unit>
+ <target>பதிப்புரிமை &#169; 2002&#x2012;12 Red Hat, Inc. அனைத்து உரிமைகளும் உள்ளடக்கியது.</target></trans-unit>
<trans-unit id="footer.jsp.legalStatement">
<source>Legal statement</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 70849b3..2f82537 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
@@ -1161,7 +1161,7 @@
<target>选择 {0} 个系统</target></trans-unit>
<!-- footer.jsp -->
<trans-unit id="footer.jsp.copyright">
-<source>Copyright &#169; 2002--12 Red Hat, Inc. All rights reserved.</source>
+<source>Copyright &#169; 2002&#x2012;12 Red Hat, Inc. All rights reserved.</source>
<context-group name="ctx">
<context context-type="sourcefile">./includes/footer.jsp</context>
</context-group>
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 0122e82..90829af 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
@@ -1161,11 +1161,11 @@
<target>選擇了 {0} 部系統</target></trans-unit>
<!-- footer.jsp -->
<trans-unit id="footer.jsp.copyright">
-<source>Copyright &#169; 2002--12 Red Hat, Inc. All rights reserved.</source>
+<source>Copyright &#169; 2002&#x2012;12 Red Hat, Inc. All rights reserved.</source>
<context-group name="ctx">
<context context-type="sourcefile">./includes/footer.jsp</context>
</context-group>
- <target>版權所有 &#169; 2002--12 Red Hat, Inc. 保留所有權利。</target></trans-unit>
+ <target>版權所有 &#169; 2002&#x2012;12 Red Hat, Inc. 保留所有權利。</target></trans-unit>
<trans-unit id="footer.jsp.legalStatement">
<source>Legal statement</source>
<context-group name="ctx">
12 years, 2 months
2 commits - java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 2
java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java | 43 +++++-----
2 files changed, 23 insertions(+), 22 deletions(-)
New commits:
commit 389ee5d29b993be189921407a6c422a5a64af6d9
Author: Michael Calmer <mc(a)suse.de>
Date: Thu Apr 19 11:47:24 2012 +0200
fix has_errata_with_keyword_applied_since_last_reboot query
Fixes:
com.redhat.rhn.common.db.WrappedSQLException: ORA-00936: missing expression
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
index 64560e0..d365719 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
@@ -790,7 +790,6 @@ SELECT DISTINCT S.id, S.NAME,
<mode name="has_errata_with_keyword_applied_since_last_reboot">
<query params="org_id, user_id, keyword, sid">
- SELECT EXISTS (
SELECT 1
FROM rhnServer S,
rhnErrata E,
@@ -808,7 +807,6 @@ SELECT DISTINCT S.id, S.NAME,
AND EP.errata_id = E.id AND EP.package_id = P.id
AND (to_date('1970-01-01', 'YYYY-MM-DD') + numtodsinterval(S.last_boot, 'second')) < SP.installtime
AND E.id IN (SELECT EK.errata_id FROM rhnErrataKeyword EK WHERE EK.keyword = :keyword)
- )
</query>
</mode>
commit 052a263c96767927020b75a3fda8b483319b2af3
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Apr 19 12:00:02 2012 +0200
fix PackageEvr handling III
this fixes an issue introduced in 02a668
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java
index e02c158..7fe23e5 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java
@@ -17,8 +17,6 @@ package com.redhat.rhn.taskomatic.task.repomd;
import com.redhat.rhn.common.conf.ConfigDefaults;
import com.redhat.rhn.domain.channel.Channel;
-import com.redhat.rhn.domain.rhnpackage.PackageEvr;
-import com.redhat.rhn.domain.rhnpackage.PackageEvrFactory;
import com.redhat.rhn.frontend.dto.PackageDto;
import com.redhat.rhn.manager.rhnpackage.PackageManager;
import com.redhat.rhn.manager.task.TaskManager;
@@ -29,6 +27,8 @@ import org.xml.sax.SAXException;
import java.io.ByteArrayOutputStream;
import java.io.Writer;
+import java.util.HashMap;
+import java.util.Map;
/**
* Primary.xml writer class
@@ -288,27 +288,28 @@ public class PrimaryXmlWriter extends RepomdWriter {
SimpleAttributesImpl attr = new SimpleAttributesImpl();
attr.addAttribute("name", sanitize(pkgId, pkgCapIter
.getString("name")));
- PackageEvr evrObj = parseEvr(sanitize(pkgId, pkgCapIter
+ Map<String, String> evrMap = parseEvr(sanitize(pkgId,
+ pkgCapIter
.getString("version")));
- if (evrObj.getEpoch() != null || evrObj.getVersion() != null ||
- evrObj.getRelease() != null) {
+ if (evrMap.get("epoch") != null || evrMap.get("version") != null ||
+ evrMap.get("release") != null) {
attr.addAttribute("flags", getSenseAsString(pkgCapIter
.getNumber("sense").longValue()));
}
- if (evrObj.getEpoch() != null) {
- attr.addAttribute("epoch", evrObj.getEpoch());
+ if (evrMap.get("epoch") != null) {
+ attr.addAttribute("epoch", evrMap.get("epoch"));
}
- else if (evrObj.getVersion() != null) {
+ else if (evrMap.get("version") != null) {
attr.addAttribute("epoch", "0");
}
- if (evrObj.getVersion() != null) {
- attr.addAttribute("ver", evrObj.getVersion());
+ if (evrMap.get("version") != null) {
+ attr.addAttribute("ver", evrMap.get("version"));
}
- if (evrObj.getRelease() != null) {
- attr.addAttribute("rel", evrObj.getRelease());
+ if (evrMap.get("release") != null) {
+ attr.addAttribute("rel", evrMap.get("release"));
}
localHandler.startElement("rpm:entry", attr);
@@ -322,14 +323,17 @@ public class PrimaryXmlWriter extends RepomdWriter {
* @param evr package evr info
* @return package evr object
*/
- private static PackageEvr parseEvr(String evr) {
- String epoch = null, version = null, release = null;
+ private static Map<String, String> parseEvr(String evr) {
+ Map map = new HashMap<String, String>();
+ map.put("epoch", null);
+ map.put("version", null);
+ map.put("release", null);
if (evr != null) {
String[] parts = evr.split(":");
String vr;
if (parts.length != 1) {
- epoch = parts[0];
+ map.put("epoch", parts[0]);
vr = parts[1];
}
else {
@@ -339,16 +343,15 @@ public class PrimaryXmlWriter extends RepomdWriter {
int dash = vr.lastIndexOf("-");
if (dash == -1) {
- version = vr;
+ map.put("version", vr);
}
else {
- version = vr.substring(0, dash);
- release = vr.substring(dash + 1);
+ map.put("version", vr.substring(0, dash));
+ map.put("release", vr.substring(dash + 1));
}
}
- return PackageEvrFactory.lookupOrCreatePackageEvr(epoch, version,
- release);
+ return map;
}
/**
12 years, 2 months
java/conf
by Tomas Lestach
java/conf/default/rhn_taskomatic_daemon.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit cfaa58b73ef80092e2371c81a22aaa3dd3650ca6
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Apr 19 10:39:07 2012 +0200
increase taskomatic memory
to prevent repo generation failures for large channels
diff --git a/java/conf/default/rhn_taskomatic_daemon.conf b/java/conf/default/rhn_taskomatic_daemon.conf
index c6fc402..f26c0f6 100644
--- a/java/conf/default/rhn_taskomatic_daemon.conf
+++ b/java/conf/default/rhn_taskomatic_daemon.conf
@@ -89,7 +89,7 @@ wrapper.java.additional.1=-Dibm.dst.compatibility=true
wrapper.java.initmemory=256
# Maximum Java Heap Size (in MB)
-wrapper.java.maxmemory=512
+wrapper.java.maxmemory=1024
# Application parameters. Add parameters as needed starting from 1
#wrapper.app.parameter.1=<YourMainClass>
12 years, 2 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/action/configuration/BaseAddFilesAction.java | 2 ++
java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDetailsAction.java | 1 +
java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDownloadAction.java | 2 ++
java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf | 8 +++++---
java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/upload.jspf | 8 +++++---
java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/add_details.jspf | 5 +++--
java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf | 8 +++++---
7 files changed, 23 insertions(+), 11 deletions(-)
New commits:
commit 89ec6aedc9640768daf0eb984e72486f9d7e5400
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Apr 18 16:41:28 2012 +0200
803353 - fixing another two broken documentation links
- Click here for more information on the differences between text and binary files.
- Tip: A full listing of the available macros is listed in the RHN Reference Guide.
diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/BaseAddFilesAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/BaseAddFilesAction.java
index 71f1e74..43ac013 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/configuration/BaseAddFilesAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/BaseAddFilesAction.java
@@ -14,6 +14,7 @@
*/
package com.redhat.rhn.frontend.action.configuration;
+import com.redhat.rhn.common.conf.ConfigDefaults;
import com.redhat.rhn.common.util.StringUtil;
import com.redhat.rhn.common.validator.ValidatorException;
import com.redhat.rhn.common.validator.ValidatorResult;
@@ -56,6 +57,7 @@ public abstract class BaseAddFilesAction extends RhnAction {
StringUtil.displayFileSize(ConfigFile.getMaxFileSize()));
request.setAttribute(CSRF_TOKEN, request.getSession().getAttribute("csrf_token"));
+ request.setAttribute("documentation", ConfigDefaults.get().isDocAvailable());
if (isSubmitted(cff)) {
ConfigChannel channel = getConfigChannel(request);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDetailsAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDetailsAction.java
index a676332..074195b 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDetailsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDetailsAction.java
@@ -93,6 +93,7 @@ public class FileDetailsAction extends RhnAction {
cff.updateFromRevision(request, cr);
setupRequestParams(context, cr);
request.setAttribute("form", cff);
+ request.setAttribute("documentation", ConfigDefaults.get().isDocAvailable());
return getStrutsDelegate().forwardParams(mapping.findForward("default"), params);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDownloadAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDownloadAction.java
index 770be15..a0f6cf7 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDownloadAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDownloadAction.java
@@ -14,6 +14,7 @@
*/
package com.redhat.rhn.frontend.action.configuration.files;
+import com.redhat.rhn.common.conf.ConfigDefaults;
import com.redhat.rhn.domain.config.ConfigRevision;
import com.redhat.rhn.frontend.action.configuration.ConfigActionHelper;
import com.redhat.rhn.frontend.action.configuration.ConfigFileForm;
@@ -47,6 +48,7 @@ public class FileDownloadAction extends RhnAction {
ConfigFileForm cff = (ConfigFileForm) form;
request.setAttribute(CSRF_TOKEN, request.getSession().getAttribute("csrf_token"));
+ request.setAttribute("documentation", ConfigDefaults.get().isDocAvailable());
ConfigRevision cr = ConfigActionHelper.findRevision(request);
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 e5623d9..2accd2c 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
@@ -115,9 +115,11 @@
<html:text property="cffMacroStart" size="3" styleId="cffMacroStart" disabled = "${configFileForm.map.filetype == 'symlink'}" />
<bean:message key="filedetails.add_details.jspf.macro.end" />
<html:text property="cffMacroEnd" size="3" styleId="cffMacroEnd" disabled = "${configFileForm.map.filetype == 'symlink'}" /><br />
- <span class="small-text">
- <bean:message key="filedetails.jsp.tip.macros" arg0="/rhn/help/reference/index.jsp" />
- </span>
+ <c:if test="${documentation == 'true'}">
+ <span class="small-text">
+ <bean:message key="filedetails.jsp.tip.macros" arg0="/rhn/help/reference/index.jsp" />
+ </span>
+ </c:if>
</td>
</tr>
<tr id = "contentsRow"
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/upload.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/upload.jspf
index e01f323..d449873 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/upload.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/upload.jspf
@@ -59,9 +59,11 @@
<html:text property="cffMacroStart" size="3" />
<bean:message key="filedetails.add_details.jspf.macro.end" />
<html:text property="cffMacroEnd" size="3" /><br />
- <span class="small-text">
- <bean:message key="filedetails.jsp.tip.macros" arg0="/rhn/help/reference/index.jsp" />
- </span>
+ <c:if test="${documentation == 'true'}">
+ <span class="small-text">
+ <bean:message key="filedetails.jsp.tip.macros" arg0="/rhn/help/reference/index.jsp" />
+ </span>
+ </c:if>
</td>
</tr>
</table>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/add_details.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/add_details.jspf
index 7c07033..af4c355 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/add_details.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/add_details.jspf
@@ -31,8 +31,9 @@
<c:out value="${revision.configContent.delimEnd}" />
</rhn:require>
<br />
-
- <span class="small-text"><bean:message key="filedetails.jsp.tip.macros" arg0="/rhn/help/reference/en-US/s1-sm-configuration.jsp"/></span>
+ <c:if test="${documentation == 'true'}">
+ <span class="small-text"><bean:message key="filedetails.jsp.tip.macros" arg0="/rhn/help/reference/en-US/s1-sm-configuration.jsp"/></span>
+ </c:if>
</tr>
</c:if>
</table>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf
index 72cb8be..9151f12 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf
@@ -101,10 +101,12 @@
</c:if>
</rhn:require>
<br />
- <span class="small-text">
- <bean:message key="filedetails.jsp.binarytoggletip"
+ <c:if test="${documentation == 'true'}">
+ <span class="small-text">
+ <bean:message key="filedetails.jsp.binarytoggletip"
arg0="/rhn/help/reference/en-US/s1-sm-configuration.jsp" />
- </span>
+ </span>
+ </c:if>
</c:otherwise>
</c:choose>
</td>
12 years, 2 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 55 ++++++++++
java/code/src/com/redhat/rhn/frontend/action/systems/RequiringRebootSetupAction.java | 37 ++++++
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java | 5
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 14 ++
java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml | 6 +
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 40 +++++++
java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml | 1
java/code/webapp/WEB-INF/pages/systems/requiringrebootlist.jsp | 25 ++++
java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp | 5
java/code/webapp/WEB-INF/struts-config.xml | 10 +
10 files changed, 197 insertions(+), 1 deletion(-)
New commits:
commit 433bd3a310f38577ff3066414a2f035e4c310e47
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Tue Apr 17 15:31:06 2012 +0200
Show systems that need reboot because of an errata.
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
index cdb0cc5..64560e0 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
@@ -757,6 +757,61 @@ ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
<elaborator name="is_virtual_host" />
</mode>
+<query name="having_errata_with_keyword_applied_since_last_reboot_list" params="org_id, user_id, keyword">
+SELECT DISTINCT S.id, S.NAME,
+ (SELECT 1
+ FROM rhnServerFeaturesView SFV
+ WHERE SFV.server_id = S.id
+ AND SFV.label = 'ftr_system_grouping') AS selectable
+ FROM rhnServer S,
+ rhnErrata E,
+ rhnServerInfo SI,
+ rhnServerPackage SP,
+ rhnPackage P,
+ rhnErrataPackage EP
+ WHERE S.org_id = :org_id
+ AND EXISTS (SELECT 1 FROM rhnUserServerPerms USP WHERE USP.user_id=:user_id AND USP.server_id = S.id)
+ AND SI.server_id = S.id
+ AND SP.server_id = S.id
+ AND P.evr_id = SP.evr_id
+ AND P.name_id = SP.name_id
+ AND EP.errata_id = E.id AND EP.package_id = P.id
+ AND (to_date('1970-01-01', 'YYYY-MM-DD') + numtodsinterval(S.last_boot, 'second')) < SP.installtime
+ AND E.id IN (SELECT EK.errata_id FROM rhnErrataKeyword EK WHERE EK.keyword = :keyword)
+</query>
+
+<mode name="having_errata_with_keyword_applied_since_last_reboot" class="com.redhat.rhn.frontend.dto.SystemOverview">
+ <query name="having_errata_with_keyword_applied_since_last_reboot_list"/>
+ <elaborator name="system_overview" />
+ <elaborator name="entitlements" />
+ <elaborator name="is_virtual_guest" />
+ <elaborator name="is_virtual_host" />
+</mode>
+
+<mode name="has_errata_with_keyword_applied_since_last_reboot">
+ <query params="org_id, user_id, keyword, sid">
+ SELECT EXISTS (
+ SELECT 1
+ FROM rhnServer S,
+ rhnErrata E,
+ rhnServerInfo SI,
+ rhnServerPackage SP,
+ rhnPackage P,
+ rhnErrataPackage EP
+ WHERE S.org_id = :org_id
+ AND S.id = :sid
+ AND EXISTS (SELECT 1 FROM rhnUserServerPerms USP WHERE USP.user_id=:user_id AND USP.server_id = S.id)
+ AND SI.server_id = S.id
+ AND SP.server_id = S.id
+ AND P.evr_id = SP.evr_id
+ AND P.name_id = SP.name_id
+ AND EP.errata_id = E.id AND EP.package_id = P.id
+ AND (to_date('1970-01-01', 'YYYY-MM-DD') + numtodsinterval(S.last_boot, 'second')) < SP.installtime
+ AND E.id IN (SELECT EK.errata_id FROM rhnErrataKeyword EK WHERE EK.keyword = :keyword)
+ )
+ </query>
+</mode>
+
<mode name="inactive" class="com.redhat.rhn.frontend.dto.SystemOverview">
<query params="org_id, user_id, checkin_threshold">
SELECT S.id, S.NAME,
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/RequiringRebootSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/RequiringRebootSetupAction.java
new file mode 100644
index 0000000..e33dce7
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/RequiringRebootSetupAction.java
@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) 2012 Novell
+ *
+ * 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 org.apache.struts.action.ActionForm;
+
+import com.redhat.rhn.common.db.datasource.DataResult;
+import com.redhat.rhn.domain.user.User;
+import com.redhat.rhn.frontend.dto.SystemOverview;
+import com.redhat.rhn.frontend.listview.PageControl;
+import com.redhat.rhn.manager.system.SystemManager;
+
+/**
+ * InactiveSetupAction
+ * @version $Rev$
+ */
+public class RequiringRebootSetupAction extends BaseSystemsAction {
+
+ @Override
+ protected DataResult<SystemOverview> getDataResult(User user,
+ PageControl pc, ActionForm formIn) {
+ return SystemManager.requiringRebootList(user, null);
+ }
+
+}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java
index fc6ce5b..f82ab20 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java
@@ -59,6 +59,7 @@ public class SystemOverviewAction extends RhnAction {
.RECEIVE_NOTIFICATIONS};
/** {@inheritDoc} */
+ @Override
public ActionForward execute(ActionMapping mapping, ActionForm form,
HttpServletRequest request, HttpServletResponse response) {
RequestContext rctx = new RequestContext(request);
@@ -106,6 +107,9 @@ public class SystemOverviewAction extends RhnAction {
boolean hasUpdates =
criticalErrataCount + nonCriticalErrataCount + upgradablePackagesCount > 0;
+ // Reboot needed after certain types of updates
+ boolean rebootRequired = SystemManager.requiresReboot(user, sid);
+
// Monitoring
processRequestForMonitoring(user, s, request);
@@ -118,6 +122,7 @@ public class SystemOverviewAction extends RhnAction {
SdcHelper.ssmCheck(request, sid, user);
+ request.setAttribute("rebootRequired", Boolean.valueOf(rebootRequired));
request.setAttribute("unentitled", Boolean.valueOf(s.getEntitlements().isEmpty()));
request.setAttribute("systemInactive", Boolean.valueOf(s.isInactive()));
request.setAttribute("documentation", ConfigDefaults.get().isDocAvailable());
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 afe8387..6ed1aac 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
@@ -5058,6 +5058,13 @@ value for this entitlement, excluding the default organization's consumption.</s
</context-group>
</trans-unit>
+ <trans-unit id="requiringrebootlist.jsp.header">
+ <source>Systems requiring reboot</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/systems/RequiringReboot</context>
+ <context context-type="sourcefile">/rhn/systems/YourRhn.do</context>
+ </context-group>
+ </trans-unit>
<trans-unit id="inactivelist.jsp.header">
<source>Inactive Systems</source>
@@ -17559,6 +17566,13 @@ The Tree Path, Kickstart RPM, Base Channel, and Installer Generation should alwa
</context-group>
</trans-unit>
+ <trans-unit id="sdc.details.overview.requires_reboot">
+ <source>The system requires a reboot</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/systems/details/Overview.do</context>
+ </context-group>
+ </trans-unit>
+
<trans-unit id="sdc.details.overview.inactive1">
<source><strong>System not checking in with @@PRODUCT_NAME@@</strong></source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml
index 97b6522..5400455 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml
@@ -111,6 +111,12 @@ http://www.oasis-open.org/committees/xliff/documents/xliff-core-1.1.xsd"
<context context-type="sourcefile">Systems Navigation Menu</context>
</context-group>
</trans-unit>
+ <trans-unit id="Requiring Reboot">
+ <source>Requiring Reboot</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">Systems Navigation Menu</context>
+ </context-group>
+ </trans-unit>
<trans-unit id="duplicate.systems.nav.ips">
<source>Duplicate IP Address</source>
diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
index 23be330..78240dc 100644
--- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
@@ -196,6 +196,46 @@ public class SystemManager extends BaseManager {
return m.execute(params);
}
+ /**
+ * @param user
+ * Currently logged in user.
+ * @param sid
+ * System id
+ * @return true if the system requires a reboot i.e: because kernel updates.
+ */
+ public static boolean requiresReboot(User user, Long sid) {
+ SelectMode m = ModeFactory.getMode("System_queries",
+ "has_errata_with_keyword_applied_since_last_reboot");
+ Map params = new HashMap();
+ params.put("user_id", user.getId());
+ params.put("org_id", user.getOrg().getId());
+ params.put("sid", sid);
+ params.put("keyword", "reboot_suggested");
+ DataResult dr = m.execute(params);
+ return !dr.isEmpty();
+ }
+
+ /**
+ * Returns list of systems requiring a reboot i.e: because kernel updates,
+ * visible to user, sorted by name.
+ *
+ * @param user
+ * Currently logged in user.
+ * @param pc
+ * PageControl
+ * @return list of SystemOverviews.
+ */
+ public static DataResult<SystemOverview> requiringRebootList(User user,
+ PageControl pc) {
+ SelectMode m = ModeFactory.getMode("System_queries",
+ "having_errata_with_keyword_applied_since_last_reboot");
+ Map<String, Object> params = new HashMap<String, Object>();
+ params.put("org_id", user.getOrg().getId());
+ params.put("user_id", user.getId());
+ params.put("keyword", "reboot_suggested");
+ Map<String, Object> elabParams = new HashMap<String, Object>();
+ return makeDataResult(params, elabParams, pc, m);
+ }
/**
* Gets the latest upgradable packages for a system
diff --git a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
index a79d842..c153626 100644
--- a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
+++ b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
@@ -37,6 +37,7 @@
<rhn-tab name="All" url="/rhn/systems/SystemList.do"/>
<rhn-tab name="Virtual Systems" url="/rhn/systems/VirtualSystemsList.do"/>
<rhn-tab name="Out of Date" url="/rhn/systems/OutOfDate.do"/>
+ <rhn-tab name="Requiring Reboot" url="/rhn/systems/RequiringReboot.do"/>
<rhn-tab name="Unentitled" url="/rhn/systems/Unentitled.do"/>
<rhn-tab name="Ungrouped" url="/rhn/systems/Ungrouped.do" acl="org_entitlement(sw_mgr_enterprise); user_role(org_admin)"/>
<rhn-tab name="Inactive" url="/rhn/systems/Inactive.do"/>
diff --git a/java/code/webapp/WEB-INF/pages/systems/requiringrebootlist.jsp b/java/code/webapp/WEB-INF/pages/systems/requiringrebootlist.jsp
new file mode 100644
index 0000000..d5cb310
--- /dev/null
+++ b/java/code/webapp/WEB-INF/pages/systems/requiringrebootlist.jsp
@@ -0,0 +1,25 @@
+<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
+<%@ 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" %>
+<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
+
+<html:xhtml/>
+<html>
+<head>
+ <meta name="page-decorator" content="none" />
+</head>
+<body>
+<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif" imgAlt="system.common.systemAlt"
+ helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-list-inact">
+ <bean:message key="requiringrebootlist.jsp.header"/>
+</rhn:toolbar>
+
+<rl:listset name="systemListSet" legend="system">
+ <rhn:csrf />
+ <rhn:submitted />
+ <%@ include file="/WEB-INF/pages/common/fragments/systems/system_listdisplay.jspf" %>
+</rl:listset>
+
+</body>
+</html>
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp
index 40d220b..d69645b 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp
@@ -22,7 +22,10 @@
<bean:message key="sdc.details.overview.inactive2" arg0="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-list"/>
</c:if>
</c:when>
-
+ <c:when test="${rebootRequired}">
+ <img src="/img/restart.png"/><bean:message key="sdc.details.overview.requires_reboot"/>
+ <bean:message key="sdc.details.overview.schedulereboot" arg0="/network/systems/details/reboot_confirm.pxt?sid=${system.id}"/>
+ </c:when>
<c:when test="${hasUpdates}">
<c:choose>
<c:when test="${criticalErrataCount > 0}">
diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml
index 591c766..88dc052 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -2707,6 +2707,16 @@
path="/WEB-INF/pages/systems/inactivelist.jsp"/>
</action>
+ <action path="/systems/RequiringReboot"
+ scope="request"
+ input="/WEB-INF/pages/systems/requiringreboot.jsp"
+ type="com.redhat.rhn.frontend.action.systems.RequiringRebootSetupAction"
+ className="com.redhat.rhn.frontend.struts.RhnActionMapping">
+ <set-property property="postRequiredIfSubmitted" value="true" />
+ <forward name="default"
+ path="/WEB-INF/pages/systems/requiringrebootlist.jsp"/>
+ </action>
+
<action path="/systems/Registered"
scope="request"
name="recentlyRegisteredSystemsForm"
12 years, 2 months
Changes to 'refs/tags/spacewalk-proxy-1.8.3-1'
by Miroslav Suchý
Tag 'spacewalk-proxy-1.8.3-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2012-04-18 12:43 +0000
Tagging package [spacewalk-proxy] version [1.8.3-1] in directory [proxy/proxy/].
Changes since spacewalk-proxy-1.8.2-1:
Miroslav Suchý (2):
add pylint warning
Automatic commit of package [spacewalk-proxy] release [1.8.3-1].
---
proxy/proxy/apacheHandler.py | 1 +
proxy/proxy/spacewalk-proxy.spec | 5 ++++-
rel-eng/packages/spacewalk-proxy | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
12 years, 2 months