java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml | 7 +++++-- java/code/src/com/redhat/rhn/frontend/dto/PackageDto.java | 2 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageDtoSerializer.java | 4 ++++ 3 files changed, 10 insertions(+), 3 deletions(-)
New commits: commit f4da592071efc56e040ec32e148f401494a60255 Author: Tomas Lestach tlestach@redhat.com Date: Wed Mar 24 16:22:38 2010 +0100
559693 - fixing apidoc
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageDtoSerializer.java index d557198..db0d6b1 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageDtoSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageDtoSerializer.java @@ -34,6 +34,8 @@ import redstone.xmlrpc.XmlRpcSerializer; * #prop("string", "version") * #prop("string", "release") * #prop("string", "epoch") + * #prop("string", "checksum") + * #prop("string", "checksum_type") * #prop("int", "id") * #prop("string", "arch_label") * #prop("string", "last_modified_date")
commit 1822a606bdf6072e29af4b08b9e8ca7b4e6415cb Author: Colin Coe colin.coe@gmail.com Date: Fri Mar 19 21:01:57 2010 +0800
559693 - allow channel.software.listAllPackages to return the checksum
This is a rebase of three original commits BZ 559693 - allow channel.software.listAllPackages to return the checksum BZ 559693 - allow channel.software.listAllPackages, take 2 BZ 559693 - display checksum type
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 1fbb01a..03f14db 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 @@ -1259,14 +1259,17 @@ SELECT P.id AS id, NVL(PE.release, ' ') as release, NVL(PE.epoch, ' ') as epoch, PA.label AS arch_label, - TO_CHAR(P.last_modified, 'YYYY-MM-DD HH24:MI:SS') AS last_modified + TO_CHAR(P.last_modified, 'YYYY-MM-DD HH24:MI:SS') AS last_modified, + CV.checksum as checksum, + CV.checksum_type as checksum_type FROM rhnPackageArch PA, rhnPackageName PN, rhnPackageEVR PE, rhnPackage P, - rhnChannelPackage CP + rhnChannelPackage CP, rhnChecksumView CV WHERE CP.channel_id = :cid AND CP.package_id = P.id AND P.name_id = PN.id AND P.evr_id = PE.id AND PA.id = P.package_arch_id + AND P.checksum_id = CV.id ORDER BY UPPER(name) </query> </mode> 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 9f4510a..0e00dc5 100644 --- a/java/code/src/com/redhat/rhn/frontend/dto/PackageDto.java +++ b/java/code/src/com/redhat/rhn/frontend/dto/PackageDto.java @@ -213,7 +213,7 @@ public class PackageDto extends BaseDto { * * @param checksumTypeIn The checksumtype to set */ - public void setChecksumtype(String checksumTypeIn) { + public void setChecksumType(String checksumTypeIn) { this.checksumType = checksumTypeIn; }
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageDtoSerializer.java index eeb2af7..d557198 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageDtoSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageDtoSerializer.java @@ -66,6 +66,8 @@ public class PackageDtoSerializer implements XmlRpcCustomSerializer { epoch = ""; } helper.add("epoch", epoch == null ? "" : epoch); + helper.add("checksum", pack.getChecksum()); + helper.add("checksum_type", pack.getChecksumType()); helper.add("id", pack.getId()); helper.add("arch_label", pack.getArchLabel()); helper.add("last_modified_date", pack.getLastModified());
spacewalk-commits@lists.fedorahosted.org