client/rhel
by Milan Zazrivec
client/rhel/rhn-client-tools/src/up2date_client/hardware.py | 2 --
1 file changed, 2 deletions(-)
New commits:
commit 0d3bcbc472a546aa844f88aa4195e5ba0365c3b5
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Nov 11 12:56:37 2009 +0100
536789 - remove forgotten lines
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py b/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
index 3a21070..b8aee9b 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
@@ -702,8 +702,6 @@ def read_network():
if netdict['hostname'] == 'localhost.localdomain' or \
netdict['ipaddr'] == "127.0.0.1":
hostname, ipaddr = findHostByRoute()
- netdict['hostname'] = hostname
- netdict['ipaddr'] = ipaddr
if netdict['hostname'] == 'localhost.localdomain':
netdict['hostname'] = hostname
14 years, 5 months
client/rhel
by Milan Zazrivec
client/rhel/rhn-client-tools/src/up2date_client/hardware.py | 5 +++++
1 file changed, 5 insertions(+)
New commits:
commit 8936b5ec75fef6b184942f8c829a7c3f4860ae55
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Nov 11 12:51:47 2009 +0100
536789 - set only necessary network info
This helps to register clients which have set hostname via DHCP but
have no DNS record with a system name set to hostname rather than
'unknown'.
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py b/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
index d9f4269..3a21070 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
@@ -705,6 +705,11 @@ def read_network():
netdict['hostname'] = hostname
netdict['ipaddr'] = ipaddr
+ if netdict['hostname'] == 'localhost.localdomain':
+ netdict['hostname'] = hostname
+ if netdict['ipaddr'] == "127.0.0.1":
+ netdict['ipaddr'] = ipaddr
+
return netdict
def read_network_interfaces():
14 years, 5 months
java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 4fe1f5b41507550c214a8945111e381163109de4
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Tue Nov 10 12:10:30 2009 -0500
unit test fix
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java
index 3b2ccf4..6c44cea 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java
@@ -464,6 +464,8 @@ public class KickstartDataTest extends BaseTestCaseWithUser {
k.setKernelParams(KERNEL_PARAMS);
+ k = (KickstartData) TestUtils.saveAndReload(k);
+
k.addKsPackage(new KickstartPackage(k, pn));
k.addKsPackage(new KickstartPackage(k, pn2));
14 years, 5 months
Branch 'sha256-support3' - java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/domain/common/Checksum.java | 7 +++----
java/code/src/com/redhat/rhn/domain/common/CommonFactory.java | 1 -
java/code/src/com/redhat/rhn/domain/rhnpackage/Package.java | 4 ++--
java/code/src/com/redhat/rhn/domain/rhnpackage/PackageSource.java | 4 ++--
java/code/src/com/redhat/rhn/frontend/dto/PackageDto.java | 2 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackageHelper.java | 3 ++-
java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackagesHandler.java | 3 ++-
7 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 9adf8731e0fd5e64bacb93a8685d0617f68d9476
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Nov 10 17:24:37 2009 +0100
making java changes compilable and checkstyle compliant
diff --git a/java/code/src/com/redhat/rhn/domain/common/Checksum.java b/java/code/src/com/redhat/rhn/domain/common/Checksum.java
index b17ff61..bfb9ed4 100644
--- a/java/code/src/com/redhat/rhn/domain/common/Checksum.java
+++ b/java/code/src/com/redhat/rhn/domain/common/Checksum.java
@@ -15,7 +15,6 @@
package com.redhat.rhn.domain.common;
import com.redhat.rhn.domain.BaseDomainHelper;
-import com.redhat.rhn.domain.common.ChecksumType;
import org.apache.commons.lang.builder.ToStringBuilder;
@@ -61,7 +60,7 @@ public class Checksum extends BaseDomainHelper {
/**
* @return Returns the type of checksum.
*/
- public String getChecksumType() {
+ public ChecksumType getChecksumType() {
return checksumType;
}
@@ -81,9 +80,9 @@ public class Checksum extends BaseDomainHelper {
return false;
}
- Checksum checksum = (Checksum) o;
+ Checksum other = (Checksum) o;
- if (id != null ? !id.equals(checksum.id) : checksum.id != null) {
+ if (id != null ? !id.equals(other.id) : other.id != null) {
return false;
}
diff --git a/java/code/src/com/redhat/rhn/domain/common/CommonFactory.java b/java/code/src/com/redhat/rhn/domain/common/CommonFactory.java
index ff3e2a4..3a32587 100644
--- a/java/code/src/com/redhat/rhn/domain/common/CommonFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/common/CommonFactory.java
@@ -16,7 +16,6 @@ package com.redhat.rhn.domain.common;
import com.redhat.rhn.common.conf.Config;
import com.redhat.rhn.common.hibernate.HibernateFactory;
-import com.redhat.rhn.domain.common.Checksum;
import com.redhat.rhn.domain.org.Org;
import org.apache.commons.codec.binary.Hex;
diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/Package.java b/java/code/src/com/redhat/rhn/domain/rhnpackage/Package.java
index 3ac9212..6852052 100644
--- a/java/code/src/com/redhat/rhn/domain/rhnpackage/Package.java
+++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/Package.java
@@ -257,14 +257,14 @@ public class Package extends BaseDomainHelper {
/**
* @return Returns the checksum.
*/
- public String getChecksum() {
+ public Checksum getChecksum() {
return checksum;
}
/**
* @param checksumIn The checksum to set.
*/
- public void setChecksum(String checksumIn) {
+ public void setChecksum(Checksum checksumIn) {
this.checksum = checksumIn;
}
diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageSource.java b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageSource.java
index 967b15b..0138972 100644
--- a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageSource.java
+++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageSource.java
@@ -49,7 +49,7 @@ public class PackageSource extends BaseDomainHelper {
/**
* @return Returns the sig checksum.
*/
- public String getSigchecksum() {
+ public Checksum getSigchecksum() {
return sigchecksum;
}
@@ -147,7 +147,7 @@ public class PackageSource extends BaseDomainHelper {
/**
* @return Returns the checksum.
*/
- public String getChecksum() {
+ public Checksum getChecksum() {
return checksum;
}
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/PackageDto.java b/java/code/src/com/redhat/rhn/frontend/dto/PackageDto.java
index e95b2f3..0976365 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/PackageDto.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/PackageDto.java
@@ -31,7 +31,7 @@ public class PackageDto extends BaseDto {
private String epoch;
private String archLabel;
private String checksum;
- private String checksumType
+ private String checksumType;
private Long cid;
private String channelName;
private String summary;
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackageHelper.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackageHelper.java
index 2bfe4d4..c09dfcd 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackageHelper.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackageHelper.java
@@ -95,7 +95,8 @@ public class PackageHelper {
addEntry(pkgMap, "checksum",
StringUtils.defaultString(pkg.getChecksum().getChecksum()));
addEntry(pkgMap, "checksum_type",
- StringUtils.defaultString(pkg.getChecksum().getChecksumType().getLabel()));
+ StringUtils.defaultString(
+ pkg.getChecksum().getChecksumType().getLabel()));
addEntry(pkgMap, "vendor",
StringUtils.defaultString(pkg.getVendor()));
addEntry(pkgMap, "summary",
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackagesHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackagesHandler.java
index 61a0bee..e4b7c05 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackagesHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackagesHandler.java
@@ -218,7 +218,8 @@ public class PackagesHandler extends BaseHandler {
row.put("size", file.get("file_size"));
row.put("linkto", StringUtils.defaultString((String) file.get("linkto")));
row.put("checksum", StringUtils.defaultString((String) file.get("checksum")));
- row.put("checksum_type", StringUtils.defaultString((String) file.get("checksumtype")));
+ row.put("checksum_type", StringUtils.defaultString(
+ (String) file.get("checksumtype")));
// Determine the file_type
if (file.get("checksum") != null) {
14 years, 5 months
Branch 'sha256-support3' - 5 commits - java/code
by Miroslav Suchý
java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml | 24 +-
java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml | 9
java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml | 14 -
java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml | 8
java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml | 11 -
java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml | 32 --
java/code/src/com/redhat/rhn/domain/common/Checksum.hbm.xml | 27 ++
java/code/src/com/redhat/rhn/domain/common/Checksum.java | 107 ++++++++++
java/code/src/com/redhat/rhn/domain/common/ChecksumType.java | 1
java/code/src/com/redhat/rhn/domain/common/CommonFactory.java | 10
java/code/src/com/redhat/rhn/domain/errata/impl/PublishedErrataFile.hbm.xml | 3
java/code/src/com/redhat/rhn/domain/errata/impl/UnpublishedErrataFile.hbm.xml | 3
java/code/src/com/redhat/rhn/domain/rhnpackage/Package.java | 15 -
java/code/src/com/redhat/rhn/domain/rhnpackage/PackageSource.hbm.xml | 4
java/code/src/com/redhat/rhn/domain/rhnpackage/PackageSource.java | 29 +-
java/code/src/com/redhat/rhn/domain/rhnpackage/Package_satellite.hbm.xml | 5
java/code/src/com/redhat/rhn/frontend/dto/ErrataPackageFile.java | 34 ++-
java/code/src/com/redhat/rhn/frontend/dto/PackageDto.java | 31 ++
java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java | 2
java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackageHelper.java | 6
java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackagesHandler.java | 11 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/test/PackageHelperTest.java | 3
22 files changed, 278 insertions(+), 111 deletions(-)
New commits:
commit 8a891534513da68e62d340a8be6b2732f98070e9
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Nov 10 14:47:13 2009 +0100
allow Checksum to be created and saved
diff --git a/java/code/src/com/redhat/rhn/domain/common/Checksum.hbm.xml b/java/code/src/com/redhat/rhn/domain/common/Checksum.hbm.xml
index 17cbb08..3ca4417 100644
--- a/java/code/src/com/redhat/rhn/domain/common/Checksum.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/common/Checksum.hbm.xml
@@ -5,7 +5,6 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<hibernate-mapping>
<class name="com.redhat.rhn.domain.common.Checksum"
table="rhnChecksum" mutable="false">
- <cache usage="read-only"/>
<id name="id" type="long" column="id">
<meta attribute="scope-set">protected</meta>
<generator class="assigned" />
diff --git a/java/code/src/com/redhat/rhn/domain/common/CommonFactory.java b/java/code/src/com/redhat/rhn/domain/common/CommonFactory.java
index 959e7fd..ff3e2a4 100644
--- a/java/code/src/com/redhat/rhn/domain/common/CommonFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/common/CommonFactory.java
@@ -16,6 +16,7 @@ package com.redhat.rhn.domain.common;
import com.redhat.rhn.common.conf.Config;
import com.redhat.rhn.common.hibernate.HibernateFactory;
+import com.redhat.rhn.domain.common.Checksum;
import com.redhat.rhn.domain.org.Org;
import org.apache.commons.codec.binary.Hex;
@@ -56,6 +57,15 @@ public class CommonFactory extends HibernateFactory {
}
/**
+ * Save a Checksum to the DB.
+ *
+ * @param checksumIn Checksum to save
+ */
+ public static void saveChecksum(Checksum checksumIn) {
+ singleton.saveObject(checksumIn);
+ }
+
+ /**
* Save a FileList to the DB.
*
* @param fIn FileList to save
commit 3e416d31d36c86876fcbfef9bddc78dbd47e7332
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Nov 10 13:44:41 2009 +0100
code clenup - query package_files is defined in Package_queries.xml and code use query from that file
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml
index 6661e89..a103629 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml
@@ -1,19 +1,5 @@
<datasource_modes>
-<mode name="package_files">
- <query params="pid">
-SELECT C.name,
- F.file_size,
- F.md5, F.file_mode,
- F.linkto,
- TO_CHAR(F.mtime, 'YYYY-MM-DD HH24:MI:SS') AS MTIME
- FROM rhnPackageFile F, rhnPackageCapability C
- WHERE F.package_id = :pid
- AND F.capability_id = C.id
-ORDER BY UPPER(C.name)
- </query>
-</mode>
-
<mode name="kickstarts_for_org" class="com.redhat.rhn.frontend.dto.kickstart.KickstartDto">
<query params="org_id">
SELECT KS.id, KS.org_id, KS.label, KS.is_org_default,
commit 3b29777cbac08312e9acba4ba8d905e82df93b12
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Nov 10 13:43:07 2009 +0100
code cleanup - query selected_configfiles is not used anywhere in code
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml
index e964f2f..d2edaad 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml
@@ -644,38 +644,6 @@ SELECT S.id, S.name, count(DISTINCT CF.config_file_name_id) AS config_file_coun
</query>
</mode>
-<mode name="selected_configfiles">
- <query params="set_label, user_id">
-SELECT CR.id,
- CCon.md5sum,
- CFN.path,
- CR.revision,
- NVL2((SELECT 1 FROM rhnConfigFile CFt WHERE CFT.latest_config_revision_id = CR.id), 'Y', 'N') LATEST,
- TO_CHAR(CCon.created, 'YYYY-MM-DD HH24:MI:SS') AS CREATED,
- CASE CCT.label WHEN 'local_override' THEN '(system override)' ELSE CC.name END AS CONFIG_CHANNEL_NAME,
- CC.label AS CONFIG_CHANNEL_LABEL,
- CC.id AS CONFIG_CHANNEL_ID
- FROM rhnConfigChannelType CCT,
- rhnConfigChannel CC,
- rhnConfigFileName CFN,
- rhnConfigFile CF,
- rhnConfigContent CCon,
- rhnConfigRevision CR,
- rhnSet S
- WHERE S.user_id = :user_id
- AND S.label = :set_label
- AND S.element = CR.id
- AND CR.config_file_id = CF.id
- AND CF.config_channel_id = CC.id
- AND CC.confchan_type_id = CCT.id
- AND CCon.id = CR.config_content_id
- AND CCT.label IN ('normal', 'local_override')
- AND CFN.id = CF.config_file_name_id
- AND rhn_config_channel.get_user_chan_access(CC.id, :user_id) = 1
-ORDER BY CFN.path
- </query>
-</mode>
-
<mode name="global_configfiles_for_user" class="com.redhat.rhn.frontend.dto.ConfigFileDto">
<query params="org_id, user_id">
SELECT CF.id, CFN.path
commit e45c9e5b860e4d8a20c3da3110aa45433030f7e8
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Nov 10 13:34:10 2009 +0100
replace md5sum with generic checksum in Package and Errata classes
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
index a70d6f0..5806da0 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
@@ -206,7 +206,7 @@ ORDER BY MIN(ordering)
<query params="channel_label, download_type, org_id" >
SELECT RD.name AS DOWNLOAD_NAME,
RF.path AS DOWNLOAD_PATH,
- RF.md5sum AS DOWNLOAD_CHECKSUM,
+ CS.checksum AS DOWNLOAD_CHECKSUM,
RF.file_size AS DOWNLOAD_SIZE,
RF.id AS FILE_ID,
RF.id AS ID, -- for datasource, needs ID for elaborator
@@ -216,7 +216,8 @@ SELECT RD.name AS DOWNLOAD_NAME,
rhnDownloadType DT,
rhnAvailableChannels AC,
rhnChannelDownloads CD,
- rhnChannel C
+ rhnChannel C,
+ rhnChecksum CS
WHERE AC.org_id = :org_id
AND RD.id = CD.downloads_id
AND CD.channel_id = C.id
@@ -225,6 +226,7 @@ SELECT RD.name AS DOWNLOAD_NAME,
AND DT.id = RD.download_type
AND DT.label = :download_type
AND RF.id = RD.file_id
+ AND RF.checksum_id = CS.id
ORDER BY RD.ordering
</query>
<elaborator multiple="t">
@@ -263,17 +265,18 @@ ORDER BY MIN(ordering)
SELECT DISTINCT RF.id AS ID,
RD.name AS DOWNLOAD_NAME,
RF.path AS DOWNLOAD_PATH,
- RF.md5sum AS DOWNLOAD_CHECKSUM,
+ CS.checksum AS DOWNLOAD_CHECKSUM,
RF.file_size AS DOWNLOAD_SIZE,
- RF.id AS FILE_ID,
+ RF.id AS FILE_ID,
RD.category AS CATEGORY,
- RD.ordering AS ORDERING
+ RD.ordering AS ORDERING
FROM rhnFile RF,
rhnDownloads RD,
rhnDownloadType DT,
rhnChannelDownloads CD,
- rhnAvailableChannels AC,
- rhnChannel C
+ rhnAvailableChannels AC,
+ rhnChannel C,
+ rhnChecksum CS
WHERE AC.org_id = :org_id
AND C.id = AC.channel_id
AND C.label = :channel_label
@@ -282,6 +285,7 @@ SELECT DISTINCT RF.id AS ID,
AND DT.id = RD.download_type
AND DT.label = :download_type
AND RF.id = RD.file_id
+ AND RF.checksum_id = CS.id
ORDER BY RD.ordering
</query>
<elaborator multiple="t">
@@ -1143,7 +1147,7 @@ GROUP BY C.id, C.name
<mode name="channel_errata_packages" class="com.redhat.rhn.frontend.dto.PackageDto">
<query params="eid, cid">
- SELECT P.id, P.md5sum,
+ SELECT P.id, CS.checksum, CST.label checksumtype,
PN.name || '-' || PE.version
|| '-' || PE.release || (CASE WHEN PE.epoch IS NULL THEN '' ELSE ':' || PE.epoch END)
|| '-' || PA.label name
@@ -1152,7 +1156,9 @@ GROUP BY C.id, C.name
rhnErrataPackage EP on EP.package_id = CP.package_id inner join
rhnPackageName PN on P.name_id = PN.id inner join
rhnPackageEvr PE on P.evr_id = PE.id inner join
- rhnPackageArch PA on P.package_arch_id = PA.id
+ rhnPackageArch PA on P.package_arch_id = PA.id inner join
+ rhnChecksum CS on P.checksum_id = CS.id inner join
+ rhnChecksumType CST on CS.checksum_type_id = CST.id
where CP.channel_id = :cid
and EP.errata_id = :eid
ORDER by name
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml
index 2c7696f..45c248f 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml
@@ -1102,18 +1102,23 @@ ORDER BY UPPER(EK.keyword)
<mode name="errata_packages" class="com.redhat.rhn.frontend.dto.ErrataPackageFile">
<query params="eid, org_id">
SELECT DISTINCT EFP.package_id,
- EF.md5sum,
+ CS.checksum,
+ CST.label AS CHECKSUMTYPE,
EF.filename AS FILENAME,
C.name AS CHANNEL_NAME
FROM rhnChannel C,
rhnErrataFilePackage EFP,
rhnErrataFileChannel EFC,
- rhnErrataFile EF
+ rhnErrataFile EF,
+ rhnChecksum CS,
+ rhnChecksumType CST
WHERE EF.errata_id = :eid
AND EF.id = EFC.errata_file_id (+)
AND EF.id = EFP.errata_file_id (+)
AND EFC.channel_id IN (SELECT AC.channel_id FROM rhnAvailableChannels AC WHERE AC.org_id = :org_id)
AND EFC.channel_id = C.id
+ AND EF.checksum_id = CS.id
+ AND CS.checksum_type_id = CST.id
ORDER BY C.name, EF.filename DESC
</query>
</mode>
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
index 2820e0b..7b68962 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
@@ -86,13 +86,17 @@ ORDER BY UPPER(C.name), C.version
<query params="pid">
SELECT C.name,
F.file_size,
- F.md5,
+ CS.checksum,
+ CST.label checksumtype,
F.file_mode,
F.linkto,
TO_CHAR(F.mtime, 'YYYY-MM-DD HH24:MI:SS') AS MTIME
- FROM rhnPackageFile F, rhnPackageCapability C
+ FROM rhnPackageFile F, rhnPackageCapability C,
+ rhnChecksum CS, rhnChecksumType CST
WHERE F.package_id = :pid
AND F.capability_id = C.id
+ AND F.checksum_id = CS.id
+ AND CS.checksum_type_id = CST.id
ORDER BY UPPER(C.name)
</query>
</mode>
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
index a293d7b..cffddc0 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
@@ -555,9 +555,10 @@ FROM
SELECT /*+ ORDERED */ p.id, pn.name as name, pevr.epoch as epoch,
pevr.version as version, pevr.release as release,
p.summary, p.description, pa.label as arch_label,
- p.md5sum, p.build_time, p.path, p.package_size, p.payload_size,
+ p.build_time, p.path, p.package_size, p.payload_size,
p.copyright, p.vendor, p.build_host, p.header_start, p.header_end,
- srpm.name as source_rpm, pg.name as package_group_name
+ srpm.name as source_rpm, pg.name as package_group_name,
+ cs.checksum, cst.label as checksumtype
FROM
rhnChannelPackage cp,
rhnPackage p
@@ -565,13 +566,17 @@ FROM
LEFT OUTER JOIN rhnSourceRpm srpm ON p.source_rpm_id = srpm.id,
rhnPackageName pn,
rhnPackageEvr pevr,
- rhnPackageArch pa
+ rhnPackageArch pa,
+ rhnChecksum cs,
+ rhnChecksumType cst
WHERE
cp.package_id = p.id
AND p.name_id = pn.id
AND p.evr_id = pevr.id
AND p.package_arch_id = pa.id
AND cp.channel_id = :channel_id
+ AND p.checksum_id = cs.id
+ AND cs.checksum_type_id = cst.id
ORDER by 1
</query>
</mode>
diff --git a/java/code/src/com/redhat/rhn/domain/common/ChecksumType.java b/java/code/src/com/redhat/rhn/domain/common/ChecksumType.java
index 3e41435..af74027 100644
--- a/java/code/src/com/redhat/rhn/domain/common/ChecksumType.java
+++ b/java/code/src/com/redhat/rhn/domain/common/ChecksumType.java
@@ -99,6 +99,7 @@ public class ChecksumType extends BaseDomainHelper {
builder.append("id", id);
builder.append("label", label);
+ builder.append("description", description);
return builder.toString();
}
diff --git a/java/code/src/com/redhat/rhn/domain/errata/impl/PublishedErrataFile.hbm.xml b/java/code/src/com/redhat/rhn/domain/errata/impl/PublishedErrataFile.hbm.xml
index 1a19b74..d2e7db5 100644
--- a/java/code/src/com/redhat/rhn/domain/errata/impl/PublishedErrataFile.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/errata/impl/PublishedErrataFile.hbm.xml
@@ -10,7 +10,8 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<param name="sequence">RHN_ERRATAFILE_ID_SEQ</param>
</generator>
</id>
- <property name="checksum" type="string" length="64" column="md5sum" />
+ <many-to-one name="checksum" class="com.redhat.rhn.domain.common.Checksum"
+ column="checksum_id" />
<property name="fileName" type="string" length="1024" />
<property name="created" column="created" type="timestamp"
insert="false" update="false"/>
diff --git a/java/code/src/com/redhat/rhn/domain/errata/impl/UnpublishedErrataFile.hbm.xml b/java/code/src/com/redhat/rhn/domain/errata/impl/UnpublishedErrataFile.hbm.xml
index 881eea4..c9f9663 100644
--- a/java/code/src/com/redhat/rhn/domain/errata/impl/UnpublishedErrataFile.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/errata/impl/UnpublishedErrataFile.hbm.xml
@@ -10,7 +10,8 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<param name="sequence">RHN_ERRATAFILE_ID_SEQ</param>
</generator>
</id>
- <property name="checksum" type="string" length="64" column="md5sum" />
+ <many-to-one name="checksum" class="com.redhat.rhn.domain.common.Checksum"
+ column="checksum_id" />
<property name="fileName" type="string" length="1024" />
<property name="created" column="created" type="timestamp"
insert="false" update="false"/>
diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/Package.java b/java/code/src/com/redhat/rhn/domain/rhnpackage/Package.java
index feb20bd..3ac9212 100644
--- a/java/code/src/com/redhat/rhn/domain/rhnpackage/Package.java
+++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/Package.java
@@ -26,6 +26,7 @@ import org.apache.commons.lang.builder.ToStringBuilder;
import com.redhat.rhn.common.util.StringUtil;
import com.redhat.rhn.domain.BaseDomainHelper;
import com.redhat.rhn.domain.channel.Channel;
+import com.redhat.rhn.domain.common.Checksum;
import com.redhat.rhn.domain.errata.impl.PublishedErrata;
import com.redhat.rhn.domain.errata.impl.UnpublishedErrata;
import com.redhat.rhn.domain.org.Org;
@@ -45,7 +46,7 @@ public class Package extends BaseDomainHelper {
private Long payloadSize;
private String buildHost;
private Date buildTime;
- private String md5sum;
+ private Checksum checksum;
private String vendor;
private String payloadFormat;
private Long compat;
@@ -254,17 +255,17 @@ public class Package extends BaseDomainHelper {
}
/**
- * @return Returns the md5sum.
+ * @return Returns the checksum.
*/
- public String getMd5sum() {
- return md5sum;
+ public String getChecksum() {
+ return checksum;
}
/**
- * @param m The md5sum to set.
+ * @param checksumIn The checksum to set.
*/
- public void setMd5sum(String m) {
- this.md5sum = m;
+ public void setChecksum(String checksumIn) {
+ this.checksum = checksumIn;
}
/**
diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageSource.hbm.xml b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageSource.hbm.xml
index 883ecbd..af87333 100644
--- a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageSource.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageSource.hbm.xml
@@ -18,7 +18,6 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<property name="payloadSize" type="long" column="payload_size"/>
<property name="buildHost" type="string" column="build_host"/>
<property name="buildTime" type="date" column="build_time"/>
- <property name="md5sum" type="string" column="md5sum"/>
<property name="sigmd5" type="string" column="sigmd5"/>
<property name="vendor" type="string" column="vendor"/>
<property name="path" type="string" column="path"/>
@@ -29,7 +28,8 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<property name="modified" column="modified" type="timestamp"
insert="false" update="false"/>
-
+ <many-to-one name="checksum" class="com.redhat.rhn.domain.common.Checksum"
+ column="checksum_id" />
<many-to-one name="org"
class="com.redhat.rhn.domain.org.OrgImpl"
column="org_id"
diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageSource.java b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageSource.java
index 14003ee..967b15b 100644
--- a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageSource.java
+++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageSource.java
@@ -15,6 +15,7 @@
package com.redhat.rhn.domain.rhnpackage;
import com.redhat.rhn.domain.BaseDomainHelper;
+import com.redhat.rhn.domain.common.Checksum;
import com.redhat.rhn.domain.org.Org;
import com.redhat.rhn.domain.rpm.SourceRpm;
@@ -34,8 +35,8 @@ public class PackageSource extends BaseDomainHelper {
private Long payloadSize;
private String buildHost;
private Date buildTime;
- private String md5sum;
- private String sigmd5;
+ private Checksum checksum;
+ private Checksum sigchecksum;
private String vendor;
private String path;
private String cookie;
@@ -46,17 +47,17 @@ public class PackageSource extends BaseDomainHelper {
private SourceRpm sourceRpm;
/**
- * @return Returns the sigmd5.
+ * @return Returns the sig checksum.
*/
- public String getSigmd5() {
- return sigmd5;
+ public String getSigchecksum() {
+ return sigchecksum;
}
/**
- * @param sigmd5In The sigmd5 to set.
+ * @param sigchecksumIn The sigchecksum to set.
*/
- public void setSigmd5(String sigmd5In) {
- this.sigmd5 = sigmd5In;
+ public void setSigchecksum(Checksum sigchecksumIn) {
+ this.sigchecksum = sigchecksumIn;
}
/**
@@ -144,17 +145,17 @@ public class PackageSource extends BaseDomainHelper {
}
/**
- * @return Returns the md5sum.
+ * @return Returns the checksum.
*/
- public String getMd5sum() {
- return md5sum;
+ public String getChecksum() {
+ return checksum;
}
/**
- * @param m The md5sum to set.
+ * @param checksumIn The checksum to set.
*/
- public void setMd5sum(String m) {
- this.md5sum = m;
+ public void setChecksum(Checksum checksumIn) {
+ this.checksum = checksumIn;
}
/**
diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/Package_satellite.hbm.xml b/java/code/src/com/redhat/rhn/domain/rhnpackage/Package_satellite.hbm.xml
index a3a7d52..e0ec9fd 100644
--- a/java/code/src/com/redhat/rhn/domain/rhnpackage/Package_satellite.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/Package_satellite.hbm.xml
@@ -20,7 +20,6 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<property name="payloadSize" type="long" column="payload_size"/>
<property name="buildHost" type="string" column="build_host"/>
<property name="buildTime" type="date" column="build_time"/>
- <property name="md5sum" type="string" column="md5sum"/>
<property name="vendor" type="string" column="vendor"/>
<property name="payloadFormat" type="string" column="payload_format"/>
<property name="compat" type="long" column="compat"/>
@@ -31,7 +30,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<property name="lastModified" type="date" column="last_modified"/>
<property name="created" type="date" column="created"/>
<property name="modified" type="date" column="modified"/>
-
+
<set name="changeLog" cascade="save-update,delete" inverse="true">
<key column="package_id" />
<one-to-many class="com.redhat.rhn.domain.rhnpackage.ChangeLogEntry" />
@@ -110,6 +109,8 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ <many-to-one name="checksum" class="com.redhat.rhn.domain.common.Checksum"
+ column="checksum_id" />
<many-to-one name="org"
class="com.redhat.rhn.domain.org.OrgImpl"
column="org_id"
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/ErrataPackageFile.java b/java/code/src/com/redhat/rhn/frontend/dto/ErrataPackageFile.java
index 7d40f8f..32e1d85 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/ErrataPackageFile.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/ErrataPackageFile.java
@@ -21,7 +21,8 @@ package com.redhat.rhn.frontend.dto;
*/
public class ErrataPackageFile {
private Long packageId;
- private String md5sum;
+ private String checksum;
+ private String checksumType;
private String filename;
private String channelName;
@@ -51,16 +52,35 @@ public class ErrataPackageFile {
this.filename = filenameIn;
}
/**
- * @return Returns the md5sum.
+ *
+ * @return Returns the checksum
*/
- public String getMd5sum() {
- return md5sum;
+ public String getChecksum() {
+ return checksum;
}
+
+ /**
+ *
+ * @param checksumIn The checksum to set
+ */
+ public void setChecksum(String checksumIn) {
+ this.checksum = checksumIn;
+ }
+
+ /**
+ *
+ * @return Returns the checksum type
+ */
+ public String getChecksumType() {
+ return checksumType;
+ }
+
/**
- * @param md5sumIn The md5sum to set.
+ *
+ * @param checksumTypeIn The checksumtype to set
*/
- public void setMd5sum(String md5sumIn) {
- this.md5sum = md5sumIn;
+ public void setChecksumtype(String checksumTypeIn) {
+ this.checksumType = checksumTypeIn;
}
/**
* @return Returns the packageId.
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/PackageDto.java b/java/code/src/com/redhat/rhn/frontend/dto/PackageDto.java
index daf7be2..e95b2f3 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/PackageDto.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/PackageDto.java
@@ -30,7 +30,8 @@ public class PackageDto extends BaseDto {
private String release;
private String epoch;
private String archLabel;
- private String md5sum;
+ private String checksum;
+ private String checksumType
private Long cid;
private String channelName;
private String summary;
@@ -179,18 +180,34 @@ public class PackageDto extends BaseDto {
/**
*
- * @return Returns the md5sum
+ * @return Returns the checksum
*/
- public String getMd5sum() {
- return md5sum;
+ public String getChecksum() {
+ return checksum;
}
/**
*
- * @param md5sumIn The md5sum to set
+ * @param checksumIn The checksum to set
*/
- public void setMd5sum(String md5sumIn) {
- this.md5sum = md5sumIn;
+ public void setChecksum(String checksumIn) {
+ this.checksum = checksumIn;
+ }
+
+ /**
+ *
+ * @return Returns the checksum type
+ */
+ public String getChecksumType() {
+ return checksumType;
+ }
+
+ /**
+ *
+ * @param checksumTypeIn The checksumtype to set
+ */
+ public void setChecksumtype(String checksumTypeIn) {
+ this.checksumType = checksumTypeIn;
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java
index d972fcd..7b8638f 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java
@@ -597,7 +597,7 @@ public class ErrataHandler extends BaseHandler {
* providing this package.")
* #prop("string", "build_host")
* #prop("string", "description")
- * #prop("string", "md5sum")
+ * #prop("string", "checksum")
* #prop("string", "vendor")
* #prop("string", "summary")
* #prop("string", "cookie")
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackageHelper.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackageHelper.java
index 98051ef..2bfe4d4 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackageHelper.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackageHelper.java
@@ -92,8 +92,10 @@ public class PackageHelper {
StringUtils.defaultString(pkg.getBuildHost()));
addEntry(pkgMap, "description",
StringUtils.defaultString(pkg.getDescription()));
- addEntry(pkgMap, "md5sum",
- StringUtils.defaultString(pkg.getMd5sum()));
+ addEntry(pkgMap, "checksum",
+ StringUtils.defaultString(pkg.getChecksum().getChecksum()));
+ addEntry(pkgMap, "checksum_type",
+ StringUtils.defaultString(pkg.getChecksum().getChecksumType().getLabel()));
addEntry(pkgMap, "vendor",
StringUtils.defaultString(pkg.getVendor()));
addEntry(pkgMap, "summary",
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackagesHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackagesHandler.java
index f1563ac..61a0bee 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackagesHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackagesHandler.java
@@ -81,7 +81,8 @@ public class PackagesHandler extends BaseHandler {
* #prop_array("string", "label", "Channel label providing this package.")
* #prop("string", "build_host")
* #prop("string", "description")
- * #prop("string", "md5sum")
+ * #prop("string", "checksum")
+ * #prop("string", "checksum_type")
* #prop("string", "vendor")
* #prop("string", "summary")
* #prop("string", "cookie")
@@ -188,7 +189,8 @@ public class PackagesHandler extends BaseHandler {
* #prop("string", "path")
* #prop("string", "type")
* #prop("string", "last_modified_date")
- * #prop("string", "md5sum")
+ * #prop("string", "checksum")
+ * #prop("string", "checksum_type")
* #prop("int", "size")
* #prop("string", "linkto")
* #struct_end()
@@ -215,10 +217,11 @@ public class PackagesHandler extends BaseHandler {
row.put("last_modified_date", file.get("mtime"));
row.put("size", file.get("file_size"));
row.put("linkto", StringUtils.defaultString((String) file.get("linkto")));
- row.put("md5sum", StringUtils.defaultString((String) file.get("md5")));
+ row.put("checksum", StringUtils.defaultString((String) file.get("checksum")));
+ row.put("checksum_type", StringUtils.defaultString((String) file.get("checksumtype")));
// Determine the file_type
- if (file.get("md5") != null) {
+ if (file.get("checksum") != null) {
row.put("type", "file");
}
else {
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/test/PackageHelperTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/test/PackageHelperTest.java
index cddf51c..ea6a98e 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/test/PackageHelperTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/test/PackageHelperTest.java
@@ -46,7 +46,8 @@ public class PackageHelperTest extends RhnBaseTestCase {
assertKey(map, "arch_label", pkg.getPackageArch().getLabel());
assertKey(map, "build_host", pkg.getBuildHost());
assertKey(map, "description", pkg.getDescription());
- assertKey(map, "md5sum", pkg.getMd5sum());
+ assertKey(map, "checksum", pkg.getChecksum().getChecksum());
+ assertKey(map, "checksum_type", pkg.getChecksum().getChecksumType().getLabel());
assertKey(map, "vendor", pkg.getVendor());
assertKey(map, "summary", pkg.getSummary());
assertKey(map, "cookie", pkg.getCookie());
commit 7180ef0eeed4fdc09276e608d9b15b71636f631a
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Nov 10 13:02:12 2009 +0100
Creating new domain class for table rhnChecksum
diff --git a/java/code/src/com/redhat/rhn/domain/common/Checksum.hbm.xml b/java/code/src/com/redhat/rhn/domain/common/Checksum.hbm.xml
new file mode 100644
index 0000000..17cbb08
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/domain/common/Checksum.hbm.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping
+PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping>
+ <class name="com.redhat.rhn.domain.common.Checksum"
+ table="rhnChecksum" mutable="false">
+ <cache usage="read-only"/>
+ <id name="id" type="long" column="id">
+ <meta attribute="scope-set">protected</meta>
+ <generator class="assigned" />
+ </id>
+ <property name="checksum" type="string" column="checksum" />
+ <property name="description" type="string" column="description" />
+ <many-to-one
+ name="checksumType"
+ class="com.redhat.rhn.domain.common.ChecksumType"
+ column="checksum_id"/>
+
+ </class>
+
+ <query name="Checksum.findById">
+ <![CDATA[from com.redhat.rhn.domain.common.Checksum as t where t.id = :id]]>
+ </query>
+ <query name="Checksum.findByChecksum">
+ <![CDATA[from com.redhat.rhn.domain.common.Checksum as t where t.checksum = :checksum]]>
+ </query>
+</hibernate-mapping>
diff --git a/java/code/src/com/redhat/rhn/domain/common/Checksum.java b/java/code/src/com/redhat/rhn/domain/common/Checksum.java
new file mode 100644
index 0000000..b17ff61
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/domain/common/Checksum.java
@@ -0,0 +1,107 @@
+/**
+ * Copyright (c) 2009 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.domain.common;
+
+import com.redhat.rhn.domain.BaseDomainHelper;
+import com.redhat.rhn.domain.common.ChecksumType;
+
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+/**
+ * Checksum
+ * Class for checksums of files, packages and erratas.
+ * @version $Rev$
+ */
+public class Checksum extends BaseDomainHelper {
+
+ private Long id;
+ private String checksum;
+ private ChecksumType checksumType;
+
+ /**
+ * @return Returns the id.
+ */
+ public Long getId() {
+ return id;
+ }
+
+ /**
+ * @param idIn The id to set.
+ */
+ public void setId(Long idIn) {
+ this.id = idIn;
+ }
+
+ /**
+ * @return Returns the checksum.
+ */
+ public String getChecksum() {
+ return checksum;
+ }
+
+ /**
+ * @param checksumIn The checksum to set.
+ */
+ public void setChecksum(String checksumIn) {
+ this.checksum = checksumIn;
+ }
+
+ /**
+ * @return Returns the type of checksum.
+ */
+ public String getChecksumType() {
+ return checksumType;
+ }
+
+ /**
+ * @param checksumTypeIn The checksum type to set.
+ */
+ public void setDescription(ChecksumType checksumTypeIn) {
+ this.checksumType = checksumTypeIn;
+ }
+
+ /** {@inheritDoc} */
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+
+ Checksum checksum = (Checksum) o;
+
+ if (id != null ? !id.equals(checksum.id) : checksum.id != null) {
+ return false;
+ }
+
+ return true;
+ }
+
+ /** {@inheritDoc} */
+ public int hashCode() {
+ return id != null ? id.hashCode() : 0;
+ }
+
+ /** {@inheritDoc} */
+ public String toString() {
+ ToStringBuilder builder = new ToStringBuilder(this);
+
+ builder.append("id", id);
+ builder.append("checksum", checksum);
+
+ return builder.toString();
+ }
+}
14 years, 5 months
Branch 'sha256-support3' - 2 commits - backend/server
by Michael Mraka
backend/server/importlib/errataImport.py | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
New commits:
commit bc2cc590d2e5a63284144530a7dbec39a547e945
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Nov 10 16:11:38 2009 +0100
comment out dead SRPM import code for now
diff --git a/backend/server/importlib/errataImport.py b/backend/server/importlib/errataImport.py
index ef4820b..434bf57 100644
--- a/backend/server/importlib/errataImport.py
+++ b/backend/server/importlib/errataImport.py
@@ -90,9 +90,9 @@ class ErrataImport(GenericPackageImport):
self._processPackage(package)
if not package in self.packages:
self.packages.append(package)
- elif f['file_type'] == 'SRPM':
- # XXX misa: do something here
- pass
+ #elif f['file_type'] == 'SRPM':
+ # # XXX misa: do something here
+ # pass
def _preprocessErratumFileChannels(self, erratum):
for f in (erratum['files'] or []):
commit 348c0eef987f19fb894a5b1a5457db7b0e36f068
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Nov 10 16:00:52 2009 +0100
more checksum changes for rhnErrataFile
diff --git a/backend/server/importlib/errataImport.py b/backend/server/importlib/errataImport.py
index 1437546..ef4820b 100644
--- a/backend/server/importlib/errataImport.py
+++ b/backend/server/importlib/errataImport.py
@@ -79,11 +79,17 @@ class ErrataImport(GenericPackageImport):
def _preprocessErratumFiles(self, erratum):
for f in (erratum['files'] or []):
+ checksum = ('md5', f['md5sum']) # FIXME sha256
+ f['checksum'] = checksum
+ if not self.checksums.has_key(checksum):
+ self.checksums[checksum] = None
+
if f['file_type'] == 'RPM':
package = f.get('pkgobj')
if package:
- self.packages.append(package)
self._processPackage(package)
+ if not package in self.packages:
+ self.packages.append(package)
elif f['file_type'] == 'SRPM':
# XXX misa: do something here
pass
@@ -251,6 +257,7 @@ class ErrataImport(GenericPackageImport):
def _fix_erratum_file_packages(self, erratum):
for ef in erratum['files']:
+ ef['checksum_id'] = self.checksums[ef['checksum']]
if ef['file_type'] == 'RPM':
package = ef.get('pkgobj')
if not package:
14 years, 5 months
schema/spacewalk
by Miroslav Suchý
schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/002-rhn_db_environment-rhn_environment-drop.sql | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 7b853b51d33dc557d1f21cadd432259d2e02c774
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Nov 10 14:09:54 2009 +0100
forgot to drop column which reference those droped tables
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/002-rhn_db_environment-rhn_environment-drop.sql b/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/002-rhn_db_environment-rhn_environment-drop.sql
index 2e08148..b601a7d 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/002-rhn_db_environment-rhn_environment-drop.sql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/002-rhn_db_environment-rhn_environment-drop.sql
@@ -7,5 +7,7 @@ create unique index rhn_confm_name_pk
tablespace [[2m_tbs]];
alter table rhn_config_macro add constraint rhn_confm_name_pk primary key (name);
+alter table rhn_config_macro drop column environment;
+
drop table rhn_environment;
drop table rhn_db_environment;
14 years, 5 months
Changes to 'refs/tags/spacewalk-java-0.7.16-1'
by Tomas Lestach
Tag 'spacewalk-java-0.7.16-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2009-11-10 10:09 +0000
Tagging package [spacewalk-java] version [0.7.16-1] in directory [java/].
Changes since rhn-client-tools-0.7.9-1:
Justin Sherrill (2):
531649 - fixed issue where confirmation message was not displayed after using channel merge/compare feature
unit test fixes
Michael Mraka (8):
optimized queries in update_perms_for_server
just fixed indentation
added fixed rhn_cache.pkb into schema upgrades
sql optimization: removed unnecessary table join
532683 - removed unnecessary table joins
removed cartesian join by adding missing relationship
replaced corsors + for loops with already written bulk procedure
fixed forgotten table alias
Miroslav Suchý (3):
count length of buffer only once in loop
replace len() with ==
aamt is not Null in most cases, move it more to right
Tomas Lestach (2):
WebUI Errata & CVEs enhancements
Automatic commit of package [spacewalk-java] release [0.7.16-1].
---
client/rhel/rhnlib/rhn/SSL.py | 8
java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml | 18 +
java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.java | 1
java/code/src/com/redhat/rhn/frontend/action/errata/BugErrataListAllAction.java | 36 +++
java/code/src/com/redhat/rhn/frontend/action/errata/BugErrataListRelevantAction.java | 38 +++
java/code/src/com/redhat/rhn/frontend/action/errata/EnhancementErrataListAllAction.java | 37 +++
java/code/src/com/redhat/rhn/frontend/action/errata/EnhancementErrataListRelevantAction.java | 39 +++
java/code/src/com/redhat/rhn/frontend/action/errata/ErrataListBaseAction.java | 10
java/code/src/com/redhat/rhn/frontend/action/errata/SecurityErrataListAllAction.java | 42 ++++
java/code/src/com/redhat/rhn/frontend/action/errata/SecurityErrataListRelevantAction.java | 42 ++++
java/code/src/com/redhat/rhn/frontend/dto/ErrataOverview.java | 36 +++
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 3
java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java | 17 +
java/code/webapp/WEB-INF/nav/errata_all_tabs.xml | 15 +
java/code/webapp/WEB-INF/nav/errata_overview_tabs.xml | 15 +
java/code/webapp/WEB-INF/nav/errata_relevant_tabs.xml | 15 +
java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml | 14 +
java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf | 16 +
java/code/webapp/WEB-INF/pages/errata/all.jsp | 2
java/code/webapp/WEB-INF/pages/errata/overview.jsp | 2
java/code/webapp/WEB-INF/pages/errata/relevant.jsp | 2
java/code/webapp/WEB-INF/struts-config.xml | 76 +++++++
java/spacewalk-java.spec | 24 ++
rel-eng/packages/spacewalk-java | 2
schema/spacewalk/common/views/rhnChannelFamilyServerPhysical.sql | 4
schema/spacewalk/oracle/packages/rhn_cache.pkb | 55 +++--
schema/spacewalk/oracle/packages/rhn_channel.pkb | 19 -
schema/spacewalk/oracle/packages/rhn_server.pkb | 17 -
schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/160-rhn_cache.pkb | 102 ++++++++++
web/modules/pxt/PXT/Utils.pm | 10
web/modules/sniglets/Sniglets/ListView/List.pm | 14 +
web/modules/sniglets/Sniglets/ListView/PackageList.pm | 17 -
32 files changed, 661 insertions(+), 87 deletions(-)
---
14 years, 5 months
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 24 +++++++++++++++++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 24 insertions(+), 2 deletions(-)
New commits:
commit 24e1214100d344a546a8948021bfbf0508dde98b
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Nov 10 11:09:46 2009 +0100
Automatic commit of package [spacewalk-java] release [0.7.16-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index eacc426..2f0b057 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -12,7 +12,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 0.7.15
+Version: 0.7.16
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -280,6 +280,28 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Nov 10 2009 Tomas Lestach <tlestach(a)redhat.com> 0.7.16-1
+- WebUI Errata & CVEs enhancements (tlestach(a)redhat.com)
+- unit test fixes (jsherril(a)redhat.com)
+- 531649 - fixed issue where confirmation message was not displayed after using
+ channel merge/compare feature (jsherril(a)redhat.com)
+- 531645 - fixing query with mistaken id reference (jsherril(a)redhat.com)
+- standart Red Hat header added to CompareConfigFilesTask.java
+ (tlestach(a)redhat.com)
+- Show number of differing config files in overview
+ (joshua.roys(a)gtri.gatech.edu)
+- Set CompareConfigFilesTask to run at 11pm (joshua.roys(a)gtri.gatech.edu)
+- Add task to schedule config file comparisons (joshua.roys(a)gtri.gatech.edu)
+- Fix two more fd leaks (joshua.roys(a)gtri.gatech.edu)
+- Plug fd leak (joshua.roys(a)gtri.gatech.edu)
+- Fix system comparison file/dir/symlink counts (joshua.roys(a)gtri.gatech.edu)
+- 508771 - fixing incorrect sort on channel errata list page
+ (jsherril(a)redhat.com)
+- 531091 - fixing issue that would result in odd hibernate errors due to
+ hibernate objects being used across hibernate sessions (jsherril(a)redhat.com)
+- 531059 - fixing issue where certain characters in the org name would cause
+ errors when trying to create things in cobbler (jsherril(a)redhat.com)
+
* Tue Oct 27 2009 Tomas Lestach <tlestach(a)redhat.com> 0.7.15-1
- replacing HashSet with TreeSet (tlestach(a)redhat.com)
- checkstyle errors removed (tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index e4d3dbc..23ec0f7 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-0.7.15-1 java/
+0.7.16-1 java/
14 years, 5 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml | 18 ++
java/code/src/com/redhat/rhn/frontend/action/errata/BugErrataListAllAction.java | 36 ++++
java/code/src/com/redhat/rhn/frontend/action/errata/BugErrataListRelevantAction.java | 38 +++++
java/code/src/com/redhat/rhn/frontend/action/errata/EnhancementErrataListAllAction.java | 37 ++++
java/code/src/com/redhat/rhn/frontend/action/errata/EnhancementErrataListRelevantAction.java | 39 +++++
java/code/src/com/redhat/rhn/frontend/action/errata/ErrataListBaseAction.java | 10 +
java/code/src/com/redhat/rhn/frontend/action/errata/SecurityErrataListAllAction.java | 42 +++++
java/code/src/com/redhat/rhn/frontend/action/errata/SecurityErrataListRelevantAction.java | 42 +++++
java/code/src/com/redhat/rhn/frontend/dto/ErrataOverview.java | 36 ++++
java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java | 17 ++
java/code/webapp/WEB-INF/nav/errata_all_tabs.xml | 15 +
java/code/webapp/WEB-INF/nav/errata_overview_tabs.xml | 15 +
java/code/webapp/WEB-INF/nav/errata_relevant_tabs.xml | 15 +
java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml | 14 +
java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf | 16 +-
java/code/webapp/WEB-INF/pages/errata/all.jsp | 2
java/code/webapp/WEB-INF/pages/errata/overview.jsp | 2
java/code/webapp/WEB-INF/pages/errata/relevant.jsp | 2
java/code/webapp/WEB-INF/struts-config.xml | 76 +++++++++-
19 files changed, 464 insertions(+), 8 deletions(-)
New commits:
commit dd16ea48ab2ffce8f1fe5f8c30dc7a58dfc138f5
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Nov 9 18:00:00 2009 +0100
WebUI Errata & CVEs enhancements
- allowed errata filtering: Bug/Enhancement/Security
- added CVE column for Security Errata pages
- allowing errata sort according to the UPDATE_DATE
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml
index 2c7696f..773dc52 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml
@@ -52,7 +52,6 @@ ORDER BY E.update_date DESC, E.id
<elaborator name="errata_overview" />
</mode>
-
<mode name="all_errata" class="com.redhat.rhn.frontend.dto.ErrataOverview">
<query params="org_id">
SELECT DISTINCT E.id, E.update_date, E.synopsis AS ADVISORY_SYNOPSIS
@@ -69,6 +68,23 @@ SELECT DISTINCT E.id, E.update_date, E.synopsis AS ADVISORY_SYNOPSIS
<elaborator name="errata_overview" />
</mode>
+<mode name="all_errata_by_type" class="com.redhat.rhn.frontend.dto.ErrataOverview">
+ <query params="org_id, type">
+SELECT DISTINCT E.id, E.update_date, E.synopsis AS ADVISORY_SYNOPSIS
+ FROM rhnErrata E, rhnChannelErrata CE, rhnChannel C,
+ rhnChannelFamilyMembers CFM,
+ rhnOrgChannelFamilyPermissions OCF
+ WHERE CE.errata_id = E.id
+ AND CE.channel_id = C.id
+ AND C.id = CFM.channel_id
+ AND CFM.channel_family_id = OCF.channel_family_id
+ AND OCF.org_id = :org_id
+ AND E.advisory_type = :type
+ ORDER BY E.update_date DESC, E.id
+ </query>
+ <elaborator name="errata_overview" />
+</mode>
+
<mode name="all_errata_orig" class="com.redhat.rhn.frontend.dto.ErrataOverview">
<query params="org_id">
SELECT DISTINCT E.id, E.update_date, E.synopsis AS ADVISORY_SYNOPSIS
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/BugErrataListAllAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/BugErrataListAllAction.java
new file mode 100644
index 0000000..b2ed87b
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/BugErrataListAllAction.java
@@ -0,0 +1,36 @@
+/**
+ * Copyright (c) 2009 Red Hat, Inc.
+ *
+ * This software is licensed to you under the GNU General Public License,
+ * version 2 (GPLv2). There is NO WARRANTY for this software, express or
+ * implied, including the implied warranties of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+ * along with this software; if not, see
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * Red Hat trademarks are not licensed under GPLv2. No permission is
+ * granted to use or replicate Red Hat trademarks that are incorporated
+ * in this software or its documentation.
+ */
+package com.redhat.rhn.frontend.action.errata;
+
+import com.redhat.rhn.domain.errata.ErrataFactory;
+import com.redhat.rhn.domain.user.User;
+import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.manager.errata.ErrataManager;
+
+import java.util.List;
+
+/**
+ * BugErrataListAllAction
+ * @version $Rev$
+ */
+public class BugErrataListAllAction extends ErrataListAllAction {
+
+ /** {@inheritDoc} */
+ public List getResult(RequestContext context) {
+
+ User user = context.getLoggedInUser();
+ return ErrataManager.allErrataByType(user, ErrataFactory.ERRATA_TYPE_BUG);
+ }
+}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/BugErrataListRelevantAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/BugErrataListRelevantAction.java
new file mode 100644
index 0000000..d9c1244
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/BugErrataListRelevantAction.java
@@ -0,0 +1,38 @@
+/**
+ * Copyright (c) 2009 Red Hat, Inc.
+ *
+ * This software is licensed to you under the GNU General Public License,
+ * version 2 (GPLv2). There is NO WARRANTY for this software, express or
+ * implied, including the implied warranties of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+ * along with this software; if not, see
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * Red Hat trademarks are not licensed under GPLv2. No permission is
+ * granted to use or replicate Red Hat trademarks that are incorporated
+ * in this software or its documentation.
+ */
+package com.redhat.rhn.frontend.action.errata;
+
+import com.redhat.rhn.domain.errata.ErrataFactory;
+import com.redhat.rhn.domain.user.User;
+import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.manager.errata.ErrataManager;
+
+import java.util.List;
+
+
+/**
+ * BugErrataListRelevantAction
+ * @version $Rev$
+ */
+public class BugErrataListRelevantAction extends ErrataListRelevantAction {
+
+ /** {@inheritDoc} */
+ public List getResult(RequestContext context) {
+
+ User user = context.getLoggedInUser();
+ return ErrataManager.relevantErrataByType(user, null,
+ ErrataFactory.ERRATA_TYPE_BUG);
+ }
+}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/EnhancementErrataListAllAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/EnhancementErrataListAllAction.java
new file mode 100644
index 0000000..49f6879
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/EnhancementErrataListAllAction.java
@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) 2009 Red Hat, Inc.
+ *
+ * This software is licensed to you under the GNU General Public License,
+ * version 2 (GPLv2). There is NO WARRANTY for this software, express or
+ * implied, including the implied warranties of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+ * along with this software; if not, see
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * Red Hat trademarks are not licensed under GPLv2. No permission is
+ * granted to use or replicate Red Hat trademarks that are incorporated
+ * in this software or its documentation.
+ */
+package com.redhat.rhn.frontend.action.errata;
+
+import com.redhat.rhn.domain.errata.ErrataFactory;
+import com.redhat.rhn.domain.user.User;
+import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.manager.errata.ErrataManager;
+
+import java.util.List;
+
+
+/**
+ * EnhancementErrataListAllAction
+ * @version $Rev$
+ */
+public class EnhancementErrataListAllAction extends ErrataListAllAction {
+
+ /** {@inheritDoc} */
+ public List getResult(RequestContext context) {
+
+ User user = context.getLoggedInUser();
+ return ErrataManager.allErrataByType(user, ErrataFactory.ERRATA_TYPE_ENHANCEMENT);
+ }
+}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/EnhancementErrataListRelevantAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/EnhancementErrataListRelevantAction.java
new file mode 100644
index 0000000..0e2f99e
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/EnhancementErrataListRelevantAction.java
@@ -0,0 +1,39 @@
+/**
+ * Copyright (c) 2009 Red Hat, Inc.
+ *
+ * This software is licensed to you under the GNU General Public License,
+ * version 2 (GPLv2). There is NO WARRANTY for this software, express or
+ * implied, including the implied warranties of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+ * along with this software; if not, see
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * Red Hat trademarks are not licensed under GPLv2. No permission is
+ * granted to use or replicate Red Hat trademarks that are incorporated
+ * in this software or its documentation.
+ */
+package com.redhat.rhn.frontend.action.errata;
+
+import com.redhat.rhn.domain.errata.ErrataFactory;
+import com.redhat.rhn.domain.user.User;
+import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.manager.errata.ErrataManager;
+
+import java.util.List;
+
+
+/**
+ * EnhancementErrataListRelevantAction
+ * @version $Rev$
+ */
+public class EnhancementErrataListRelevantAction extends
+ ErrataListRelevantAction {
+
+ /** {@inheritDoc} */
+ public List getResult(RequestContext context) {
+
+ User user = context.getLoggedInUser();
+ return ErrataManager.relevantErrataByType(user, null,
+ ErrataFactory.ERRATA_TYPE_ENHANCEMENT);
+ }
+}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataListBaseAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataListBaseAction.java
index 489db9e..85f04d0 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataListBaseAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataListBaseAction.java
@@ -52,7 +52,7 @@ public abstract class ErrataListBaseAction extends RhnAction implements Listable
HttpServletRequest request,
HttpServletResponse response)
throws Exception {
-
+ request.setAttribute("displayCves", isSecurityAction());
ListHelper helper = new ListHelper(this, request);
helper.execute();
@@ -83,6 +83,14 @@ public abstract class ErrataListBaseAction extends RhnAction implements Listable
}
/**
+ * Method to distinguish security errata actions
+ * @return whether it is an action of Security Errata
+ */
+ public boolean isSecurityAction() {
+ return false;
+ }
+
+ /**
* Used by subclasses to dictate the data that is displayed.
*/
protected enum ErrataFilter {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/SecurityErrataListAllAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/SecurityErrataListAllAction.java
new file mode 100644
index 0000000..b0ba43d
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/SecurityErrataListAllAction.java
@@ -0,0 +1,42 @@
+/**
+ * Copyright (c) 2009 Red Hat, Inc.
+ *
+ * This software is licensed to you under the GNU General Public License,
+ * version 2 (GPLv2). There is NO WARRANTY for this software, express or
+ * implied, including the implied warranties of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+ * along with this software; if not, see
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * Red Hat trademarks are not licensed under GPLv2. No permission is
+ * granted to use or replicate Red Hat trademarks that are incorporated
+ * in this software or its documentation.
+ */
+package com.redhat.rhn.frontend.action.errata;
+
+import com.redhat.rhn.domain.errata.ErrataFactory;
+import com.redhat.rhn.domain.user.User;
+import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.manager.errata.ErrataManager;
+
+import java.util.List;
+
+
+/**
+ * SecurityErrataListAllAction
+ * @version $Rev$
+ */
+public class SecurityErrataListAllAction extends ErrataListAllAction {
+
+ /** {@inheritDoc} */
+ public List getResult(RequestContext context) {
+
+ User user = context.getLoggedInUser();
+ return ErrataManager.allErrataByType(user, ErrataFactory.ERRATA_TYPE_SECURITY);
+ }
+
+ /** {@inheritDoc} */
+ public boolean isSecurityAction() {
+ return true;
+ }
+}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/SecurityErrataListRelevantAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/SecurityErrataListRelevantAction.java
new file mode 100644
index 0000000..eac7de5
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/SecurityErrataListRelevantAction.java
@@ -0,0 +1,42 @@
+/**
+ * Copyright (c) 2009 Red Hat, Inc.
+ *
+ * This software is licensed to you under the GNU General Public License,
+ * version 2 (GPLv2). There is NO WARRANTY for this software, express or
+ * implied, including the implied warranties of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+ * along with this software; if not, see
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * Red Hat trademarks are not licensed under GPLv2. No permission is
+ * granted to use or replicate Red Hat trademarks that are incorporated
+ * in this software or its documentation.
+ */
+package com.redhat.rhn.frontend.action.errata;
+
+import com.redhat.rhn.domain.errata.ErrataFactory;
+import com.redhat.rhn.domain.user.User;
+import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.manager.errata.ErrataManager;
+
+import java.util.List;
+
+/**
+ * SecurityErrataListRelevantAction
+ * @version $Rev$
+ */
+public class SecurityErrataListRelevantAction extends ErrataListRelevantAction {
+
+ /** {@inheritDoc} */
+ public List getResult(RequestContext context) {
+
+ User user = context.getLoggedInUser();
+ return ErrataManager.relevantErrataByType(user, null,
+ ErrataFactory.ERRATA_TYPE_SECURITY);
+ }
+
+ /** {@inheritDoc} */
+ public boolean isSecurityAction() {
+ return true;
+ }
+}
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/ErrataOverview.java b/java/code/src/com/redhat/rhn/frontend/dto/ErrataOverview.java
index 047af3b..0624ea9 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/ErrataOverview.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/ErrataOverview.java
@@ -14,19 +14,27 @@
*/
package com.redhat.rhn.frontend.dto;
+import com.redhat.rhn.common.db.datasource.DataResult;
+import com.redhat.rhn.common.db.datasource.Elaborator;
+import com.redhat.rhn.common.db.datasource.RowCallback;
import com.redhat.rhn.common.localization.LocalizationService;
+import com.redhat.rhn.manager.errata.ErrataManager;
import java.text.ParseException;
+import java.sql.ResultSet;
import java.text.SimpleDateFormat;
+import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Date;
+import java.util.Iterator;
import java.util.List;
/**
* ErrataOverview
* @version $Rev$
*/
-public class ErrataOverview extends BaseDto {
+public class ErrataOverview extends BaseDto
+ implements RowCallback {
private Long id;
private String advisory;
private String advisoryName;
@@ -376,4 +384,30 @@ public class ErrataOverview extends BaseDto {
public void setLastModified(Date lastModifiedIn) {
this.lastModified = lastModifiedIn;
}
+
+ /**
+ * {@inheritDoc}
+ */
+ public List<String> getCallBackColumns() {
+ return new ArrayList<String>();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void callback(ResultSet rs) throws SQLException {
+ if (rs != null) {
+ if ("Security Advisory".equals(rs.getString("advisory_type"))) {
+ long eid = rs.getLong("id");
+ DataResult dr = ErrataManager.errataCVEs(eid);
+ Elaborator elab = dr.getElaborator();
+ List cvesList = new ArrayList();
+ for (Iterator iter = dr.iterator(); iter.hasNext();) {
+ CVE cve = (CVE)iter.next();
+ cvesList.add(cve.getName());
+ }
+ this.setCves(cvesList);
+ }
+ }
+ }
}
diff --git a/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java b/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java
index c00742b..91271ad 100644
--- a/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java
+++ b/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java
@@ -279,6 +279,23 @@ public class ErrataManager extends BaseManager {
}
/**
+ * Returns all of the errata of specified advisory type.
+ * @param user Currently logged in user.
+ * @param type advisory type
+ * @return all errata of specified advisory type
+ */
+ public static DataResult allErrataByType(User user, String type) {
+ SelectMode m = ModeFactory.getMode("Errata_queries", "all_errata_by_type");
+ Map params = new HashMap();
+ params.put("org_id", user.getOrg().getId());
+ params.put("type", type);
+ Map elabParams = new HashMap();
+ elabParams.put("user_id", user.getId());
+ DataResult result = makeDataResult(params, elabParams, null, m);
+ return result;
+ }
+
+ /**
* Returns all of the errata in a channel
* @param cid the channel id
* @return all of the errata in the channel.
diff --git a/java/code/webapp/WEB-INF/nav/errata_all_tabs.xml b/java/code/webapp/WEB-INF/nav/errata_all_tabs.xml
new file mode 100644
index 0000000..5c40873
--- /dev/null
+++ b/java/code/webapp/WEB-INF/nav/errata_all_tabs.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<rhn-navi-tree label="errata_tabs" invisible="1" formvar="prid" title-depth="1">
+ <rhn-tab name="erratalist.jsp.allerrata">
+ <rhn-tab-url>/rhn/errata/AllErrata.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="yourrhn.jsp.criticalsystems.bugfixerrata">
+ <rhn-tab-url>/rhn/errata/AllBugErrata.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="yourrhn.jsp.criticalsystems.enhancementerrata">
+ <rhn-tab-url>/rhn/errata/AllEnhancementErrata.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="yourrhn.jsp.criticalsystems.securityerrata">
+ <rhn-tab-url>/rhn/errata/AllSecurityErrata.do</rhn-tab-url>
+ </rhn-tab>
+</rhn-navi-tree>
diff --git a/java/code/webapp/WEB-INF/nav/errata_overview_tabs.xml b/java/code/webapp/WEB-INF/nav/errata_overview_tabs.xml
new file mode 100644
index 0000000..b259d08
--- /dev/null
+++ b/java/code/webapp/WEB-INF/nav/errata_overview_tabs.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<rhn-navi-tree label="errata_tabs" invisible="1" formvar="prid" title-depth="1">
+ <rhn-tab name="erratalist.jsp.allerrata">
+ <rhn-tab-url>/rhn/errata/Overview.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="yourrhn.jsp.criticalsystems.bugfixerrata">
+ <rhn-tab-url>/rhn/errata/OverviewBugErrata.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="yourrhn.jsp.criticalsystems.enhancementerrata">
+ <rhn-tab-url>/rhn/errata/OverviewEnhancementErrata.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="yourrhn.jsp.criticalsystems.securityerrata">
+ <rhn-tab-url>/rhn/errata/OverviewSecurityErrata.do</rhn-tab-url>
+ </rhn-tab>
+</rhn-navi-tree>
diff --git a/java/code/webapp/WEB-INF/nav/errata_relevant_tabs.xml b/java/code/webapp/WEB-INF/nav/errata_relevant_tabs.xml
new file mode 100644
index 0000000..f75991f
--- /dev/null
+++ b/java/code/webapp/WEB-INF/nav/errata_relevant_tabs.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<rhn-navi-tree label="errata_tabs" invisible="1" formvar="prid" title-depth="1">
+ <rhn-tab name="erratalist.jsp.allerrata">
+ <rhn-tab-url>/rhn/errata/RelevantErrata.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="yourrhn.jsp.criticalsystems.bugfixerrata">
+ <rhn-tab-url>/rhn/errata/RelevantBugErrata.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="yourrhn.jsp.criticalsystems.enhancementerrata">
+ <rhn-tab-url>/rhn/errata/RelevantEnhancementErrata.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="yourrhn.jsp.criticalsystems.securityerrata">
+ <rhn-tab-url>/rhn/errata/RelevantSecurityErrata.do</rhn-tab-url>
+ </rhn-tab>
+</rhn-navi-tree>
diff --git a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
index f7608ac..6e7d4b1 100644
--- a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
+++ b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
@@ -95,8 +95,18 @@
<rhn-tab name="Errata" url="/rhn/errata/Overview.do" active-image="tab-errata-selected.gif" inactive-image="tab-errata.gif" on-click="Sniglets::Lists->navi_empty_set" node-id="target_systems_list">
<rhn-tab name="Errata" url="/rhn/errata/Overview.do" on-click="Sniglets::Lists->navi_empty_set" node-id="target_systems_list">
<rhn-tab-directory>/rhn/errata</rhn-tab-directory>
- <rhn-tab name="Relevant" url="/rhn/errata/RelevantErrata.do" on-click="Sniglets::Lists->navi_empty_set" node-id="target_systems_list" />
- <rhn-tab name="All" url="/rhn/errata/AllErrata.do" on-click="Sniglets::Lists->navi_empty_set" node-id="target_systems_list" />
+ <rhn-tab name="Relevant" on-click="Sniglets::Lists->navi_empty_set" node-id="target_systems_list">
+ <rhn-tab-url>/rhn/errata/RelevantErrata.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/errata/RelevantBugErrata.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/errata/RelevantEnhancementErrata.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/errata/RelevantSecurityErrata.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="All" on-click="Sniglets::Lists->navi_empty_set" node-id="target_systems_list">
+ <rhn-tab-url>/rhn/errata/AllErrata.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/errata/AllBugErrata.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/errata/AllEnhancementErrata.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/errata/AllSecurityErrata.do</rhn-tab-url>
+ </rhn-tab>
</rhn-tab>
<rhn-tab name="Advanced Search" url="/rhn/errata/Search.do"/>
<rhn-tab name="Manage Errata" url="/rhn/errata/manage/PublishedErrata.do" acl="user_role(channel_admin)">
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf
index 2078084..3086910 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf
@@ -32,9 +32,23 @@
styleclass="text-align: center;">
<a href="/rhn/errata/details/SystemsAffected.do?eid=${current.id}">${current.affectedSystemCount}</a>
</rl:column>
- <rl:column headerkey="erratalist.jsp.updated" styleclass="text-align: center;">
+ <rl:column headerkey="erratalist.jsp.updated"
+ sortable="true"
+ sortattr="updateDateObj"
+ styleclass="text-align: center;">
${current.updateDate}
</rl:column>
+ <c:if test="${displayCves}">
+
+ <rl:column headerkey="details.jsp.cves">
+ <c:forEach items="${current.cves}" var="cve">
+ <a href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=${cve}">
+ <c:out value="${cve}"/> <br />
+ </a>
+ </c:forEach>
+ </rl:column>
+
+ </c:if>
</rl:list>
diff --git a/java/code/webapp/WEB-INF/pages/errata/all.jsp b/java/code/webapp/WEB-INF/pages/errata/all.jsp
index 3eb4fba..fad6839 100644
--- a/java/code/webapp/WEB-INF/pages/errata/all.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/all.jsp
@@ -15,6 +15,8 @@
<bean:message key="erratalist.jsp.allerrata"/>
</rhn:toolbar>
+<rhn:dialogmenu mindepth="0" maxdepth="3" definition="/WEB-INF/nav/errata_all_tabs.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />
+
<%@ include file="/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf" %>
</body>
diff --git a/java/code/webapp/WEB-INF/pages/errata/overview.jsp b/java/code/webapp/WEB-INF/pages/errata/overview.jsp
index d10ff46..e81ef45 100644
--- a/java/code/webapp/WEB-INF/pages/errata/overview.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/overview.jsp
@@ -15,6 +15,8 @@
<bean:message key="errata.overview.jsp.errataoverview"/>
</rhn:toolbar>
+<rhn:dialogmenu mindepth="0" maxdepth="3" definition="/WEB-INF/nav/errata_overview_tabs.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />
+
<p><bean:message key="errata.overview.jsp.summary"/></p>
<h2><bean:message key="errata.jsp.header"/></h2>
diff --git a/java/code/webapp/WEB-INF/pages/errata/relevant.jsp b/java/code/webapp/WEB-INF/pages/errata/relevant.jsp
index 75d826e..e2d20db 100644
--- a/java/code/webapp/WEB-INF/pages/errata/relevant.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/relevant.jsp
@@ -15,6 +15,8 @@
<bean:message key="erratalist.jsp.relevanterrata"/>
</rhn:toolbar>
+<rhn:dialogmenu mindepth="0" maxdepth="3" definition="/WEB-INF/nav/errata_relevant_tabs.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />
+
<%@ include file="/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf" %>
</body>
diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml
index d22c3c9..9ba2e2a 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -1756,7 +1756,31 @@
input="/WEB-INF/pages/errata/all.jsp"
type="com.redhat.rhn.frontend.action.errata.ErrataListAllAction">
<forward name="default"
- path="/WEB-INF/pages/errata/all.jsp" />
+ path="/WEB-INF/pages/errata/all.jsp" />
+ </action>
+
+ <action path="/errata/AllBugErrata"
+ scope="request"
+ input="/WEB-INF/pages/errata/all.jsp"
+ type="com.redhat.rhn.frontend.action.errata.BugErrataListAllAction">
+ <forward name="default"
+ path="/WEB-INF/pages/errata/all.jsp" />
+ </action>
+
+ <action path="/errata/AllEnhancementErrata"
+ scope="request"
+ input="/WEB-INF/pages/errata/all.jsp"
+ type="com.redhat.rhn.frontend.action.errata.EnhancementErrataListAllAction">
+ <forward name="default"
+ path="/WEB-INF/pages/errata/all.jsp" />
+ </action>
+
+ <action path="/errata/AllSecurityErrata"
+ scope="request"
+ input="/WEB-INF/pages/errata/all.jsp"
+ type="com.redhat.rhn.frontend.action.errata.SecurityErrataListAllAction">
+ <forward name="default"
+ path="/WEB-INF/pages/errata/all.jsp" />
</action>
<action path="/errata/Overview"
@@ -1767,6 +1791,30 @@
path="/WEB-INF/pages/errata/overview.jsp"/>
</action>
+ <action path="/errata/OverviewBugErrata"
+ scope="request"
+ input="/WEB-INF/pages/errata/overview.jsp"
+ type="com.redhat.rhn.frontend.action.errata.BugErrataListRelevantAction">
+ <forward name="default"
+ path="/WEB-INF/pages/errata/overview.jsp"/>
+ </action>
+
+ <action path="/errata/OverviewEnhancementErrata"
+ scope="request"
+ input="/WEB-INF/pages/errata/overview.jsp"
+ type="com.redhat.rhn.frontend.action.errata.EnhancementErrataListRelevantAction">
+ <forward name="default"
+ path="/WEB-INF/pages/errata/overview.jsp"/>
+ </action>
+
+ <action path="/errata/OverviewSecurityErrata"
+ scope="request"
+ input="/WEB-INF/pages/errata/overview.jsp"
+ type="com.redhat.rhn.frontend.action.errata.SecurityErrataListRelevantAction">
+ <forward name="default"
+ path="/WEB-INF/pages/errata/overview.jsp"/>
+ </action>
+
<action path="/errata/RelevantErrata"
scope="request"
input="/WEB-INF/pages/errata/relevant.jsp"
@@ -1775,12 +1823,36 @@
path="/WEB-INF/pages/errata/relevant.jsp" />
</action>
+ <action path="/errata/RelevantBugErrata"
+ scope="request"
+ input="/WEB-INF/pages/errata/relevant.jsp"
+ type="com.redhat.rhn.frontend.action.errata.BugErrataListRelevantAction">
+ <forward name="default"
+ path="/WEB-INF/pages/errata/relevant.jsp" />
+ </action>
+
+ <action path="/errata/RelevantEnhancementErrata"
+ scope="request"
+ input="/WEB-INF/pages/errata/relevant.jsp"
+ type="com.redhat.rhn.frontend.action.errata.EnhancementErrataListRelevantAction">
+ <forward name="default"
+ path="/WEB-INF/pages/errata/relevant.jsp" />
+ </action>
+
+ <action path="/errata/RelevantSecurityErrata"
+ scope="request"
+ input="/WEB-INF/pages/errata/relevant.jsp"
+ type="com.redhat.rhn.frontend.action.errata.SecurityErrataListRelevantAction">
+ <forward name="default"
+ path="/WEB-INF/pages/errata/relevant.jsp" />
+ </action>
+
<action path="/errata/details/Details"
scope="request"
input="/WEB-INF/pages/errata/details.jsp"
type="com.redhat.rhn.frontend.action.errata.ErrataDetailsSetupAction">
<forward name="default"
- path="/WEB-INF/pages/errata/details.jsp" />
+ path="/WEB-INF/pages/errata/details.jsp" />
</action>
<action path="/errata/details/Packages"
14 years, 5 months