java/code/src/com/redhat/rhn/domain/task/Task.hbm.xml |
3
java/code/src/com/redhat/rhn/domain/task/Task.java |
21 ---
java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java |
2
java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java |
59 ++++------
java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java |
49 +++-----
java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java |
45 +++----
schema/spacewalk/common/tables/rhnTaskQueue.sql |
1
schema/spacewalk/upgrade/spacewalk-schema-1.0-to-spacewalk-schema-1.1/001-repo-sync.sql |
4
8 files changed, 74 insertions(+), 110 deletions(-)
New commits:
commit cc9264336c6ff6ffbbc940a5383070dca6cce192
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Mon Jun 21 16:52:56 2010 -0400
making links between repo objects and taskomatic
diff --git a/java/code/src/com/redhat/rhn/domain/task/Task.hbm.xml
b/java/code/src/com/redhat/rhn/domain/task/Task.hbm.xml
index 08d3b56..97d9c7f 100644
--- a/java/code/src/com/redhat/rhn/domain/task/Task.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/task/Task.hbm.xml
@@ -10,8 +10,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
class="com.redhat.rhn.domain.org.OrgImpl"
column="org_id" />
<key-property name="name" type="string"
column="task_name" length="64"/>
- <key-property name="data" column="task_data"
type="long"/>
- <key-property name="data2" column="task_data_two"
type="long"/>
+ <key-property name="data" column="task_data"
type="long"/>
<key-property name="earliest" column="earliest"
type="timestamp"/>
</composite-id>
diff --git a/java/code/src/com/redhat/rhn/domain/task/Task.java
b/java/code/src/com/redhat/rhn/domain/task/Task.java
index f891773..a88c218 100644
--- a/java/code/src/com/redhat/rhn/domain/task/Task.java
+++ b/java/code/src/com/redhat/rhn/domain/task/Task.java
@@ -29,8 +29,7 @@ import java.util.Date;
public class Task implements Serializable {
private String name;
- private Long data;
- private Long data2;
+ private Long data;
private int priority;
private Date earliest;
private Org org;
@@ -48,23 +47,7 @@ public class Task implements Serializable {
*/
public void setData(Long dataIn) {
this.data = dataIn;
- }
-
- /**
- *
- * @return the data
- */
- public Long getData2() {
- return data2;
- }
-
- /**
- *
- * @param dataIn data to set
- */
- public void setData2(Long dataIn) {
- this.data2 = dataIn;
- }
+ }
/**
* @return Returns the earliest.
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 08e231d..465f48e 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
@@ -609,7 +609,7 @@ public class EditChannelAction extends RhnAction implements Listable
{
c.getLastSynced());
}
request.setAttribute("last_sync", lastSync);
- if (ChannelManager.getLatestSyncLogFile(cs, c) != null) {
+ if (ChannelManager.getLatestSyncLogFile(c) != null) {
request.setAttribute("log_url",
DownloadManager.getChannelSyncLogDownloadPath(cs,
ctx.getLoggedInUser()));
diff --git a/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java
b/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java
index bd47599..df5a406 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java
@@ -14,6 +14,32 @@
*/
package com.redhat.rhn.frontend.action.common;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.TimeZone;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.actions.DownloadAction;
+
import com.redhat.rhn.common.conf.Config;
import com.redhat.rhn.common.conf.ConfigDefaults;
import com.redhat.rhn.common.security.SessionSwap;
@@ -22,7 +48,6 @@ import com.redhat.rhn.common.util.MD5Sum;
import com.redhat.rhn.common.util.download.ByteArrayStreamInfo;
import com.redhat.rhn.domain.channel.Channel;
import com.redhat.rhn.domain.channel.ChannelFactory;
-import com.redhat.rhn.domain.channel.ContentSource;
import com.redhat.rhn.domain.kickstart.KickstartFactory;
import com.redhat.rhn.domain.kickstart.KickstartSession;
import com.redhat.rhn.domain.kickstart.KickstartSessionState;
@@ -42,32 +67,6 @@ import com.redhat.rhn.manager.download.DownloadManager;
import com.redhat.rhn.manager.download.UnknownDownloadTypeException;
import com.redhat.rhn.manager.kickstart.KickstartManager;
-import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-import org.apache.struts.actions.DownloadAction;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.TimeZone;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
/**
* ChannelPackagesAction
* @version $Rev$
@@ -373,11 +372,9 @@ public class DownloadFile extends DownloadAction {
(int) patch.getReadme().length()));
}
else if (type.equals(DownloadManager.DOWNLOAD_TYPE_REPO_LOG)) {
- Channel c = ChannelFactory.lookupById((Long)params.get(CHANNEL));
- ContentSource cs =
- ChannelFactory.lookupContentSource(fileId, user.getOrg());
+ Channel c = ChannelFactory.lookupById((Long)params.get(fileId));
ChannelManager.verifyChannelAdmin(user, fileId);
- File file = new File(ChannelManager.getLatestSyncLogFile(cs, c));
+ File file = new File(ChannelManager.getLatestSyncLogFile(c));
StringBuilder output = new StringBuilder();
BufferedReader input = new BufferedReader(new FileReader(file));
diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
index 77ac74e..de36f77 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
@@ -14,6 +14,26 @@
*/
package com.redhat.rhn.manager.channel;
+import java.io.File;
+import java.sql.Timestamp;
+import java.sql.Types;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.commons.lang.BooleanUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
+
import com.redhat.rhn.common.conf.Config;
import com.redhat.rhn.common.conf.ConfigDefaults;
import com.redhat.rhn.common.db.datasource.CallableMode;
@@ -35,7 +55,6 @@ import com.redhat.rhn.domain.channel.ChannelFamily;
import com.redhat.rhn.domain.channel.ChannelFamilyFactory;
import com.redhat.rhn.domain.channel.ChannelVersion;
import com.redhat.rhn.domain.channel.ClonedChannel;
-import com.redhat.rhn.domain.channel.ContentSource;
import com.redhat.rhn.domain.channel.DistChannelMap;
import com.redhat.rhn.domain.channel.InvalidChannelRoleException;
import com.redhat.rhn.domain.channel.ProductName;
@@ -73,26 +92,6 @@ import com.redhat.rhn.manager.system.SystemManager;
import com.redhat.rhn.manager.user.UserManager;
import com.redhat.rhn.taskomatic.task.TaskConstants;
-import org.apache.commons.lang.BooleanUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
-
-import java.io.File;
-import java.sql.Timestamp;
-import java.sql.Types;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
/**
* ChannelManager
* @version $Rev$
@@ -2811,20 +2810,18 @@ public class ChannelManager extends BaseManager {
/**
* get the latest log file for spacewalk-repo-sync
- * @param cs the channel content source you want the latest log file for
* @param c channel
* @return the string of the filename (fully qualified)
*/
- public static String getLatestSyncLogFile(ContentSource cs, Channel c) {
+ public static String getLatestSyncLogFile(Channel c) {
String logPath =
Config.get().getString(ConfigDefaults.SPACEWALK_REPOSYNC_LOG_PATH,
- "/var/log/rhn/reposync/");
- String repoLabel = cs.getLabel();
+ "/var/log/rhn/reposync/");
File dir = new File(logPath);
List<String> possibleList = new ArrayList<String>();
for (String file : dir.list()) {
- if (file.contains(c.getLabel() + '-' + repoLabel)) {
+ if (file.contains(c.getLabel())) {
possibleList.add(file);
}
}
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 82ba218..76dbb0a 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java
@@ -14,23 +14,22 @@
*/
package com.redhat.rhn.taskomatic.task;
-import com.redhat.rhn.common.conf.Config;
-import com.redhat.rhn.common.conf.ConfigDefaults;
-import com.redhat.rhn.domain.channel.Channel;
-import com.redhat.rhn.domain.channel.ChannelFactory;
-import com.redhat.rhn.domain.channel.ContentSource;
-import com.redhat.rhn.domain.task.Task;
-import com.redhat.rhn.domain.task.TaskFactory;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
import org.apache.log4j.Logger;
import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import com.redhat.rhn.common.conf.Config;
+import com.redhat.rhn.common.conf.ConfigDefaults;
+import com.redhat.rhn.domain.channel.Channel;
+import com.redhat.rhn.domain.channel.ChannelFactory;
+import com.redhat.rhn.domain.task.Task;
+import com.redhat.rhn.domain.task.TaskFactory;
/**
@@ -69,15 +68,13 @@ public class RepoSyncTask implements Job {
if (task == null || task.getData() == null) {
TaskFactory.removeTask(task);
continue;
- }
- ContentSource src = ChannelFactory.lookupContentSource(task.getData());
- Channel c = ChannelFactory.lookupById(task.getData2());
+ }
+ Channel c = ChannelFactory.lookupById(task.getData());
if (log.isInfoEnabled()) {
- log.info("Syncing repo " + src.getSourceUrl() + " to
channel " +
- c.getLabel());
+ log.info("Syncing repos for channel: " + c.getName());
}
- if (src == null) {
- log.error("Content Source could not be found: " +
task.getData());
+ if (c == null) {
+ log.error("Channel could not be found: " + task.getData());
TaskFactory.removeTask(task);
continue;
}
@@ -85,7 +82,7 @@ public class RepoSyncTask implements Job {
try {
Process p = Runtime.getRuntime().exec(
- getSyncCommand(src, c).toArray(new String[0]));
+ getSyncCommand(c).toArray(new String[0]));
c.setLastSynced(new Date());
int chr = p.getInputStream().read();
while (chr != -1) {
@@ -101,18 +98,14 @@ public class RepoSyncTask implements Job {
}
}
- private static List<String> getSyncCommand(ContentSource src, Channel c) {
+ private static List<String> getSyncCommand(Channel c) {
List<String> cmd = new ArrayList<String>();
cmd.add(Config.get().getString(ConfigDefaults.SPACEWALK_REPOSYNC_PATH,
"/usr/bin/spacewalk-repo-sync"));
cmd.add("--channel");
cmd.add(c.getLabel());
- cmd.add("--url");
- cmd.add(src.getSourceUrl());
- cmd.add("--type");
- cmd.add(src.getType().getLabel());
- cmd.add("--label");
- cmd.add(src.getLabel());
+ cmd.add("--type");
+ cmd.add(ChannelFactory.CONTENT_SOURCE_TYPE_YUM.getLabel());
cmd.add("--quiet");
return cmd;
}
diff --git a/schema/spacewalk/common/tables/rhnTaskQueue.sql
b/schema/spacewalk/common/tables/rhnTaskQueue.sql
index 6ee756d..240c8c3 100644
--- a/schema/spacewalk/common/tables/rhnTaskQueue.sql
+++ b/schema/spacewalk/common/tables/rhnTaskQueue.sql
@@ -22,7 +22,6 @@ CREATE TABLE rhnTaskQueue
ON DELETE CASCADE,
task_name VARCHAR2(64) NOT NULL,
task_data NUMBER,
- task_data_two NUMBER,
priority NUMBER
DEFAULT (0),
earliest DATE
diff --git
a/schema/spacewalk/upgrade/spacewalk-schema-1.0-to-spacewalk-schema-1.1/001-repo-sync.sql
b/schema/spacewalk/upgrade/spacewalk-schema-1.0-to-spacewalk-schema-1.1/001-repo-sync.sql
index a39ab46..b834613 100644
---
a/schema/spacewalk/upgrade/spacewalk-schema-1.0-to-spacewalk-schema-1.1/001-repo-sync.sql
+++
b/schema/spacewalk/upgrade/spacewalk-schema-1.0-to-spacewalk-schema-1.1/001-repo-sync.sql
@@ -1,10 +1,6 @@
ALTER table rhnChannelContentSource rename to rhnContentSource;
-ALTER table rhnTaskQueue
-add task_data_two NUMBER;
-
-
-- create new table for mapping channels and repos
CREATE TABLE rhnChannelContentSource
(