java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFile.hbm.xml | 4 -
java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFile.java | 32 +++++-----
java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageTest.java | 3
3 files changed, 23 insertions(+), 16 deletions(-)
New commits:
commit b6cbb1a4e4407bf850e78a0b7a5cb6d3eb8d7479
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Mon Dec 7 16:45:37 2009 -0500
checkstyle fix
diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFile.java
b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFile.java
index 37838e7..886c730 100644
--- a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFile.java
+++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFile.java
@@ -285,10 +285,10 @@ public class PackageFile extends BaseDomainHelper implements
Serializable {
/**
- * @param checksum The checksum to set.
+ * @param checksumIn The checksum to set.
*/
- public void setChecksum(Checksum checksum) {
- this.checksum = checksum;
+ public void setChecksum(Checksum checksumIn) {
+ this.checksum = checksumIn;
}
}
commit 1e5b8f6c2ed81b40a0de9149e0040d8f6ba96289
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Mon Dec 7 16:41:14 2009 -0500
updating PackageFile to support new sha256 work
diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFile.hbm.xml
b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFile.hbm.xml
index 0cd37a9..65325b2 100644
--- a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFile.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFile.hbm.xml
@@ -24,7 +24,6 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<property name="rdev" type="long"
column="rdev"/>
<property name="fileSize" type="long"
column="file_size"/>
<property name="mtime" type="date"
column="mtime"/>
- <property name="md5" type="string"
column="md5"/>
<property name="linkTo" type="string"
column="linkto"/>
<property name="flags" type="long"
column="flags"/>
<property name="verifyFlags" type="long"
column="verifyflags"/>
@@ -35,6 +34,9 @@ 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" />
+
</class>
diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFile.java
b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFile.java
index ef86ba9..37838e7 100644
--- a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFile.java
+++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFile.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 org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
@@ -43,7 +44,7 @@ public class PackageFile extends BaseDomainHelper implements
Serializable {
private Long rdev;
private Long fileSize;
private Date mtime;
- private String md5;
+ private Checksum checksum;
private String linkTo;
private Long flags;
private Long verifyFlags;
@@ -189,19 +190,6 @@ public class PackageFile extends BaseDomainHelper implements
Serializable {
this.mtime = mtimeIn;
}
- /**
- * @return Returns the md5.
- */
- public String getMd5() {
- return md5;
- }
-
- /**
- * @param md5In The md5 to set.
- */
- public void setMd5(String md5In) {
- this.md5 = md5In;
- }
/**
* @return Returns the linkTo.
@@ -287,4 +275,20 @@ public class PackageFile extends BaseDomainHelper implements
Serializable {
return hash.toHashCode();
}
+
+ /**
+ * @return Returns the checksum.
+ */
+ public Checksum getChecksum() {
+ return checksum;
+ }
+
+
+ /**
+ * @param checksum The checksum to set.
+ */
+ public void setChecksum(Checksum checksum) {
+ this.checksum = checksum;
+ }
+
}
diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageTest.java
b/java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageTest.java
index 5e656ea..614e4c0 100644
--- a/java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageTest.java
+++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageTest.java
@@ -19,6 +19,7 @@ import com.redhat.rhn.common.db.datasource.WriteMode;
import com.redhat.rhn.common.hibernate.HibernateFactory;
import com.redhat.rhn.common.util.MD5Crypt;
import com.redhat.rhn.domain.channel.Channel;
+import com.redhat.rhn.domain.common.Checksum;
import com.redhat.rhn.domain.common.ChecksumFactory;
import
com.redhat.rhn.domain.org.Org;
import com.redhat.rhn.domain.org.OrgFactory;
@@ -224,7 +225,7 @@ public class PackageTest extends RhnBaseTestCase {
file.setInode(343L);
file.setLang("eng");
file.setLinkTo("dkfjdkfj");
- file.setMd5("dkfjd");
+ file.setChecksum(ChecksumFactory.safeCreate("kfdjfkd",
"md5"));
file.setModified(new Date());
file.setMtime(new Date());
file.setRdev(3434L);