java/code
by Milan Zazrivec
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 11faa2bbea36eb825fa5a65f17af77ded53a64d3
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Mar 26 15:13:24 2013 +0100
correct capitalization
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 d43d0c3..930a5ca 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
@@ -16402,7 +16402,7 @@ The Tree Path, Kickstart RPM, Base Channel, and Installer Generation should alwa
</context-group>
</trans-unit>
<trans-unit id="crashes.jsp.totalcrashcount">
- <source>total crash count</source>
+ <source>Total Crash Count</source>
<context-group name="ctx">
<context context-type="sourcefile">/systems/softwarecrashesoverview.do</context>
</context-group>
11 years, 1 month
java/code
by Milan Zazrivec
java/code/src/com/redhat/rhn/common/db/datasource/xml/Crash_queries.xml | 4 ++
java/code/src/com/redhat/rhn/frontend/dto/IdenticalCrashesDto.java | 17 ++++++++++
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 4 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/crash/CrashHandler.java | 6 +++
java/code/webapp/WEB-INF/pages/systems/softwarecrashesoverview.jsp | 6 +++
5 files changed, 35 insertions(+), 2 deletions(-)
New commits:
commit 41ec5c322dc06fbbf2c17af214ae8805967444a4
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Mar 26 15:08:23 2013 +0100
abrt: display component in crash overview
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Crash_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Crash_queries.xml
index bfe34c2..663ac1c 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Crash_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Crash_queries.xml
@@ -3,6 +3,10 @@
<mode name="list_identical_crashes_for_org" class="com.redhat.rhn.frontend.dto.IdenticalCrashesDto">
<query params="org_id, user_id">
select sc.uuid as uuid,
+ case when count(distinct sc.component) = 1
+ then min(sc.component)
+ else NULL
+ end as component,
count(distinct sc.server_id) as system_count,
sum(sc.count) as total_crash_count,
max(sc.modified) as last_crash_report
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/IdenticalCrashesDto.java b/java/code/src/com/redhat/rhn/frontend/dto/IdenticalCrashesDto.java
index 03baea3..823c414 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/IdenticalCrashesDto.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/IdenticalCrashesDto.java
@@ -25,6 +25,7 @@ public class IdenticalCrashesDto extends BaseDto {
private Long id;
private String uuid;
+ private String component;
private long totalCrashCount;
private long systemCount;
private Date lastCrashReport;
@@ -62,6 +63,22 @@ public class IdenticalCrashesDto extends BaseDto {
}
/**
+ * Returns the component.
+ * @return Returns the component.
+ */
+ public String getComponent() {
+ return component;
+ }
+
+ /**
+ * Sets the component.
+ * @param componentIn The id to set.
+ */
+ public void setComponent(String componentIn) {
+ component = componentIn;
+ }
+
+ /**
* Returns total number of crashes.
* @return total number of crashes.
*/
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 7fc3819..d43d0c3 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
@@ -16402,9 +16402,9 @@ The Tree Path, Kickstart RPM, Base Channel, and Installer Generation should alwa
</context-group>
</trans-unit>
<trans-unit id="crashes.jsp.totalcrashcount">
- <source>Total Crash Count</source>
+ <source>total crash count</source>
<context-group name="ctx">
- <context context-type="sourcefile">/systems/SoftwareCrashesOverview.do</context>
+ <context context-type="sourcefile">/systems/softwarecrashesoverview.do</context>
</context-group>
</trans-unit>
<trans-unit id="crashes.jsp.affectedsystemscount">
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/crash/CrashHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/crash/CrashHandler.java
index 28d70d5..d71fcd4 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/crash/CrashHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/crash/CrashHandler.java
@@ -413,6 +413,8 @@ public class CrashHandler extends BaseHandler {
* #array()
* #struct("crash")
* #prop_desc("string", "uuid", "Crash UUID")
+ * #prop_desc("string", "component",
+ * "Package component (set if unique and non empty)")
* #prop_desc("int", "crash_count", "Number of crashes occurred")
* #prop_des("int", "system_count", "Number of systems affected")
* #prop_desc("dateTime.iso8601", "last_report", "Last crash occurence")
@@ -426,6 +428,10 @@ public class CrashHandler extends BaseHandler {
user.getOrg())) {
HashMap crashMap = new HashMap();
crashMap.put("uuid", ic.getUuid());
+ String component = ic.getComponent();
+ if (component != null) {
+ crashMap.put("component", component);
+ }
crashMap.put("crash_count", ic.getTotalCrashCount());
crashMap.put("system_count", ic.getSystemCount());
crashMap.put("last_report", ic.getLastCrashReport());
diff --git a/java/code/webapp/WEB-INF/pages/systems/softwarecrashesoverview.jsp b/java/code/webapp/WEB-INF/pages/systems/softwarecrashesoverview.jsp
index 974d35b..a9747a8 100644
--- a/java/code/webapp/WEB-INF/pages/systems/softwarecrashesoverview.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/softwarecrashesoverview.jsp
@@ -37,6 +37,12 @@
${current.uuid}
</a>
</rl:column>
+ <rl:column headerkey="crashes.jsp.component"
+ bound="false"
+ sortattr="component"
+ sortable="true">
+ ${current.component}
+ </rl:column>
<rl:column headerkey="crashes.jsp.totalcrashcount"
bound="false"
sortattr="totalCrashCount"
11 years, 1 month
Changes to 'refs/tags/spacewalk-web-1.10.13-1'
by Jan Pazdziora
Tag 'spacewalk-web-1.10.13-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2013-03-26 08:45 +0000
Tagging package [spacewalk-web] version [1.10.13-1] in directory [web/].
Changes since spacewalk-backend-1.10.13-1:
Jan Pazdziora (2):
Mode system_available_packages not used in web/, removing.
Automatic commit of package [spacewalk-web] release [1.10.13-1].
---
rel-eng/packages/spacewalk-web | 2 -
web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml | 24 --------------
web/modules/sniglets/Sniglets/ListView/PackageList.pm | 4 --
web/spacewalk-web.spec | 5 ++
4 files changed, 5 insertions(+), 30 deletions(-)
---
11 years, 1 month
Changes to 'refs/tags/spacewalk-backend-1.10.13-1'
by Jan Pazdziora
Tag 'spacewalk-backend-1.10.13-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2013-03-26 08:45 +0000
Tagging package [spacewalk-backend] version [1.10.13-1] in directory [backend/].
Changes since spacewalk-java-1.10.30-1:
Jan Pazdziora (2):
Replacing DECODE with more standard CASE.
Automatic commit of package [spacewalk-backend] release [1.10.13-1].
---
backend/server/action/rhnsd.py | 4 ++--
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
---
11 years, 1 month
4 commits - backend/server backend/spacewalk-backend.spec rel-eng/packages web/modules web/spacewalk-web.spec
by Jan Pazdziora
backend/server/action/rhnsd.py | 4 +-
backend/spacewalk-backend.spec | 5 ++
rel-eng/packages/spacewalk-backend | 2 -
rel-eng/packages/spacewalk-web | 2 -
web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml | 24 --------------
web/modules/sniglets/Sniglets/ListView/PackageList.pm | 4 --
web/spacewalk-web.spec | 5 ++
7 files changed, 12 insertions(+), 34 deletions(-)
New commits:
commit a60a69876a7580a1ccf0181b50ec716b53330e7f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Mar 26 09:45:23 2013 +0100
Automatic commit of package [spacewalk-web] release [1.10.13-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 38a011e..21465dc 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.10.12-1 web/
+1.10.13-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index f0a9f92..01addd8 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -4,7 +4,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 1.10.12
+Version: 1.10.13
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk/
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -262,6 +262,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Tue Mar 26 2013 Jan Pazdziora 1.10.13-1
+- Mode system_available_packages not used in web/, removing.
+
* Tue Mar 26 2013 Jan Pazdziora 1.10.12-1
- Use to_timestamp instead of to_date which should bring the second precision
to PostgreSQL.
commit 3b2012ec9c1a6c0deb11ee80b3c503bfe7e64728
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Mar 26 09:41:15 2013 +0100
Mode system_available_packages not used in web/, removing.
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml b/web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml
index 062c346..6b52186 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml
@@ -1302,30 +1302,6 @@ ORDER BY UPPER(PACKAGE_NVREA)
<elaborator name="package_channels" />
</mode>
-<mode name="system_available_packages">
- <query params="sid">
-SELECT pn.name AS NAME,
- pn.name || '-' || full_list.evr.version || '-' || full_list.evr.release || DECODE(full_list.evr.epoch, NULL, '', ':' || full_list.evr.epoch) AS NVRE,
- pn.id || '|' || lookup_evr(full_list.evr.epoch, full_list.evr.version, full_list.evr.release) AS ID
- FROM (
- SELECT p.name_id name_id, max(pe.evr) evr
- FROM rhnPackageEVR PE, rhnPackage P,
- rhnChannelPackage CP, rhnServerChannel SC
- WHERE sc.server_id = :sid
- AND sc.channel_id = cp.channel_id
- AND cp.package_id = p.id
- AND p.evr_id = pe.id
- GROUP BY p.name_id
- ) full_list,
- rhnPackageName pn
- WHERE full_list.name_id = pn.id
- AND full_list.name_id NOT IN (SELECT SP.name_id
- FROM rhnServerPackage SP
- WHERE SP.server_id = :sid)
-ORDER BY UPPER(pn.name)
- </query>
-</mode>
-
<mode name="ssm_packages_for_upgrade">
<query params="user_id">
SELECT P.id AS ID,
diff --git a/web/modules/sniglets/Sniglets/ListView/PackageList.pm b/web/modules/sniglets/Sniglets/ListView/PackageList.pm
index b0aac53..9387d06 100644
--- a/web/modules/sniglets/Sniglets/ListView/PackageList.pm
+++ b/web/modules/sniglets/Sniglets/ListView/PackageList.pm
@@ -177,10 +177,6 @@ sub _register_modes {
-datasource => RHN::DataSource::Package->new,
-action_callback => \&default_callback);
- Sniglets::ListView::List->add_mode(-mode => "system_available_packages",
- -datasource => RHN::DataSource::Package->new,
- -action_callback => \&default_callback);
-
Sniglets::ListView::List->add_mode(-mode => "system_profile_comparison",
-datasource => RHN::DataSource::Package->new,
-provider => \&profile_comparison_provider,
commit 8cf1b2b26574d0bde83bde65316689fc836e18a1
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Mar 26 09:45:08 2013 +0100
Automatic commit of package [spacewalk-backend] release [1.10.13-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index e741033..0d43ba7 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -12,7 +12,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 1.10.12
+Version: 1.10.13
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -638,6 +638,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Tue Mar 26 2013 Jan Pazdziora 1.10.13-1
+- Replacing DECODE with more standard CASE.
+
* Tue Mar 26 2013 Jan Pazdziora 1.10.12-1
- Use to_timestamp instead of to_date which should bring the second precision
to PostgreSQL.
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 022443b..e6b49c9 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.10.12-1 backend/
+1.10.13-1 backend/
commit dd11f6cac7a4be1c108a46299d765840f1481bcd
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Mar 26 09:37:11 2013 +0100
Replacing DECODE with more standard CASE.
diff --git a/backend/server/action/rhnsd.py b/backend/server/action/rhnsd.py
index eacb698..61f0fd0 100644
--- a/backend/server/action/rhnsd.py
+++ b/backend/server/action/rhnsd.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008--2011 Red Hat, Inc.
+# Copyright (c) 2008--2013 Red Hat, Inc.
#
# This software is licensed to you under the GNU General Public License,
# version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -24,7 +24,7 @@ from spacewalk.common.rhnException import rhnException
__rhnexport__ = ['configure']
_query_lookup_interval = rhnSQL.Statement("""
- select interval, decode(restart, 'Y', 1, 'N', 0) restart
+ select interval, case when restart = 'Y' then 1 else 0 end as restart
from rhnActionDaemonConfig
where action_id = :action_id
""")
11 years, 1 month
Changes to 'refs/tags/spacewalk-java-1.10.30-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.10.30-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2013-03-26 08:10 +0000
Tagging package [spacewalk-java] version [1.10.30-1] in directory [java/].
Changes since spacewalk-web-1.10.12-1:
Jan Pazdziora (2):
Fixing checktyle.
Automatic commit of package [spacewalk-java] release [1.10.30-1].
---
java/code/src/com/redhat/rhn/domain/server/CPU.java | 2 +-
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
---
11 years, 1 month
2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora
java/code/src/com/redhat/rhn/domain/server/CPU.java | 2 +-
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 7ffbabf39a215eb31969022292b4be83952410c5
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Mar 26 09:10:02 2013 +0100
Automatic commit of package [spacewalk-java] release [1.10.30-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index bb10d0e..ca901d0 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.10.29
+Version: 1.10.30
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -678,6 +678,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Mar 26 2013 Jan Pazdziora 1.10.30-1
+- Fixing checktyle.
+
* Tue Mar 26 2013 Jan Pazdziora 1.10.29-1
- Use to_timestamp instead of to_date which should bring the second precision
to PostgreSQL.
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 37e4909..3ccab31 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.10.29-1 java/
+1.10.30-1 java/
commit e4222e094ad107786307c7ed3b7d404ff14b5302
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Mar 26 09:09:44 2013 +0100
Fixing checktyle.
Addressing
/builddir/build/BUILD/spacewalk-java-1.10.28/./code/src/com/redhat/rhn/domain/server/CPU.java:235:8: Unused @param tag for 'nrSocketIn'.
/builddir/build/BUILD/spacewalk-java-1.10.28/./code/src/com/redhat/rhn/domain/server/CPU.java:237:34: Expected @param tag for 'nrsocketIn'.
diff --git a/java/code/src/com/redhat/rhn/domain/server/CPU.java b/java/code/src/com/redhat/rhn/domain/server/CPU.java
index 6fc5cfa..5db2739 100644
--- a/java/code/src/com/redhat/rhn/domain/server/CPU.java
+++ b/java/code/src/com/redhat/rhn/domain/server/CPU.java
@@ -232,7 +232,7 @@ public class CPU extends BaseDomainHelper {
}
/**
- * @param nrSocketIn The nrSocket to set.
+ * @param nrsocketIn The nrsocket to set.
*/
public void setNrsocket(Long nrsocketIn) {
this.nrsocket = nrsocketIn;
11 years, 1 month
Changes to 'refs/tags/spacewalk-web-1.10.12-1'
by Jan Pazdziora
Tag 'spacewalk-web-1.10.12-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2013-03-26 08:03 +0000
Tagging package [spacewalk-web] version [1.10.12-1] in directory [web/].
Changes since spacewalk-search-1.10.3-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-web] release [1.10.12-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
---
11 years, 1 month
Changes to 'refs/tags/spacewalk-search-1.10.3-1'
by Jan Pazdziora
Tag 'spacewalk-search-1.10.3-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2013-03-26 08:03 +0000
Tagging package [spacewalk-search] version [1.10.3-1] in directory [search-server/spacewalk-search/].
Changes since spacewalk-schema-1.10.16-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-search] release [1.10.3-1].
---
rel-eng/packages/spacewalk-search | 2 +-
search-server/spacewalk-search/spacewalk-search.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
---
11 years, 1 month
Changes to 'refs/tags/spacewalk-schema-1.10.16-1'
by Jan Pazdziora
Tag 'spacewalk-schema-1.10.16-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2013-03-26 08:03 +0000
Tagging package [spacewalk-schema] version [1.10.16-1] in directory [schema/spacewalk/].
Changes since spacewalk-java-1.10.29-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-schema] release [1.10.16-1].
---
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
---
11 years, 1 month