java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml | 2
-
java/code/src/com/redhat/rhn/domain/channel/Channel.java | 15
+++++++
java/code/src/com/redhat/rhn/domain/channel/ContentSource.hbm.xml | 3
-
java/code/src/com/redhat/rhn/domain/channel/ContentSource.java | 18
---------
java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java | 4
+-
java/code/src/com/redhat/rhn/frontend/dto/ContentSourceDto.java | 19
----------
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelSerializer.java | 4
+-
java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java | 2
-
java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp | 3
-
9 files changed, 23 insertions(+), 47 deletions(-)
New commits:
commit e9caf228653a8cfa89d65fd71e84b48fd5a4de1e
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Mon May 24 18:45:50 2010 -0400
update channel to handle sync date; remove from content source
diff --git a/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
b/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
index b235027..1751603 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
@@ -28,7 +28,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<property name="maintainerEmail" type="string"
column="maint_email"/>
<property name="maintainerPhone" type="string"
column="maint_phone"/>
<property name="supportPolicy" type="string"
column="support_policy"/>
-
+ <property name="lastSynced" type="timestamp"
column="last_synced"/>
<property name="created" column="created"
type="timestamp"
insert="false" update="false"/>
<property name="modified" column="modified"
type="timestamp"
diff --git a/java/code/src/com/redhat/rhn/domain/channel/Channel.java
b/java/code/src/com/redhat/rhn/domain/channel/Channel.java
index de27e11..04924fb 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/Channel.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/Channel.java
@@ -70,6 +70,7 @@ public class Channel extends BaseDomainHelper implements Comparable {
private Long id;
private String label;
private Date lastModified;
+ private Date lastSynced;
private String name;
private String access = PRIVATE;
private Org org;
@@ -302,6 +303,20 @@ public class Channel extends BaseDomainHelper implements Comparable
{
}
/**
+ * @return Returns the lastSynced.
+ */
+ public Date getLastSynced() {
+ return lastSynced;
+ }
+
+ /**
+ * @param lastSyncedIn The lastSynced to set.
+ */
+ public void setLastSynced(Date lastSyncedIn) {
+ this.lastSynced = lastSyncedIn;
+ }
+
+ /**
* @return Returns the name.
*/
public String getName() {
diff --git a/java/code/src/com/redhat/rhn/domain/channel/ContentSource.hbm.xml
b/java/code/src/com/redhat/rhn/domain/channel/ContentSource.hbm.xml
index 9251f5f..e30feb3 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/ContentSource.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/channel/ContentSource.hbm.xml
@@ -13,8 +13,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
</generator>
</id>
- <property name="sourceUrl" type="string"
column="source_url"/>
- <property name="lastSynced" type="timestamp"
column="last_synced"/>
+ <property name="sourceUrl" type="string"
column="source_url"/>
<property name="created" type="timestamp"
column="created" insert="false" update="false" />
<property name="modified" type="timestamp"
column="modified" insert="false" update="false" />
<property name="label" type="string"
column="label"/>
diff --git a/java/code/src/com/redhat/rhn/domain/channel/ContentSource.java
b/java/code/src/com/redhat/rhn/domain/channel/ContentSource.java
index 2211195..af87cb1 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/ContentSource.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/ContentSource.java
@@ -30,8 +30,7 @@ public class ContentSource extends BaseDomainHelper {
private Long id;
private Org org;
private ContentSourceType type;
- private String sourceUrl;
- private Date lastSynced;
+ private String sourceUrl;
private String label;
private Set<Channel> channels = new HashSet<Channel>();
/**
@@ -110,21 +109,6 @@ public class ContentSource extends BaseDomainHelper {
public void setSourceUrl(String sourceUrlIn) {
this.sourceUrl = sourceUrlIn;
}
-
- /**
- * @return Returns the lastSynced.
- */
- public Date getLastSynced() {
- return lastSynced;
- }
-
-
- /**
- * @param lastSyncedIn The lastSynced to set.
- */
- public void setLastSynced(Date lastSyncedIn) {
- this.lastSynced = lastSyncedIn;
- }
/**
*
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
index 4c928e4..e503aea 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
@@ -604,9 +604,9 @@ public class EditChannelAction extends RhnAction implements Listable
{
form.set("repo_label", cs.getLabel());
String lastSync = LocalizationService.getInstance().getMessage(
"channel.edit.repo.neversynced");
- if (cs.getLastSynced() != null) {
+ if (c.getLastSynced() != null) {
lastSync = LocalizationService.getInstance().formatDate(
- cs.getLastSynced());
+ c.getLastSynced());
}
request.setAttribute("last_sync", lastSync);
if (ChannelManager.getLatestSyncLogFile(cs,c) != null) {
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/ContentSourceDto.java
b/java/code/src/com/redhat/rhn/frontend/dto/ContentSourceDto.java
index 0afdfa2..0dd693e 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/ContentSourceDto.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/ContentSourceDto.java
@@ -14,8 +14,6 @@
*/
package com.redhat.rhn.frontend.dto;
-import java.util.Date;
-
/**
* ContentSourceDto
@@ -25,25 +23,8 @@ public class ContentSourceDto extends BaseDto {
private Long id;
private String label;
- private Date lastSynced;
-
- /**
- *
- * @return laste date repo was synced
- */
- public Date getLastSynced() {
- return lastSynced;
- }
/**
- *
- * @param lastSyncedIn date to set of last sync
- */
- public void setLastSynced(Date lastSyncedIn) {
- this.lastSynced = lastSyncedIn;
- }
-
- /**
* {@inheritDoc}
*/
public Long getId() {
diff --git
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelSerializer.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelSerializer.java
index 36bab29..71ae913 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelSerializer.java
@@ -104,8 +104,8 @@ public class ChannelSerializer implements XmlRpcCustomSerializer {
ContentSource cs = c.getSources().iterator().next();
helper.add("yumrepo_source_url", cs.getSourceUrl());
helper.add("yumrepo_label", cs.getLabel());
- if (cs.getLastSynced() != null) {
- helper.add("yumrepo_last_sync", cs.getLastSynced());
+ if (c.getLastSynced() != null) {
+ helper.add("yumrepo_last_sync", c.getLastSynced());
}
else {
helper.add("yumrepo_last_sync", "");
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java
b/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java
index ce11bff..f5e621c 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java
@@ -86,7 +86,7 @@ public class RepoSyncTask implements Job {
try {
Process p = Runtime.getRuntime().exec(
getSyncCommand(src,c).toArray(new String[0]));
- src.setLastSynced(new Date());
+ c.setLastSynced(new Date());
int chr = p.getInputStream().read();
while (chr != -1) {
chr = p.getInputStream().read();
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp
b/java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp
index 4bdf247..9b7955a 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp
@@ -39,9 +39,6 @@
filterattr="label">
<c:out value="<a
href=\"/rhn/channel/manage/RepoEdit.do?label=${current.label}\">${current.label}</a>"
escapeXml="false" />
</rl:column>
- <rl:column headerkey="repos.jsp.lastsync"
styleclass="last-column">
- <c:out value="${current.lastSynced}"/>
- </rl:column>
</rl:list>
</rl:listset>
Show replies by date