spacewalk-commits June 2010

spacewalk-commits@lists.fedorahosted.org

11 participants
236 discussions

Branch 'taskomatic' - 3 commits - java/code
by Tomas Lestach 14 Jun '10

14 Jun '10

java/code/src/com/redhat/rhn/common/util/test/ServletUtilsTest.java | 14 -- java/code/src/com/redhat/rhn/domain/server/test/ServerGroupTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/rhnset/SetItemSelectionAction.java | 4 java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigChannelTag.java | 2 java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java | 2 java/code/src/com/redhat/rhn/frontend/taglibs/list/SelectableColumnTag.java | 4 java/code/src/com/redhat/rhn/frontend/xmlrpc/XmlRpcServlet.java | 2 java/code/src/com/redhat/rhn/taskomatic/NoSuchBunchTaskException.java | 5 java/code/src/com/redhat/rhn/taskomatic/NoSuchTaskException.java | 5 java/code/src/com/redhat/rhn/taskomatic/NoSuchTaskoTriggerException.java | 5 java/code/src/com/redhat/rhn/taskomatic/TaskoFactory.java | 68 ++++++++++ java/code/src/com/redhat/rhn/taskomatic/TaskoRun.hbm.xml | 5 java/code/src/com/redhat/rhn/taskomatic/TaskoTemplate.java | 2 java/code/src/com/redhat/rhn/taskomatic/TaskoXmlRpcHandler.java | 24 ++- java/code/src/com/redhat/rhn/taskomatic/core/RhnJobFactory.java | 1 java/code/src/com/redhat/rhn/taskomatic/task/test/DailySummaryTest.java | 4 java/code/src/com/redhat/rhn/testing/RhnBaseTestCase.java | 3 17 files changed, 121 insertions(+), 33 deletions(-) New commits: commit 18d30dfada31e3a37e613d8e27bc9a4442de635d Author: Tomas Lestach <tlestach(a)redhat.com> Date: Mon Jun 14 19:01:28 2010 +0200 deleting old task run history diff --git a/java/code/src/com/redhat/rhn/taskomatic/NoSuchBunchTaskException.java b/java/code/src/com/redhat/rhn/taskomatic/NoSuchBunchTaskException.java index 54c4ac0..bb7b8b3 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/NoSuchBunchTaskException.java +++ b/java/code/src/com/redhat/rhn/taskomatic/NoSuchBunchTaskException.java @@ -21,6 +21,11 @@ package com.redhat.rhn.taskomatic; */ public class NoSuchBunchTaskException extends Exception { + /** + * Comment for <code>serialVersionUID</code> + */ + private static final long serialVersionUID = -1611165320092152311L; + public NoSuchBunchTaskException(String message) { super(message); } diff --git a/java/code/src/com/redhat/rhn/taskomatic/NoSuchTaskException.java b/java/code/src/com/redhat/rhn/taskomatic/NoSuchTaskException.java index 6170012..f4703de 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/NoSuchTaskException.java +++ b/java/code/src/com/redhat/rhn/taskomatic/NoSuchTaskException.java @@ -21,4 +21,9 @@ package com.redhat.rhn.taskomatic; */ public class NoSuchTaskException extends Exception { + /** + * Comment for <code>serialVersionUID</code> + */ + private static final long serialVersionUID = -1252459283237351146L; + } diff --git a/java/code/src/com/redhat/rhn/taskomatic/NoSuchTaskoTriggerException.java b/java/code/src/com/redhat/rhn/taskomatic/NoSuchTaskoTriggerException.java index 8feed42..196a34b 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/NoSuchTaskoTriggerException.java +++ b/java/code/src/com/redhat/rhn/taskomatic/NoSuchTaskoTriggerException.java @@ -17,4 +17,9 @@ package com.redhat.rhn.taskomatic; public class NoSuchTaskoTriggerException extends Exception { + /** + * Comment for <code>serialVersionUID</code> + */ + private static final long serialVersionUID = 1110623343705256957L; + } diff --git a/java/code/src/com/redhat/rhn/taskomatic/TaskoFactory.java b/java/code/src/com/redhat/rhn/taskomatic/TaskoFactory.java index 4f477aa..6a62706 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/TaskoFactory.java +++ b/java/code/src/com/redhat/rhn/taskomatic/TaskoFactory.java @@ -16,9 +16,14 @@ package com.redhat.rhn.taskomatic; import com.redhat.rhn.common.hibernate.HibernateFactory; +import com.redhat.rhn.taskomatic.core.SchedulerKernel; import org.apache.log4j.Logger; +import org.quartz.SchedulerException; +import org.quartz.Trigger; +import java.io.File; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -64,6 +69,10 @@ public class TaskoFactory extends HibernateFactory { singleton.saveObject(taskoRun); } + public static void delete(TaskoRun taskoRun) { + singleton.removeObject(taskoRun); + } + public static void save(TaskoTemplate taskoTemplate) { singleton.saveObject(taskoTemplate); } @@ -81,4 +90,63 @@ public class TaskoFactory extends HibernateFactory { return (List<TaskoTask>) singleton.listObjectsByNamedQuery( "TaskoTask.listTasks", new HashMap()); } + + public static List<TaskoRun> listRunsOlderThan(Integer orgId, Date limitTime) { + Map params = new HashMap(); + params.put("org_id", orgId); + params.put("limit_time", limitTime); + return (List<TaskoRun>) singleton.listObjectsByNamedQuery( + "TaskoRun.listRunsOlderThan", params); + } + + public static void clearRunHistory(Integer orgId, Date limitTime) { + try { + String[] triggerNames = SchedulerKernel.getScheduler(). + getTriggerNames(orgId.toString()); + // triggerName == jobLabel + for (String jobLabel : triggerNames) { + // delete history of runs + List<TaskoRun> runList = + TaskoFactory.listRunsOlderThan(orgId, limitTime); + for (TaskoRun run : runList) { + TaskoFactory.deleteLogFiles(run); + TaskoFactory.delete(run); + } + + // unschedule outdated jobs + Trigger trigger = SchedulerKernel.getScheduler().getTrigger( + jobLabel, orgId.toString()); + Date endTime = trigger.getEndTime(); + if ((endTime != null) && (endTime.before(limitTime))) { + SchedulerKernel.getScheduler().unscheduleJob(trigger.getName(), + orgId.toString()); + } + } + TaskoFactory.commitTransaction(); + } + catch (SchedulerException e) { + TaskoFactory.rollbackTransaction(); + } + } + + public static void deleteLogFiles(TaskoRun run) { + String out = run.getStdOutputPath(); + if ((out != null) && (!out.isEmpty())) { + deleteFile(out); + run.setStdOutputPath(null); + } + String err = run.getStdErrorPath(); + if ((err != null) && (!err.isEmpty())) { + deleteFile(err); + run.setStdErrorPath(null); + } + } + + private static boolean deleteFile(String fileName) { + File file = new File(fileName); + if (file.exists()) { + return file.delete(); + } + return false; + } } diff --git a/java/code/src/com/redhat/rhn/taskomatic/TaskoRun.hbm.xml b/java/code/src/com/redhat/rhn/taskomatic/TaskoRun.hbm.xml index 07248ad..bb316e3 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/TaskoRun.hbm.xml +++ b/java/code/src/com/redhat/rhn/taskomatic/TaskoRun.hbm.xml @@ -33,8 +33,11 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" </class> <query name="TaskoRun.listRunsWithStatus"> - <![CDATA[from com.redhat.rhn.taskomatic.TaskoRun as r where r.template.task.id = :task_id AND (r.status = :status1 OR status = :status2)]]> + <![CDATA[FROM com.redhat.rhn.taskomatic.TaskoRun AS r WHERE r.template.task.id = :task_id AND (r.status = :status1 OR status = :status2)]]> </query> + <query name="TaskoRun.listRunsOlderThan"> + <![CDATA[FROM com.redhat.rhn.taskomatic.TaskoRun AS r WHERE r.orgId = :org_id and r.endTime < :limit_time]]> + </query> </hibernate-mapping> diff --git a/java/code/src/com/redhat/rhn/taskomatic/TaskoXmlRpcHandler.java b/java/code/src/com/redhat/rhn/taskomatic/TaskoXmlRpcHandler.java index e0c9e1e..ca6d88e 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/TaskoXmlRpcHandler.java +++ b/java/code/src/com/redhat/rhn/taskomatic/TaskoXmlRpcHandler.java @@ -75,11 +75,20 @@ public class TaskoXmlRpcHandler { params); } - public int unscheduleBunch(Integer orgId, String triggerName) + public int unscheduleBunch(Integer orgId, String jobLabel) throws NoSuchTaskoTriggerException { try { - return SchedulerKernel.getScheduler().unscheduleJob(triggerName, - orgId.toString()) ? 1 : 0; + Trigger trigger = SchedulerKernel.getScheduler().getTrigger( + jobLabel, orgId.toString()); + if (false) { + Trigger newTrigger = (Trigger) trigger.clone(); + newTrigger.setEndTime(new Date()); + SchedulerKernel.getScheduler().rescheduleJob(jobLabel, orgId.toString(), newTrigger); + } + else { + SchedulerKernel.getScheduler().unscheduleJob(jobLabel, orgId.toString()); + } + return 1; } catch (SchedulerException e) { throw new NoSuchTaskoTriggerException(); @@ -88,7 +97,7 @@ public class TaskoXmlRpcHandler { public Date scheduleSingleBunchRun(Integer orgId, String bunchName, String jobLabel, Map params) - throws ParseException, InvalidJobLabelException, NoSuchBunchTaskException { + throws InvalidJobLabelException, NoSuchBunchTaskException { try { JobDetail jobDetail = createJob(bunchName, orgId, jobLabel, params); SimpleTrigger st = new SimpleTrigger(jobLabel, orgId.toString(), 1, 1); @@ -110,7 +119,7 @@ public class TaskoXmlRpcHandler { } TaskoBunch bunch = TaskoFactory.lookupOrgBunchByName(bunchName); if (bunch == null) { - throw new NoSuchBunchTaskException("bunchName"); + throw new NoSuchBunchTaskException(bunchName); } // create job JobDetail jobDetail = new JobDetail(jobLabel, orgId.toString(), @@ -133,4 +142,9 @@ public class TaskoXmlRpcHandler { throw new NoSuchTaskoTriggerException(); } } + + public int clearRunHistory(Integer orgId, Date limitTime) { + TaskoFactory.clearRunHistory(orgId, limitTime); + return 1; + } } diff --git a/java/code/src/com/redhat/rhn/taskomatic/core/RhnJobFactory.java b/java/code/src/com/redhat/rhn/taskomatic/core/RhnJobFactory.java index 4eee7dd..4406c5d 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/core/RhnJobFactory.java +++ b/java/code/src/com/redhat/rhn/taskomatic/core/RhnJobFactory.java @@ -17,7 +17,6 @@ package com.redhat.rhn.taskomatic.core; import com.redhat.rhn.common.hibernate.HibernateRuntimeException; import com.redhat.rhn.taskomatic.TaskoBunch; import com.redhat.rhn.taskomatic.TaskoFactory; -import com.redhat.rhn.taskomatic.TaskoTemplate; import org.quartz.Job; import org.quartz.SchedulerException; commit c2e950489de46dc6217d80c6ce4c705da566ab66 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Mon Jun 14 19:00:02 2010 +0200 code cleanup - removed exceptions from method definitions that aren't thrown - removed unused imports diff --git a/java/code/src/com/redhat/rhn/common/util/test/ServletUtilsTest.java b/java/code/src/com/redhat/rhn/common/util/test/ServletUtilsTest.java index 5e8cbf2..19e8516 100644 --- a/java/code/src/com/redhat/rhn/common/util/test/ServletUtilsTest.java +++ b/java/code/src/com/redhat/rhn/common/util/test/ServletUtilsTest.java @@ -119,7 +119,7 @@ public class ServletUtilsTest extends MockObjectTestCase { assertEquals(expectedParams, actualParams); } - public void testPathWithParamsValueUrlEncoding() throws UnsupportedEncodingException { + public void testPathWithParamsValueUrlEncoding() { Map params = new HashMap(); params.put("key", "some; value&"); String result = ServletUtils.pathWithParams("/foo", params); @@ -133,16 +133,14 @@ public class ServletUtilsTest extends MockObjectTestCase { assertEquals("/foo", result); } - public void testPathWithParamsArrayValueUrlEncoding() - throws UnsupportedEncodingException { + public void testPathWithParamsArrayValueUrlEncoding() { Map params = new HashMap(); params.put("key", new Object[] {"value;", "value&", "$", "normal"}); String result = ServletUtils.pathWithParams("/foo", params); assertEquals("/foo?key=value%3B&key=value%26&key=%24&key=normal", result); } - public void testPathWithParamsListValue() - throws UnsupportedEncodingException { + public void testPathWithParamsListValue() { Map params = new HashMap(); List values = new ArrayList(); values.add("value;"); @@ -155,16 +153,14 @@ public class ServletUtilsTest extends MockObjectTestCase { } - public void testPathWithParamsKeyUrlEncoding() - throws UnsupportedEncodingException { + public void testPathWithParamsKeyUrlEncoding() { Map params = new HashMap(); params.put("a;", "somevalue"); String result = ServletUtils.pathWithParams("/foo", params); assertEquals("/foo?a%3B=somevalue", result); } - public void testPathWithParamsKeyArrayUrlEncoding() - throws UnsupportedEncodingException { + public void testPathWithParamsKeyArrayUrlEncoding() { Map params = new HashMap(); params.put("a;", new Object[] {"1", "2", "3"}); String result = ServletUtils.pathWithParams("/foo", params); diff --git a/java/code/src/com/redhat/rhn/domain/server/test/ServerGroupTest.java b/java/code/src/com/redhat/rhn/domain/server/test/ServerGroupTest.java index 10a13b7..119f8ce 100644 --- a/java/code/src/com/redhat/rhn/domain/server/test/ServerGroupTest.java +++ b/java/code/src/com/redhat/rhn/domain/server/test/ServerGroupTest.java @@ -32,7 +32,6 @@ import com.redhat.rhn.testing.UserTestUtils; import org.hibernate.Session; -import java.sql.SQLException; import java.util.HashMap; import java.util.Map; @@ -104,8 +103,7 @@ public class ServerGroupTest extends RhnBaseTestCase { private static EntitlementServerGroup updateGroupType(EntitlementServerGroup sg, - ServerGroupType type) - throws SQLException { + ServerGroupType type) { WriteMode m = ModeFactory.getWriteMode("test_queries", "update_group_type"); diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnset/SetItemSelectionAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnset/SetItemSelectionAction.java index 02f074f..a6233cd 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/rhnset/SetItemSelectionAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/rhnset/SetItemSelectionAction.java @@ -26,7 +26,6 @@ import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; -import java.io.IOException; import java.util.Set; import javax.servlet.http.HttpServletRequest; @@ -107,8 +106,7 @@ public class SetItemSelectionAction extends RhnAction { // Write an responseText with the current count from the set - private void writeResponse(HttpServletResponse resp, int setSize, String setLabel) - throws IOException { + private void writeResponse(HttpServletResponse resp, int setSize, String setLabel) { StringBuffer responseText = new StringBuffer(); LocalizationService ls = LocalizationService.getInstance(); if (RhnSetDecl.SYSTEMS.getLabel().equals(setLabel)) { diff --git a/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigChannelTag.java b/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigChannelTag.java index 7113f84..e58807a 100644 --- a/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigChannelTag.java +++ b/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigChannelTag.java @@ -120,7 +120,7 @@ public class ConfigChannelTag extends TagSupport { /** * Checks to see if no invalid values are specified */ - private boolean checkType() throws JspException { + private boolean checkType() { try { ConfigChannelType.lookup(type); return true; diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java index 51a126b..38061aa 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java @@ -889,7 +889,7 @@ public class ListDisplayTag extends BodyTagSupport { buf.append(input.render() + "\n"); } - private void renderViewAllLink(JspWriter out) throws IOException { + private void renderViewAllLink(JspWriter out) { /* diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/SelectableColumnTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/SelectableColumnTag.java index 6f9d2b9..2222bce 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/SelectableColumnTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/SelectableColumnTag.java @@ -380,7 +380,7 @@ public class SelectableColumnTag extends TagSupport { ListTagUtil.write(pageContext, "\" />\n"); } - private boolean isSelected() throws JspException { + private boolean isSelected() { if (!StringUtils.isBlank(selectExpr)) { return selectExpr.equalsIgnoreCase("true"); } @@ -394,7 +394,7 @@ public class SelectableColumnTag extends TagSupport { return selections != null && selections.containsKey(valueExpr); } - private boolean isDisabled() throws JspException { + private boolean isDisabled() { if (disabledExpr != null && disabledExpr.equalsIgnoreCase("true")) { return true; } diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/XmlRpcServlet.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/XmlRpcServlet.java index 24d52f8..a60444c 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/XmlRpcServlet.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/XmlRpcServlet.java @@ -69,7 +69,7 @@ public class XmlRpcServlet extends HttpServlet { private void passControl(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws IOException { response.sendRedirect("/rhn/apidoc/index.jsp"); } diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/test/DailySummaryTest.java b/java/code/src/com/redhat/rhn/taskomatic/task/test/DailySummaryTest.java index a957665..375a4a1 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/test/DailySummaryTest.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/test/DailySummaryTest.java @@ -20,8 +20,6 @@ import com.redhat.rhn.taskomatic.task.DailySummary; import com.redhat.rhn.testing.RhnBaseTestCase; import com.redhat.rhn.testing.UserTestUtils; -import org.quartz.JobExecutionException; - import java.util.HashMap; import java.util.Map; @@ -76,7 +74,7 @@ public class DailySummaryTest extends RhnBaseTestCase { return; } - public void aTestExcecute() throws JobExecutionException { + public void aTestExcecute() { // using jesusr_redhat orgid for this test. Run only on hosted. // TODO: how do we create good test data for something like this? return; diff --git a/java/code/src/com/redhat/rhn/testing/RhnBaseTestCase.java b/java/code/src/com/redhat/rhn/testing/RhnBaseTestCase.java index 52f2780..5cc8325 100644 --- a/java/code/src/com/redhat/rhn/testing/RhnBaseTestCase.java +++ b/java/code/src/com/redhat/rhn/testing/RhnBaseTestCase.java @@ -27,7 +27,6 @@ import org.hibernate.HibernateException; import org.hibernate.Session; import java.io.File; -import java.io.IOException; import java.io.Serializable; import java.lang.reflect.InvocationTargetException; import java.text.DateFormat; @@ -268,7 +267,7 @@ public abstract class RhnBaseTestCase extends TestCase { log.setLevel(Level.ERROR); } - protected static void createDirIfNotExists(File dir) throws IOException { + protected static void createDirIfNotExists(File dir) { String error = "Could not create the following directory:[" + dir.getPath() + "] . Please create that directory before proceeding with the tests"; commit 191aca930aaccb35bd67ac8911f473d4dea954a5 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Mon Jun 14 10:00:06 2010 +0200 fix for another assignment without effect diff --git a/java/code/src/com/redhat/rhn/taskomatic/TaskoTemplate.java b/java/code/src/com/redhat/rhn/taskomatic/TaskoTemplate.java index 62850b0..a308fe1 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/TaskoTemplate.java +++ b/java/code/src/com/redhat/rhn/taskomatic/TaskoTemplate.java @@ -128,7 +128,7 @@ public class TaskoTemplate { * @param modifiedIn The modified to set. */ public void setModified(Date modifiedIn) { - this.modified = modified; + this.modified = modifiedIn; }

1 0

Branch 'fve' - 5 commits - client/rhel java/build.xml rel-eng/packages
by Partha Aji 14 Jun '10

14 Jun '10

client/rhel/yum-rhn-plugin/rhnplugin.py | 2 +- client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 15 ++++++++++++++- java/build.xml | 4 ++-- rel-eng/packages/yum-rhn-plugin | 2 +- 4 files changed, 18 insertions(+), 5 deletions(-) New commits: commit 15b6622765e6ac72b44b3b4ec79b6f11ebe08abb Merge: fba324a... 81a1597... Author: Partha Aji <paji(a)redhat.com> Date: Mon Jun 14 11:47:22 2010 -0400 Merge branch 'master' into fve commit 81a159731c75763d1c2eacf31055df3eb14fa9fc Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Mon Jun 14 16:50:02 2010 +0200 Automatic commit of package [yum-rhn-plugin] release [1.1.3-1]. diff --git a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec index 7afb4e6..15f0141 100644 --- a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec +++ b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec @@ -1,6 +1,6 @@ Summary: RHN support for yum Name: yum-rhn-plugin -Version: 1.1.2 +Version: 1.1.3 Release: 1%{?dist} License: GPLv2 Group: System Environment/Base @@ -53,6 +53,19 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE %changelog +* Mon Jun 14 2010 Miroslav Suchý <msuchy(a)redhat.com> 1.1.3-1 +- 598323 - yumex do not set version (msuchy(a)redhat.com) +- l10n: Updates to Chinese (China) (zh_CN) translation + (leahliu(a)fedoraproject.org) +- l10n: Updates to Spanish (Castilian) (es) translation + (gguerrer(a)fedoraproject.org) +- l10n: Updates to Russian (ru) translation (ypoyarko(a)fedoraproject.org) +- cleanup - removing translation file, which does not match any language code + (msuchy(a)redhat.com) +- update po files for yum-rhn-plugin (msuchy(a)redhat.com) +- l10n: Updates to German (de) translation (ttrinks(a)fedoraproject.org) +- l10n: Updates to Polish (pl) translation (raven(a)fedoraproject.org) + * Wed May 05 2010 Justin Sherrill <jsherril(a)redhat.com> 1.1.2-1 - 589120 - fixing issue with traceback from rhn_chec "no attribute cfg" (jsherril(a)redhat.com) diff --git a/rel-eng/packages/yum-rhn-plugin b/rel-eng/packages/yum-rhn-plugin index 191c38b..b4664b0 100644 --- a/rel-eng/packages/yum-rhn-plugin +++ b/rel-eng/packages/yum-rhn-plugin @@ -1 +1 @@ -1.1.2-1 client/rhel/yum-rhn-plugin/ +1.1.3-1 client/rhel/yum-rhn-plugin/ commit f3fbab86131955dfc5fc162aed47c8da474f0e5c Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Mon Jun 14 16:46:18 2010 +0200 598323 - yumex do not set version addressing: YUM: Loaded plugins: multithread, rhnplugin YUM: Traceback (most recent call last): YUM: File "/usr/share/yumex/yum_childtask.py", line 61, in <module> YUM: my = YumServer(debuglevel, plugins, offline, repos) YUM: File "/usr/lib/python2.6/site-packages/yumexbackend/yum_server.py", line 158, in __init__ YUM: self.doLock() YUM: File "/usr/lib/python2.6/site-packages/yumexbackend/yum_server.py", line 226, in doLock YUM: yum.YumBase.doLock(self) YUM: File "/usr/lib/python2.6/site-packages/yum/__init__.py", line 1377, in doLock YUM: if self.conf.uid != 0: YUM: File "/usr/lib/python2.6/site-packages/yum/__init__.py", line 778, in <lambda> YUM: conf = property(fget=lambda self: self._getConfig(), YUM: File "/usr/lib/python2.6/site-packages/yum/__init__.py", line 311, in _getConfig YUM: self.plugins.run('init') YUM: File "/usr/lib/python2.6/site-packages/yum/plugins.py", line 177, in run YUM: func(conduitcls(self, self.base, conf, **kwargs)) YUM: File "/usr/share/yum-plugins/rhnplugin.py", line 110, in init_hook YUM: if opts.version or (len(commands) == 0): YUM: AttributeError: Values instance has no attribute 'version' diff --git a/client/rhel/yum-rhn-plugin/rhnplugin.py b/client/rhel/yum-rhn-plugin/rhnplugin.py index c7ab606..595b1ca 100644 --- a/client/rhel/yum-rhn-plugin/rhnplugin.py +++ b/client/rhel/yum-rhn-plugin/rhnplugin.py @@ -107,7 +107,7 @@ def init_hook(conduit): "\n" + RHN_DISABLED) return - if opts.version or (len(commands) == 0): + if (hasattr(opts,'version') and opts.version) or (len(commands) == 0): rhn_enabled = False conduit.info(10, _("Either --version, or no commands entered") + "\n" + RHN_DISABLED) commit b7a9bfb131d18432763bff021ccd1f85e664e9ac Author: Shannon Hughes <shughes(a)redhat.com> Date: Mon Jun 14 09:47:36 2010 -0400 bumping up heap to 512m for jsp compiles diff --git a/java/build.xml b/java/build.xml index a88c955..fbee15a 100644 --- a/java/build.xml +++ b/java/build.xml @@ -608,7 +608,7 @@ target="1.5" deprecation="${deprecation}" fork="yes" - memoryMaximumSize="256m" + memoryMaximumSize="512m" classpathref="alljars"> <src path="${build.dir}/jsp-temp"/> </javac> commit 11bb67104f1163479915deb0b82d115f5c4a0a8d Author: Shannon Hughes <shughes(a)redhat.com> Date: Mon Jun 14 09:43:22 2010 -0400 bumping up build heap to 512m diff --git a/java/build.xml b/java/build.xml index 5f903e4..a88c955 100644 --- a/java/build.xml +++ b/java/build.xml @@ -456,7 +456,7 @@ nowarn="${nowarn}" encoding="utf-8" fork="yes" - memoryMaximumSize="256m" + memoryMaximumSize="512m" classpathref="buildjars" > <src> <path location="${build.dir}/src" />

1 0

Changes to 'refs/tags/yum-rhn-plugin-1.1.3-1'
by Miroslav Suchý 14 Jun '10

14 Jun '10

Tag 'yum-rhn-plugin-1.1.3-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2010-06-14 14:50 +0000 Tagging package [yum-rhn-plugin] version [1.1.3-1] in directory [client/rhel/yum-rhn-plugin/]. Changes since spacewalk-backend-1.1.20-1: Justin Sherrill (4): 600323 - fixing checksums KeyError with rhnpush fix broken solaris package downloads, due to much needed and urgent change of package parsing going from NVREA to NEVRA from january (commit 1db6ede50c55b44bc464119d9c29d4bc1b9c4df7 & 18b077ab79d7b19df0f29434156feca9b646e4bd) 600323 - fixing checksums KeyError with rhnpush and channel association Automatic commit of package [spacewalk-backend] release [1.1.21-1]. Milan Zazrivec (2): 596237 - use correct constant in HardwareWindow (tui) 601683 - properly import get_computer_info routine Miroslav Suchý (2): 598323 - yumex do not set version Automatic commit of package [yum-rhn-plugin] release [1.1.3-1]. Partha Aji (3): removed an unused method Removed the bulk-subscribe and unsubscribe which is not used anywhere Removed an unnecessary abstraction for VirtEntitlements Shannon Hughes (2): bumping up build heap to 512m bumping up heap to 512m for jsp compiles Tomas Lestach (1): 591291 - associate packages also (when mergeing errata) leahliu (1): l10n: Updates to Chinese (China) (zh_CN) translation --- backend/server/importlib/headerSource.py | 1 backend/server/importlib/packageImport.py | 4 backend/server/rhnPackage.py | 3 backend/spacewalk-backend.spec | 8 client/rhel/rhn-client-tools/src/up2date_client/hardware.py | 6 client/rhel/rhn-client-tools/src/up2date_client/tui.py | 2 client/rhel/yum-rhn-plugin/po/zh_CN.po | 30 +-- client/rhel/yum-rhn-plugin/rhnplugin.py | 2 client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 15 + java/build.xml | 4 java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/VirtualizationEntitlementsAction.java | 19 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java | 7 java/code/src/com/redhat/rhn/manager/system/VirtEntitlementsManagerImpl.java | 67 ------- java/code/src/com/redhat/rhn/manager/system/VirtualizationEntitlementsManager.java | 37 +++- rel-eng/packages/spacewalk-backend | 2 rel-eng/packages/yum-rhn-plugin | 2 schema/spacewalk/oracle/packages/rhn_channel.pkb | 17 -- schema/spacewalk/oracle/packages/rhn_channel.pks | 3 schema/spacewalk/postgres/packages/rhn_channel.pkb | 29 --- web/html/network/software/channels/license.pxt | 45 ----- web/html/network/systems/ssm/channels/index.pxt | 79 --------- web/html/network/systems/ssm/channels/license.pxt | 60 ------- web/modules/rhn/RHN/DB/Server.pm | 60 ------- web/modules/rhn/RHN/DB/ServerActions.pm | 42 ----- web/modules/sniglets/Sniglets/Channel.pm | 68 -------- web/modules/sniglets/Sniglets/ListView/SystemList.pm | 84 ---------- 26 files changed, 102 insertions(+), 594 deletions(-) ---

1 0

client/rhel rel-eng/packages
by Miroslav Suchý 14 Jun '10

14 Jun '10

client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 15 ++++++++++++++- rel-eng/packages/yum-rhn-plugin | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) New commits: commit 81a159731c75763d1c2eacf31055df3eb14fa9fc Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Mon Jun 14 16:50:02 2010 +0200 Automatic commit of package [yum-rhn-plugin] release [1.1.3-1]. diff --git a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec index 7afb4e6..15f0141 100644 --- a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec +++ b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec @@ -1,6 +1,6 @@ Summary: RHN support for yum Name: yum-rhn-plugin -Version: 1.1.2 +Version: 1.1.3 Release: 1%{?dist} License: GPLv2 Group: System Environment/Base @@ -53,6 +53,19 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE %changelog +* Mon Jun 14 2010 Miroslav Suchý <msuchy(a)redhat.com> 1.1.3-1 +- 598323 - yumex do not set version (msuchy(a)redhat.com) +- l10n: Updates to Chinese (China) (zh_CN) translation + (leahliu(a)fedoraproject.org) +- l10n: Updates to Spanish (Castilian) (es) translation + (gguerrer(a)fedoraproject.org) +- l10n: Updates to Russian (ru) translation (ypoyarko(a)fedoraproject.org) +- cleanup - removing translation file, which does not match any language code + (msuchy(a)redhat.com) +- update po files for yum-rhn-plugin (msuchy(a)redhat.com) +- l10n: Updates to German (de) translation (ttrinks(a)fedoraproject.org) +- l10n: Updates to Polish (pl) translation (raven(a)fedoraproject.org) + * Wed May 05 2010 Justin Sherrill <jsherril(a)redhat.com> 1.1.2-1 - 589120 - fixing issue with traceback from rhn_chec "no attribute cfg" (jsherril(a)redhat.com) diff --git a/rel-eng/packages/yum-rhn-plugin b/rel-eng/packages/yum-rhn-plugin index 191c38b..b4664b0 100644 --- a/rel-eng/packages/yum-rhn-plugin +++ b/rel-eng/packages/yum-rhn-plugin @@ -1 +1 @@ -1.1.2-1 client/rhel/yum-rhn-plugin/ +1.1.3-1 client/rhel/yum-rhn-plugin/

1 0

client/rhel
by Miroslav Suchý 14 Jun '10

14 Jun '10

client/rhel/yum-rhn-plugin/rhnplugin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f3fbab86131955dfc5fc162aed47c8da474f0e5c Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Mon Jun 14 16:46:18 2010 +0200 598323 - yumex do not set version addressing: YUM: Loaded plugins: multithread, rhnplugin YUM: Traceback (most recent call last): YUM: File "/usr/share/yumex/yum_childtask.py", line 61, in <module> YUM: my = YumServer(debuglevel, plugins, offline, repos) YUM: File "/usr/lib/python2.6/site-packages/yumexbackend/yum_server.py", line 158, in __init__ YUM: self.doLock() YUM: File "/usr/lib/python2.6/site-packages/yumexbackend/yum_server.py", line 226, in doLock YUM: yum.YumBase.doLock(self) YUM: File "/usr/lib/python2.6/site-packages/yum/__init__.py", line 1377, in doLock YUM: if self.conf.uid != 0: YUM: File "/usr/lib/python2.6/site-packages/yum/__init__.py", line 778, in <lambda> YUM: conf = property(fget=lambda self: self._getConfig(), YUM: File "/usr/lib/python2.6/site-packages/yum/__init__.py", line 311, in _getConfig YUM: self.plugins.run('init') YUM: File "/usr/lib/python2.6/site-packages/yum/plugins.py", line 177, in run YUM: func(conduitcls(self, self.base, conf, **kwargs)) YUM: File "/usr/share/yum-plugins/rhnplugin.py", line 110, in init_hook YUM: if opts.version or (len(commands) == 0): YUM: AttributeError: Values instance has no attribute 'version' diff --git a/client/rhel/yum-rhn-plugin/rhnplugin.py b/client/rhel/yum-rhn-plugin/rhnplugin.py index c7ab606..595b1ca 100644 --- a/client/rhel/yum-rhn-plugin/rhnplugin.py +++ b/client/rhel/yum-rhn-plugin/rhnplugin.py @@ -107,7 +107,7 @@ def init_hook(conduit): "\n" + RHN_DISABLED) return - if opts.version or (len(commands) == 0): + if (hasattr(opts,'version') and opts.version) or (len(commands) == 0): rhn_enabled = False conduit.info(10, _("Either --version, or no commands entered") + "\n" + RHN_DISABLED)

1 0

java/build.xml
by Shannon Hughes 14 Jun '10

14 Jun '10

java/build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b7a9bfb131d18432763bff021ccd1f85e664e9ac Author: Shannon Hughes <shughes(a)redhat.com> Date: Mon Jun 14 09:47:36 2010 -0400 bumping up heap to 512m for jsp compiles diff --git a/java/build.xml b/java/build.xml index a88c955..fbee15a 100644 --- a/java/build.xml +++ b/java/build.xml @@ -608,7 +608,7 @@ target="1.5" deprecation="${deprecation}" fork="yes" - memoryMaximumSize="256m" + memoryMaximumSize="512m" classpathref="alljars"> <src path="${build.dir}/jsp-temp"/> </javac>

1 0

java/build.xml
by Shannon Hughes 14 Jun '10

14 Jun '10

java/build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 11bb67104f1163479915deb0b82d115f5c4a0a8d Author: Shannon Hughes <shughes(a)redhat.com> Date: Mon Jun 14 09:43:22 2010 -0400 bumping up build heap to 512m diff --git a/java/build.xml b/java/build.xml index 5f903e4..a88c955 100644 --- a/java/build.xml +++ b/java/build.xml @@ -456,7 +456,7 @@ nowarn="${nowarn}" encoding="utf-8" fork="yes" - memoryMaximumSize="256m" + memoryMaximumSize="512m" classpathref="buildjars" > <src> <path location="${build.dir}/src" />

1 0

Branch 'taskomatic' - 2 commits - java/code schema/spacewalk
by Tomas Lestach 11 Jun '10

11 Jun '10

java/code/src/com/redhat/rhn/taskomatic/NoSuchBunchTaskException.java | 3 java/code/src/com/redhat/rhn/taskomatic/TaskoBunch.hbm.xml | 16 ++ java/code/src/com/redhat/rhn/taskomatic/TaskoFactory.java | 16 ++ java/code/src/com/redhat/rhn/taskomatic/TaskoRun.java | 4 java/code/src/com/redhat/rhn/taskomatic/TaskoTemplate.hbm.xml | 6 - java/code/src/com/redhat/rhn/taskomatic/TaskoTemplate.java | 3 java/code/src/com/redhat/rhn/taskomatic/TaskoXmlRpcHandler.java | 57 +++++++--- java/code/src/com/redhat/rhn/taskomatic/core/RhnJobFactory.java | 3 schema/spacewalk/common/data/rhnTaskoBunch.sql | 4 schema/spacewalk/common/tables/rhnTaskoTemplate.sql | 2 10 files changed, 85 insertions(+), 29 deletions(-) New commits: commit 01deaffafe72ecff9e3bd4f6302ea1c24f0c1349 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Fri Jun 11 17:56:44 2010 +0200 make taskomatic working again diff --git a/java/code/src/com/redhat/rhn/taskomatic/NoSuchBunchTaskException.java b/java/code/src/com/redhat/rhn/taskomatic/NoSuchBunchTaskException.java index 812c500..54c4ac0 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/NoSuchBunchTaskException.java +++ b/java/code/src/com/redhat/rhn/taskomatic/NoSuchBunchTaskException.java @@ -21,4 +21,7 @@ package com.redhat.rhn.taskomatic; */ public class NoSuchBunchTaskException extends Exception { + public NoSuchBunchTaskException(String message) { + super(message); + } } diff --git a/java/code/src/com/redhat/rhn/taskomatic/TaskoBunch.hbm.xml b/java/code/src/com/redhat/rhn/taskomatic/TaskoBunch.hbm.xml index 07efb14..2b8a2df 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/TaskoBunch.hbm.xml +++ b/java/code/src/com/redhat/rhn/taskomatic/TaskoBunch.hbm.xml @@ -13,7 +13,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" </generator> </id> - <property name="name" type="string" column="name"/> + <property name="name" type="string" column="name" unique="true"/> <property name="description" type="string" column="description"/> <property name="activeFrom" type="date" column="active_from"/> <property name="activeTill" type="date" column="active_till"/> @@ -33,15 +33,23 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" </class> <query name="TaskoBunch.findById"> - <![CDATA[from com.redhat.rhn.taskomatic.TaskoBunch where id = :id]]> + <![CDATA[FROM com.redhat.rhn.taskomatic.TaskoBunch WHERE id = :id]]> </query> <query name="TaskoBunch.findByName"> - <![CDATA[from com.redhat.rhn.taskomatic.TaskoBunch where name = :name]]> + <![CDATA[FROM com.redhat.rhn.taskomatic.TaskoBunch WHERE name = :name]]> + </query> + + <query name="TaskoBunch.findOrgBunchByName"> + <![CDATA[FROM com.redhat.rhn.taskomatic.TaskoBunch WHERE orgBunch is not null AND name = :name]]> + </query> + + <query name="TaskoBunch.findSatBunchByName"> + <![CDATA[FROM com.redhat.rhn.taskomatic.TaskoBunch WHERE orgBunch is null AND name = :name]]> </query> <query name="TaskoBunch.listBunches"> - <![CDATA[from com.redhat.rhn.taskomatic.TaskoBunch as b]]> + <![CDATA[FROM com.redhat.rhn.taskomatic.TaskoBunch as b]]> </query> </hibernate-mapping> diff --git a/java/code/src/com/redhat/rhn/taskomatic/TaskoFactory.java b/java/code/src/com/redhat/rhn/taskomatic/TaskoFactory.java index d5806b9..4f477aa 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/TaskoFactory.java +++ b/java/code/src/com/redhat/rhn/taskomatic/TaskoFactory.java @@ -40,11 +40,19 @@ public class TaskoFactory extends HibernateFactory { return log; } - public static TaskoBunch lookupByName(String bunchName) { + public static TaskoBunch lookupOrgBunchByName(String bunchName) { Map params = new HashMap(); params.put("name", bunchName); return (TaskoBunch) singleton.lookupObjectByNamedQuery( - "TaskoBunch.findByName", params); + "TaskoBunch.findOrgBunchByName", params); + } + + public static TaskoTemplate lookupTemplateByBunchAndOrder(Long bunchId, Long order) { + Map params = new HashMap(); + params.put("bunch_id", bunchId); + params.put("order", order); + return (TaskoTemplate) singleton.lookupObjectByNamedQuery( + "TaskoTemplate.findByBunchAndOrder", params); } public static List<TaskoBunch> listBunches() { diff --git a/java/code/src/com/redhat/rhn/taskomatic/TaskoRun.java b/java/code/src/com/redhat/rhn/taskomatic/TaskoRun.java index 4ca9921..36b650e 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/TaskoRun.java +++ b/java/code/src/com/redhat/rhn/taskomatic/TaskoRun.java @@ -58,7 +58,6 @@ public class TaskoRun implements Job { public TaskoRun(Integer orgIdIn, TaskoTemplate templateIn, String jobLabelIn) { setOrgId(orgIdIn); setTemplate(templateIn); - TaskoFactory.save(templateIn); setJobLabel(jobLabelIn); File logDir = new File(getStdLogDirName(orgId)); if (!logDir.isDirectory()) { diff --git a/java/code/src/com/redhat/rhn/taskomatic/TaskoTemplate.hbm.xml b/java/code/src/com/redhat/rhn/taskomatic/TaskoTemplate.hbm.xml index c22c54d..edcaed8 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/TaskoTemplate.hbm.xml +++ b/java/code/src/com/redhat/rhn/taskomatic/TaskoTemplate.hbm.xml @@ -24,7 +24,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" <property name="ordering" type="long" column="ordering"/> <property name="startIf" type="string" column="start_if"/> - <set name="runHistory" inverse="true" lazy="false" table="rhnTaskoRun"> + <set name="runHistory" inverse="true" table="rhnTaskoRun"> <key column="template_id"/> <one-to-many class="com.redhat.rhn.taskomatic.TaskoRun"/> </set> @@ -35,4 +35,8 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" insert="false" update="false"/> </class> + <query name="TaskoTemplate.findByBunchAndOrder"> + <![CDATA[from com.redhat.rhn.taskomatic.TaskoTemplate where bunch.id = :bunch_id and ordering = :order]]> + </query> + </hibernate-mapping> diff --git a/java/code/src/com/redhat/rhn/taskomatic/TaskoTemplate.java b/java/code/src/com/redhat/rhn/taskomatic/TaskoTemplate.java index 1296bc4..62850b0 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/TaskoTemplate.java +++ b/java/code/src/com/redhat/rhn/taskomatic/TaskoTemplate.java @@ -44,7 +44,7 @@ public class TaskoTemplate { * @param idIn The id to set. */ public void setId(Long idIn) { - this.id = id; + this.id = idIn; } /** @@ -146,5 +146,4 @@ public class TaskoTemplate { public void setRunHistory(Set<TaskoRun> runHistoryIn) { this.runHistory = runHistoryIn; } - } diff --git a/java/code/src/com/redhat/rhn/taskomatic/TaskoXmlRpcHandler.java b/java/code/src/com/redhat/rhn/taskomatic/TaskoXmlRpcHandler.java index 9490329..e0c9e1e 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/TaskoXmlRpcHandler.java +++ b/java/code/src/com/redhat/rhn/taskomatic/TaskoXmlRpcHandler.java @@ -20,6 +20,7 @@ import org.quartz.CronTrigger; import org.quartz.JobDetail; import org.quartz.SchedulerException; import org.quartz.SimpleTrigger; +import org.quartz.Trigger; import java.text.ParseException; import java.util.Date; @@ -47,7 +48,7 @@ public class TaskoXmlRpcHandler { public Date scheduleBunch(Integer orgId, String bunchName, String jobLabel, Date startTime, Date endTime, String cronExpression, Map params) - throws ParseException, NoSuchTaskException, InvalidJobLabelException { + throws InvalidJobLabelException, NoSuchBunchTaskException, ParseException { try { JobDetail jobDetail = createJob(bunchName, orgId, jobLabel, params); // create trigger @@ -69,7 +70,7 @@ public class TaskoXmlRpcHandler { public Date scheduleBunch(Integer orgId, String bunchName, String jobLabel, String cronExpression, Map params) - throws ParseException, NoSuchTaskException, InvalidJobLabelException { + throws ParseException, InvalidJobLabelException, NoSuchBunchTaskException { return scheduleBunch(orgId, bunchName, jobLabel, null, null, cronExpression, params); } @@ -87,7 +88,7 @@ public class TaskoXmlRpcHandler { public Date scheduleSingleBunchRun(Integer orgId, String bunchName, String jobLabel, Map params) - throws ParseException, NoSuchTaskException, InvalidJobLabelException { + throws ParseException, InvalidJobLabelException, NoSuchBunchTaskException { try { JobDetail jobDetail = createJob(bunchName, orgId, jobLabel, params); SimpleTrigger st = new SimpleTrigger(jobLabel, orgId.toString(), 1, 1); @@ -103,10 +104,14 @@ public class TaskoXmlRpcHandler { private JobDetail createJob(String bunchName, Integer orgId, String jobLabel, Map params) - throws SchedulerException, InvalidJobLabelException { + throws SchedulerException, InvalidJobLabelException, NoSuchBunchTaskException { if (!checkUniqueName(jobLabel, orgId.toString())) { throw new InvalidJobLabelException(); } + TaskoBunch bunch = TaskoFactory.lookupOrgBunchByName(bunchName); + if (bunch == null) { + throw new NoSuchBunchTaskException("bunchName"); + } // create job JobDetail jobDetail = new JobDetail(jobLabel, orgId.toString(), TaskoBunch.class); diff --git a/java/code/src/com/redhat/rhn/taskomatic/core/RhnJobFactory.java b/java/code/src/com/redhat/rhn/taskomatic/core/RhnJobFactory.java index 089d91c..4eee7dd 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/core/RhnJobFactory.java +++ b/java/code/src/com/redhat/rhn/taskomatic/core/RhnJobFactory.java @@ -17,6 +17,7 @@ package com.redhat.rhn.taskomatic.core; import com.redhat.rhn.common.hibernate.HibernateRuntimeException; import com.redhat.rhn.taskomatic.TaskoBunch; import com.redhat.rhn.taskomatic.TaskoFactory; +import com.redhat.rhn.taskomatic.TaskoTemplate; import org.quartz.Job; import org.quartz.SchedulerException; @@ -39,7 +40,7 @@ public class RhnJobFactory implements JobFactory { String bunchName = trigger.getJobDetail().getJobDataMap().getString("bunch_name"); try { - bunch = TaskoFactory.lookupByName(bunchName); + bunch = TaskoFactory.lookupOrgBunchByName(bunchName); } catch (HibernateRuntimeException re) { throw new SchedulerException("No such bunch task " + bunchName); diff --git a/schema/spacewalk/common/data/rhnTaskoBunch.sql b/schema/spacewalk/common/data/rhnTaskoBunch.sql index d2244ce..9f83e28 100644 --- a/schema/spacewalk/common/data/rhnTaskoBunch.sql +++ b/schema/spacewalk/common/data/rhnTaskoBunch.sql @@ -15,9 +15,9 @@ INSERT INTO rhnTaskoBunch (id, name, description, org_bunch, active_from) - VALUES (rhn_tasko_bunch_id_seq.nextval, 'daily-status', 'daily-status description', 'N', sysdate); + VALUES (rhn_tasko_bunch_id_seq.nextval, 'daily-status', 'daily-status description', '', sysdate); INSERT INTO rhnTaskoBunch (id, name, description, org_bunch, active_from) - VALUES (rhn_tasko_bunch_id_seq.nextval, 'sat-sync', 'sat-sync description', 'N', sysdate); + VALUES (rhn_tasko_bunch_id_seq.nextval, 'sat-sync', 'sat-sync description', 'Y', sysdate); commit; diff --git a/schema/spacewalk/common/tables/rhnTaskoTemplate.sql b/schema/spacewalk/common/tables/rhnTaskoTemplate.sql index bd9b2a1..03684b0 100644 --- a/schema/spacewalk/common/tables/rhnTaskoTemplate.sql +++ b/schema/spacewalk/common/tables/rhnTaskoTemplate.sql @@ -25,7 +25,7 @@ CREATE TABLE rhnTaskoTemplate CONSTRAINT rhn_tasko_template_task_fk REFERENCES rhnTaskoTask (id), ordering NUMBER NOT NULL, - start_if CHAR(1), + start_if CHAR(10), created DATE DEFAULT (sysdate) NOT NULL, modified DATE commit 1d6c1012185b7ac03cf2253a3e925b9e2e271ebd Author: Tomas Lestach <tlestach(a)redhat.com> Date: Fri Jun 11 13:34:35 2010 +0200 create scheduleSingleBunchRun diff --git a/java/code/src/com/redhat/rhn/taskomatic/TaskoFactory.java b/java/code/src/com/redhat/rhn/taskomatic/TaskoFactory.java index 5c309c6..d5806b9 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/TaskoFactory.java +++ b/java/code/src/com/redhat/rhn/taskomatic/TaskoFactory.java @@ -56,6 +56,10 @@ public class TaskoFactory extends HibernateFactory { singleton.saveObject(taskoRun); } + public static void save(TaskoTemplate taskoTemplate) { + singleton.saveObject(taskoTemplate); + } + public static void sleep(long millis) { try { Thread.sleep(millis); diff --git a/java/code/src/com/redhat/rhn/taskomatic/TaskoRun.java b/java/code/src/com/redhat/rhn/taskomatic/TaskoRun.java index 18b7667..4ca9921 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/TaskoRun.java +++ b/java/code/src/com/redhat/rhn/taskomatic/TaskoRun.java @@ -58,6 +58,7 @@ public class TaskoRun implements Job { public TaskoRun(Integer orgIdIn, TaskoTemplate templateIn, String jobLabelIn) { setOrgId(orgIdIn); setTemplate(templateIn); + TaskoFactory.save(templateIn); setJobLabel(jobLabelIn); File logDir = new File(getStdLogDirName(orgId)); if (!logDir.isDirectory()) { @@ -83,14 +84,14 @@ public class TaskoRun implements Job { public void finished(JobExecutionContext context) { setEndTime(new Date()); String out = (String) context.getJobDetail().getJobDataMap().get("stdOutput"); - if ((out != null) && (out != "")) { + if ((out != null) && (!out.isEmpty())) { saveLogToFile(getStdOutputPath(), out); } else { setStdOutputPath(""); } String err = (String) context.getJobDetail().getJobDataMap().get("stdError"); - if ((err != null) && (err != "")) { + if ((err != null) && (!err.isEmpty())) { saveLogToFile(getStdErrorPath(), err); } else { diff --git a/java/code/src/com/redhat/rhn/taskomatic/TaskoXmlRpcHandler.java b/java/code/src/com/redhat/rhn/taskomatic/TaskoXmlRpcHandler.java index d97176c..9490329 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/TaskoXmlRpcHandler.java +++ b/java/code/src/com/redhat/rhn/taskomatic/TaskoXmlRpcHandler.java @@ -19,6 +19,7 @@ import com.redhat.rhn.taskomatic.core.SchedulerKernel; import org.quartz.CronTrigger; import org.quartz.JobDetail; import org.quartz.SchedulerException; +import org.quartz.SimpleTrigger; import java.text.ParseException; import java.util.Date; @@ -26,7 +27,7 @@ import java.util.Map; public class TaskoXmlRpcHandler { - private Boolean checkUserName(String name, String group) throws SchedulerException { + private Boolean checkUniqueName(String name, String group) throws SchedulerException { return ((SchedulerKernel.getScheduler().getTrigger(name, group) == null) && (SchedulerKernel.getScheduler().getJobDetail(name, group) == null)); } @@ -48,17 +49,7 @@ public class TaskoXmlRpcHandler { Date startTime, Date endTime, String cronExpression, Map params) throws ParseException, NoSuchTaskException, InvalidJobLabelException { try { - if (!checkUserName(jobLabel, orgId.toString())) { - throw new InvalidJobLabelException(); - } - // create job - JobDetail jobDetail = new JobDetail(jobLabel, orgId.toString(), - TaskoBunch.class); - // set job params - jobDetail.getJobDataMap().putAll(params); - jobDetail.getJobDataMap().put("org_id", orgId); - jobDetail.getJobDataMap().put("bunch_name", bunchName); - jobDetail.getJobDataMap().put("job_label", jobLabel); + JobDetail jobDetail = createJob(bunchName, orgId, jobLabel, params); // create trigger CronTrigger ct = new CronTrigger(jobLabel, orgId.toString(), cronExpression); @@ -94,6 +85,39 @@ public class TaskoXmlRpcHandler { } } + public Date scheduleSingleBunchRun(Integer orgId, String bunchName, String jobLabel, + Map params) + throws ParseException, NoSuchTaskException, InvalidJobLabelException { + try { + JobDetail jobDetail = createJob(bunchName, orgId, jobLabel, params); + SimpleTrigger st = new SimpleTrigger(jobLabel, orgId.toString(), 1, 1); + st.setEndTime(new Date()); + + // schedule job + return SchedulerKernel.getScheduler().scheduleJob(jobDetail, st); + } + catch (SchedulerException e) { + return null; + } + } + + private JobDetail createJob(String bunchName, Integer orgId, + String jobLabel, Map params) + throws SchedulerException, InvalidJobLabelException { + if (!checkUniqueName(jobLabel, orgId.toString())) { + throw new InvalidJobLabelException(); + } + // create job + JobDetail jobDetail = new JobDetail(jobLabel, orgId.toString(), + TaskoBunch.class); + // set job params + jobDetail.getJobDataMap().putAll(params); + jobDetail.getJobDataMap().put("org_id", orgId); + jobDetail.getJobDataMap().put("bunch_name", bunchName); + jobDetail.getJobDataMap().put("job_label", jobLabel); + return jobDetail; + } + public int listBunchRuns(Integer orgId, String triggerName) throws NoSuchTaskoTriggerException { try {

1 0

Branch 'fve' - java/code
by Partha Aji 11 Jun '10

11 Jun '10

java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 31 ++++++++++ java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp | 20 +++--- 2 files changed, 42 insertions(+), 9 deletions(-) New commits: commit fba324ad855355537fc0a87f951d7e84721bf89b Author: Partha Aji <paji(a)redhat.com> Date: Thu Jun 10 16:33:04 2010 -0400 More updates to the UI diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml index 0e14d2c..9916ca8 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml @@ -6176,6 +6176,9 @@ value for this entitlement, excluding the default organization's consumption.</s <context context-type="sourcefile">rhn/systems/entitlements/FlexGuests.do</context> <context context-type="sourcefile">rhn/systems/entitlements/EligibleFlexGuests.do</context> </context-group> + <trans-unit id="Registered"> + <source>Registered</source> + </trans-unit> <trans-unit id="flexguest.jsp.entitlement_counts_message_unlimited"> <source>{0} consumed, unlimited available entitlements</source> </trans-unit> @@ -6185,7 +6188,35 @@ value for this entitlement, excluding the default organization's consumption.</s </trans-unit> <trans-unit id="flexguest.jsp.entitlement_counts_message_1"> <source>{0} consumed, {1} available entitlements</source> + </trans-unit> + <trans-unit id="flexguest.jsp.header"> + <source>Flex Guest Entitlement Consumers</source> + </trans-unit> + <trans-unit id="flexguest.jsp.message"> + <source>The following is a list of guest systems that are currently consuming <a href="{0}"> Flex Guest entitlements</a>. These entitlements are used when registering virtual guests that are not associated with a registered host system or that are associated with a host system that is not Virtualization or Virtualization Platform entitled. Flex Guest Entitlement Consumers</source> + </trans-unit> + <trans-unit id="floating.guests"> + <source>Flex Guest Entitlement Consumers</source> + </trans-unit> + + <trans-unit id="eligible.floating.guests"> + <source>Guests Consuming Regular Entitlements</source> </trans-unit> + <trans-unit id="eligible.flexguest.jsp.header"> + <source>Guests Consuming Regular Entitlements</source> + </trans-unit> + <trans-unit id="eligible.flexguest.jsp.message"> + <source>The following is a list of guest systems that are not associated with a virtual entitled (either Virtualization or Virtualization Platform) host system in RHN or for whom there are no remaining <a href="{0}"> Virtualization inherited guest entitlements</a>. These systems are consuming the same software and system entitlements as a physical system.</source> + </trans-unit> + + <trans-unit id="eligible.flexguest.jsp.no-systems"> + <source>There are no eligible flex guest systems consuming regular entitlements.</source> + </trans-unit> + + <trans-unit id="flexguest.jsp.no-systems"> + <source>There are no systems consuming Flex Guest entitlements.</source> + </trans-unit> + </group>  diff --git a/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp b/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp index ecb25dd..cfc2d18 100644 --- a/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp @@ -10,11 +10,13 @@ <c:set var="headerkey" value="eligible.flexguest.jsp.header"/> <c:set var="messagekey" value="eligible.flexguest.jsp.message"/> <c:set var="namestyle" value="first-column"/> + <c:set var="empty_msg" value="eligible-flexguest.jsp.no-systems"/> </c:when> <c:otherwise> <c:set var="headerkey" value="flexguest.jsp.header"/> <c:set var="messagekey" value="flexguest.jsp.message"/> <c:set var="namestyle" value=""/> + <c:set var="empty_msg" value="flexguest.jsp.no-systems"/> </c:otherwise> </c:choose> @@ -25,22 +27,22 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif" imgAlt="system.common.systemAlt" - helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-list-ood"> - <bean:message key="flexguest.jsp.header"/> -</rhn:toolbar> + <rhn:toolbar base="h1" img="/img/rhn-icon-system.gif" imgAlt="system.common.systemAlt"> + <bean:message key="virtualentitlements.toolbar" /> + </rhn:toolbar> -<rl:listset name="FlexSet"> <rhn:dialogmenu mindepth="0" maxdepth="1" definition="/WEB-INF/nav/virt_entitlements.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer"/> - <p><bean:message key="flexguest.jsp.message"/> +<h2><bean:message key="${headerkey}"/></h2> + <p><bean:message key="${messagekey}" arg0="http://kbase.redhat.com/faq/docs/DOC-17424"/> </p> - + +<rl:listset name="FlexSet"> <rl:list - emptykey="nosystems.message" + emptykey="${empty_msg}" parentiselement = "false" searchparent="false" searchchild="true" @@ -98,7 +100,7 @@ </rl:non-expandable> </rl:column> - <rl:column headerkey="systemlist.jsp.registered" + <rl:column headerkey="Registered" styleclass="last-column"> <rl:expandable></rl:expandable> <rl:non-expandable>${current.registeredString}</rl:non-expandable>

1 0

Branch 'fve' - java/code
by Partha Aji 10 Jun '10

10 Jun '10

java/code/src/com/redhat/rhn/frontend/dto/ChannelFamilySystemGroup.java | 10 - java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 6 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 3 java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml | 7 - java/code/webapp/WEB-INF/nav/virt_entitlements.xml | 7 + java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp | 70 +++++++++- java/code/webapp/WEB-INF/struts-config.xml | 1 7 files changed, 92 insertions(+), 12 deletions(-) New commits: commit ee9d38cb3cd7b30ad28059eafaa3fbdb3c04143a Author: Partha Aji <paji(a)redhat.com> Date: Thu Jun 10 16:08:19 2010 -0400 More UI updates on the Flex Guest Pages added Nav stuff diff --git a/java/code/src/com/redhat/rhn/frontend/dto/ChannelFamilySystemGroup.java b/java/code/src/com/redhat/rhn/frontend/dto/ChannelFamilySystemGroup.java index dc68082..62c09f4 100644 --- a/java/code/src/com/redhat/rhn/frontend/dto/ChannelFamilySystemGroup.java +++ b/java/code/src/com/redhat/rhn/frontend/dto/ChannelFamilySystemGroup.java @@ -43,11 +43,13 @@ public class ChannelFamilySystemGroup implements Identifiable, Expandable { return ls.getMessage("flexguest.jsp.entitlement_counts_message_unlimited", currentMembers); } + String key = "flexguest.jsp.entitlement_counts_message"; + long available = maxMembers - currentMembers; + if (available > 1) { + key = key + "_1"; + } - - return ls.getMessage("flexguest.jsp.entitlement_counts_message", - currentMembers, maxMembers - currentMembers); - + return ls.getMessage(key, currentMembers, available); } /** diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml index e5cc410..3987ef8 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml @@ -557,6 +557,12 @@ http://www.oasis-open.org/committees/xliff/documents/xliff-core-1.1.xsd" <context context-type="sourcefile">Navigation Menu</context> </context-group> </trans-unit> + <trans-unit id="Active"> +<source>Active</source> + <context-group name="ctx"> + <context context-type="sourcefile">Navigation Menu</context> + </context-group> + </trans-unit> <trans-unit id="IP Ranges"> <source>IP Ranges</source> <context-group name="ctx"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml index 56811c7..0e14d2c 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml @@ -6183,6 +6183,9 @@ value for this entitlement, excluding the default organization's consumption.</s <trans-unit id="flexguest.jsp.entitlement_counts_message"> <source>{0} consumed, {1} available entitlement</source> </trans-unit> + <trans-unit id="flexguest.jsp.entitlement_counts_message_1"> + <source>{0} consumed, {1} available entitlements</source> + </trans-unit> </group>  diff --git a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml index 78d8838..e514848 100644 --- a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml +++ b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml @@ -15,7 +15,12 @@ <rhn-tab name="Locale Preferences" url="/rhn/account/LocalePreferences.do" /> <rhn-tab name="Subscription Management" url="/rhn/systems/SystemEntitlements.do" acl="user_role(org_admin)" > <rhn-tab name="System Entitlements" url="/rhn/systems/SystemEntitlements.do" acl="user_role(org_admin)" /> - <rhn-tab name="virtualization.entitlements" url="/rhn/systems/entitlements/GuestLimitedHosts.do" acl="user_role(org_admin)"/> + <rhn-tab name="virtualization.entitlements" url="/rhn/systems/entitlements/GuestLimitedHosts.do" acl="user_role(org_admin)"> + <rhn-tab-url>/rhn/systems/entitlements/GuestUnlimitedHosts.do</rhn-tab-url> + <rhn-tab-url>/rhn/systems/entitlements/PhysicalHosts.do</rhn-tab-url> + <rhn-tab-url>/rhn/systems/entitlements/FlexGuests.do</rhn-tab-url> + <rhn-tab-url>/rhn/systems/entitlements/EligibleFlexGuests.do</rhn-tab-url> + </rhn-tab> <rhn-tab name="Software Channel Entitlements" url="/rhn/channels/software/Entitlements.do" acl="user_role(org_admin)" /> </rhn-tab> <rhn-tab name="Organization Trusts" url="/rhn/multiorg/Organizations.do" acl="user_role(org_admin)"> diff --git a/java/code/webapp/WEB-INF/nav/virt_entitlements.xml b/java/code/webapp/WEB-INF/nav/virt_entitlements.xml index 188bccd..76a954c 100644 --- a/java/code/webapp/WEB-INF/nav/virt_entitlements.xml +++ b/java/code/webapp/WEB-INF/nav/virt_entitlements.xml @@ -10,4 +10,11 @@ <rhn-tab name="guests.without.hosts"> <rhn-tab-url>/rhn/systems/entitlements/PhysicalHosts.do</rhn-tab-url> </rhn-tab> + <rhn-tab name="floating.guests"> + <rhn-tab-url>/rhn/systems/entitlements/FlexGuests.do</rhn-tab-url> +</rhn-tab> + <rhn-tab name="eligible.floating.guests"> + <rhn-tab-url>/rhn/systems/entitlements/EligibleFlexGuests.do</rhn-tab-url> + </rhn-tab> + </rhn-navi-tree> diff --git a/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp b/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp index 7224c62..ecb25dd 100644 --- a/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp @@ -1,9 +1,24 @@ +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %> <%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> +<c:choose> + <c:when test="${not empty requestScope.selectable}"> + <c:set var="headerkey" value="eligible.flexguest.jsp.header"/> + <c:set var="messagekey" value="eligible.flexguest.jsp.message"/> + <c:set var="namestyle" value="first-column"/> + </c:when> + <c:otherwise> + <c:set var="headerkey" value="flexguest.jsp.header"/> + <c:set var="messagekey" value="flexguest.jsp.message"/> + <c:set var="namestyle" value=""/> + </c:otherwise> +</c:choose> + + <html:xhtml/> <html> <head> @@ -17,11 +32,13 @@ <rl:listset name="FlexSet"> + <rhn:dialogmenu mindepth="0" + maxdepth="1" + definition="/WEB-INF/nav/virt_entitlements.xml" + renderer="com.redhat.rhn.frontend.nav.DialognavRenderer"/> <p><bean:message key="flexguest.jsp.message"/> </p> -<%-- <rhn:dialogmenu mindepth="0" maxdepth="1" definition="/WEB-INF/nav/duplicate_systems_tabs.xml" - renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> --%> -<br/> + <rl:list emptykey="nosystems.message" parentiselement = "false" @@ -32,9 +49,26 @@ <rl:rowrenderer name="ExpandableRowRenderer" /> <rl:decorator name="ExpansionDecorator"/> + <c:if test="${not empty requestScope.selectable}"> + <rl:decorator name="SelectableDecorator"/> + <c:choose> + <c:when test = "${rl:expandable(current)}"> + <rl:selectablecolumn value="${current.id}" + styleclass="first-column"/> + </c:when> + <c:otherwise> + <rl:selectablecolumn value="${current.selectionKey}" + styleclass="first-column"/> + + </c:otherwise> + </c:choose> + </c:if> + +  - <rl:column headerkey="systemlist.jsp.system" filterattr="name" filtermessage="${filtermessage}" styleclass="first-column"> - <rl:expandable rendericon="true">${current.name} <em>(${current.entitlementCountMessage})</em> </rl:expandable> + <rl:column headerkey="systemlist.jsp.system" filterattr="name" filtermessage="${filtermessage}" styleclass="${namestyle}"> + <rl:expandable rendericon="true"> <a href="/rhn/software/channels/ChannelFamilyTree.do?cfid=${current.id}">${current.name} <em>(${current.entitlementCountMessage})</em> </a> + </rl:expandable> <rl:non-expandable rendericon="true"> <c:out value="<a href=\"/rhn/systems/details/Overview.do?sid=${current.id}\">" escapeXml="false" /> @@ -49,9 +83,19 @@ </rl:non-expandable> </rl:column> - <rl:column headerkey="systemlist.jsp.active"> + <rl:column headerkey="Status"> <rl:expandable></rl:expandable> - <rl:non-expandable>${current.active}</rl:non-expandable> + <rl:non-expandable> + <c:choose> + <c:when test="${current.active}"> + <bean:message key="Active"/> + </c:when> + <c:otherwise> + <bean:message key="Inactive"/> + </c:otherwise> + </c:choose> + + </rl:non-expandable> </rl:column> <rl:column headerkey="systemlist.jsp.registered" @@ -63,6 +107,18 @@ </rl:list> <rhn:submitted/> +<c:if test="${not empty requestScope.selectable}"> + <div align="right"> + + <hr /> + <html:submit property="dispatch"> + <bean:message key="Make Flex"/> + </html:submit> + + </div> +</c:if> + + </rl:listset> diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml index 561d957..2eaaaa9 100644 --- a/java/code/webapp/WEB-INF/struts-config.xml +++ b/java/code/webapp/WEB-INF/struts-config.xml @@ -6358,6 +6358,7 @@ className="com.redhat.rhn.frontend.struts.RhnActionMapping"> <set-property property="acls" value="user_role(org_admin)"/> <forward name="default" path="/WEB-INF/pages/systems/entitlements/flexguests.jsp"/> + <forward name="success" path="/systems/entitlements/FlexGuests.do" redirect="true"/> </action> <action path="/channels/manage/errata/Add"

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits June 2010