Changes to 'refs/tags/spacewalk-java-1.8.149-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.8.149-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-09-19 14:24 +0000
Tagging package [spacewalk-java] version [1.8.149-1] in directory [java/].
Changes since spacewalk-java-1.8.148-1:
Jan Pazdziora (2):
Convert TIMESTAMP without time zone as well.
Automatic commit of package [spacewalk-java] release [1.8.149-1].
Johannes Renner (1):
Validate proxy format on general config page
Milan Zazrivec (1):
857284 - don't setup ipv6 if /proc/net/if_inet6 is empty
Stephen Herr (1):
790120 - make system_overview fast
---
java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java | 1
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 66 ++++
java/code/src/com/redhat/rhn/common/validator/HostPortValidator.java | 134 ++++++++++
java/code/src/com/redhat/rhn/common/validator/test/HostPortValidatorTest.java | 63 ++++
java/code/src/com/redhat/rhn/frontend/action/satellite/GeneralConfigAction.java | 12
java/code/src/com/redhat/rhn/frontend/dto/SystemOverview.java | 10
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 8
java/spacewalk-java.spec | 7
rel-eng/packages/spacewalk-java | 2
spacewalk/spacewalk-setup-jabberd/bin/spacewalk-setup-jabberd | 2
10 files changed, 292 insertions(+), 13 deletions(-)
---
11 years, 7 months
java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora
java/spacewalk-java.spec | 7 ++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit fb4d4f17525a0716cd39dd6400bb8a0a42ed520a
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Sep 19 16:24:37 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.149-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index ac12497..60878a1 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -23,7 +23,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.148
+Version: 1.8.149
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -616,6 +616,11 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Sep 19 2012 Jan Pazdziora 1.8.149-1
+- Convert TIMESTAMP without time zone as well.
+- Validate proxy format on general config page
+- 790120 - make system_overview fast
+
* Tue Sep 18 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.148-1
- ssm_kickstartable mode does not need system_monitoring elaborator
- find_by_name mode does not need system_monitoring elaborator
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index cd8d2d6..20170d3 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.148-1 java/
+1.8.149-1 java/
11 years, 7 months
java/code
by Jan Pazdziora
java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 10072249015ea2a962f7cd1703116b260ac6cb70
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Sep 19 13:43:08 2012 +0200
Convert TIMESTAMP without time zone as well.
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java b/java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java
index 5333edd..0b49f62 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java
@@ -778,6 +778,7 @@ public class CachedStatement {
// vs the real date: August 23, 2005 1:36:12 PM PDT
if (columnValue instanceof Date ||
("oracle.sql.TIMESTAMPLTZ".equals(columnValue.getClass().getCanonicalName())) ||
+ ("oracle.sql.TIMESTAMP".equals(columnValue.getClass().getCanonicalName())) ||
("oracle.sql.TIMESTAMPTZ".equals(columnValue.getClass().getCanonicalName()))) {
Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
return rs.getTimestamp(columnName, cal);
11 years, 7 months
spacewalk/spacewalk-setup-jabberd
by Milan Zazrivec
spacewalk/spacewalk-setup-jabberd/bin/spacewalk-setup-jabberd | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6d931e6abb6724fa7131d2c718aa047b9f3fc28e
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Sep 19 13:59:26 2012 +0200
857284 - don't setup ipv6 if /proc/net/if_inet6 is empty
diff --git a/spacewalk/spacewalk-setup-jabberd/bin/spacewalk-setup-jabberd b/spacewalk/spacewalk-setup-jabberd/bin/spacewalk-setup-jabberd
index 54fec6c..0c31fb1 100755
--- a/spacewalk/spacewalk-setup-jabberd/bin/spacewalk-setup-jabberd
+++ b/spacewalk/spacewalk-setup-jabberd/bin/spacewalk-setup-jabberd
@@ -35,7 +35,7 @@ if ($q =~ /^rhn-(org-)?httpd-ssl-key-pair/) {
$macros{'server_pem'} = '/etc/jabberd/server.pem';
}
-if (-f "/proc/net/if_inet6") {
+if (-f "/proc/net/if_inet6" and -s "/proc/net/if_inet6") {
$macros{'localhost'} = '::1';
$macros{'ipaddress'} = '::';
}
11 years, 7 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/common/validator/HostPortValidator.java | 134 ++++++++++
java/code/src/com/redhat/rhn/common/validator/test/HostPortValidatorTest.java | 63 ++++
java/code/src/com/redhat/rhn/frontend/action/satellite/GeneralConfigAction.java | 12
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 8
4 files changed, 216 insertions(+), 1 deletion(-)
New commits:
commit d37de0066ae9b10a2c8e919d4c0fa401a6fdeb26
Author: Johannes Renner <jrenner(a)suse.de>
Date: Tue Sep 18 14:17:11 2012 +0200
Validate proxy format on general config page
diff --git a/java/code/src/com/redhat/rhn/common/validator/HostPortValidator.java b/java/code/src/com/redhat/rhn/common/validator/HostPortValidator.java
new file mode 100644
index 0000000..cff8ad7
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/common/validator/HostPortValidator.java
@@ -0,0 +1,134 @@
+/**
+ * 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.common.validator;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Input validation for host[:port], where the host part can be either an IP address
+ * (IPv4 or IPv6) or a hostname.
+ */
+public class HostPortValidator {
+
+ // Singleton instance
+ private static HostPortValidator instance;
+
+ // Pattern to match IPv6 address in bracket notation
+ private static final Pattern IPV6_BRACKETS = Pattern.compile("^\\[(.*)\\](:(\\d*))?$");
+
+ // Private constructor
+ private HostPortValidator() {
+ }
+
+ /**
+ * Return the singleton instance of {@link HostPortValidator}.
+ * @return {@link HostPortValidator} instance
+ */
+ public static HostPortValidator getInstance() {
+ if (instance == null) {
+ instance = new HostPortValidator();
+ }
+ return instance;
+ }
+
+ /**
+ * Return true if the given string is a valid host[:port] representation.
+ * @param hostPort
+ * @return true if hostPort represents a valid host and port, else false.
+ */
+ public boolean isValid(String hostPort) {
+ if (hostPort == null || hostPort.isEmpty()) {
+ return false;
+ }
+ String host;
+ String port;
+
+ if (hostPort.startsWith("[")) {
+ // Parse an IPv6 address in bracket notation
+ Matcher matcher = IPV6_BRACKETS.matcher(hostPort);
+ if (!matcher.matches()) {
+ return false;
+ }
+ host = matcher.group(1);
+ port = matcher.group(3);
+ }
+ else {
+ int colonIndex = hostPort.indexOf(':');
+ if (colonIndex != -1 && colonIndex == hostPort.lastIndexOf(':')) {
+ // Split into host:port
+ host = hostPort.substring(0, colonIndex);
+ port = hostPort.substring(colonIndex + 1);
+ }
+ else {
+ host = hostPort;
+ port = null;
+ }
+ }
+
+ // Validate host and port separately
+ boolean isValidHost = true;
+ // Validate IP addresses externally (v4 and v6)
+ if (host.replaceAll("[\\d\\.]", "").isEmpty() || host.contains(":")) {
+ isValidHost = isValidIP(host);
+ }
+ boolean isValidPort = true;
+ if (port != null) {
+ isValidPort = isValidPort(port);
+ }
+
+ return isValidHost && isValidPort;
+ }
+
+ /**
+ * Validate IP address format for a given string.
+ * @param ipString
+ * @return true if the given string is a valid IP, else false.
+ */
+ private boolean isValidIP(String ipString) {
+ boolean ret = false;
+ if (ipString != null && !ipString.isEmpty()) {
+ try {
+ InetAddress.getByName(ipString);
+ ret = true;
+ }
+ catch (UnknownHostException e) {
+ // Stay silent
+ }
+ }
+ return ret;
+ }
+
+ /**
+ * Parse a port number from a given string and validate it.
+ * @param portString
+ * @return true if the given string is a valid port, else false.
+ */
+ private boolean isValidPort(String portString) {
+ boolean ret = false;
+ if (portString != null && !portString.isEmpty()) {
+ try {
+ int port = Integer.parseInt(portString);
+ ret = port >= 0 && port < 65535;
+ }
+ catch (NumberFormatException e) {
+ // Stay silent
+ }
+ }
+ return ret;
+ }
+}
diff --git a/java/code/src/com/redhat/rhn/common/validator/test/HostPortValidatorTest.java b/java/code/src/com/redhat/rhn/common/validator/test/HostPortValidatorTest.java
new file mode 100644
index 0000000..e96bd91
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/common/validator/test/HostPortValidatorTest.java
@@ -0,0 +1,63 @@
+/**
+ * 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.common.validator.test;
+
+import com.redhat.rhn.common.validator.HostPortValidator;
+
+import junit.framework.TestCase;
+
+/**
+ * Test class for the {@link HostPortValidator}.
+ */
+public class HostPortValidatorTest extends TestCase {
+
+ public void testIPv4() {
+ assertTrue(HostPortValidator.getInstance().isValid("192.168.1.2"));
+ assertTrue(HostPortValidator.getInstance().isValid("192.168.1.2:8888"));
+ assertTrue(HostPortValidator.getInstance().isValid("192.168.1"));
+
+ assertFalse(HostPortValidator.getInstance().isValid("192.168.1.2:"));
+ assertFalse(HostPortValidator.getInstance().isValid("192.168.1.2.3"));
+ assertFalse(HostPortValidator.getInstance().isValid("1200.5.4.3"));
+ assertFalse(HostPortValidator.getInstance().isValid("192.168.2.1:888888"));
+ assertFalse(HostPortValidator.getInstance().isValid("http://192.168.2.1:8888"));
+ }
+
+ public void testIPv6() {
+ assertTrue(HostPortValidator.getInstance().isValid("2001:0db8:85a3:08d3:1319:8a2e:0370:7344"));
+ assertTrue(HostPortValidator.getInstance().isValid("[2001:0db8:85a3:08d3:1319:8a2e:0370:7344]"));
+ assertTrue(HostPortValidator.getInstance().isValid("[2001:0db8:85a3:08d3:1319:8a2e:0370:7344]:8888"));
+ assertTrue(HostPortValidator.getInstance().isValid("[2607:f0d0:1002:51::4]:8888"));
+ assertTrue(HostPortValidator.getInstance().isValid("[::1]"));
+ assertTrue(HostPortValidator.getInstance().isValid("[::1]:8888"));
+
+ assertFalse(HostPortValidator.getInstance().isValid("2001:0db8:85a3:08d3:1319:8a2e:0370:7344:8888"));
+ assertFalse(HostPortValidator.getInstance().isValid("[2001:0db8:85a3:08d3:1319:8a2e:0370:7344]]:8888"));
+ assertFalse(HostPortValidator.getInstance().isValid("[2001:0db8:85a3:08d3:1319:8a2e:0370:7344:8888"));
+ assertFalse(HostPortValidator.getInstance().isValid("2001:0db8:85a3:08d3:1319:8a2e:0370:7344]:8888"));
+ assertFalse(HostPortValidator.getInstance().isValid("[::1]:"));
+ assertFalse(HostPortValidator.getInstance().isValid("[]"));
+ }
+
+ public void testHostnames() {
+ assertTrue(HostPortValidator.getInstance().isValid("myproxy"));
+ assertTrue(HostPortValidator.getInstance().isValid("myproxy:8888"));
+ assertTrue(HostPortValidator.getInstance().isValid("proxy.example.com"));
+ assertTrue(HostPortValidator.getInstance().isValid("proxy.example.com:8888"));
+
+ assertFalse(HostPortValidator.getInstance().isValid("http://proxy.example.com"));
+ assertFalse(HostPortValidator.getInstance().isValid("http://proxy.example.com:8888"));
+ }
+}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/GeneralConfigAction.java b/java/code/src/com/redhat/rhn/frontend/action/satellite/GeneralConfigAction.java
index 257d296..5514537 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/satellite/GeneralConfigAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/GeneralConfigAction.java
@@ -16,6 +16,7 @@ package com.redhat.rhn.frontend.action.satellite;
import com.redhat.rhn.common.conf.Config;
import com.redhat.rhn.common.conf.ConfigDefaults;
+import com.redhat.rhn.common.validator.HostPortValidator;
import com.redhat.rhn.common.validator.ValidatorError;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.struts.RequestContext;
@@ -212,7 +213,16 @@ public class GeneralConfigAction extends BaseConfigAction {
*/
private ActionErrors validateForm(DynaActionForm form) {
ActionErrors errors = new ActionErrors();
- String email = (String) form.get(translateFormPropertyName("traceback_mail"));
+
+ // Check if proxy is given as host:port
+ String proxy = (String) form.get(
+ translateFormPropertyName("server.satellite.http_proxy"));
+ HostPortValidator validator = HostPortValidator.getInstance();
+ if (!(proxy.equals("") || validator.isValid(proxy))) {
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("error.proxy_invalid"));
+ }
+
String password = (String) form.get(
translateFormPropertyName("server.satellite.http_proxy_password"));
String confirmationPassword = (String) form.get(
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 51512c1..00dd421 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
@@ -1179,6 +1179,14 @@ http://www.oasis-open.org/committees/xliff/documents/xliff-core-1.1.xsd"
<context context-type="sourcefile">com.redhat.rhn.frontend.action.monitoring.notification.AbstractFilterEditAction</context>
</context-group>
</trans-unit>
+
+ <trans-unit id="error.proxy_invalid">
+<source>HTTP proxy needs to be specified as host:port.</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/config/GeneralConfig</context>
+ </context-group>
+ </trans-unit>
+
<trans-unit id="/rhn/">
<source>That username is already taken; please choose another.</source>
<context-group name="ctx">
11 years, 7 months
java/code
by StephenHerr
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 66 ++++++++--
java/code/src/com/redhat/rhn/frontend/dto/SystemOverview.java | 10 +
2 files changed, 67 insertions(+), 9 deletions(-)
New commits:
commit b7fc95df2bc41d7786da0bd5e1c9d2e00ed5a8ac
Author: Stephen Herr <sherr(a)redhat.com>
Date: Tue Sep 18 16:14:21 2012 -0400
790120 - make system_overview fast
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 c28a7bc..c3d8c2d 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
@@ -37,6 +37,7 @@ select * from (
ORDER BY UPPER(COALESCE(X.name, '(none)')), X.id
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_config_files_with_diffs" />
</mode>
<mode name="find_by_name" class="com.redhat.rhn.frontend.dto.SystemOverview">
@@ -51,6 +52,7 @@ ORDER BY UPPER(COALESCE(X.name, '(none)')), X.id
and S.name = :name
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_config_files_with_diffs" />
</mode>
@@ -70,6 +72,7 @@ SELECT S.id,
ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_config_files_with_diffs" />
<elaborator name="is_virtual_guest" />
<elaborator name="is_virtual_host" />
</mode>
@@ -98,6 +101,7 @@ SELECT DISTINCT S.id,
ORDER BY UPPER(COALESCE(X.server_name, '(none)')), X.id
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_config_files_with_diffs" />
<elaborator name="system_monitoring" />
</mode>
@@ -212,6 +216,7 @@ SELECT S.id as id,
ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_config_files_with_diffs" />
<elaborator name="system_monitoring" />
</mode>
@@ -256,6 +261,7 @@ SELECT
ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_config_files_with_diffs" />
<elaborator name="system_monitoring" />
<elaborator name="entitlements"/>
</mode>
@@ -347,6 +353,7 @@ SELECT SGM.server_id AS ID, S.name AS NAME,
ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_config_files_with_diffs" />
<elaborator name="system_monitoring" />
<elaborator name="entitlements"/>
</mode>
@@ -365,6 +372,7 @@ SELECT S.id, S.name,
ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_config_files_with_diffs" />
<elaborator name="system_monitoring" />
<elaborator name="entitlements"/>
</mode>
@@ -383,6 +391,7 @@ SELECT S.id, S.name
ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_config_files_with_diffs" />
<elaborator name="system_monitoring" />
</mode>
@@ -397,6 +406,7 @@ SELECT S.ID
ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_config_files_with_diffs" />
<elaborator name="system_monitoring" />
</mode>
@@ -416,6 +426,7 @@ SELECT ES.id, S.name, 1 as selectable
AND EXISTS (SELECT 1 FROM rhnUserServerPerms USP WHERE USP.user_id = :user_id AND USP.server_id = ES.id)
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_config_files_with_diffs" />
<elaborator name="system_monitoring" />
<elaborator name="entitlements"/>
</mode>
@@ -470,6 +481,7 @@ ORDER BY UPPER(COALESCE(X.name, '(none)')), X.id
<mode name="visible_to_user_from_sysid_list" class="com.redhat.rhn.frontend.dto.SystemSearchResult">
<query name="available_to_user_from_sysid_list" />
<elaborator name="system_overview" />
+ <elaborator name="system_config_files_with_diffs" />
<elaborator name="system_monitoring" />
<elaborator name="entitlements"/>
<elaborator name="is_virtual_guest" />
@@ -480,6 +492,7 @@ ORDER BY UPPER(COALESCE(X.name, '(none)')), X.id
<mode name="visible_to_user" class="com.redhat.rhn.frontend.dto.SystemOverview">
<query name="available_to_user" />
<elaborator name="system_overview" />
+ <elaborator name="system_config_files_with_diffs" />
<elaborator name="system_monitoring" />
<elaborator name="entitlements"/>
<elaborator name="is_virtual_guest" />
@@ -513,6 +526,7 @@ ORDER BY UPPER(COALESCE(X.name, '(none)')), X.id
<mode name="most_critical_systems" class="com.redhat.rhn.frontend.dto.SystemOverview">
<query name="available_to_user_with_errata" />
<elaborator name="system_overview_most_critical" />
+ <elaborator name="system_config_files_with_diffs" />
<elaborator name="system_monitoring" />
</mode>
@@ -576,6 +590,7 @@ where a.user_id = :formvar_uid
ORDER BY UPPER(COALESCE(S.name, '(none)')), S.id
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_config_files_with_diffs" />
<elaborator name="system_monitoring" />
<elaborator name="entitlements" />
</mode>
@@ -631,6 +646,7 @@ SELECT SA.server_id as id,
WHERE errata_id = :eid)
</elaborator>
<elaborator name="system_overview" />
+ <elaborator name="system_config_files_with_diffs" />
<elaborator name="system_monitoring" />
<elaborator name="entitlements" />
</mode>
@@ -652,12 +668,14 @@ SELECT SA.server_id as id,
ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_config_files_with_diffs" />
<elaborator name="system_monitoring" />
</mode>
<mode name="in_set" class="com.redhat.rhn.frontend.dto.SystemOverview">
<query name="in_set" />
<elaborator name="system_overview" />
+ <elaborator name="system_config_files_with_diffs" />
<elaborator name="system_monitoring" />
<elaborator name="entitlements" />
<elaborator name="is_virtual_guest" />
@@ -730,6 +748,7 @@ select * from (
ORDER BY UPPER(COALESCE(X.NAME, '(none)')), X.ID
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_config_files_with_diffs" />
<elaborator name="system_monitoring" />
<elaborator name="entitlements" />
<elaborator name="is_virtual_guest" />
@@ -750,6 +769,7 @@ SELECT S.ID, S.NAME,
ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_config_files_with_diffs" />
<elaborator name="system_monitoring" />
<elaborator name="is_virtual_guest" />
<elaborator name="is_virtual_host" />
@@ -773,6 +793,7 @@ SELECT S.ID, S.NAME,
ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_config_files_with_diffs" />
<elaborator name="system_monitoring" />
<elaborator name="entitlements" />
<elaborator name="is_virtual_guest" />
@@ -805,6 +826,7 @@ SELECT DISTINCT S.id, S.NAME,
<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="system_config_files_with_diffs" />
<elaborator name="system_monitoring" />
<elaborator name="entitlements" />
<elaborator name="is_virtual_guest" />
@@ -850,6 +872,7 @@ SELECT S.id, S.NAME,
ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_config_files_with_diffs" />
<elaborator name="system_monitoring" />
<elaborator name="entitlements" />
<elaborator name="is_virtual_guest" />
@@ -872,6 +895,7 @@ SELECT S.id, S.NAME,
ORDER BY SI.checkin DESC
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_config_files_with_diffs" />
<elaborator name="system_monitoring" />
<elaborator name="entitlements" />
</mode>
@@ -898,6 +922,7 @@ SELECT S.id, S.NAME, S.info, S.created,
ORDER BY S.created DESC
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_config_files_with_diffs" />
<elaborator name="system_monitoring" />
<elaborator name="entitlements" />
<elaborator name="is_virtual_guest" />
@@ -927,6 +952,7 @@ SELECT S.id, S.NAME, S.info, S.created,
ORDER BY S.created DESC
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_config_files_with_diffs" />
<elaborator name="system_monitoring" />
<elaborator name="entitlements" />
</mode>
@@ -943,6 +969,7 @@ SELECT PI.server_id ID, S.name,
AND S.id = PI.server_id
</query>
<elaborator name="system_overview"/>
+ <elaborator name="system_config_files_with_diffs" />
<elaborator name="system_monitoring" />
<elaborator name="entitlements" />
<elaborator name="is_virtual_guest" />
@@ -976,6 +1003,7 @@ SELECT PI.server_id ID, S.name,
ORDER BY NAME, VI.virtual_system_id, VI.uuid DESC
</query>
<elaborator name="virtual_system_overview"/>
+ <elaborator name="system_config_files_with_diffs" />
<elaborator name="virtual_system_entitlements" />
</mode>
@@ -1022,6 +1050,7 @@ ORDER BY NAME, VI.virtual_system_id, VI.uuid DESC
ORDER BY VI.host_system_id, VI.uuid DESC
</query>
<elaborator name="virtual_system_overview"/>
+ <elaborator name="system_config_files_with_diffs" />
<elaborator name="virtual_system_entitlements" />
<elaborator name="total_virtual_instances" />
<elaborator name="active_virtual_instances" />
@@ -1075,6 +1104,7 @@ SELECT SP.proxy_server_id ID, S.name, (SP.position + 1) AS position, SP.hostname
ORDER BY SP.position
</query>
<elaborator name="system_overview"/>
+ <elaborator name="system_config_files_with_diffs" />
<elaborator name="system_monitoring" />
</mode>
@@ -1102,6 +1132,7 @@ ORDER BY UPPER(COALESCE(S.name, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
<elaborator name="system_monitoring" />
+ <elaborator name="system_config_files_with_diffs" />
</mode>
<mode name="systems_failed_action" class="com.redhat.rhn.frontend.dto.ActionedSystem">
@@ -1122,6 +1153,7 @@ ORDER BY UPPER(COALESCE(S.name, '(none)')), S.ID
ORDER BY UPPER(COALESCE(S.name, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_config_files_with_diffs" />
<elaborator name="system_monitoring" />
</mode>
@@ -1143,6 +1175,7 @@ ORDER BY UPPER(COALESCE(S.name, '(none)')), S.ID
ORDER BY UPPER(COALESCE(S.name, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_config_files_with_diffs" />
<elaborator name="system_monitoring" />
</mode>
@@ -1237,15 +1270,34 @@ ORDER BY S.ID
</query>
<query name="system_overview" params="">
- SELECT /*+ RULE */ SERVER_ID AS ID, OUTDATED_PACKAGES, SERVER_NAME, security_errata, bug_errata, enhancement_errata,
+ SELECT SERVER_ID AS ID, OUTDATED_PACKAGES, SERVER_NAME, security_errata, bug_errata, enhancement_errata,
SERVER_ADMINS, GROUP_COUNT, MODIFIED, CHANNEL_LABELS, CHANNEL_ID, HISTORY_COUNT,
- LAST_CHECKIN_DAYS_AGO, PENDING_UPDATES, OS, RELEASE, SERVER_ARCH_NAME, LAST_CHECKIN, LOCKED,
- config_files_with_differences
+ LAST_CHECKIN_DAYS_AGO, PENDING_UPDATES, OS, RELEASE, SERVER_ARCH_NAME, LAST_CHECKIN, LOCKED
FROM rhnServerOverview
WHERE server_id IN (%s)
ORDER BY UPPER(COALESCE(SERVER_NAME, '(none)')), SERVER_ID
</query>
+<query name="system_config_files_with_diffs">
+ SELECT ACR.server_id AS ID, count(*) AS config_files_with_differences
+ FROM rhnActionConfigRevision ACR
+ INNER JOIN rhnActionConfigRevisionResult ACRR ON ACR.id = ACRR.action_config_revision_id
+ WHERE ACR.action_id = (
+ SELECT MAX(rA.id)
+ FROM rhnAction rA
+ INNER JOIN rhnServerAction rSA ON rSA.action_id = rA.id
+ INNER JOIN rhnActionStatus rAS ON rAS.id = rSA.status
+ INNER JOIN rhnActionType rAT ON rAT.id = rA.action_type
+ WHERE rSA.server_id = ACR.server_id
+ AND rAS.name in ('Completed', 'Failed')
+ AND rAT.label = 'configfiles.diff'
+ )
+ AND ACR.failure_id is null
+ AND ACRR.result is not null
+ AND ACR.server_id in (%s)
+GROUP BY ACR.server_id
+</query>
+
<query name="system_monitoring" params="">
SELECT CP.host_id AS id,
CASE MAX(CASE PS.state
@@ -1287,8 +1339,7 @@ select VI.host_system_id as ID, 1 as virtual_host
<query name="system_overview_most_critical" params="">
SELECT SERVER_ID AS ID, SECURITY_ERRATA, BUG_ERRATA, ENHANCEMENT_ERRATA, OUTDATED_PACKAGES, SERVER_NAME,
SERVER_ADMINS, GROUP_COUNT, MODIFIED, CHANNEL_LABELS, HISTORY_COUNT,
- LAST_CHECKIN_DAYS_AGO, PENDING_UPDATES, OS, RELEASE, SERVER_ARCH_NAME, LAST_CHECKIN, LOCKED,
- config_files_with_differences
+ LAST_CHECKIN_DAYS_AGO, PENDING_UPDATES, OS, RELEASE, SERVER_ARCH_NAME, LAST_CHECKIN, LOCKED
FROM rhnServerOverview
WHERE server_id IN (%s)
ORDER BY SECURITY_ERRATA DESC, BUG_ERRATA DESC, ENHANCEMENT_ERRATA DESC
@@ -1298,8 +1349,7 @@ ORDER BY SECURITY_ERRATA DESC, BUG_ERRATA DESC, ENHANCEMENT_ERRATA DESC
SELECT VI.id,
SERVER_ID as system_id, SECURITY_ERRATA, BUG_ERRATA, ENHANCEMENT_ERRATA, OUTDATED_PACKAGES, SERVER_NAME,
SERVER_ADMINS, GROUP_COUNT, OV.MODIFIED, CHANNEL_LABELS, CHANNEL_ID, HISTORY_COUNT,
- LAST_CHECKIN_DAYS_AGO, PENDING_UPDATES, OS, RELEASE, SERVER_ARCH_NAME, LAST_CHECKIN, LOCKED,
- config_files_with_differences
+ LAST_CHECKIN_DAYS_AGO, PENDING_UPDATES, OS, RELEASE, SERVER_ARCH_NAME, LAST_CHECKIN, LOCKED
FROM rhnVirtualInstance VI, rhnServerOverview OV
WHERE VI.id IN (%s)
AND ( ( VI.uuid IS NULL
@@ -1360,6 +1410,7 @@ DISTINCT VI.id,
ORDER BY NAME, VI.virtual_system_id, VI.uuid DESC
</query>
<elaborator name="virtual_system_overview"/>
+ <elaborator name="system_config_files_with_diffs" />
<elaborator name="virtual_system_entitlements" />
</mode>
@@ -1946,6 +1997,7 @@ SELECT S.id,
ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_config_files_with_diffs" />
<elaborator name="system_monitoring" />
</mode>
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/SystemOverview.java b/java/code/src/com/redhat/rhn/frontend/dto/SystemOverview.java
index 1b5bd75..932ceb8 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/SystemOverview.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/SystemOverview.java
@@ -188,6 +188,7 @@ public class SystemOverview extends BaseDto implements Serializable {
/**
* @return Returns the id.
*/
+ @Override
public Long getId() {
return id;
}
@@ -316,6 +317,9 @@ public class SystemOverview extends BaseDto implements Serializable {
* @return Returns the configFilesWithDifferences.
*/
public Long getConfigFilesWithDifferences() {
+ if (configFilesWithDifferences == null) {
+ return 0L;
+ }
return configFilesWithDifferences;
}
/**
@@ -532,8 +536,8 @@ public class SystemOverview extends BaseDto implements Serializable {
for (int i = 2; i < ent.size(); i++) {
msg = msg +
- ls.getMessage("list delimiter") +
- ls.getMessage((String) ent.get(i));
+ ls.getMessage("list delimiter") +
+ ls.getMessage((String) ent.get(i));
}
return msg;
}
@@ -614,6 +618,7 @@ public class SystemOverview extends BaseDto implements Serializable {
* They are false otherwise
* @return whether the current system is UI selectable
*/
+ @Override
public boolean isSelectable() {
return selectable;
}
@@ -621,6 +626,7 @@ public class SystemOverview extends BaseDto implements Serializable {
/**
* {@inheritDoc}
*/
+ @Override
public String toString() {
return new ToStringBuilder(this).append("id", id).append("serverName",
serverName).toString();
11 years, 7 months
Changes to 'refs/tags/spacewalk-java-1.8.148-1'
by Tomas Lestach
Tag 'spacewalk-java-1.8.148-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-09-18 15:17 +0000
Tagging package [spacewalk-java] version [1.8.148-1] in directory [java/].
Changes since osad-5.11.6-1:
Tomas Lestach (8):
extract system_monitoring elaborator from system_overview
remove SystemHealthIconDecorator and appropriate query
use system_monitoring elaborator in most_critical_systems query
virtual_system_overview does not need system health information
virtual_hosts_for_user mode does not need system_monitoring elaborator
find_by_name mode does not need system_monitoring elaborator
ssm_kickstartable mode does not need system_monitoring elaborator
Automatic commit of package [spacewalk-java] release [1.8.148-1].
---
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 114 ++++------
java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/SystemHealthIconDecorator.java | 61 -----
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 14 -
java/code/webapp/WEB-INF/pages/common/fragments/systems/system_listdisplay.jspf | 1
java/spacewalk-java.spec | 14 +
rel-eng/packages/spacewalk-java | 2
6 files changed, 67 insertions(+), 139 deletions(-)
---
11 years, 7 months
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 14 +++++++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 14 insertions(+), 2 deletions(-)
New commits:
commit c375c3f516f452d6f3fcefdb0787467fb9c8a5c3
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Sep 18 17:17:28 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.148-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index de9cc5c..ac12497 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -23,7 +23,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.147
+Version: 1.8.148
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -616,6 +616,18 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Sep 18 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.148-1
+- ssm_kickstartable mode does not need system_monitoring elaborator
+- find_by_name mode does not need system_monitoring elaborator
+- virtual_hosts_for_user mode does not need system_monitoring elaborator
+- virtual_system_overview does not need system health information
+- use system_monitoring elaborator in most_critical_systems query
+- remove SystemHealthIconDecorator and appropriate query
+- extract system_monitoring elaborator from system_overview
+- removing @Override annotations for methods that aren't overriden
+- removing @Override annotations for methods that aren't overriden
+- removing unnecessarily nested else statement
+
* Mon Sep 17 2012 Jan Pazdziora 1.8.147-1
- 790120 - Adding the RULE hint back into the system_overview elaborator
- Checkstyle fix.
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index e3ea2fa..cd8d2d6 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.147-1 java/
+1.8.148-1 java/
11 years, 7 months
3 commits - java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 3 ---
1 file changed, 3 deletions(-)
New commits:
commit bc6d9d230b36532d0f5074b135bb04a2f44c0b65
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Sep 18 17:15:31 2012 +0200
ssm_kickstartable mode does not need system_monitoring elaborator
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 12faf58..c28a7bc 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
@@ -70,7 +70,6 @@ SELECT S.id,
ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
- <elaborator name="system_monitoring" />
<elaborator name="is_virtual_guest" />
<elaborator name="is_virtual_host" />
</mode>
commit 70536e9a3ce5afa6bf09c35a32088190a2ab89f7
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Sep 18 16:35:50 2012 +0200
find_by_name mode does not need system_monitoring elaborator
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 6e31a3c..12faf58 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
@@ -51,7 +51,6 @@ ORDER BY UPPER(COALESCE(X.name, '(none)')), X.id
and S.name = :name
</query>
<elaborator name="system_overview" />
- <elaborator name="system_monitoring" />
</mode>
commit b05cb4cd5b8d84da11f0b3df5444926056e4363f
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Sep 18 16:33:21 2012 +0200
virtual_hosts_for_user mode does not need system_monitoring elaborator
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 576b0cb..6e31a3c 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
@@ -37,7 +37,6 @@ select * from (
ORDER BY UPPER(COALESCE(X.name, '(none)')), X.id
</query>
<elaborator name="system_overview" />
- <elaborator name="system_monitoring" />
</mode>
<mode name="find_by_name" class="com.redhat.rhn.frontend.dto.SystemOverview">
11 years, 7 months
4 commits - java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 117 ++++------
java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/SystemHealthIconDecorator.java | 61 -----
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 14 -
java/code/webapp/WEB-INF/pages/common/fragments/systems/system_listdisplay.jspf | 1
4 files changed, 56 insertions(+), 137 deletions(-)
New commits:
commit 834321796d96c5f8d851b92e09e064f4aa216194
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Sep 18 14:49:57 2012 +0200
virtual_system_overview does not need system health information
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 65060ca..576b0cb 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
@@ -1302,22 +1302,8 @@ ORDER BY SECURITY_ERRATA DESC, BUG_ERRATA DESC, ENHANCEMENT_ERRATA DESC
SERVER_ID as system_id, SECURITY_ERRATA, BUG_ERRATA, ENHANCEMENT_ERRATA, OUTDATED_PACKAGES, SERVER_NAME,
SERVER_ADMINS, GROUP_COUNT, OV.MODIFIED, CHANNEL_LABELS, CHANNEL_ID, HISTORY_COUNT,
LAST_CHECKIN_DAYS_AGO, PENDING_UPDATES, OS, RELEASE, SERVER_ARCH_NAME, LAST_CHECKIN, LOCKED,
- config_files_with_differences, MONITORING_STATUS.ST AS MONITORING_STATUS
- FROM rhnVirtualInstance VI, rhnServerOverview OV LEFT OUTER JOIN
- ( SELECT CP.host_id, CASE MAX(CASE PS.state
- WHEN 'OK' THEN 1
- WHEN 'PENDING' THEN 2
- WHEN 'UNKNOWN' THEN 3
- WHEN 'WARNING' THEN 4
- WHEN 'CRITICAL' THEN 5 END)
- WHEN 1 THEN 'OK'
- WHEN 2 THEN 'PENDING'
- WHEN 3 THEN 'UNKNOWN'
- WHEN 4 THEN 'WARNING'
- WHEN 5 THEN 'CRITICAL' END ST
- FROM rhn_check_probe CP, rhn_probe_state PS
- WHERE PS.probe_id = CP.probe_id
- GROUP BY CP.host_id ) MONITORING_STATUS ON OV.server_id = MONITORING_STATUS.host_id
+ config_files_with_differences
+ FROM rhnVirtualInstance VI, rhnServerOverview OV
WHERE VI.id IN (%s)
AND ( ( VI.uuid IS NULL
AND OV.server_id = VI.host_system_id)
commit c4f4499b0e7fcc2dc128b897ecc8f952e8b837f8
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Sep 18 14:45:16 2012 +0200
use system_monitoring elaborator in most_critical_systems query
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 fd715b8..65060ca 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
@@ -516,6 +516,7 @@ ORDER BY UPPER(COALESCE(X.name, '(none)')), X.id
<mode name="most_critical_systems" class="com.redhat.rhn.frontend.dto.SystemOverview">
<query name="available_to_user_with_errata" />
<elaborator name="system_overview_most_critical" />
+ <elaborator name="system_monitoring" />
</mode>
<query name="available_to_uid" params="formvar_uid">
@@ -1290,22 +1291,8 @@ select VI.host_system_id as ID, 1 as virtual_host
SELECT SERVER_ID AS ID, SECURITY_ERRATA, BUG_ERRATA, ENHANCEMENT_ERRATA, OUTDATED_PACKAGES, SERVER_NAME,
SERVER_ADMINS, GROUP_COUNT, MODIFIED, CHANNEL_LABELS, HISTORY_COUNT,
LAST_CHECKIN_DAYS_AGO, PENDING_UPDATES, OS, RELEASE, SERVER_ARCH_NAME, LAST_CHECKIN, LOCKED,
- config_files_with_differences, MONITORING_STATUS.ST AS MONITORING_STATUS
- FROM rhnServerOverview OV LEFT OUTER JOIN
- ( SELECT CP.host_id, CASE MAX(CASE PS.state
- WHEN 'OK' THEN 1
- WHEN 'PENDING' THEN 2
- WHEN 'UNKNOWN' THEN 3
- WHEN 'WARNING' THEN 4
- WHEN 'CRITICAL' THEN 5 END)
- WHEN 1 THEN 'OK'
- WHEN 2 THEN 'PENDING'
- WHEN 3 THEN 'UNKNOWN'
- WHEN 4 THEN 'WARNING'
- WHEN 5 THEN 'CRITICAL' END ST
- FROM rhn_check_probe CP, rhn_probe_state PS
- WHERE PS.probe_id = CP.probe_id
- GROUP BY CP.host_id ) MONITORING_STATUS ON OV.server_id = MONITORING_STATUS.host_id
+ config_files_with_differences
+ FROM rhnServerOverview
WHERE server_id IN (%s)
ORDER BY SECURITY_ERRATA DESC, BUG_ERRATA DESC, ENHANCEMENT_ERRATA DESC
</query>
commit 88bddba5d0d01d1114f6d9cd8acd766ab72da77e
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Sep 18 14:12:09 2012 +0200
remove SystemHealthIconDecorator and appropriate query
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 b0ca060..fd715b8 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
@@ -1393,17 +1393,6 @@ ORDER BY NAME, VI.virtual_system_id, VI.uuid DESC
<elaborator name="virtual_system_entitlements" />
</mode>
-<mode name="monitoring_status">
- <query name="monitoring_status" params="sid">
- SELECT CASE
- MAX(CASE PS.state WHEN 'OK' THEN 1 WHEN 'PENDING' THEN 2 WHEN 'UNKNOWN' THEN 3 WHEN 'WARNING' THEN 4 WHEN 'CRITICAL' THEN 5 END)
- WHEN 1 THEN 'OK' WHEN 2 THEN 'PENDING' WHEN 3 THEN 'UNKNOWN' WHEN 4 THEN 'WARNING' WHEN 5 THEN 'CRITICAL' END ST
- FROM rhn_check_probe CP, rhn_probe_state PS
- WHERE PS.probe_id = CP.probe_id
- AND CP.host_id = :sid
- </query>
-</mode>
-
<query name="system_package_data_from_set" params="user_id, package_set_label">
select * from (
SELECT DISTINCT S.id SYSTEM_ID, S.name SYSTEM_NAME, PN.name || '-' || PE.evr.as_vre_simple() NVRE
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/SystemHealthIconDecorator.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/SystemHealthIconDecorator.java
deleted file mode 100644
index a8c0f01..0000000
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/SystemHealthIconDecorator.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * 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.
- */
-package com.redhat.rhn.frontend.taglibs.list.decorators;
-
-import com.redhat.rhn.common.db.datasource.DataResult;
-import com.redhat.rhn.frontend.dto.SystemOverview;
-import com.redhat.rhn.frontend.struts.RequestContext;
-import com.redhat.rhn.frontend.taglibs.list.ListTag;
-import com.redhat.rhn.manager.system.SystemManager;
-
-import java.util.HashMap;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
-
-/**
- * ElaborationDecorator
- * @version $Rev$
- */
-public class SystemHealthIconDecorator extends BaseListDecorator {
-
-
- /**
- * {@inheritDoc}
- */
- public void setCurrentList(ListTag current) {
- super.setCurrentList(current);
- if (current != null) {
- elaborateContents();
- }
- }
-
- private void elaborateContents() {
- List<SystemOverview> systems = getCurrentList().getPageData();
-
- RequestContext context = new RequestContext(
- (HttpServletRequest)getCurrentList().getContext().getRequest());
-
- for (SystemOverview next : systems) {
- DataResult result = SystemManager.getMonitoringStatus(
- context.getLoggedInUser(), next.getId().longValue());
- if (result != null && result.size() == 1) {
- next.setMonitoringStatus((String)
- ((HashMap) result.get(0)).values().iterator().next());
- }
- }
- }
-}
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 3a73472..2689fb6 100644
--- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
@@ -2226,20 +2226,6 @@ public class SystemManager extends BaseManager {
}
/**
- * gets the monitoring status for a particular system
- * @param user the user to check for
- * @param sid the system id to check for
- * @return DataResult with the monitoring string
- */
- public static DataResult getMonitoringStatus(User user, Long sid) {
- SelectMode m = ModeFactory.getMode("System_queries", "monitoring_status");
- Map params = new HashMap();
- params.put("uid", user.getId());
- params.put("sid", sid);
- return m.execute(params);
- }
-
- /**
* Return the system names and IDs that are selected in the SSM for the given user,
* which also have been subscribed to the given channel.
*
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_listdisplay.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_listdisplay.jspf
index 43f9c3c..e18c28b 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_listdisplay.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_listdisplay.jspf
@@ -23,7 +23,6 @@
<rl:decorator name="ElaborationDecorator"/>
<c:if test = "${empty noSystemIcons}">
<rl:decorator name="SystemIconDecorator"/>
- <rl:decorator name="SystemHealthIconDecorator"/>
</c:if>
<rl:decorator name="PageSizeDecorator"/>
commit 3424f669400c2a604903be5acfaf2d21d835de4f
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Sep 17 15:51:41 2012 +0200
extract system_monitoring elaborator from system_overview
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 5be9919..b0ca060 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
@@ -37,6 +37,7 @@ select * from (
ORDER BY UPPER(COALESCE(X.name, '(none)')), X.id
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
</mode>
<mode name="find_by_name" class="com.redhat.rhn.frontend.dto.SystemOverview">
@@ -51,6 +52,7 @@ ORDER BY UPPER(COALESCE(X.name, '(none)')), X.id
and S.name = :name
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
</mode>
@@ -70,6 +72,7 @@ SELECT S.id,
ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
<elaborator name="is_virtual_guest" />
<elaborator name="is_virtual_host" />
</mode>
@@ -98,6 +101,7 @@ SELECT DISTINCT S.id,
ORDER BY UPPER(COALESCE(X.server_name, '(none)')), X.id
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
</mode>
<mode name="custom_vals">
@@ -211,6 +215,7 @@ SELECT S.id as id,
ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
</mode>
<mode name="count_systems_subscribed_to_channel">
@@ -254,6 +259,7 @@ SELECT
ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
<elaborator name="entitlements"/>
</mode>
@@ -344,6 +350,7 @@ SELECT SGM.server_id AS ID, S.name AS NAME,
ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
<elaborator name="entitlements"/>
</mode>
@@ -361,6 +368,7 @@ SELECT S.id, S.name,
ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
<elaborator name="entitlements"/>
</mode>
@@ -378,6 +386,7 @@ SELECT S.id, S.name
ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
</mode>
<mode name="systems_with_needed_package" class="com.redhat.rhn.frontend.dto.SystemOverview">
@@ -391,6 +400,7 @@ SELECT S.ID
ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
</mode>
<mode name="target_systems_for_channel" class="com.redhat.rhn.frontend.dto.SystemOverview">
@@ -409,6 +419,7 @@ SELECT ES.id, S.name, 1 as selectable
AND EXISTS (SELECT 1 FROM rhnUserServerPerms USP WHERE USP.user_id = :user_id AND USP.server_id = ES.id)
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
<elaborator name="entitlements"/>
</mode>
@@ -462,6 +473,7 @@ ORDER BY UPPER(COALESCE(X.name, '(none)')), X.id
<mode name="visible_to_user_from_sysid_list" class="com.redhat.rhn.frontend.dto.SystemSearchResult">
<query name="available_to_user_from_sysid_list" />
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
<elaborator name="entitlements"/>
<elaborator name="is_virtual_guest" />
<elaborator name="is_virtual_host" />
@@ -471,6 +483,7 @@ ORDER BY UPPER(COALESCE(X.name, '(none)')), X.id
<mode name="visible_to_user" class="com.redhat.rhn.frontend.dto.SystemOverview">
<query name="available_to_user" />
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
<elaborator name="entitlements"/>
<elaborator name="is_virtual_guest" />
<elaborator name="is_virtual_host" />
@@ -565,6 +578,7 @@ where a.user_id = :formvar_uid
ORDER BY UPPER(COALESCE(S.name, '(none)')), S.id
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
<elaborator name="entitlements" />
</mode>
@@ -619,6 +633,7 @@ SELECT SA.server_id as id,
WHERE errata_id = :eid)
</elaborator>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
<elaborator name="entitlements" />
</mode>
@@ -639,11 +654,13 @@ SELECT SA.server_id as id,
ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
</mode>
<mode name="in_set" class="com.redhat.rhn.frontend.dto.SystemOverview">
<query name="in_set" />
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
<elaborator name="entitlements" />
<elaborator name="is_virtual_guest" />
<elaborator name="is_virtual_host" />
@@ -715,6 +732,7 @@ select * from (
ORDER BY UPPER(COALESCE(X.NAME, '(none)')), X.ID
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
<elaborator name="entitlements" />
<elaborator name="is_virtual_guest" />
<elaborator name="is_virtual_host" />
@@ -734,6 +752,7 @@ SELECT S.ID, S.NAME,
ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
<elaborator name="is_virtual_guest" />
<elaborator name="is_virtual_host" />
</mode>
@@ -756,6 +775,7 @@ SELECT S.ID, S.NAME,
ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
<elaborator name="entitlements" />
<elaborator name="is_virtual_guest" />
<elaborator name="is_virtual_host" />
@@ -787,6 +807,7 @@ SELECT DISTINCT S.id, S.NAME,
<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="system_monitoring" />
<elaborator name="entitlements" />
<elaborator name="is_virtual_guest" />
<elaborator name="is_virtual_host" />
@@ -831,6 +852,7 @@ SELECT S.id, S.NAME,
ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
<elaborator name="entitlements" />
<elaborator name="is_virtual_guest" />
<elaborator name="is_virtual_host" />
@@ -852,6 +874,7 @@ SELECT S.id, S.NAME,
ORDER BY SI.checkin DESC
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
<elaborator name="entitlements" />
</mode>
@@ -877,6 +900,7 @@ SELECT S.id, S.NAME, S.info, S.created,
ORDER BY S.created DESC
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
<elaborator name="entitlements" />
<elaborator name="is_virtual_guest" />
<elaborator name="is_virtual_host" />
@@ -905,6 +929,7 @@ SELECT S.id, S.NAME, S.info, S.created,
ORDER BY S.created DESC
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
<elaborator name="entitlements" />
</mode>
@@ -920,6 +945,7 @@ SELECT PI.server_id ID, S.name,
AND S.id = PI.server_id
</query>
<elaborator name="system_overview"/>
+ <elaborator name="system_monitoring" />
<elaborator name="entitlements" />
<elaborator name="is_virtual_guest" />
<elaborator name="is_virtual_host" />
@@ -1051,6 +1077,7 @@ SELECT SP.proxy_server_id ID, S.name, (SP.position + 1) AS position, SP.hostname
ORDER BY SP.position
</query>
<elaborator name="system_overview"/>
+ <elaborator name="system_monitoring" />
</mode>
<!-- TO_CHAR(A.earliest_action, 'YYYY-MM-DD HH24:MI:SS') AS DISPLAY_DATE -->
@@ -1076,6 +1103,7 @@ ORDER BY SP.position
ORDER BY UPPER(COALESCE(S.name, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
</mode>
<mode name="systems_failed_action" class="com.redhat.rhn.frontend.dto.ActionedSystem">
@@ -1096,6 +1124,7 @@ ORDER BY UPPER(COALESCE(S.name, '(none)')), S.ID
ORDER BY UPPER(COALESCE(S.name, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
</mode>
<mode name="systems_completed_action" class="com.redhat.rhn.frontend.dto.ActionedSystem">
@@ -1116,6 +1145,7 @@ ORDER BY UPPER(COALESCE(S.name, '(none)')), S.ID
ORDER BY UPPER(COALESCE(S.name, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
</mode>
<mode name="systems_in_set_with_no_base_channel" class="com.redhat.rhn.frontend.dto.EssentialServerDto">
@@ -1212,28 +1242,30 @@ ORDER BY S.ID
SELECT /*+ RULE */ SERVER_ID AS ID, OUTDATED_PACKAGES, SERVER_NAME, security_errata, bug_errata, enhancement_errata,
SERVER_ADMINS, GROUP_COUNT, MODIFIED, CHANNEL_LABELS, CHANNEL_ID, HISTORY_COUNT,
LAST_CHECKIN_DAYS_AGO, PENDING_UPDATES, OS, RELEASE, SERVER_ARCH_NAME, LAST_CHECKIN, LOCKED,
- config_files_with_differences,
- MONITORING_STATUS.ST AS MONITORING_STATUS
- FROM rhnServerOverview OV LEFT OUTER JOIN
- ( SELECT CP.host_id, CASE MAX(CASE PS.state
- WHEN 'OK' THEN 1
- WHEN 'PENDING' THEN 2
- WHEN 'UNKNOWN' THEN 3
- WHEN 'WARNING' THEN 4
- WHEN 'CRITICAL' THEN 5 END)
- WHEN 1 THEN 'OK'
- WHEN 2 THEN 'PENDING'
- WHEN 3 THEN 'UNKNOWN'
- WHEN 4 THEN 'WARNING'
- WHEN 5 THEN 'CRITICAL' END ST
- FROM rhn_check_probe CP, rhn_probe_state PS
- WHERE PS.probe_id = CP.probe_id
- GROUP BY CP.host_id ) MONITORING_STATUS
- ON OV.server_id = MONITORING_STATUS.host_id
+ config_files_with_differences
+ FROM rhnServerOverview
WHERE server_id IN (%s)
ORDER BY UPPER(COALESCE(SERVER_NAME, '(none)')), SERVER_ID
</query>
+<query name="system_monitoring" params="">
+ SELECT CP.host_id AS id,
+ CASE MAX(CASE PS.state
+ WHEN 'OK' THEN 1
+ WHEN 'PENDING' THEN 2
+ WHEN 'UNKNOWN' THEN 3
+ WHEN 'WARNING' THEN 4
+ WHEN 'CRITICAL' THEN 5 END)
+ WHEN 1 THEN 'OK'
+ WHEN 2 THEN 'PENDING'
+ WHEN 3 THEN 'UNKNOWN'
+ WHEN 4 THEN 'WARNING'
+ WHEN 5 THEN 'CRITICAL' END MONITORING_STATUS
+ FROM rhn_check_probe CP, rhn_probe_state PS
+ WHERE PS.probe_id = CP.probe_id
+ AND CP.host_id IN (%s)
+ GROUP BY CP.host_id
+</query>
<query name="is_virtual_guest" params="">
SELECT vi.virtual_system_id as ID, 1 as virtual_guest FROM rhnVirtualInstance vi WHERE vi.virtual_system_id in (%s)
@@ -1955,6 +1987,7 @@ SELECT S.id,
ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
+ <elaborator name="system_monitoring" />
</mode>
</datasource_modes>
11 years, 7 months