proxy/installer proxy/proxy
by Miroslav Suchý
proxy/installer/spacewalk-proxy-installer.spec | 1 -
proxy/proxy/spacewalk-proxy.spec | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 275d84522d0ec98da869340a91642e8e60fd433e
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Jul 3 11:37:29 2009 +0200
509522 - remove conflicts and put provides to spacewalk-proxy-management
this way we should be able to upgrade from command line and not force older proxies to upgrade to newly provided rhns-proxy-tool package
diff --git a/proxy/installer/spacewalk-proxy-installer.spec b/proxy/installer/spacewalk-proxy-installer.spec
index 69dad52..3213b3e 100644
--- a/proxy/installer/spacewalk-proxy-installer.spec
+++ b/proxy/installer/spacewalk-proxy-installer.spec
@@ -19,7 +19,6 @@ Requires: glibc-common
Requires: chkconfig
Requires: libxslt
BuildRequires: /usr/bin/docbook2man
-Conflicts: rhns-proxy-tools < 5.3.0
Obsoletes: proxy-installer < 5.3.0
Provides: proxy-installer = 5.3.0
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index e83ca74..a53c9da 100644
--- a/proxy/proxy/spacewalk-proxy.spec
+++ b/proxy/proxy/spacewalk-proxy.spec
@@ -42,6 +42,7 @@ Obsoletes: rhns-proxy < 5.3.0
Obsoletes: rhns-proxy-management < 5.3.0
BuildRequires: /usr/bin/docbook2man
Obsoletes: rhns-proxy-tools < 5.3.0
+Provides: rhns-proxy-tools = 5.3.0
Obsoletes: spacewalk-proxy-tools < 0.5.3
Provides: spacewalk-proxy-tools = %{version}
14 years, 11 months
Changes to 'refs/tags/spacewalk-backend-0.6.16-1'
by Miroslav Suchý
Tag 'spacewalk-backend-0.6.16-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2009-07-03 09:06 +0000
Tagging package [spacewalk-backend] version [0.6.16-1] in directory [backend/].
Changes since spacewalk-proxy-installer-0.6.17-1:
Brad Buckingham (1):
509371 - SSM->Install,Remove,Verify - minor fixes to Package Name and Arch
Mark Chappell (1):
509516 - failure to check for non-existant header
Miroslav Suchý (1):
Automatic commit of package [spacewalk-backend] release [0.6.16-1].
Shannon Hughes (1):
509444 - remove delete action system from virt page
---
backend/common/rhnRepository.py | 5 +++--
backend/spacewalk-backend.spec | 7 ++++++-
java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml | 6 +++---
java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListSetupAction.java | 2 +-
rel-eng/packages/spacewalk-backend | 2 +-
5 files changed, 14 insertions(+), 8 deletions(-)
---
14 years, 11 months
backend/spacewalk-backend.spec rel-eng/packages
by Miroslav Suchý
backend/spacewalk-backend.spec | 7 ++++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 53e73c11e3d17c2681135655df531ced7d60b3ed
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Jul 3 11:06:29 2009 +0200
Automatic commit of package [spacewalk-backend] release [0.6.16-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index d9dea5e..f89dbde 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -7,7 +7,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 0.6.15
+Version: 0.6.16
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -568,6 +568,11 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Fri Jul 3 2009 Miroslav Suchy <msuchy(a)redhat.com> 0.6.16-1
+- 509516 - failure to check for non-existant header (Mark Chappell <m.d.chappell(a)bath.ac.uk>)
+- 509444 - remove delete action system from virt page (Shannon Hughes <shughes(a)redhat.com>)
+- 509371 - SSM->Install,Remove,Verify - minor fixes to Package Name and Arch (Brad Buckingham <bbuckingham(a)redhat.com>)
+
* Thu Jun 25 2009 John Matthews <jmatthew(a)redhat.com> 0.6.15-1
- change comments to docstrings (msuchy(a)redhat.com)
- change comments to docstrings (msuchy(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 65f3b59..3ebd6c4 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-0.6.15-1 backend/
+0.6.16-1 backend/
14 years, 11 months
backend/common
by Miroslav Suchý
backend/common/rhnRepository.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit f04c0d4bf19fcfcbc9e691fc7ad8be37a26805ca
Author: Mark Chappell <m.d.chappell(a)bath.ac.uk>
Date: Thu Jul 2 16:51:23 2009 +0100
509516 - failure to check for non-existant header
diff --git a/backend/common/rhnRepository.py b/backend/common/rhnRepository.py
index 85e0408..c66b2d9 100644
--- a/backend/common/rhnRepository.py
+++ b/backend/common/rhnRepository.py
@@ -101,8 +101,9 @@ class Repository(RPC_Base):
# Must be a client. We'll determine the redirect capability via
# the x-rhn-transport-capability header instead.
transport_cap = rhnFlags.get('x-rhn-transport-capability')
- transport_cap_list = transport_cap.split('=')
- redirectsSupported = transport_cap_list[0] == 'follow-redirects' and transport_cap_list[1] >= 2
+ if transport_cap :
+ transport_cap_list = transport_cap.split('=')
+ redirectsSupported = transport_cap_list[0] == 'follow-redirects' and transport_cap_list[1] >= 2
if redirectsSupported:
log_debug(3, "Client supports redirects.")
14 years, 11 months
Branch 'ssm-kickstart' - java/code
by Partha Aji
java/code/src/com/redhat/rhn/frontend/action/kickstart/ssm/SsmKSScheduleAction.java | 15 ++++------
java/code/src/com/redhat/rhn/manager/profile/ProfileManager.java | 3 +-
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-sync.jspf | 2 +
java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp | 2 +
4 files changed, 13 insertions(+), 9 deletions(-)
New commits:
commit 97cd1d0e743a2e2c2b0c09a69d844a353569f338
Author: Partha Aji <paji(a)redhat.com>
Date: Thu Jul 2 18:16:17 2009 -0400
Added profile sync setup logic ...
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/ssm/SsmKSScheduleAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/ssm/SsmKSScheduleAction.java
index d2dffa4..0369fcf 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/ssm/SsmKSScheduleAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/ssm/SsmKSScheduleAction.java
@@ -21,8 +21,6 @@ import com.redhat.rhn.domain.kickstart.KickstartFactory;
import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.server.ServerFactory;
import com.redhat.rhn.domain.user.User;
-import com.redhat.rhn.frontend.action.common.DateRangePicker;
-import com.redhat.rhn.frontend.action.common.DateRangePicker.DatePickerResults;
import com.redhat.rhn.frontend.action.kickstart.ScheduleKickstartWizardAction;
import com.redhat.rhn.frontend.dto.SystemOverview;
import com.redhat.rhn.frontend.struts.RequestContext;
@@ -35,7 +33,7 @@ import com.redhat.rhn.manager.kickstart.KickstartLister;
import com.redhat.rhn.manager.kickstart.KickstartManager;
import com.redhat.rhn.manager.kickstart.SSMScheduleCommand;
import com.redhat.rhn.manager.kickstart.cobbler.CobblerXMLRPCHelper;
-import com.redhat.rhn.manager.system.SystemManager;
+import com.redhat.rhn.manager.profile.ProfileManager;
import org.apache.commons.lang.StringUtils;
import org.apache.struts.action.ActionForm;
@@ -44,7 +42,6 @@ import org.apache.struts.action.ActionMapping;
import org.apache.struts.action.DynaActionForm;
import org.cobbler.Profile;
-import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -66,11 +63,11 @@ public class SsmKSScheduleAction extends RhnAction implements Listable {
/**
* ${@inheritDoc}
*/
- public ActionForward execute(ActionMapping mapping, ActionForm form,
+ public ActionForward execute(ActionMapping mapping, ActionForm formIn,
HttpServletRequest request, HttpServletResponse response) throws Exception {
RequestContext context = new RequestContext(request);
User user = context.getLoggedInUser();
-
+ DynaActionForm form = (DynaActionForm)formIn;
if ("ip".equals(mapping.getParameter())) {
request.setAttribute(SCHEDULE_TYPE_IP, Boolean.TRUE);
}
@@ -82,9 +79,11 @@ public class SsmKSScheduleAction extends RhnAction implements Listable {
ListHelper helper = new ListHelper(this, request);
helper.execute();
ScheduleKickstartWizardAction.setupProxyInfo(context);
+ form.set(ScheduleKickstartWizardAction.SYNCH_PACKAGES,
+ ProfileManager.listProfileOverviews(user.getOrg().getId()));
// create and prepopulate the date picker.
getStrutsDelegate().prepopulateDatePicker(
- request, (DynaActionForm)form, "date", DatePicker.YEAR_RANGE_POSITIVE);
+ request, form, "date", DatePicker.YEAR_RANGE_POSITIVE);
return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
@@ -161,5 +160,5 @@ public class SsmKSScheduleAction extends RhnAction implements Listable {
}
return profiles;
}
-
+
}
diff --git a/java/code/src/com/redhat/rhn/manager/profile/ProfileManager.java b/java/code/src/com/redhat/rhn/manager/profile/ProfileManager.java
index 11840fc..22e37e0 100644
--- a/java/code/src/com/redhat/rhn/manager/profile/ProfileManager.java
+++ b/java/code/src/com/redhat/rhn/manager/profile/ProfileManager.java
@@ -36,6 +36,7 @@ import com.redhat.rhn.domain.server.ServerFactory;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.dto.PackageListItem;
import com.redhat.rhn.frontend.dto.PackageMetadata;
+import com.redhat.rhn.frontend.dto.ProfileOverviewDto;
import com.redhat.rhn.frontend.listview.PageControl;
import com.redhat.rhn.manager.BaseManager;
import com.redhat.rhn.manager.MissingEntitlementException;
@@ -1252,7 +1253,7 @@ public class ProfileManager extends BaseManager {
* @param orgId The id of the org the profiles are associated with.
* @return DataResult of ProfileOverviewDto
*/
- public static DataResult listProfileOverviews(Long orgId) {
+ public static DataResult<ProfileOverviewDto> listProfileOverviews(Long orgId) {
SelectMode m = ModeFactory.getMode("profile_queries", "profile_overview");
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-sync.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-sync.jspf
index 323fd86..2ce1b60 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-sync.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-sync.jspf
@@ -34,6 +34,7 @@
</c:forEach>
</select>
<br /><br />
+ <c:if test="${empty noSystemProfile}">
<!--- System profile sync-->
<input type="radio" name="targetProfileType" value="system"
onclick="form.syncPackageSelect.disabled = true; form.syncSystemSelect.disabled = false;"
@@ -53,6 +54,7 @@
</c:forEach>
</select>
<br /><br />
+ </c:if>
<input type="radio" name="targetProfileType" value="none"
onclick="form.syncPackageSelect.disabled = true; form.syncSystemSelect.disabled = true;"
id="syncNone"
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp b/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp
index 2c56ddd..1f65810 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp
@@ -37,6 +37,8 @@
</div>
<c:set var="regularKS" value="true"/>
<c:set var="form" value="${kickstartScheduleWizardForm.map}"/>
+<c:set var="noSystemProfile" value="true"/>
+
<rl:listset name="form">
<c:if test="${empty requestScope.isIP}">
<%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/profile-list.jspf" %>
14 years, 11 months
Branch 'ssm-kickstart' - java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/frontend/action/kickstart/ssm/SsmKSScheduleAction.java | 37 ++++++++--
java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java | 12 ---
java/code/webapp/WEB-INF/struts-config.xml | 6 -
3 files changed, 33 insertions(+), 22 deletions(-)
New commits:
commit 5c2bb83a738e341aea77d626b9eeac39d2fa1f84
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Jul 2 17:43:34 2009 -0400
more glues
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/ssm/SsmKSScheduleAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/ssm/SsmKSScheduleAction.java
index 60e9e08..d2dffa4 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/ssm/SsmKSScheduleAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/ssm/SsmKSScheduleAction.java
@@ -18,6 +18,8 @@ import com.redhat.rhn.common.util.DatePicker;
import com.redhat.rhn.common.validator.ValidatorError;
import com.redhat.rhn.domain.kickstart.KickstartData;
import com.redhat.rhn.domain.kickstart.KickstartFactory;
+import com.redhat.rhn.domain.server.Server;
+import com.redhat.rhn.domain.server.ServerFactory;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.common.DateRangePicker;
import com.redhat.rhn.frontend.action.common.DateRangePicker.DatePickerResults;
@@ -33,13 +35,17 @@ import com.redhat.rhn.manager.kickstart.KickstartLister;
import com.redhat.rhn.manager.kickstart.KickstartManager;
import com.redhat.rhn.manager.kickstart.SSMScheduleCommand;
import com.redhat.rhn.manager.kickstart.cobbler.CobblerXMLRPCHelper;
+import com.redhat.rhn.manager.system.SystemManager;
+import org.apache.commons.lang.StringUtils;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.action.DynaActionForm;
import org.cobbler.Profile;
+import java.util.Collection;
+import java.util.Collections;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
@@ -65,18 +71,16 @@ public class SsmKSScheduleAction extends RhnAction implements Listable {
RequestContext context = new RequestContext(request);
User user = context.getLoggedInUser();
+ if ("ip".equals(mapping.getParameter())) {
+ request.setAttribute(SCHEDULE_TYPE_IP, Boolean.TRUE);
+ }
if (context.wasDispatched("kickstart.schedule.button2.jsp")) {
schedule(request, form, context);
}
- if ("ip".equals(mapping.getParameter())) {
- request.setAttribute(SCHEDULE_TYPE_IP, Boolean.TRUE);
- }
- if (!isIP(request)) {
- ListHelper helper = new ListHelper(this, request);
- helper.execute();
- }
+ ListHelper helper = new ListHelper(this, request);
+ helper.execute();
ScheduleKickstartWizardAction.setupProxyInfo(context);
// create and prepopulate the date picker.
getStrutsDelegate().prepopulateDatePicker(
@@ -117,6 +121,20 @@ public class SsmKSScheduleAction extends RhnAction implements Listable {
}
}
+
+ String proxyId = (String) request.getAttribute(ScheduleKickstartWizardAction.PROXY_HOST);
+ if (!StringUtils.isEmpty(proxyId)) {
+ Server proxy = ServerFactory.lookupById(Long.parseLong(proxyId));
+ com.setProxy(proxy);
+ }
+ com.setProfileType(dynaForm.getString(
+ ScheduleKickstartWizardAction.TARGET_PROFILE_TYPE));
+ com.setServerProfileId((Long) dynaForm.get("targetProfile"));
+ com.setPackageProfileId((Long) dynaForm.get("targetProfile"));
+
+
+
+
List<ValidatorError> errors = com.store();
}
@@ -126,6 +144,11 @@ public class SsmKSScheduleAction extends RhnAction implements Listable {
* {@inheritDoc}
*/
public List getResult(RequestContext ctx) {
+
+ if (isIP(ctx.getRequest())) {
+ return Collections.EMPTY_LIST;
+ }
+
User user = ctx.getLoggedInUser();
List profiles = KickstartLister.getInstance().listProfilesForSsm(user);
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java
index 4291fb5..3a5b5d5 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java
@@ -122,22 +122,10 @@ public class KickstartManager extends BaseManager {
* @return the the list of ip ranges accessible to the user.
*/
public List<KickstartIpRange> listIpRanges(User user) {
- ensureConfigAdmin(user);
return KickstartFactory.lookupRangeByOrg(user.getOrg());
}
/**
- * ensure that the user is a config admin throw perm exception other wise
- * @param user user object
- */
- private void ensureConfigAdmin(User user) {
- if (!user.hasRole(RoleFactory.CONFIG_ADMIN)) {
- throw new PermissionException(RoleFactory.CONFIG_ADMIN);
- }
- }
-
-
- /**
* Find a kickstart profile for a given server by searching by IP addresses
* @param server the server to find the ksdata for
* @return the kickstartData or 'null' if nothing found
diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml
index 751fd62..fcf676c 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -4623,7 +4623,7 @@
type="com.redhat.rhn.frontend.action.kickstart.ssm.SsmKSScheduleAction"
parameter="profile"
className="com.redhat.rhn.frontend.struts.RhnActionMapping">
- <set-property property="acls" value="org_entitlement(rhn_provisioning); user_role(config_admin)"/>
+ <set-property property="acls" value="org_entitlement(rhn_provisioning);"/>
<forward name="default"
path="/WEB-INF/pages/kickstart/ssm/schedule.jsp"/>
<forward name="success" redirect= "true"
@@ -4637,7 +4637,7 @@
type="com.redhat.rhn.frontend.action.kickstart.ssm.SsmKSScheduleAction"
parameter="ip"
className="com.redhat.rhn.frontend.struts.RhnActionMapping">
- <set-property property="acls" value="org_entitlement(rhn_provisioning); user_role(config_admin)"/>
+ <set-property property="acls" value="org_entitlement(rhn_provisioning);"/>
<forward name="default"
path="/WEB-INF/pages/kickstart/ssm/schedule.jsp"/>
<forward name="success" redirect= "true"
@@ -4651,7 +4651,7 @@
input="/WEB-INF/pages/kickstart/kickstarts.jsp"
type="com.redhat.rhn.frontend.action.kickstart.KickstartsSetupAction"
className="com.redhat.rhn.frontend.struts.RhnActionMapping">
- <set-property property="acls" value="org_entitlement(rhn_provisioning); user_role(config_admin)"/>
+ <set-property property="acls" value="org_entitlement(rhn_provisioning);"/>
<forward name="default"
path="/WEB-INF/pages/kickstart/kickstarts.jsp"/>
</action>
14 years, 11 months
Branch 'ssm-kickstart' - java/code
by Partha Aji
java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickstartWizardAction.java | 162 ++++------
java/code/src/com/redhat/rhn/frontend/action/kickstart/test/ScheduleKickstartWizardTest.java | 3
java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/ProvisionVirtualizationWizardAction.java | 17 -
java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/test/ProvisionVirtualizationWizardActionTest.java | 5
java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java | 86 +----
java/code/src/com/redhat/rhn/manager/kickstart/ProvisionVirtualInstanceCommand.java | 1
java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartScheduleCommandTest.java | 4
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf | 4
java/code/webapp/WEB-INF/struts-config.xml | 3
9 files changed, 96 insertions(+), 189 deletions(-)
New commits:
commit a22c18b425d558c8c6af8300987d895a97756b59
Author: Partha Aji <paji(a)redhat.com>
Date: Thu Jul 2 17:24:48 2009 -0400
Bunch of fixes and more work ...
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickstartWizardAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickstartWizardAction.java
index de7735a..213aa21 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickstartWizardAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickstartWizardAction.java
@@ -38,7 +38,6 @@ import com.redhat.rhn.manager.kickstart.cobbler.CobblerSystemCreateCommand;
import com.redhat.rhn.manager.kickstart.cobbler.CobblerXMLRPCHelper;
import com.redhat.rhn.manager.system.SystemManager;
-import org.apache.commons.lang.BooleanUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import org.apache.struts.action.ActionErrors;
@@ -47,6 +46,7 @@ import org.apache.struts.action.ActionMapping;
import org.apache.struts.action.DynaActionForm;
import org.apache.struts.util.LabelValueBean;
import org.cobbler.CobblerConnection;
+import org.cobbler.CobblerObject;
import org.cobbler.Distro;
import org.cobbler.SystemRecord;
@@ -58,6 +58,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
/**
@@ -74,7 +75,6 @@ public class ScheduleKickstartWizardAction extends RhnWizardAction {
.getLogger(ScheduleKickstartWizardAction.class);
public static final String SYNCH_PACKAGES = "syncPackages";
- public static final String ACTIVATION_KEYS = "activationKeys";
public static final String SYNCH_SYSTEMS = "syncSystems";
public static final String HAS_PROFILES = "hasProfiles";
public static final String HAS_PROXIES = "hasProxies";
@@ -86,16 +86,13 @@ public class ScheduleKickstartWizardAction extends RhnWizardAction {
public static final String KERNEL_PARAMS_DISTRO = "distro";
public static final String KERNEL_PARAMS_PROFILE = "profile";
public static final String KERNEL_PARAMS_CUSTOM = "custom";
-
+ private static final String COBBLER_ONLY_PROFILE = "cobblerOnlyProfile";
public static final String POST_KERNEL_PARAMS = "postKernelParams";
public static final String POST_KERNEL_PARAMS_TYPE = "postKernelParamsType";
public static final String PROXY_HOST = "proxyHost";
- public static final String USE_EXISTING_PROFILE = "useExistingProfile";
- public static final String ACTIVATION_KEY = "activationKey";
public static final String IS_VIRTUAL_GUEST = "isVirtualGuest";
public static final String HOST_SID = "hostSid";
public static final String VIRT_HOST_IS_REGISTERED = "virtHostIsRegistered";
-
public static final String TARGET_PROFILE_TYPE = "targetProfileType";
/**
* {@inheritDoc}
@@ -149,7 +146,6 @@ public class ScheduleKickstartWizardAction extends RhnWizardAction {
}
return profiles;
}
-
}
@@ -269,33 +265,33 @@ public class ScheduleKickstartWizardAction extends RhnWizardAction {
checkForKickstart(form, cmd, ctx);
addRequestAttributes(ctx, cmd, form);
- form.set(ACTIVATION_KEYS, cmd.getActivationKeys());
- DataResult packageProfiles = cmd.getProfiles();
- form.set(SYNCH_PACKAGES, packageProfiles);
- DataResult systemProfiles = cmd.getCompatibleSystems();
- form.set(SYNCH_SYSTEMS, systemProfiles);
-
- // Disable the package/system sync radio buttons if no profiles are
- // available:
- String syncPackageDisabled = "false";
- if (packageProfiles.size() == 0) {
- syncPackageDisabled = "true";
- }
- String syncSystemDisabled = "false";
- if (systemProfiles.size() == 0) {
- syncSystemDisabled = "true";
- }
- ctx.getRequest()
- .setAttribute(SYNC_PACKAGE_DISABED, syncPackageDisabled);
- ctx.getRequest().setAttribute(SYNC_SYSTEM_DISABLED, syncSystemDisabled);
-
- if (StringUtils.isEmpty(form.getString(USE_EXISTING_PROFILE))) {
- form.set(USE_EXISTING_PROFILE, Boolean.FALSE.toString());
+ if (!cmd.isCobblerOnly()) {
+ List packageProfiles = cmd.getProfiles();
+ form.set(SYNCH_PACKAGES, packageProfiles);
+ List systemProfiles = cmd.getCompatibleSystems();
+ form.set(SYNCH_SYSTEMS, systemProfiles);
+
+ // Disable the package/system sync radio buttons if no profiles are
+ // available:
+ String syncPackageDisabled = "false";
+ if (packageProfiles.size() == 0) {
+ syncPackageDisabled = "true";
+ }
+ String syncSystemDisabled = "false";
+ if (systemProfiles.size() == 0) {
+ syncSystemDisabled = "true";
+ }
+ ctx.getRequest()
+ .setAttribute(SYNC_PACKAGE_DISABED, syncPackageDisabled);
+ ctx.getRequest().setAttribute(SYNC_SYSTEM_DISABLED, syncSystemDisabled);
+
+ if (StringUtils.isEmpty(form.getString(TARGET_PROFILE_TYPE))) {
+ form.set(TARGET_PROFILE_TYPE,
+ KickstartScheduleCommand.TARGET_PROFILE_TYPE_NONE);
+ }
}
-
- if (StringUtils.isEmpty(form.getString(TARGET_PROFILE_TYPE))) {
- form.set(TARGET_PROFILE_TYPE,
- KickstartScheduleCommand.TARGET_PROFILE_TYPE_NONE);
+ else {
+ ctx.getRequest().setAttribute(COBBLER_ONLY_PROFILE, Boolean.TRUE);
}
if (StringUtils.isEmpty(form.getString(KERNEL_PARAMS_TYPE))) {
@@ -384,59 +380,12 @@ public class ScheduleKickstartWizardAction extends RhnWizardAction {
KickstartHelper helper = new KickstartHelper(ctx.getRequest());
KickstartScheduleCommand cmd = getScheduleCommand(form, ctx,
scheduleTime, helper.getKickstartHost());
-
- CobblerConnection con = CobblerXMLRPCHelper.
- getConnection(ctx.getLoggedInUser());
-
- String type = form.getString(KERNEL_PARAMS_TYPE);
- if (KERNEL_PARAMS_CUSTOM.equals(type)) {
- cmd.setKernelOptions(form.getString(KERNEL_PARAMS));
- }
- else if (KERNEL_PARAMS_DISTRO.equals(type)) {
- Distro distro = Distro.
- lookupById(con, cmd.getKsdata().getTree().getCobblerId());
- cmd.setKernelOptions(distro.getKernelOptionsString());
- }
- else {
- org.cobbler.Profile profile = org.cobbler.Profile.
- lookupById(con, cmd.getKsdata().getCobblerId());
- cmd.setKernelOptions(profile.getKernelOptionsString());
- }
-
- type = form.getString(POST_KERNEL_PARAMS_TYPE);
- if (KERNEL_PARAMS_CUSTOM.equals(type)) {
- cmd.setPostKernelOptions(form.getString(POST_KERNEL_PARAMS));
- }
- else if (KERNEL_PARAMS_DISTRO.equals(type)) {
- Distro distro = Distro.
- lookupById(con, cmd.getKsdata().getTree().getCobblerId());
- cmd.setPostKernelOptions(distro.getKernelPostOptionsString());
- }
- else {
- org.cobbler.Profile profile = org.cobbler.Profile.
- lookupById(con, cmd.getKsdata().getCobblerId());
- cmd.setPostKernelOptions(profile.getKernelPostOptionsString());
- }
-
-
- boolean advancedConfig = false;
- // if existing profile is not set then actions froms from normal config
- // page
- if (StringUtils.isEmpty(form.getString(USE_EXISTING_PROFILE))) {
- form.set(USE_EXISTING_PROFILE, Boolean.TRUE.toString());
- }
- else {
- advancedConfig = true;
- }
- if (BooleanUtils.toBoolean(form.getString(USE_EXISTING_PROFILE))) {
- cmd
- .setActivationType(KickstartScheduleCommand.ACTIVATION_TYPE_EXISTING);
- }
- else {
- cmd.setActivationType(KickstartScheduleCommand.ACTIVATION_TYPE_KEY);
- cmd.setActivationKeyId((Long) form.get(ACTIVATION_KEY));
- }
+ cmd.setKernelOptions(parseKernelOptions(form, ctx.getRequest(),
+ form.getString(RequestContext.COBBLER_ID), false));
+ cmd.setPostKernelOptions(parseKernelOptions(form, ctx.getRequest(),
+ form.getString(RequestContext.COBBLER_ID), true));
+
if (!cmd.isCobblerOnly()) {
// now setup system/package profiles for kickstart to sync
Profile pkgProfile = cmd.getKsdata().getKickstartDefaults()
@@ -445,7 +394,7 @@ public class ScheduleKickstartWizardAction extends RhnWizardAction {
// if user did not override package profile, then grab from ks
// profile if avail
- if (!advancedConfig && packageProfileId != null) {
+ if (packageProfileId != null) {
cmd.setProfileId(packageProfileId);
cmd.setProfileType(KickstartScheduleCommand.TARGET_PROFILE_TYPE_PACKAGE);
}
@@ -622,5 +571,46 @@ public class ScheduleKickstartWizardAction extends RhnWizardAction {
User currentUser) {
return new KickstartScheduleCommand(sid, currentUser);
}
+
+ /**
+ * Parses the kernel options or Post kernel options
+ * from the given form. Called after the advanced options page
+ * is typically set..
+ * This is a handy method used in both SSM and SDC KS scheduling.
+ * @param form the kickstartScheduleWizardForm that holds the form fields.
+ * @param request the servlet request
+ * @param profileCobblerId the cobbler profile id
+ * @param isPost true if caller is interested in getting the
+ * post kernel options and not the pre.
+ * @return the kernel options selected by the user.
+ */
+ public static String parseKernelOptions(DynaActionForm form,
+ HttpServletRequest request,
+ String profileCobblerId,
+ boolean isPost) {
+ RequestContext context = new RequestContext(request);
+
+ CobblerConnection con = CobblerXMLRPCHelper.
+ getConnection(context.getLoggedInUser());
+ String typeKey = !isPost ? KERNEL_PARAMS_TYPE : POST_KERNEL_PARAMS_TYPE;
+ String customKey = !isPost ? KERNEL_PARAMS : POST_KERNEL_PARAMS;
+ String type = form.getString(typeKey);
+ if (KERNEL_PARAMS_CUSTOM.equals(type)) {
+ return form.getString(customKey);
+ }
+ org.cobbler.Profile profile = org.cobbler.Profile.lookupById(con,
+ profileCobblerId);
+ CobblerObject ret = profile;
+
+ if (KERNEL_PARAMS_DISTRO.equals(type)) {
+ ret = profile.getDistro();
+ }
+ if (!isPost) {
+ return ret.getKernelOptionsString();
+ }
+ else {
+ return ret.getKernelPostOptionsString();
+ }
+ }
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/ScheduleKickstartWizardTest.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/ScheduleKickstartWizardTest.java
index 4126d17..a363dd4 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/ScheduleKickstartWizardTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/ScheduleKickstartWizardTest.java
@@ -36,7 +36,6 @@ import com.redhat.rhn.domain.token.TokenFactory;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.kickstart.ScheduleKickstartWizardAction;
import com.redhat.rhn.frontend.context.Context;
-import com.redhat.rhn.frontend.dto.ActivationKeyDto;
import com.redhat.rhn.frontend.dto.ProfileDto;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.manager.kickstart.KickstartLister;
@@ -165,8 +164,6 @@ public class ScheduleKickstartWizardTest extends RhnMockStrutsTestCase {
assertNotNull(request.getAttribute(RequestContext.SYSTEM));
verifyFormList(ScheduleKickstartWizardAction.SYNCH_PACKAGES,
ProfileDto.class);
- verifyFormList(ScheduleKickstartWizardAction.ACTIVATION_KEYS,
- ActivationKeyDto.class);
verifyFormList(ScheduleKickstartWizardAction.SYNCH_SYSTEMS,
HashMap.class);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/ProvisionVirtualizationWizardAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/ProvisionVirtualizationWizardAction.java
index eaaf417..3e5ad9d 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/ProvisionVirtualizationWizardAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/ProvisionVirtualizationWizardAction.java
@@ -28,7 +28,6 @@ import com.redhat.rhn.manager.kickstart.KickstartScheduleCommand;
import com.redhat.rhn.manager.kickstart.ProvisionVirtualInstanceCommand;
import com.redhat.rhn.manager.kickstart.cobbler.CobblerXMLRPCHelper;
-import org.apache.commons.lang.BooleanUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionForward;
@@ -156,22 +155,6 @@ public class ProvisionVirtualizationWizardAction extends ScheduleKickstartWizard
ProvisionVirtualInstanceCommand cmd = getScheduleCommand(form,
ctx, scheduleTime, helper.getKickstartHost());
- if (StringUtils.isEmpty(form.getString(USE_EXISTING_PROFILE))) {
- form.set(USE_EXISTING_PROFILE, Boolean.TRUE.toString());
- }
-
- boolean useExistingProfile =
- BooleanUtils.toBoolean(form.getString(USE_EXISTING_PROFILE));
- if (useExistingProfile) {
- cmd.setActivationType(
- KickstartScheduleCommand.ACTIVATION_TYPE_EXISTING);
- }
- else {
- cmd.setActivationType(
- KickstartScheduleCommand.ACTIVATION_TYPE_KEY);
- cmd.setActivationKeyId((Long) form.get(ACTIVATION_KEY));
- }
-
cmd.setKernelOptions(form.getString(KERNEL_PARAMS));
cmd.setProfileType(form.getString("targetProfileType"));
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/test/ProvisionVirtualizationWizardActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/test/ProvisionVirtualizationWizardActionTest.java
index 944fe13..573b7a5 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/test/ProvisionVirtualizationWizardActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/test/ProvisionVirtualizationWizardActionTest.java
@@ -32,7 +32,6 @@ import com.redhat.rhn.domain.token.TokenFactory;
import com.redhat.rhn.frontend.action.kickstart.ScheduleKickstartWizardAction;
import com.redhat.rhn.frontend.action.kickstart.test.ScheduleKickstartWizardTest;
import com.redhat.rhn.frontend.action.systems.virtualization.ProvisionVirtualizationWizardAction;
-import com.redhat.rhn.frontend.dto.ActivationKeyDto;
import com.redhat.rhn.frontend.dto.ProfileDto;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.manager.kickstart.KickstartScheduleCommand;
@@ -120,8 +119,6 @@ public class ProvisionVirtualizationWizardActionTest extends RhnMockStrutsTestCa
assertNotNull(request.getAttribute(RequestContext.SYSTEM));
verifyFormList(ScheduleKickstartWizardAction.SYNCH_PACKAGES,
ProfileDto.class);
- verifyFormList(ScheduleKickstartWizardAction.ACTIVATION_KEYS,
- ActivationKeyDto.class);
verifyFormList(ScheduleKickstartWizardAction.SYNCH_SYSTEMS,
HashMap.class);
@@ -179,8 +176,6 @@ public class ProvisionVirtualizationWizardActionTest extends RhnMockStrutsTestCa
"/systems/details/kickstart/SessionStatus.do?sid=" + s.getId());
assertNotNull(KickstartFactory.lookupKickstartSessionByServer(s.getId()));
- verifyFormValue("useExistingProfile", Boolean.TRUE.toString());
-
if (addProxy && proxy != null) {
verifyFormValue(ScheduleKickstartWizardAction.PROXY_HOST,
proxy.getId().toString());
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java
index 8495ad7..239cbee 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java
@@ -44,6 +44,7 @@ import com.redhat.rhn.domain.token.ActivationKeyFactory;
import com.redhat.rhn.domain.token.Token;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.dto.PackageListItem;
+import com.redhat.rhn.frontend.dto.ProfileDto;
import com.redhat.rhn.frontend.dto.ServerPath;
import com.redhat.rhn.frontend.dto.kickstart.CobblerProfileDto;
import com.redhat.rhn.frontend.dto.kickstart.KickstartDto;
@@ -128,9 +129,7 @@ public class KickstartScheduleCommand extends BaseSystemOperation {
private KickstartSession kickstartSession;
private Date scheduleDate;
private List packagesToInstall;
- private String activationType;
private String profileType;
- private Set activationKeyIds;
private String proxyHost;
private Server targetServer;
@@ -336,8 +335,6 @@ public class KickstartScheduleCommand extends BaseSystemOperation {
log.debug("Initializing with selectedHostServerId=" + selectedHostServerId +
", selectedTargetServerId=" + selectedTargetServerId);
-
- this.setActivationType(ACTIVATION_TYPE_EXISTING);
this.setPackagesToInstall(new LinkedList());
// There must always be a host server present.
@@ -461,11 +458,15 @@ public class KickstartScheduleCommand extends BaseSystemOperation {
*
* @return DataResult list
*/
- public DataResult getProfiles() {
- DataResult profiles = ProfileManager.compatibleWithChannel(
- this.ksdata.getKickstartDefaults().getKstree().getChannel(),
- user.getOrg(), null);
- return profiles;
+ public List<ProfileDto> getProfiles() {
+ if (!isCobblerOnly()) {
+ List<ProfileDto> profiles = ProfileManager.compatibleWithChannel(
+ this.ksdata.getKickstartDefaults().getKstree().getChannel(),
+ user.getOrg(), null);
+ return profiles;
+ }
+ return Collections.EMPTY_LIST;
+
}
/**
@@ -1246,25 +1247,17 @@ public class KickstartScheduleCommand extends BaseSystemOperation {
return null;
}
-
-
- /**
- * Get the list of possible Activation keys to chose from
- * @return DataResult of
- */
- public DataResult getActivationKeys() {
- return KickstartLister.getInstance().
- getActivationKeysInOrg(this.user.getOrg(), null);
- }
-
/**
* Get the list of compatible systems you could sync to
* @return DataResult of System DTOs
*/
- public DataResult getCompatibleSystems() {
- DataResult dr = SystemManager.systemsSubscribedToChannel(
- this.getKsdata().getKickstartDefaults().getKstree().getChannel(), user);
- return dr;
+ public List getCompatibleSystems() {
+ if (!isCobblerOnly()) {
+ DataResult dr = SystemManager.systemsSubscribedToChannel(
+ this.getKsdata().getKickstartDefaults().getKstree().getChannel(), user);
+ return dr;
+ }
+ return Collections.EMPTY_LIST;
}
@@ -1283,23 +1276,6 @@ public class KickstartScheduleCommand extends BaseSystemOperation {
this.packagesToInstall = packagesToInstallIn;
}
-
- /**
- * @return Returns the activationType.
- */
- public String getActivationType() {
- return activationType;
- }
-
-
- /**
- * @param activationTypeIn The activationType to set.
- */
- public void setActivationType(String activationTypeIn) {
- this.activationType = activationTypeIn;
- }
-
-
/**
* @return Returns the profileType.
*/
@@ -1316,22 +1292,6 @@ public class KickstartScheduleCommand extends BaseSystemOperation {
}
/**
- * @return Returns the activationKeyIds.
- */
- public Set getActivationKeyIds() {
- return activationKeyIds;
- }
-
-
- /**
- * @param activationKeyIdsIn The activationKeyIds to set.
- */
- public void setActivationKeyIds(Set activationKeyIdsIn) {
- this.activationKeyIds = activationKeyIdsIn;
- }
-
-
- /**
* @return Returns the kickstartSession.
*/
public KickstartSession getKickstartSession() {
@@ -1387,18 +1347,6 @@ public class KickstartScheduleCommand extends BaseSystemOperation {
}
/**
- * Set the activationkey id to use
- * @param idIn to add to the Kickstart
- */
- public void setActivationKeyId(Long idIn) {
- if (this.activationKeyIds == null) {
- this.activationKeyIds = new HashSet();
- }
- this.activationKeyIds.add(idIn);
-
- }
-
- /**
*
* @param serverIn Proxy Host to set for this ks session
*/
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/ProvisionVirtualInstanceCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/ProvisionVirtualInstanceCommand.java
index ac26ab5..0cfb7b1 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/ProvisionVirtualInstanceCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/ProvisionVirtualInstanceCommand.java
@@ -67,7 +67,6 @@ public class ProvisionVirtualInstanceCommand extends KickstartScheduleCommand {
*/
public ProvisionVirtualInstanceCommand(Long selectedServer, User userIn) {
super(selectedServer, null, (KickstartData)null, userIn, null, null);
- this.setActivationType(ACTIVATION_TYPE_EXISTING);
this.setPackagesToInstall(new LinkedList());
this.setStaticDevice("");
}
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartScheduleCommandTest.java b/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartScheduleCommandTest.java
index 794e023..9f3ee00 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartScheduleCommandTest.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartScheduleCommandTest.java
@@ -364,10 +364,6 @@ public class KickstartScheduleCommandTest extends BaseKickstartCommandTestCase {
PackageManagerTest.addPackageToSystemAndChannel(
Config.get().getKickstartPackageName(), server, c);
// ksdata.getKsdefault().getKstree().setChannel(c);
-
- cmd.setActivationType(activationType);
-
- cmd.setActivationKeyIds(activationKeyIds);
cmd.setProfileType(profileType);
cmd.setServerProfileId(otherServerId);
cmd.setProfileId(profileId);
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf
index 216b86b..d50d6e0 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf
@@ -41,7 +41,9 @@ function setStep(stepName) {
<html:hidden property="proxyHost" />
<table class="details">
<%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/kernel-options.jspf" %>
- <%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/profile-sync.jspf" %>
+ <c:if test="${empty requestScope.cobblerOnlyProfile}" >
+ <%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/profile-sync.jspf" %>
+ </c:if>
</table>
<c:if test="${empty regularKS}">
<%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/virt-options.jspf" %>
diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml
index ba9acbc..751fd62 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -729,10 +729,7 @@
<form-property name="scheduleAsap" type="java.lang.String" />
<form-property name="scheduleDate" type="java.util.Date" />
<form-property name="nextAction" type="java.lang.String" />
- <form-property name="useExistingProfile" type="java.lang.String" />
<form-property name="proxyHost" type="java.lang.String" />
- <form-property name="activationKeys" type="java.util.List" />
- <form-property name="activationKey" type="java.lang.Long" />
<form-property name="kernelParamsType" type="java.lang.String" />
<form-property name="kernelParams" type="java.lang.String" />
<form-property name="postKernelParamsType" type="java.lang.String" />
14 years, 11 months
Branch 'VADER' - java/code
by Shannon Hughes
java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListSetupAction.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit cbc5fffcbd13a84661e00347266921dc3c7a74e4
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Thu Jul 2 15:55:12 2009 -0400
509444 - remove delete action system from virt page
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListSetupAction.java
index c1098ab..c240af8 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListSetupAction.java
@@ -89,7 +89,7 @@ public class VirtualGuestsListSetupAction extends BaseSystemListSetupAction {
// Set parameter for the actions dropdown:
List actionOptions = new LinkedList();
String [] resourceBundleKeys = {
- "virtualguestslist.jsp.deletesystem",
+ //"virtualguestslist.jsp.deletesystem",
"virtualguestslist.jsp.startsystem",
"virtualguestslist.jsp.suspendsystem",
"virtualguestslist.jsp.resumesystem",
14 years, 11 months
java/code
by Shannon Hughes
java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListSetupAction.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5e4b4dc66d7b8009c0ac606cacff5cd4340c5abe
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Thu Jul 2 15:55:12 2009 -0400
509444 - remove delete action system from virt page
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListSetupAction.java
index c1098ab..c240af8 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListSetupAction.java
@@ -89,7 +89,7 @@ public class VirtualGuestsListSetupAction extends BaseSystemListSetupAction {
// Set parameter for the actions dropdown:
List actionOptions = new LinkedList();
String [] resourceBundleKeys = {
- "virtualguestslist.jsp.deletesystem",
+ //"virtualguestslist.jsp.deletesystem",
"virtualguestslist.jsp.startsystem",
"virtualguestslist.jsp.suspendsystem",
"virtualguestslist.jsp.resumesystem",
14 years, 11 months
Branch 'VADER' - java/code
by Brad Buckingham
java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 2cf2a100933105154cde877670743aa63ac3d63f
Author: Brad Buckingham <bbuckingham(a)redhat.com>
Date: Thu Jul 2 15:42:56 2009 -0400
509371 - SSM->Install,Remove,Verify - minor fixes to Package Name and Arch
There were a few minor changes needed to the queries used for some of
the SSM pages to properly display package name and arch. This commit
addresses the following:
SSM->Install
- Package Name included arch (e.g. nvrea) - updated to drop the arch
- Architecture listed the rhnPackageArch.name (e.g. AMD64) instead of
rhnPackageArch.label - updated to address that for consistency
SSM->Remove, SSM->Verify
- Package Name included arch (e.g. nvrea) - updated to drop the arch
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
index 8682a4b..b289c06 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
@@ -368,10 +368,10 @@ ORDER BY UPPER(PN.name)
will be the name -->
SELECT DISTINCT
- PN.name || '-' || PE.evr.as_vre_simple() || '.' || PA.label nvre,
+ PN.name || '-' || PE.evr.as_vre_simple() AS nvre,
PN.id || '|' || CNP.evr_id || '|' || PA.id AS id_combo,
(SELECT MAX(summary) FROM rhnPackage P WHERE P.id = CNP.package_id) SUMMARY,
- PA.name as arch
+ PA.label as arch
FROM rhnPackageName PN,
rhnPackageEVR PE,
rhnPackageArch PA,
@@ -454,7 +454,7 @@ SELECT PN.id || '|' || SPE.id AS ID_COMBO,
<mode name="packages_from_server_set" class="com.redhat.rhn.frontend.dto.SsmRemovePackageListItem">
<query params="user_id, set_label">
SELECT PN.ID || '|' || PE.ID || '|' || PA.ID AS id_combo,
- PN.name || '-' || PE.evr.as_vre_simple() || '.' || PA.label nvre,
+ PN.name || '-' || PE.evr.as_vre_simple() AS nvre,
PA.label AS arch,
X.num_systems AS num_systems
FROM rhnPackageName PN,
14 years, 11 months