java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit caef5c68d1e335e650cc6da88556072668fd96ad
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Mon Nov 23 17:00:46 2009 -0500
fixing sort on channel manage page to sort by name and not id
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
index a70d6f0..eec9381 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
@@ -729,15 +729,16 @@ SELECT CTV.name, CTV.id, CTV.depth, CTV.channel_arch_id, C.org_id,
FROM rhnchannelpackage cp
WHERE cp.channel_id = CTV.id) AS package_count,
CTV.parent_or_self_label, CTV.label AS channel_label
- FROM rhnchannel C, rhnChannelTreeView CTV
+ FROM rhnchannel C, rhnChannelTreeView CTV, rhnChannel C2
WHERE CTV.id = C.ID
+ AND CTV.parent_or_self_id = C2.id
AND (rhn_channel.user_role_check(C.id, :user_id, 'manage') = 1
OR EXISTS (
SELECT 1
FROM rhnChannel C2
WHERE C2.parent_channel = C.ID
AND rhn_channel.user_role_check(C2.id, :user_id, 'manage') = 1))
-ORDER BY rhn_channel.channel_priority(CTV.parent_or_self_id), CTV.parent_or_self_id, CTV.depth, UPPER(CTV.name)
+ORDER BY UPPER(C2.name), depth, UPPER(C.name)
</query>
</mode>
14 years, 4 months
java/code
by Justin Sherrill
java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml | 6 +
java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp | 4 -
java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp | 8 +-
java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf | 31 +++++++---
java/code/webapp/WEB-INF/pages/ssm/packageinstall.jsp | 2
java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp | 4 -
java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp | 4 -
java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp | 4 -
java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp | 4 -
java/code/webapp/WEB-INF/pages/ssm/view-log.jsp | 4 -
java/code/webapp/WEB-INF/struts-config.xml | 8 +-
11 files changed, 50 insertions(+), 29 deletions(-)
New commits:
commit 1e8370080bc2753a7bbe9fabe39a543884c7d357
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Mon Nov 23 16:11:13 2009 -0500
fixing a bunch of list display issues that have bugged me for a while
diff --git a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
index 6e7d4b1..1580ba5 100644
--- a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
+++ b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
@@ -46,7 +46,11 @@
</rhn-tab>
<rhn-tab name="System Set Manager" url="/network/systems/ssm/index.pxt" acl="org_entitlement(sw_mgr_enterprise)">
<rhn-tab-directory>/rhn/systems/ssm</rhn-tab-directory>
- <rhn-tab name="ssm.nav.status" url="/rhn/ssm/ViewAllLog.do" acl="org_entitlement(sw_mgr_enterprise)"/>
+ <rhn-tab-directory>/rhn/ssm</rhn-tab-directory>
+ <rhn-tab name="ssm.nav.status" url="/rhn/ssm/ViewAllLog.do" acl="org_entitlement(sw_mgr_enterprise)">
+ <rhn-tab-url>/rhn/ssm/ViewLog.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/ssm/ViewCompletedLog.do</rhn-tab-url>
+ </rhn-tab>
</rhn-tab>
<rhn-tab name="Advanced Search" url="/rhn/systems/Search.do" acl="org_entitlement(sw_mgr_enterprise)" />
<rhn-tab name="Activation Keys" acl="org_entitlement(sw_mgr_enterprise); user_role(activation_key_admin)">
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp
index 7dc2508..58f3ee0 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp
@@ -57,7 +57,7 @@
<rl:column bound="false"
sortable="false"
- headerkey="entitlements.jsp.channel">
+ headerkey="entitlements.jsp.channel" styleclass="first-column">
<a href="/rhn/admin/multiorg/SoftwareEntitlementDetails.do?cfid=${current.id}"><c:out value="${current.name}" /></a>
</rl:column>
<rl:column bound="false"
@@ -72,7 +72,7 @@
</rl:column>
<rl:column bound="false"
sortable="false"
- headerkey="orgsystemsubs.jsp.proposed_total">
+ headerkey="orgsystemsubs.jsp.proposed_total" styleclass="last-column">
<c:choose>
<c:when test="${param.oid != 1}">
<input name="${current.id}" value="${current.maxMembers}" type="text"
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp
index be173ae..50570af 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp
@@ -45,9 +45,11 @@
<a href="OrgDetails.do?oid=${current.org.id}"> ${current.org.name} </a>
</rl:column>
<rl:column
- bound="false"
- sortable="false"
- headerkey="org.trust.trusts">${current.numTrusted}
+ bound="false"
+ sortable="false"
+ headerkey="org.trust.trusts"
+ styleclass="last-column">
+ ${current.numTrusted}
</rl:column>
</rl:list>
<hr/>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf
index 3086910..18b36de 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf
@@ -5,7 +5,7 @@
<rl:decorator name="PageSizeDecorator"/>
<rl:decorator name="ElaborationDecorator"/>
- <rl:column headerkey="erratalist.jsp.type" styleclass="text-align: left;">
+ <rl:column headerkey="erratalist.jsp.type" styleclass="first-column text-align: left;">
<c:if test="${current.securityAdvisory}">
<img src="/img/wrh-security.gif"
alt="<bean:message key="erratalist.jsp.securityadvisory"/>"/>
@@ -32,15 +32,30 @@
styleclass="text-align: center;">
<a href="/rhn/errata/details/SystemsAffected.do?eid=${current.id}">${current.affectedSystemCount}</a>
</rl:column>
- <rl:column headerkey="erratalist.jsp.updated"
- sortable="true"
- sortattr="updateDateObj"
- styleclass="text-align: center;">
- ${current.updateDate}
- </rl:column>
+
+ <c:if test="${displayCves}">
+ <rl:column headerkey="erratalist.jsp.updated"
+ sortable="true"
+ sortattr="updateDateObj"
+ styleclass="text-align: center;">
+ ${current.updateDate}
+ </rl:column>
+ </c:if>
+ <c:if test="${not displayCves}">
+ <rl:column headerkey="erratalist.jsp.updated"
+ sortable="true"
+ sortattr="updateDateObj"
+ styleclass="last-column text-align: center;">
+ ${current.updateDate}
+ </rl:column>
+ </c:if>
+
+
+
+
<c:if test="${displayCves}">
- <rl:column headerkey="details.jsp.cves">
+ <rl:column headerkey="details.jsp.cves" styleclass="last-column">
<c:forEach items="${current.cves}" var="cve">
<a href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=${cve}">
<c:out value="${cve}"/> <br />
diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageinstall.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageinstall.jsp
index f78c75f..7bd2594 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/packageinstall.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/packageinstall.jsp
@@ -25,7 +25,7 @@
emptykey="channels.overview.nochannels">
<rl:column headerkey="channels.overview.name" bound="false"
- sortattr="name" sortable="true">
+ sortattr="name" sortable="true" styleclass="first-column last-column">
<c:choose>
<c:when test="${current.depth > 1}">
<img style="margin-left: 4px;"
diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp
index add170b..2b47b87 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp
@@ -26,11 +26,11 @@
<rl:list dataset="pageList"
width="100%"
name="groupList"
- styleclass="list"
+ styleclass="list "
emptykey="systemlist.jsp.nosystems">
<rl:column headerkey="actions.jsp.system" bound="false"
- sortattr="name" sortable="true">
+ sortattr="name" sortable="true" styleclass="first-column last-column">
${current.name}
</rl:column>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp
index bc6019b..4eda77e 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp
@@ -27,12 +27,12 @@
<rl:decorator name="ElaborationDecorator"/>
<rl:column headerkey="actions.jsp.system" bound="false"
- sortattr="name" sortable="true">
+ sortattr="name" sortable="true" styleclass="first-column">
${current.system_name}
</rl:column>
<rl:column headerkey="ssm.package.remove.schedule.packages" bound="false"
- sortable="false">
+ sortable="false" styleclass="last-column">
<c:forEach begin="0" end="19" items="${current.elaborator0}" var="item" varStatus="status">
<c:out value="${item.nvre}"/><br/>
</c:forEach>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp
index 8ac421e..139f8a5 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp
@@ -32,12 +32,12 @@
<rl:decorator name="ElaborationDecorator"/>
<rl:column headerkey="actions.jsp.system" bound="false"
- sortattr="name" sortable="true">
+ sortattr="name" sortable="true" styleclass="first-column">
${current.server_name}
</rl:column>
<rl:column headerkey="ssm.package.upgrade.schedule.packages" bound="false"
- sortable="false">
+ sortable="false" styleclass="last-column">
<c:forEach begin="0" end="19" items="${current.elaborator0}" var="item" varStatus="status">
<c:out value="${item.nvre}"/><br/>
</c:forEach>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp
index 9d9ca72..27cd47a 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp
@@ -27,12 +27,12 @@
<rl:decorator name="ElaborationDecorator"/>
<rl:column headerkey="actions.jsp.system" bound="false"
- sortattr="name" sortable="true">
+ sortattr="name" sortable="true" styleclass="first-column">
${current.system_name}
</rl:column>
<rl:column headerkey="ssm.package.verify.schedule.packages" bound="false"
- sortable="false">
+ sortable="false" styleclass="last-column">
<c:forEach begin="0" end="19" items="${current.elaborator0}" var="item" varStatus="status">
<c:out value="${item.nvre}"/><br/>
</c:forEach>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/view-log.jsp b/java/code/webapp/WEB-INF/pages/ssm/view-log.jsp
index ae04339..eb19833 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/view-log.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/view-log.jsp
@@ -35,7 +35,7 @@
<rl:decorator name="PageSizeDecorator"/>
<rl:column headerkey="ssm.operations.viewlog.description" bound="false"
- sortattr="description" sortable="true">
+ sortattr="description" sortable="true" styleclass="first-column">
<a href="/rhn/ssm/ViewLogDetails.do?oid=${current.id}"><c:out value="${current.description}"/></a>
</rl:column>
@@ -48,7 +48,7 @@
</c:if>
</rl:column>
- <rl:column headerkey="ssm.operations.viewlog.modified" bound="false">
+ <rl:column headerkey="ssm.operations.viewlog.modified" bound="false" styleclass="last-column">
<c:out value="${current.modified}"/>
</rl:column>
diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml
index 9ba2e2a..2c5d1db 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -6596,7 +6596,7 @@
<forward name="default"
path="/WEB-INF/pages/ssm/packageinstallschedule.jsp" />
<forward name="confirm"
- path="/ssm/ViewLog.do" />
+ path="/ssm/ViewLog.do" redirect="true"/>
</action>
<!-- SSM Package Remove Pages -->
@@ -6618,7 +6618,7 @@
<forward name="default"
path="/WEB-INF/pages/ssm/packageremoveschedule.jsp" />
<forward name="confirm"
- path="/ssm/ViewLog.do"/>
+ path="/ssm/ViewLog.do" redirect="true"/>
</action>
<!-- SSM Package Upgrade Pages -->
@@ -6640,7 +6640,7 @@
<forward name="default"
path="/WEB-INF/pages/ssm/packageupgradeschedule.jsp" />
<forward name="confirm"
- path="/ssm/ViewLog.do"/>
+ path="/ssm/ViewLog.do" redirect="true"/>
</action>
<!-- SSM Package Verify Pages -->
@@ -6662,7 +6662,7 @@
<forward name="default"
path="/WEB-INF/pages/ssm/packageverifyschedule.jsp" />
<forward name="confirm"
- path="/ssm/ViewLog.do"/>
+ path="/ssm/ViewLog.do" redirect="true"/>
</action>
<action path="/admin/TaskStatus"
14 years, 4 months
java/code
by Justin Sherrill
java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_list.jspf | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 8d1e431fd21b251d764ec5fe9a775114806b635f
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Mon Nov 23 14:43:35 2009 -0500
519788 - fixing set selection on two config management lists
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_list.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_list.jspf
index 2a1ac54..f5eab7f 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_list.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_list.jspf
@@ -11,4 +11,5 @@
<rhn:set value="${current.id}"/>
<%@ include file="/WEB-INF/pages/common/fragments/configuration/sdc/configfile_rows.jspf" %>
</rhn:listdisplay>
- </rhn:list>
\ No newline at end of file
+ </rhn:list>
+ <rhn:submitted/>
\ No newline at end of file
14 years, 4 months
java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/frontend/action/schedule/test/PackageListSetupActionTest.java | 7 -------
1 file changed, 7 deletions(-)
New commits:
commit dc44473d1cacef732c0b0c132627fc118ac275e6
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Fri Nov 20 17:47:28 2009 -0500
checkstyle fix
diff --git a/java/code/src/com/redhat/rhn/frontend/action/schedule/test/PackageListSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/schedule/test/PackageListSetupActionTest.java
index 4300bd4..7394009 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/schedule/test/PackageListSetupActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/schedule/test/PackageListSetupActionTest.java
@@ -14,21 +14,14 @@
*/
package com.redhat.rhn.frontend.action.schedule.test;
-import com.redhat.rhn.common.hibernate.LookupException;
import com.redhat.rhn.domain.action.Action;
import com.redhat.rhn.domain.action.ActionFactory;
import com.redhat.rhn.domain.action.server.test.ServerActionTest;
import com.redhat.rhn.domain.action.test.ActionFactoryTest;
-import com.redhat.rhn.domain.kickstart.KickstartVirtualizationType;
import com.redhat.rhn.domain.role.RoleFactory;
import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.server.test.ServerFactoryTest;
-import com.redhat.rhn.frontend.action.common.BadParameterException;
-import com.redhat.rhn.frontend.action.kickstart.KickstartDetailsEditAction;
-import com.redhat.rhn.frontend.action.schedule.PackageListSetupAction;
-import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.manager.action.ActionManager;
-import com.redhat.rhn.testing.ActionHelper;
import com.redhat.rhn.testing.RhnMockStrutsTestCase;
/**
14 years, 5 months
java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java | 8 -
java/code/src/com/redhat/rhn/frontend/action/schedule/test/PackageListSetupActionTest.java | 66 ++++------
java/code/src/com/redhat/rhn/frontend/events/test/NewUserEventTest.java | 4
3 files changed, 37 insertions(+), 41 deletions(-)
New commits:
commit a24e4f0f95ec214d5dd539346a4b15b4a6bf93d5
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Fri Nov 20 17:39:19 2009 -0500
unit test fixes
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
index 631e68f..41363e6 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
@@ -73,7 +73,7 @@ public class KickstartData {
private Set childChannels;
private Set defaultRegTokens;
private Set preserveFileLists;
- private Set<KickstartPackage> ksPackages;
+ private Set<KickstartPackage> ksPackages = new HashSet<KickstartPackage>();
private Collection<KickstartCommand> commands = new HashSet<KickstartCommand>();
private Set ips; // rhnKickstartIpRange
private Set<KickstartScript> scripts; // rhnKickstartScript
@@ -1238,8 +1238,10 @@ public class KickstartData {
cloned.setKickstartDefaults(this.getKickstartDefaults().deepCopy(cloned));
}
cloned.setOrg(this.getOrg());
- for (KickstartPackage kp : this.getKsPackages()) {
- cloned.getKsPackages().add(kp.deepCopy(cloned));
+ if (this.getKsPackages() != null) {
+ for (KickstartPackage kp : this.getKsPackages()) {
+ cloned.getKsPackages().add(kp.deepCopy(cloned));
+ }
}
if (this.getPreserveFileLists() != null) {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/schedule/test/PackageListSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/schedule/test/PackageListSetupActionTest.java
index 1b12b18..4300bd4 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/schedule/test/PackageListSetupActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/schedule/test/PackageListSetupActionTest.java
@@ -19,61 +19,55 @@ import com.redhat.rhn.domain.action.Action;
import com.redhat.rhn.domain.action.ActionFactory;
import com.redhat.rhn.domain.action.server.test.ServerActionTest;
import com.redhat.rhn.domain.action.test.ActionFactoryTest;
+import com.redhat.rhn.domain.kickstart.KickstartVirtualizationType;
import com.redhat.rhn.domain.role.RoleFactory;
import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.server.test.ServerFactoryTest;
import com.redhat.rhn.frontend.action.common.BadParameterException;
+import com.redhat.rhn.frontend.action.kickstart.KickstartDetailsEditAction;
import com.redhat.rhn.frontend.action.schedule.PackageListSetupAction;
+import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.manager.action.ActionManager;
import com.redhat.rhn.testing.ActionHelper;
-import com.redhat.rhn.testing.RhnBaseTestCase;
+import com.redhat.rhn.testing.RhnMockStrutsTestCase;
/**
* PackageListSetupActionTest
* @version $Rev$
*/
-public class PackageListSetupActionTest extends RhnBaseTestCase {
+public class PackageListSetupActionTest extends RhnMockStrutsTestCase {
public void testPeformExecute() throws Exception {
- PackageListSetupAction action = new PackageListSetupAction();
- ActionHelper sah = new ActionHelper();
- sah.setUpAction(action);
- sah.getRequest().setupAddParameter("aid", (String)null);
- try {
- sah.executeAction();
- fail();
- }
- catch (BadParameterException e) {
- //no op
- }
-
- sah.setupClampListBounds();
- sah.getRequest().setupAddParameter("aid", "-99999");
- sah.getRequest().setupAddParameter("returnvisit", (String) null);
- try {
- sah.executeAction();
- fail();
- }
- catch (LookupException e) {
- //no op
- }
-
- sah.getUser().addRole(RoleFactory.ORG_ADMIN);
- Action a = ActionFactoryTest.createAction(sah.getUser(), ActionFactory.TYPE_ERRATA);
- Server server = ServerFactoryTest.createTestServer(sah.getUser(), true);
+ setRequestPathInfo("/schedule/PackageList");
+
+ user.addRole(RoleFactory.ORG_ADMIN);
+ Action a = ActionFactoryTest.createAction(user, ActionFactory.TYPE_ERRATA);
+ Server server = ServerFactoryTest.createTestServer(user, true);
ServerActionTest.createServerAction(server, a);
ActionManager.storeAction(a);
+ addRequestParameter("aid", a.getId().toString());
+ addRequestParameter("newset", (String)null);
+ addRequestParameter("returnvisit", (String) null);
+ actionPerform();
+ assertNotNull(getRequest().getAttribute("dataset"));
+ assertNotNull(getRequest().getAttribute("actionname"));
+ }
- sah.getRequest().setupAddParameter("aid", a.getId().toString());
- sah.setupClampListBounds();
- sah.getRequest().setupAddParameter("newset", (String)null);
- sah.getRequest().setupAddParameter("returnvisit", (String) null);
+ public void testPerformExecuteBad() {
+ setRequestPathInfo("/schedule/PackageList");
- sah.executeAction();
- assertNotNull(sah.getRequest().getAttribute("pageList"));
- assertNotNull(sah.getRequest().getAttribute("actionname"));
- assertNotNull(sah.getRequest().getAttribute("user"));
+ addRequestParameter("aid", (String) null);
+ actionPerform();
+ assertTrue(getActualForward().contains("errors/badparam.jsp"));
+ }
+
+
+ public void testPerformExecuteBad2() {
+ setRequestPathInfo("/schedule/PackageList");
+ addRequestParameter("aid", "-99999");
+ actionPerform();
+ assertTrue(getActualForward().contains("errors/lookup.jsp"));
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/events/test/NewUserEventTest.java b/java/code/src/com/redhat/rhn/frontend/events/test/NewUserEventTest.java
index 722f1e2..3afecca 100644
--- a/java/code/src/com/redhat/rhn/frontend/events/test/NewUserEventTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/events/test/NewUserEventTest.java
@@ -73,10 +73,10 @@ public class NewUserEventTest extends RhnBaseTestCase {
"someserver.rhndev.redhat.com/rhn/users/ActiveList.do");
assertTrue(mailer.getBody().contains("Your Spacewalk login: testUser") ||
- mailer.getBody().contains("Your RHN Satellite login: testUser"));
+ mailer.getBody().contains("Your RHN login: testUser"));
assertTrue(mailer.getBody().contains("Your Spacewalk email address: " +
"redhatJavaTest(a)redhat.com") ||
- mailer.getBody().contains("Your RHN Satellite email address: " +
+ mailer.getBody().contains("Your RHN email address: " +
"redhatJavaTest(a)redhat.com"));
}
14 years, 5 months
java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/manager/action/ActionManager.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 5ed553caf1a3d43bf25ecb96c822b1499f27c180
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Fri Nov 20 15:28:51 2009 -0500
unit test fix - reloading the "Action" hibernate object seemed to cause issues with the user object that it was associated with, so instead lets try refreshing
diff --git a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java
index 2794712..091e2f6 100644
--- a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java
+++ b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java
@@ -1327,7 +1327,8 @@ public class ActionManager extends BaseManager {
type = ActionFactory.lookupActionTypeByLabel(type.getLabel());
Action action = createScheduledAction(scheduler, type, name, earliestAction);
ActionFactory.save(action);
- action = (Action) ActionFactory.reload(action);
+ ActionFactory.getSession().flush();
+ ActionFactory.getSession().refresh(action);
Map params = new HashMap();
14 years, 5 months
2 commits - client/rhel
by Miroslav Suchý
client/rhel/rhn-client-tools/etc-conf/up2date.config | 2
client/rhel/rhn-client-tools/src/up2date_client/rhnPackageInfo.py | 7 -
client/rhel/yum-rhn-plugin/rhnplugin.py | 66 +++++++++-
3 files changed, 69 insertions(+), 6 deletions(-)
New commits:
commit 6898b5ea1dd655d581fd2a1712a98ea45395e93a
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Nov 20 17:38:31 2009 +0100
527412 - compute delta and write it to logs only if writeChangesToLog is set to 1
diff --git a/client/rhel/rhn-client-tools/etc-conf/up2date.config b/client/rhel/rhn-client-tools/etc-conf/up2date.config
index e6f6a71..00954e0 100644
--- a/client/rhel/rhn-client-tools/etc-conf/up2date.config
+++ b/client/rhel/rhn-client-tools/etc-conf/up2date.config
@@ -44,3 +44,5 @@ skipNetwork=0
tmpDir[comment]=Use this Directory to place the temporary transport files
tmpDir=/tmp
+writeChangesToLog[comment]=Log to /var/log/up2date which packages has been added and removed
+writeChangesToLog=0
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnPackageInfo.py b/client/rhel/rhn-client-tools/src/up2date_client/rhnPackageInfo.py
index 0cb8e8d..5560fdd 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnPackageInfo.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnPackageInfo.py
@@ -9,15 +9,12 @@ import rhnserver
import rpmUtils
-def remoteDeltaPackages(pkgs):
+def logDeltaPackages(pkgs):
log = up2dateLog.initLog()
log.log_me("Adding packages to package profile: %s" %
pprint_pkglist(pkgs['added']))
log.log_me("Removing packages from package profile: %s" %
- pprint_pkglist(pkgs['deleted']))
- s = rhnserver.RhnServer()
-
- s.registration.delta_packages(up2dateAuth.getSystemId(), pkgs)
+ pprint_pkglist(pkgs['removed']))
def updatePackageProfile():
""" get a list of installed packages and send it to rhnServer """
diff --git a/client/rhel/yum-rhn-plugin/rhnplugin.py b/client/rhel/yum-rhn-plugin/rhnplugin.py
index e5f2ff2..e7af545 100644
--- a/client/rhel/yum-rhn-plugin/rhnplugin.py
+++ b/client/rhel/yum-rhn-plugin/rhnplugin.py
@@ -196,10 +196,13 @@ def posttrans_hook(conduit):
""" Post rpm transaction hook. We update the RHN profile here. """
global rhn_enabled
if rhn_enabled:
- ts_info = conduit.getTsInfo()
- delta = make_package_delta(ts_info)
+ up2date_cfg = config.initUp2dateConfig()
+ if up2date_cfg.has_key('writeChangesToLog') and up2date_cfg['writeChangesToLog'] == 1:
+ ts_info = conduit.getTsInfo()
+ delta = make_package_delta(ts_info)
+ rhnPackageInfo.logDeltaPackages(delta)
try:
- rhnPackageInfo.remoteDeltaPackages(delta)
+ rhnPackageInfo.updatePackageProfile()
except up2dateErrors.RhnServerException, e:
conduit.error(0, COMMUNICATION_ERROR + "\n" +
_("Package profile information could not be sent.") + "\n" +
@@ -240,6 +243,7 @@ class RhnRepo(YumRepository):
def __init__(self, channel):
YumRepository.__init__(self, channel['label'])
+ self.name = channel['name']
self._callbacks_changed = False
# support failover urls, #232567
commit 0fec81b0d9c530eaf283522104c7995fb5719cc6
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Nov 19 17:07:43 2009 +0100
527412 - Revert "fixing rhn-plugin to update package profiles through the updatePackageProfile call instead of manually setting up the delta as it causes stale package entries in the ui due to epoch being set to 0 for a no epoch packages"
This reverts commit 20566c5ea64527c9159104b7c61bb70b149b6318.
We need to compute delta so we can write what we add and what we remove to logs.
Conflicts:
client/rhel/yum-rhn-plugin/rhnplugin.py
diff --git a/client/rhel/yum-rhn-plugin/rhnplugin.py b/client/rhel/yum-rhn-plugin/rhnplugin.py
index d9bed15..e5f2ff2 100644
--- a/client/rhel/yum-rhn-plugin/rhnplugin.py
+++ b/client/rhel/yum-rhn-plugin/rhnplugin.py
@@ -196,8 +196,10 @@ def posttrans_hook(conduit):
""" Post rpm transaction hook. We update the RHN profile here. """
global rhn_enabled
if rhn_enabled:
+ ts_info = conduit.getTsInfo()
+ delta = make_package_delta(ts_info)
try:
- rhnPackageInfo.updatePackageProfile()
+ rhnPackageInfo.remoteDeltaPackages(delta)
except up2dateErrors.RhnServerException, e:
conduit.error(0, COMMUNICATION_ERROR + "\n" +
_("Package profile information could not be sent.") + "\n" +
@@ -238,7 +240,6 @@ class RhnRepo(YumRepository):
def __init__(self, channel):
YumRepository.__init__(self, channel['label'])
- self.name = channel['name']
self._callbacks_changed = False
# support failover urls, #232567
@@ -462,6 +463,65 @@ class RhnRepo(YumRepository):
up2dateAuth.updateLoginInfo()
return YumRepository._getRepoXML(self)
+def make_package_delta(ts_info):
+ """
+ Construct an RHN style package delta from a yum TransactionData object.
+
+ Return a hash containing two keys: added and removed.
+ Each key's value is a list of RHN style package tuples.
+ """
+
+ delta = {}
+ delta["added"] = []
+ delta["removed"] = []
+
+ # Make sure the transaction data has the packages in nice lists.
+ ts_info.makelists()
+
+ for ts_member in ts_info.installed:
+ package = ts_member.po
+ pkgtup = __rhn_pkg_tup_from_po(package)
+ delta["added"].append(pkgtup)
+
+ for ts_member in ts_info.depinstalled:
+ package = ts_member.po
+ pkgtup = __rhn_pkg_tup_from_po(package)
+ delta["added"].append(pkgtup)
+
+ for ts_member in ts_info.updated:
+ package = ts_member.po
+ pkgtup = __rhn_pkg_tup_from_po(package)
+ delta["added"].append(pkgtup)
+
+ for ts_member in ts_info.depupdated:
+ package = ts_member.po
+ pkgtup = __rhn_pkg_tup_from_po(package)
+ delta["added"].append(pkgtup)
+
+ for ts_member in ts_info.removed:
+ package = ts_member.po
+ pkgtup = __rhn_pkg_tup_from_po(package)
+ delta["removed"].append(pkgtup)
+
+ for ts_member in ts_info.depremoved:
+ package = ts_member.po
+ pkgtup = __rhn_pkg_tup_from_po(package)
+ delta["removed"].append(pkgtup)
+
+ return delta
+
+def __rhn_pkg_tup_from_po(package):
+ """ Construct an rhn-style package tuple from a yum package object. """
+
+ name = package.returnSimple('name')
+ epoch = package.returnSimple('epoch')
+ version = package.returnSimple('version')
+ release = package.returnSimple('release')
+ arch = package.returnSimple('arch')
+
+ return (name, version, release, epoch, arch)
+
+
class BadConfig(Exception):
pass
14 years, 5 months
Changes to 'refs/tags/spacewalk-java-0.7.18-1'
by Tomas Lestach
Tag 'spacewalk-java-0.7.18-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2009-11-20 09:14 +0000
Tagging package [spacewalk-java] version [0.7.18-1] in directory [java/].
Changes since spacewalk-setup-0.7.7-1:
Tomas Lestach (2):
some columns not filled on webui for non-cve errata
Automatic commit of package [spacewalk-java] release [0.7.18-1].
---
java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml | 21 ++--------
java/code/src/com/redhat/rhn/frontend/dto/SecurityErrataOverview.java | 11 ++++-
java/spacewalk-java.spec | 17 +++++++-
rel-eng/packages/spacewalk-java | 2
4 files changed, 31 insertions(+), 20 deletions(-)
---
14 years, 5 months
2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml | 21 ++--------
java/code/src/com/redhat/rhn/frontend/dto/SecurityErrataOverview.java | 11 ++++-
java/spacewalk-java.spec | 17 +++++++-
rel-eng/packages/spacewalk-java | 2
4 files changed, 31 insertions(+), 20 deletions(-)
New commits:
commit 0518c4332d1ad1cc1853e0ad25c56f8c16bb7c3f
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Nov 20 10:14:02 2009 +0100
Automatic commit of package [spacewalk-java] release [0.7.18-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 4797ea9..695a41c 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -12,7 +12,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 0.7.17
+Version: 0.7.18
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -280,6 +280,21 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri Nov 20 2009 Tomas Lestach <tlestach(a)redhat.com> 0.7.18-1
+- some columns not filled on webui for non-cve errata (tlestach(a)redhat.com)
+- checkstyle fix (jsherril(a)redhat.com)
+- 512844 - fixing inefficient query in package set clenaup
+ (jsherril(a)redhat.com)
+- unit test fix - we no longer do validation checking on kickstart partitions,
+ so no need to test it (jsherril(a)redhat.com)
+- unit test fix - kickstart compare packages was not working correctly
+ (jsherril(a)redhat.com)
+- 537491 - fixing issue with cloned kickstart profiles losing the package list
+ during cloning (jsherril(a)redhat.com)
+- checkstyle fix (jsherril(a)redhat.com)
+- unit test fix (jsherril(a)redhat.com)
+- unit test fix (jsherril(a)redhat.com)
+
* Thu Nov 12 2009 Tomas Lestach <tlestach(a)redhat.com> 0.7.17-1
- 536825 - storing "@ Base" KickstartPackage into DB (tlestach(a)redhat.com)
- java code enhancements according to jsherrill's comments
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 325e013..f1305e7 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-0.7.17-1 java/
+0.7.18-1 java/
commit 3a37c0f219adef0b34c75a008e94d915fecc9471
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Nov 19 15:14:56 2009 +0100
some columns not filled on webui for non-cve errata
errata_cves_elab didn't fill other columns, if no associated cves found
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml
index 7ab88c0..c17e8aa 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml
@@ -66,6 +66,7 @@ SELECT E.id, E.update_date
ORDER BY E.update_date DESC, E.id
</query>
<elaborator name="errata_cves_elab" />
+ <elaborator name="errata_overview" />
</mode>
<mode name="all_errata" class="com.redhat.rhn.frontend.dto.ErrataOverview">
@@ -103,7 +104,7 @@ SELECT DISTINCT E.id, E.update_date, E.synopsis AS ADVISORY_SYNOPSIS
<mode name="all_errata_by_type_with_cves" class="com.redhat.rhn.frontend.dto.SecurityErrataOverview">
<query params="org_id, type">
-SELECT DISTINCT E.id, E.update_date, E.synopsis AS ADVISORY_SYNOPSIS
+SELECT DISTINCT E.id, E.update_date
FROM rhnErrata E, rhnChannelErrata CE, rhnChannel C,
rhnChannelFamilyMembers CFM,
rhnOrgChannelFamilyPermissions OCF
@@ -116,6 +117,7 @@ SELECT DISTINCT E.id, E.update_date, E.synopsis AS ADVISORY_SYNOPSIS
ORDER BY E.update_date DESC, E.id
</query>
<elaborator name="errata_cves_elab" />
+ <elaborator name="errata_overview" />
</mode>
<mode name="all_errata_orig" class="com.redhat.rhn.frontend.dto.ErrataOverview">
@@ -1286,21 +1288,8 @@ SELECT E.id, E.advisory, E.synopsis
</query>
</mode>
-<query name="errata_cves_elab" params="user_id" >
-SELECT E.id, E.advisory_name, E.advisory_type, E.synopsis AS ADVISORY_SYNOPSIS,
- C.name AS CVE,
- (SELECT COUNT(DISTINCT S.id)
- FROM rhnServerNeededErrataCache SNEC,
- rhnServer S, rhnUserServerPerms USP
- WHERE USP.user_id = :user_id
- AND USP.server_id = S.ID
- AND S.id = SNEC.server_id
- AND EXISTS (SELECT 1
- FROM rhnServerFeaturesView SFV
- WHERE SFV.server_id = SNEC.server_id
- AND SFV.label = 'ftr_errata_updates')
- AND SNEC.errata_id = E.id)
- AS AFFECTED_SYSTEM_COUNT
+<query name="errata_cves_elab">
+SELECT E.id, C.name AS CVE
FROM rhnErrata E, rhnCve C, rhnErrataCVE EC
WHERE E.id IN (%s)
AND E.id = EC.errata_id
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/SecurityErrataOverview.java b/java/code/src/com/redhat/rhn/frontend/dto/SecurityErrataOverview.java
index 5f0e419..34a5eef 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/SecurityErrataOverview.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/SecurityErrataOverview.java
@@ -42,9 +42,16 @@ public class SecurityErrataOverview extends ErrataOverview
*/
public void callback(ResultSet rs) throws SQLException {
if (rs != null) {
- String cve = rs.getString("CVE");
- if (cve != null) {
+ // need to use try-catch, because of use of two
+ // elaborators (only one of them elaborates "CVE")
+ try {
+ String cve = rs.getString("CVE");
+ if (cve != null) {
addCve(cve);
+ }
+ }
+ catch (SQLException e) {
+ return;
}
}
}
14 years, 5 months
Branch 'sha256-support3' - 3 commits - backend/server
by Michael Mraka
backend/server/importlib/headerSource.py | 3 ++-
backend/server/importlib/packageImport.py | 18 ++++++------------
2 files changed, 8 insertions(+), 13 deletions(-)
New commits:
commit 150e16697ad6cf3b38b6e4dd62d2bf40e85ecfdb
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Nov 20 00:10:07 2009 +0100
fixed checksum type of files inside rpm package
diff --git a/backend/server/importlib/headerSource.py b/backend/server/importlib/headerSource.py
index 4773d58..5bc1d36 100644
--- a/backend/server/importlib/headerSource.py
+++ b/backend/server/importlib/headerSource.py
@@ -282,7 +282,8 @@ class rpmFile(File, ChangeLog):
'rdev' : 'filerdevs',
'file_size' : 'filesizes',
'mtime' : 'filemtimes',
- 'md5' : 'filemd5s',
+ 'filedigest' : 'filemd5s', # FILEMD5S is a pre-rpm4.6 name for FILEDIGESTS
+ # we have to use it for compatibility reason
'linkto' : 'filelinktos',
'flags' : 'fileflags',
'verifyflags' : 'fileverifyflags',
diff --git a/backend/server/importlib/packageImport.py b/backend/server/importlib/packageImport.py
index e0c82f7..5044c84 100644
--- a/backend/server/importlib/packageImport.py
+++ b/backend/server/importlib/packageImport.py
@@ -253,13 +253,14 @@ class PackageImport(ChannelPackageSubscription):
self.capabilities[nv] = None
# Process files too
fileList = package['files']
+ checksum_type = package['checksum'][0]
for f in fileList:
nv = (f['name'], '')
del f['name']
f['capability'] = nv
if not self.capabilities.has_key(nv):
self.capabilities[nv] = None
- fchecksum = ('md5', f['md5'])
+ fchecksum = (checksum_type, f['filedigest'])
f['checksum'] = fchecksum
if not self.checksums.has_key(fchecksum):
self.checksums[fchecksum] = None
@@ -486,7 +487,7 @@ class PackageImport(ChannelPackageSubscription):
package['solaris_patch_set_members'] = infoObjs
def _comparePackages(self, package1, package2):
- if package1['md5sum'] == package2['md5sum']:
+ if package1['checksum'] == package2['checksum']:
return
# XXX Handle this better
raise Exception("Different packages in the same batch")
@@ -552,7 +553,7 @@ class SourcePackageImport(Import):
def _comparePackages(self, package1, package2):
- if package1['md5sum'] == package2['md5sum']:
+ if package1['checksum'] == package2['checksum']:
return
# XXX Handle this better
raise Exception("Different packages in the same batch")
commit eba05941e8a324731c2d929ee2f4303297f6e436
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Nov 19 23:40:45 2009 +0100
removed commented out code
diff --git a/backend/server/importlib/packageImport.py b/backend/server/importlib/packageImport.py
index b102925..e0c82f7 100644
--- a/backend/server/importlib/packageImport.py
+++ b/backend/server/importlib/packageImport.py
@@ -71,7 +71,6 @@ class ChannelPackageSubscription(GenericPackageImport):
if package.ignored:
continue
self._postprocessPackageNEVRA(package)
- #package['checksum_id'] = self.checksums[package['checksum']]
self._postprocessPackage(package)
if not CFG.ENABLE_NVREA:
# nvrea disabled, skip checksum
@@ -180,12 +179,6 @@ class ChannelPackageSubscription(GenericPackageImport):
# Replace the channel list with the uniquified list
package.channels = channels
-# # FIXME: needs to be fixed for sha256
-# checksum = ('md5',package['md5sum'])
-# package['checksum'] = checksum
-# if not self.checksums.has_key(checksum):
-# self.checksums[checksum] = None
-
# Copies the channels from one package to the other
def __copyChannels(self, sourcePackage, destPackage):
dpHash = destPackage['channels']
commit ae0a3a61985c4e0300468d404b8dbc718bc7f018
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Nov 19 23:39:06 2009 +0100
fixed comment
diff --git a/backend/server/importlib/packageImport.py b/backend/server/importlib/packageImport.py
index 036bdab..b102925 100644
--- a/backend/server/importlib/packageImport.py
+++ b/backend/server/importlib/packageImport.py
@@ -74,14 +74,14 @@ class ChannelPackageSubscription(GenericPackageImport):
#package['checksum_id'] = self.checksums[package['checksum']]
self._postprocessPackage(package)
if not CFG.ENABLE_NVREA:
- # nvrea disabled, skip md5sum
+ # nvrea disabled, skip checksum
nevrao = (
package['name_id'],
package['evr_id'],
package['package_arch_id'],
package['org_id'])
else:
- # As nvrea is enabled uniquify based on md5sum
+ # As nvrea is enabled uniquify based on checksum
nevrao = (
package['name_id'],
package['evr_id'],
14 years, 5 months