spacewalk-commits
November 2012
spacewalk-commits@lists.fedorahosted.org
- 9 participants
- 234 discussions
2 commits - java/code
by StephenHerr
java/code/src/com/redhat/rhn/domain/org/OrgFactory.java | 97 +++++-----
java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgDeleteAction.java | 30 ---
java/code/src/com/redhat/rhn/frontend/xmlrpc/org/OrgHandler.java | 32 +--
java/code/src/com/redhat/rhn/frontend/xmlrpc/test/SatScrubberTest.java | 15 -
java/code/src/com/redhat/rhn/manager/kickstart/KickstartDeleteCommand.java | 6
5 files changed, 93 insertions(+), 87 deletions(-)
New commits:
commit 04e048722f3c03209d77506be33e432e99970883
Author: Stephen Herr <sherr(a)redhat.com>
Date: Tue Nov 27 15:08:01 2012 -0500
880346 - deleting an org should remove cobbler profiles too
diff --git a/java/code/src/com/redhat/rhn/domain/org/OrgFactory.java b/java/code/src/com/redhat/rhn/domain/org/OrgFactory.java
index b9bdc99..a08968b 100644
--- a/java/code/src/com/redhat/rhn/domain/org/OrgFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/org/OrgFactory.java
@@ -16,11 +16,18 @@ package com.redhat.rhn.domain.org;
import com.redhat.rhn.common.db.datasource.CallableMode;
import com.redhat.rhn.common.db.datasource.DataList;
+import com.redhat.rhn.common.db.datasource.DataResult;
import com.redhat.rhn.common.db.datasource.ModeFactory;
import com.redhat.rhn.common.db.datasource.SelectMode;
import com.redhat.rhn.common.hibernate.HibernateFactory;
import com.redhat.rhn.domain.channel.ChannelFamily;
+import com.redhat.rhn.domain.kickstart.KickstartData;
+import com.redhat.rhn.domain.kickstart.KickstartFactory;
import com.redhat.rhn.domain.role.RoleFactory;
+import com.redhat.rhn.domain.user.User;
+import com.redhat.rhn.frontend.dto.kickstart.KickstartDto;
+import com.redhat.rhn.manager.kickstart.KickstartDeleteCommand;
+import com.redhat.rhn.manager.kickstart.KickstartLister;
import org.apache.log4j.Logger;
import org.hibernate.Session;
@@ -68,13 +75,25 @@ public class OrgFactory extends HibernateFactory {
}
/**
- *
- * @param oid Org Id to delete
* the org id is passed to pl/sql to wipe out
- */
- public static void deleteOrg(Long oid) {
- // put in a sanity check here to make sure org exists
- //Org org = OrgFactory.lookupById(oid);
+ * @param oid Org Id to delete
+ * @param user User who initiated this action
+ */
+ public static void deleteOrg(Long oid, User user) {
+ Org org = OrgFactory.lookupById(oid);
+
+ // delete kickstart profiles (to clean up cobbler profiles)
+ DataResult<KickstartDto> results = KickstartLister.getInstance()
+ .kickstartsInOrg(org, null);
+ for (KickstartDto ks : results) {
+ KickstartData ksdata = KickstartFactory
+ .lookupKickstartDataByLabelAndOrgId(ks.getLabel(), oid);
+ if (ksdata != null) {
+ KickstartDeleteCommand kdc = new KickstartDeleteCommand(ksdata,
+ user);
+ kdc.store();
+ }
+ }
Map in = new HashMap();
in.put("org_id", oid);
@@ -91,8 +110,8 @@ public class OrgFactory extends HibernateFactory {
public static Org lookupByName(String name) {
Session session = HibernateFactory.getSession();
return (Org) session.getNamedQuery("Org.findByName")
- .setString("name", name)
- .uniqueResult();
+ .setString("name", name)
+ .uniqueResult();
}
/**
@@ -105,11 +124,11 @@ public class OrgFactory extends HibernateFactory {
Session session = HibernateFactory.getSession();
return (CustomDataKey) session.getNamedQuery("CustomDataKey.findByLabelAndOrg")
- .setString("label", label)
- .setEntity("org", org)
- //Retrieve from cache if there
- .setCacheable(true)
- .uniqueResult();
+ .setString("label", label)
+ .setEntity("org", org)
+ //Retrieve from cache if there
+ .setCacheable(true)
+ .uniqueResult();
}
/**
@@ -121,10 +140,10 @@ public class OrgFactory extends HibernateFactory {
Session session = HibernateFactory.getSession();
return (CustomDataKey) session.getNamedQuery("CustomDataKey.findById")
- .setLong("id", cikid)
- //Retrieve from cache if there
- .setCacheable(true)
- .uniqueResult();
+ .setLong("id", cikid)
+ //Retrieve from cache if there
+ .setCacheable(true)
+ .uniqueResult();
}
/**
@@ -140,11 +159,11 @@ public class OrgFactory extends HibernateFactory {
//hack around this for now...
Session session = HibernateFactory.getSession();
return (OrgEntitlementType) session.
- getNamedQuery("OrgEntitlementType.findByLabel")
- .setString("label", label)
- //Retrieve from cache if there
- .setCacheable(true)
- .uniqueResult();
+ getNamedQuery("OrgEntitlementType.findByLabel")
+ .setString("label", label)
+ //Retrieve from cache if there
+ .setCacheable(true)
+ .uniqueResult();
}
/**
@@ -165,7 +184,7 @@ public class OrgFactory extends HibernateFactory {
private static Org saveNewOrg(Org org) {
CallableMode m = ModeFactory.getCallableMode("General_queries",
- "create_org");
+ "create_org");
Map inParams = new HashMap();
Map outParams = new HashMap();
@@ -233,8 +252,8 @@ public class OrgFactory extends HibernateFactory {
public static Long getActiveUsers(Org orgIn) {
Session session = HibernateFactory.getSession();
return (Long) session.getNamedQuery("Org.numOfActiveUsers")
- .setLong("org_id", orgIn.getId().longValue())
- .uniqueResult();
+ .setLong("org_id", orgIn.getId().longValue())
+ .uniqueResult();
}
@@ -246,8 +265,8 @@ public class OrgFactory extends HibernateFactory {
public static Long getActiveSystems(Org orgIn) {
Session session = HibernateFactory.getSession();
return (Long) session.getNamedQuery("Org.numOfSystems")
- .setLong("org_id", orgIn.getId().longValue())
- .uniqueResult();
+ .setLong("org_id", orgIn.getId().longValue())
+ .uniqueResult();
}
/**
@@ -258,8 +277,8 @@ public class OrgFactory extends HibernateFactory {
public static Long getServerGroups(Org orgIn) {
Session session = HibernateFactory.getSession();
return (Long) session.getNamedQuery("Org.numOfServerGroups")
- .setLong("org_id", orgIn.getId().longValue())
- .uniqueResult();
+ .setLong("org_id", orgIn.getId().longValue())
+ .uniqueResult();
}
/**
@@ -270,8 +289,8 @@ public class OrgFactory extends HibernateFactory {
public static Long getConfigChannels(Org orgIn) {
Session session = HibernateFactory.getSession();
return (Long) session.getNamedQuery("Org.numOfConfigChannels")
- .setLong("org_id", orgIn.getId().longValue())
- .uniqueResult();
+ .setLong("org_id", orgIn.getId().longValue())
+ .uniqueResult();
}
/**
@@ -282,7 +301,7 @@ public class OrgFactory extends HibernateFactory {
public static Long getActivationKeys(Org orgIn) {
SelectMode m = ModeFactory.getMode("General_queries",
- "activation_keys_for_org");
+ "activation_keys_for_org");
Map params = new HashMap();
params.put("org_id", orgIn.getId());
DataList keys = DataList.getDataList(m, params, Collections.EMPTY_MAP);
@@ -296,7 +315,7 @@ public class OrgFactory extends HibernateFactory {
*/
public static Long getKickstarts(Org orgIn) {
SelectMode m = ModeFactory.getMode("General_queries",
- "kickstarts_for_org");
+ "kickstarts_for_org");
Map params = new HashMap();
params.put("org_id", orgIn.getId());
DataList kickstarts = DataList.getDataList(m, params, Collections.EMPTY_MAP);
@@ -310,16 +329,16 @@ public class OrgFactory extends HibernateFactory {
public static TemplateString lookupTemplateByLabel(String label) {
Session session = HibernateFactory.getSession();
return (TemplateString) session.getNamedQuery("TemplateString.findByLabel")
- .setString("label", label)
- //Retrieve from cache if there
- .setCacheable(true)
- .uniqueResult();
+ .setString("label", label)
+ //Retrieve from cache if there
+ .setCacheable(true)
+ .uniqueResult();
}
public static final TemplateString EMAIL_FOOTER =
- lookupTemplateByLabel("email_footer");
+ lookupTemplateByLabel("email_footer");
public static final TemplateString EMAIL_ACCOUNT_INFO =
- lookupTemplateByLabel("email_account_info");
+ lookupTemplateByLabel("email_account_info");
/**
* Get the default organization.
diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgDeleteAction.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgDeleteAction.java
index fb6cde6..451830b 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgDeleteAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgDeleteAction.java
@@ -41,10 +41,11 @@ import javax.servlet.http.HttpServletResponse;
public class OrgDeleteAction extends RhnAction {
/** {@inheritDoc} */
+ @Override
public ActionForward execute(ActionMapping mapping,
- ActionForm formIn,
- HttpServletRequest request,
- HttpServletResponse response) {
+ ActionForm formIn,
+ HttpServletRequest request,
+ HttpServletResponse response) {
RequestContext requestContext = new RequestContext(request);
Long oid = requestContext.getParamAsLong(RequestContext.ORG_ID);
@@ -85,7 +86,7 @@ public class OrgDeleteAction extends RhnAction {
* @param daForm to populate
*/
private void setupFormValues(HttpServletRequest request,
- DynaActionForm daForm) {
+ DynaActionForm daForm) {
daForm.set("submitted", Boolean.TRUE);
RequestContext requestContext = new RequestContext(request);
@@ -110,8 +111,9 @@ public class OrgDeleteAction extends RhnAction {
private void deleteOrg(Long oidIn, HttpServletRequest request) {
Org org = OrgFactory.lookupById(oidIn);
String name = org.getName();
+ RequestContext requestContext = new RequestContext(request);
- OrgFactory.deleteOrg(oidIn);
+ OrgFactory.deleteOrg(oidIn, requestContext.getCurrentUser());
ActionMessages msg = new ActionMessages();
msg.add(ActionMessages.GLOBAL_MESSAGE,
new ActionMessage("message.org_deleted", name));
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/OrgHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/OrgHandler.java
index 16f42fe..16acb32 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/OrgHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/OrgHandler.java
@@ -77,7 +77,7 @@ import java.util.Map;
public class OrgHandler extends BaseHandler {
private static final String VALIDATION_XSD =
- "/com/redhat/rhn/frontend/action/multiorg/validation/orgCreateForm.xsd";
+ "/com/redhat/rhn/frontend/action/multiorg/validation/orgCreateForm.xsd";
private static final String ORG_ID_KEY = "org_id";
private static final String ORG_NAME_KEY = "org_name";
private static final String ALLOCATED_KEY = "allocated";
@@ -121,10 +121,10 @@ public class OrgHandler extends BaseHandler {
getSatAdmin(sessionKey);
validateCreateOrgData(orgName, adminPassword, firstName, lastName, email,
- usePamAuth);
+ usePamAuth);
CreateOrgCommand cmd = new CreateOrgCommand(orgName, adminLogin, adminPassword,
- email);
+ email);
cmd.setFirstName(firstName);
cmd.setLastName(lastName);
cmd.setPrefix(prefix);
@@ -207,7 +207,7 @@ public class OrgHandler extends BaseHandler {
* @xmlrpc.returntype #return_int_success()
*/
public int delete(String sessionKey, Integer orgId) {
- getSatAdmin(sessionKey);
+ User user = getSatAdmin(sessionKey);
Org org = verifyOrgExists(orgId);
// Verify we're not trying to delete the default org (id 1):
@@ -216,7 +216,7 @@ public class OrgHandler extends BaseHandler {
throw new SatelliteOrgException();
}
- OrgFactory.deleteOrg(org.getId());
+ OrgFactory.deleteOrg(org.getId(), user);
return 1;
}
@@ -427,6 +427,7 @@ public class OrgHandler extends BaseHandler {
* $OrgSoftwareEntitlementDtoSerializer
* #array_end()
*/
+ @Deprecated
public List<OrgSoftwareEntitlementDto> listSoftwareEntitlements(String sessionKey,
String channelFamilyLabel) {
@@ -512,8 +513,8 @@ public class OrgHandler extends BaseHandler {
lookupChannelFamily(channelFamilyLabel);
UpdateOrgSoftwareEntitlementsCommand cmd =
- new UpdateOrgSoftwareEntitlementsCommand(channelFamilyLabel, org,
- Long.valueOf(allocation), null);
+ new UpdateOrgSoftwareEntitlementsCommand(channelFamilyLabel, org,
+ Long.valueOf(allocation), null);
ValidatorError ve = cmd.store();
if (ve != null) {
throw new ValidationException(ve.getMessage());
@@ -554,8 +555,8 @@ public class OrgHandler extends BaseHandler {
lookupChannelFamily(channelFamilyLabel);
UpdateOrgSoftwareEntitlementsCommand cmd =
- new UpdateOrgSoftwareEntitlementsCommand(channelFamilyLabel, org,
- null, Long.valueOf(allocation));
+ new UpdateOrgSoftwareEntitlementsCommand(channelFamilyLabel, org,
+ null, Long.valueOf(allocation));
ValidatorError ve = cmd.store();
if (ve != null) {
throw new ValidationException(ve.getMessage());
@@ -630,8 +631,9 @@ public class OrgHandler extends BaseHandler {
* #struct_end()
* #array_end()
*/
+ @Deprecated
public List<Map> listSystemEntitlements(String sessionKey,
- String label) {
+ String label) {
getSatAdmin(sessionKey);
verifyEntitlementExists(label);
DataList<Map> result = OrgManager.allOrgsSingleEntitlement(label);
@@ -684,7 +686,7 @@ public class OrgHandler extends BaseHandler {
* #array_end()
*/
public List<Map> listSystemEntitlements(String sessionKey,
- String label, Boolean includeUnentitled) {
+ String label, Boolean includeUnentitled) {
getSatAdmin(sessionKey);
verifyEntitlementExists(label);
@@ -731,7 +733,7 @@ public class OrgHandler extends BaseHandler {
* #array_end()
*/
public List<OrgEntitlementDto> listSystemEntitlementsForOrg(String sessionKey,
- Integer orgId) {
+ Integer orgId) {
getSatAdmin(sessionKey);
Org org = verifyOrgExists(orgId);
return OrgManager.listEntitlementsFor(org);
@@ -778,12 +780,12 @@ public class OrgHandler extends BaseHandler {
Entitlement ent = EntitlementManager.getByName(systemEntitlementLabel);
if (ent == null || (!EntitlementManager.getAddonEntitlements().contains(ent) &&
- !EntitlementManager.getBaseEntitlements().contains(ent))) {
+ !EntitlementManager.getBaseEntitlements().contains(ent))) {
throw new InvalidEntitlementException();
}
UpdateOrgSystemEntitlementsCommand cmd =
- new UpdateOrgSystemEntitlementsCommand(ent, org, new Long(allocation));
+ new UpdateOrgSystemEntitlementsCommand(ent, org, new Long(allocation));
ValidatorError ve = cmd.store();
if (ve != null) {
throw new ValidationException(ve.getMessage());
@@ -862,7 +864,7 @@ public class OrgHandler extends BaseHandler {
// unless the user is a satellite admin, they are not permitted to migrate
// systems from an org that they do not belong to
if ((!admin.hasRole(RoleFactory.SAT_ADMIN)) &&
- (!admin.getOrg().equals(server.getOrg()))) {
+ (!admin.getOrg().equals(server.getOrg()))) {
throw new PermissionCheckFailureException(server);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/test/SatScrubberTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/test/SatScrubberTest.java
index 0f3081f..b7d06b3 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/test/SatScrubberTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/test/SatScrubberTest.java
@@ -22,6 +22,7 @@ import com.redhat.rhn.domain.kickstart.KickstartData;
import com.redhat.rhn.domain.kickstart.KickstartFactory;
import com.redhat.rhn.domain.kickstart.KickstartableTree;
import com.redhat.rhn.domain.org.OrgFactory;
+import com.redhat.rhn.domain.role.RoleFactory;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.domain.user.UserFactory;
import com.redhat.rhn.frontend.dto.kickstart.KickstartDto;
@@ -64,21 +65,21 @@ public class SatScrubberTest extends TestCase {
public void cleanupKickstarts() throws Exception {
orgAdmin = UserFactory.findRandomOrgAdmin(OrgFactory.getSatelliteOrg());
List kickstarts = KickstartLister.
- getInstance().kickstartsInOrg(orgAdmin.getOrg(), null);
+ getInstance().kickstartsInOrg(orgAdmin.getOrg(), null);
for (int i = 0; i < kickstarts.size(); i++) {
KickstartDto dto = (KickstartDto) kickstarts.get(i);
KickstartData ksdata = KickstartFactory.
- lookupKickstartDataByIdAndOrg(orgAdmin.getOrg(), dto.getId());
+ lookupKickstartDataByIdAndOrg(orgAdmin.getOrg(), dto.getId());
if (ksdata.getLabel().startsWith("KS Data: ")) {
KickstartFactory.removeKickstartData(ksdata);
}
}
List trees = KickstartLister.
- getInstance().kickstartTreesInOrg(orgAdmin.getOrg(), null);
+ getInstance().kickstartTreesInOrg(orgAdmin.getOrg(), null);
for (int i = 0; i < trees.size(); i++) {
KickstartableTreeDto dto = (KickstartableTreeDto) trees.get(i);
KickstartableTree tree = KickstartFactory.
- lookupKickstartTreeByIdAndOrg(dto.getId(), orgAdmin.getOrg());
+ lookupKickstartTreeByIdAndOrg(dto.getId(), orgAdmin.getOrg());
if (tree.getLabel().startsWith("ks-ChannelLabel")) {
KickstartFactory.removeKickstartableTree(tree);
}
@@ -158,7 +159,7 @@ public class SatScrubberTest extends TestCase {
*/
private void deleteServer(Long sid) {
CallableMode m = ModeFactory.
- getCallableMode("System_queries", "delete_server");
+ getCallableMode("System_queries", "delete_server");
Map in = new HashMap();
in.put("server_id", sid);
m.execute(in, new HashMap());
@@ -175,7 +176,8 @@ public class SatScrubberTest extends TestCase {
Long id = (Long) row.get("id");
log.debug("Deleting org: " + id);
try {
- OrgFactory.deleteOrg(new Long(id.longValue()));
+ OrgFactory.deleteOrg(new Long(id.longValue()), UserFactory
+ .findResponsibleUser(1L, RoleFactory.SAT_ADMIN));
}
catch (Exception e) {
log.warn("Error deleting org: " + id, e);
@@ -193,6 +195,7 @@ public class SatScrubberTest extends TestCase {
* @see TestCase#tearDown()
* @see HibernateFactory#closeSession()
*/
+ @Override
protected void tearDown() throws Exception {
super.tearDown();
TestCaseHelper.tearDownHelper();
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartDeleteCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartDeleteCommand.java
index 886c977..c37c528 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartDeleteCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartDeleteCommand.java
@@ -15,6 +15,7 @@
package com.redhat.rhn.manager.kickstart;
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.user.User;
import com.redhat.rhn.manager.kickstart.cobbler.CobblerProfileDeleteCommand;
@@ -36,10 +37,19 @@ public class KickstartDeleteCommand extends KickstartEditCommand {
}
/**
+ * @param ksdataIn kickstartdata in
+ * @param userIn kickstartdata user
+ */
+ public KickstartDeleteCommand(KickstartData ksdataIn, User userIn) {
+ super(ksdataIn, userIn);
+ }
+
+ /**
* This is counter-intuitive however it is done this way to
* reuse BaseKickstartEditAction
* {@inheritDoc}
*/
+ @Override
public ValidatorError store() {
int deleted = KickstartFactory.removeKickstartData(getKickstartData());
if (deleted == 0) {
@@ -47,7 +57,7 @@ public class KickstartDeleteCommand extends KickstartEditCommand {
}
else if (!StringUtils.isBlank(getKickstartData().getCobblerId())) {
CobblerProfileDeleteCommand cmd =
- new CobblerProfileDeleteCommand(getKickstartData(), this.getUser());
+ new CobblerProfileDeleteCommand(getKickstartData(), this.getUser());
cmd.store();
}
return null;
commit db78723615ce0fd6feb08e1264b2dc9cffb1a08e
Author: Stephen Herr <sherr(a)redhat.com>
Date: Tue Nov 27 14:13:55 2012 -0500
Revert "880346 - delete cobbler profiles when deleting an org"
This reverts commit 4532f5ab0389132ce041938ecbe02273cd6e8c56.
diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgDeleteAction.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgDeleteAction.java
index cebe374..fb6cde6 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgDeleteAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgDeleteAction.java
@@ -14,20 +14,14 @@
*/
package com.redhat.rhn.frontend.action.multiorg;
-import com.redhat.rhn.common.db.datasource.DataResult;
import com.redhat.rhn.common.localization.LocalizationService;
import com.redhat.rhn.common.security.PermissionException;
-import com.redhat.rhn.domain.kickstart.KickstartData;
-import com.redhat.rhn.domain.kickstart.KickstartFactory;
import com.redhat.rhn.domain.org.Org;
import com.redhat.rhn.domain.org.OrgFactory;
-import com.redhat.rhn.frontend.dto.kickstart.KickstartDto;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnAction;
import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.manager.acl.AclManager;
-import com.redhat.rhn.manager.kickstart.KickstartLister;
-import com.redhat.rhn.manager.kickstart.KickstartDeleteCommand;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -47,11 +41,10 @@ import javax.servlet.http.HttpServletResponse;
public class OrgDeleteAction extends RhnAction {
/** {@inheritDoc} */
- @Override
public ActionForward execute(ActionMapping mapping,
- ActionForm formIn,
- HttpServletRequest request,
- HttpServletResponse response) {
+ ActionForm formIn,
+ HttpServletRequest request,
+ HttpServletResponse response) {
RequestContext requestContext = new RequestContext(request);
Long oid = requestContext.getParamAsLong(RequestContext.ORG_ID);
@@ -61,8 +54,8 @@ public class OrgDeleteAction extends RhnAction {
if (!AclManager.hasAcl("user_role(satellite_admin)", request, null)) {
LocalizationService ls = LocalizationService.getInstance();
- PermissionException pex = new PermissionException(
- "Only satellite admin's can delete organizations");
+ PermissionException pex =
+ new PermissionException("Only satellite admin's can delete organizations");
pex.setLocalizedTitle(ls.getMessage("permission.jsp.title.orgdetail"));
pex.setLocalizedSummary(ls.getMessage("permission.jsp.summary.general"));
throw pex;
@@ -75,7 +68,7 @@ public class OrgDeleteAction extends RhnAction {
retval = mapping.findForward("error");
}
else {
- deleteOrg(oid, request, requestContext);
+ deleteOrg(oid, request);
retval = mapping.findForward("success");
}
retval = getStrutsDelegate().forwardParam(retval, "oid", oid.toString());
@@ -92,7 +85,7 @@ public class OrgDeleteAction extends RhnAction {
* @param daForm to populate
*/
private void setupFormValues(HttpServletRequest request,
- DynaActionForm daForm) {
+ DynaActionForm daForm) {
daForm.set("submitted", Boolean.TRUE);
RequestContext requestContext = new RequestContext(request);
@@ -114,23 +107,10 @@ public class OrgDeleteAction extends RhnAction {
* @param oidIn Organization Id to delete
* @return Success or Failure in form of Boolean
*/
- private void deleteOrg(Long oidIn, HttpServletRequest request, RequestContext ctx) {
+ private void deleteOrg(Long oidIn, HttpServletRequest request) {
Org org = OrgFactory.lookupById(oidIn);
String name = org.getName();
- // delete kickstart profiles
- DataResult<KickstartDto> results = KickstartLister.getInstance().
- kickstartsInOrg(org, null);
- for (KickstartDto ks : results) {
- KickstartData ksdata = KickstartFactory.lookupKickstartDataByLabelAndOrgId(
- ks.getLabel(), oidIn);
- if (ksdata != null) {
- KickstartDeleteCommand kdc = new KickstartDeleteCommand(ksdata,
- ctx.getLoggedInUser());
- kdc.store();
- }
- }
-
OrgFactory.deleteOrg(oidIn);
ActionMessages msg = new ActionMessages();
msg.add(ActionMessages.GLOBAL_MESSAGE,
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartDeleteCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartDeleteCommand.java
index 444a139..886c977 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartDeleteCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartDeleteCommand.java
@@ -15,7 +15,6 @@
package com.redhat.rhn.manager.kickstart;
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.user.User;
import com.redhat.rhn.manager.kickstart.cobbler.CobblerProfileDeleteCommand;
@@ -37,19 +36,10 @@ public class KickstartDeleteCommand extends KickstartEditCommand {
}
/**
- * @param data kickstartdata to delete
- * @param userIn kickstartdata user
- */
- public KickstartDeleteCommand(KickstartData data, User userIn) {
- super(data, userIn);
- }
-
- /**
* This is counter-intuitive however it is done this way to
* reuse BaseKickstartEditAction
* {@inheritDoc}
*/
- @Override
public ValidatorError store() {
int deleted = KickstartFactory.removeKickstartData(getKickstartData());
if (deleted == 0) {
@@ -57,7 +47,7 @@ public class KickstartDeleteCommand extends KickstartEditCommand {
}
else if (!StringUtils.isBlank(getKickstartData().getCobblerId())) {
CobblerProfileDeleteCommand cmd =
- new CobblerProfileDeleteCommand(getKickstartData(), this.getUser());
+ new CobblerProfileDeleteCommand(getKickstartData(), this.getUser());
cmd.store();
}
return null;
11 years, 5 months
- 1
- 0
client/tools
by StephenHerr
client/tools/rhncfg/config_common/file_utils.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 4a4b1b697a21e2ad283f259204f72c3ddbeb60fd
Author: Stephen Herr <sherr(a)redhat.com>
Date: Tue Nov 27 12:12:34 2012 -0500
879299 - statinfo needs to be defined even if file does not exist
diff --git a/client/tools/rhncfg/config_common/file_utils.py b/client/tools/rhncfg/config_common/file_utils.py
index 713210c..30dcce3 100644
--- a/client/tools/rhncfg/config_common/file_utils.py
+++ b/client/tools/rhncfg/config_common/file_utils.py
@@ -142,6 +142,7 @@ class FileProcessor:
def diff(src, dst, srcname=None, dstname=None, display_diff=False):
def f_content(path, name):
+ statinfo = None
if os.access(path, os.R_OK):
f = open(path, 'U')
content = f.readlines()
@@ -169,8 +170,9 @@ def diff(src, dst, srcname=None, dstname=None, display_diff=False):
# for security reasons.
if (len(ret_list) > 0 # if differences exist
and not display_diff # and we have not explicitly decided to display
- and dst_stat.st_uid == 0 # and file is owned by root
- and not dst_stat.st_mode & stat.S_IROTH): #and not readable by all
+ and (dst_stat == None # file is not there or not readable to root
+ or (dst_stat.st_uid == 0 # file is owned by root
+ and not dst_stat.st_mode & stat.S_IROTH))): # not read-all
ret_list = [
"Differences exist in a file that is not readable by all. ",
"Re-deployment of configuration file is recommended.\n"]
11 years, 5 months
- 1
- 0
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 6cb233e42549141ee7e60911ecc6dd0a3128a618
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Nov 27 15:29:47 2012 +0100
add a null check
addressing:
java.lang.NullPointerException
at java.io.File.<init>(File.java:239)
at com.redhat.rhn.domain.kickstart.KickstartFactory.removeKickstartTemplatePath(KickstartFactory.java:432)
at com.redhat.rhn.domain.kickstart.KickstartFactory.removeKickstartData(KickstartFactory.java:420)
at com.redhat.rhn.manager.kickstart.KickstartDeleteCommand.store(KickstartDeleteCommand.java:54)
at com.redhat.rhn.frontend.action.kickstart.BaseKickstartEditAction.execute(BaseKickstartEditAction.java:88)
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
index a328cd4..41171d5 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
@@ -429,10 +429,12 @@ public class KickstartFactory extends HibernateFactory {
Profile p = Profile.lookupById(CobblerXMLRPCHelper.getAutomatedConnection(),
ksdataIn.getCobblerId());
String path = getKickstartTemplatePath(ksdataIn, p);
- File file = new File(path);
- if (file.exists()) {
- log.debug("deleting : " + path);
- file.delete();
+ if (path != null) {
+ File file = new File(path);
+ if (file.exists()) {
+ log.debug("deleting : " + path);
+ file.delete();
+ }
}
}
11 years, 5 months
- 1
- 0
branding/styles java/code web/html
by Tomas Lestach
branding/styles/navbar_top.txt | 2 +-
branding/styles/navbar_top_sat.txt | 2 +-
java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java | 2 +-
java/code/webapp/WEB-INF/includes/header.jsp | 2 +-
web/html/errors/403.html | 2 +-
web/html/errors/404.html | 2 +-
web/html/errors/413.html | 2 +-
web/html/errors/500.html | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit f50de96131512a622d2289c0fcf0f78e2f5bffad
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Nov 27 11:17:18 2012 +0100
470463 - fixing xmllint issue
addressing:
parser error : Specification mandate value for attribute autofocus
diff --git a/branding/styles/navbar_top.txt b/branding/styles/navbar_top.txt
index 613ce7b..2509fa0 100644
--- a/branding/styles/navbar_top.txt
+++ b/branding/styles/navbar_top.txt
@@ -38,7 +38,7 @@ class="navPipe">|</span><a href="/rhn/Logout.do"><span>Sign Out</span></a>
<option value="errata">Errata</option>
<option value="docs">Documentation</option>
</select><input type="text" name="search_string" maxlength="40"
-size="20" accesskey="4" autofocus/>
+size="20" accesskey="4" autofocus="autofocus"/>
<input type="hidden" name="submitted" value="true"/>
<input type="submit" class="button" name="image-1" value="Search"
diff --git a/branding/styles/navbar_top_sat.txt b/branding/styles/navbar_top_sat.txt
index d67605d..76d6c47 100644
--- a/branding/styles/navbar_top_sat.txt
+++ b/branding/styles/navbar_top_sat.txt
@@ -38,7 +38,7 @@ class="navPipe">|</span><a href="/rhn/Logout.do"><span>Sign Out</span></a>
<option value="errata">Errata</option>
<option value="docs">Documentation</option>
</select><input type="text" name="search_string" maxlength="40"
-size="20" accesskey="4" autofocus/>
+size="20" accesskey="4" autofocus="autofocus"/>
<input type="hidden" name="submitted" value="true"/>
<input type="submit" class="button" name="image-1" value="Search"
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java
index 4a49a88..4541612 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java
@@ -685,7 +685,7 @@ public class ListTagUtil {
if (filterValue != null) {
ListTagUtil.write(pageContext, StringEscapeUtils.escapeHtml(filterValue));
}
- ListTagUtil.write(pageContext, "\" autofocus/>");
+ ListTagUtil.write(pageContext, "\" autofocus=\"autofocus\"/>");
ListTagUtil.write(pageContext, IE_MAGIC_SNIPPET);
ListTagUtil.write(pageContext,
diff --git a/java/code/webapp/WEB-INF/includes/header.jsp b/java/code/webapp/WEB-INF/includes/header.jsp
index 4135e50..7b6a054 100644
--- a/java/code/webapp/WEB-INF/includes/header.jsp
+++ b/java/code/webapp/WEB-INF/includes/header.jsp
@@ -58,7 +58,7 @@
<option value="packages"><bean:message key="header.jsp.packages"/></option>
<option value="errata"><bean:message key="header.jsp.errata"/></option>
<option value="docs"><bean:message key="header.jsp.documentation"/></option>
- </select><input type="text" name="search_string" maxlength="40" size="20" accesskey="4" autofocus/>
+ </select><input type="text" name="search_string" maxlength="40" size="20" accesskey="4" autofocus="autofocus"/>
<input type="hidden" name="submitted" value="true"/>
<input type="submit" class="button" name="image-1" value="Search" align="top" /></form>
</div>
diff --git a/web/html/errors/403.html b/web/html/errors/403.html
index f0c0a2f..1866a2b 100644
--- a/web/html/errors/403.html
+++ b/web/html/errors/403.html
@@ -40,7 +40,7 @@
<option value="packages">Packages</option>
<option value="errata">Errata</option>
<option value="docs">Documentation</option>
- </select><input name="search_string" maxlength="40" size="20" type="text" accesskey="4" autofocus>
+ </select><input name="search_string" maxlength="40" size="20" type="text" accesskey="4" autofocus="autofocus">
<input name="submitted" value="true" type="hidden">
<input class="button" name="image-1" value="Search" type="submit" align="top"></form>
diff --git a/web/html/errors/404.html b/web/html/errors/404.html
index 8bde7ed..f59e0bc 100644
--- a/web/html/errors/404.html
+++ b/web/html/errors/404.html
@@ -40,7 +40,7 @@
<option value="packages">Packages</option>
<option value="errata">Errata</option>
<option value="docs">Documentation</option>
- </select><input name="search_string" maxlength="40" size="20" type="text" accesskey="4" autofocus>
+ </select><input name="search_string" maxlength="40" size="20" type="text" accesskey="4" autofocus="autofocus">
<input name="submitted" value="true" type="hidden">
<input class="button" name="image-1" value="Search" type="submit" align="top"></form>
diff --git a/web/html/errors/413.html b/web/html/errors/413.html
index 49f4669..283e24e 100644
--- a/web/html/errors/413.html
+++ b/web/html/errors/413.html
@@ -40,7 +40,7 @@
<option value="packages">Packages</option>
<option value="errata">Errata</option>
<option value="docs">Documentation</option>
- </select><input name="search_string" maxlength="40" size="20" type="text" accesskey="4" autofocus>
+ </select><input name="search_string" maxlength="40" size="20" type="text" accesskey="4" autofocus="autofocus">
<input name="submitted" value="true" type="hidden">
<input class="button" name="image-1" value="Search" type="submit" align="top"></form>
diff --git a/web/html/errors/500.html b/web/html/errors/500.html
index 4c2ba64..9dec6d0 100644
--- a/web/html/errors/500.html
+++ b/web/html/errors/500.html
@@ -40,7 +40,7 @@
<option value="packages">Packages</option>
<option value="errata">Errata</option>
<option value="docs">Documentation</option>
- </select><input name="search_string" maxlength="40" size="20" type="text" accesskey="4" autofocus>
+ </select><input name="search_string" maxlength="40" size="20" type="text" accesskey="4" autofocus="autofocus">
<input name="submitted" value="true" type="hidden">
<input class="button" name="image-1" value="Search" type="submit" align="top"></form>
11 years, 5 months
- 1
- 0
java/code
by Milan Zazrivec
java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 07690613c9e5264f3ce0e2341b422773cb70f61b
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Nov 27 13:11:20 2012 +0100
put a newline before pre_install_network_config snippet
This is to make sure that the kickstart file rendered by Spacewalk won't
contain a line like:
wget "http://FQDN/cblr/svc/op/trig/mode/pre/system/system:1:virt-guest-01" -O /dev/null# Start pre_install_network_config generated code
which would result into an installation error like:
--2012-11-27 10:21:52-- http://FQDN/cblr/svc/op/trig/mode/pre/system/system:1:virt-guest-01
Resolving FQDN (FQDN)... 10.11.12.13
Connecting to FQDN (FQDN)|10.11.12.13|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 4 [text/plain]
Saving to: '/dev/null#'
0K 100% 259K=0s
2012-11-27 10:21:58 (259 KB/s) - '/dev/null#' saved [4/4]
--2012-11-27 10:21:58-- http://start/
Resolving start (start)... failed: Name or service not known.
wget: unable to resolve host address 'start'
--2012-11-27 10:21:58-- http://pre_install_network_config/
Resolving pre_install_network_config (pre_install_network_config)... failed: Name or service not known.
wget: unable to resolve host address 'pre_install_network_config'
--2012-11-27 10:21:58-- http://generated/
Resolving generated (generated)... failed: Name or service not known.
wget: unable to resolve host address 'generated'
--2012-11-27 10:21:58-- http://code/
Resolving code (code)... failed: Name or service not known.
wget: unable to resolve host address 'code'
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
index 6d1d3d4..db486f3 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
@@ -256,6 +256,7 @@ public class KickstartFormatter {
buf.append("$kickstart_start");
}
+ buf.append(NEWLINE);
addCobblerSnippet(buf, "pre_install_network_config");
buf.append(NEWLINE);
11 years, 5 months
- 1
- 0
backend/satellite_tools
by Milan Zazrivec
backend/satellite_tools/repo_plugins/yum_src.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit b1abeb2c9a2a86ee2c937c7468143d39265f29af
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Nov 27 10:52:26 2012 +0100
877451 - read the repo config from yumbase
diff --git a/backend/satellite_tools/repo_plugins/yum_src.py b/backend/satellite_tools/repo_plugins/yum_src.py
index 145476c..c11c697 100644
--- a/backend/satellite_tools/repo_plugins/yum_src.py
+++ b/backend/satellite_tools/repo_plugins/yum_src.py
@@ -130,8 +130,9 @@ class ContentSource(object):
fileutils.makedirs(pkgdir, user='apache', group='apache')
repo.pkgdir = pkgdir
- if not ((repo.cfg.has_section(self.name) and repo.cfg.has_option(self.name, 'proxy')) or
- (repo.cfg.has_section('main') and repo.cfg.has_option('main', 'proxy'))) and \
+ yb_cfg = self.yumbase.conf.cfg
+ if not ((yb_cfg.has_section(self.name) and yb_cfg.has_option(self.name, 'proxy')) or
+ (yb_cfg.has_section('main') and yb_cfg.has_option('main', 'proxy'))) and \
self.proxy_addr is not None:
repo.proxy = "http://%s" % self.proxy_addr
repo.proxy_username = self.proxy_user
11 years, 5 months
- 1
- 0
java/code
by StephenHerr
java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgDeleteAction.java | 36 +++++++---
java/code/src/com/redhat/rhn/manager/kickstart/KickstartDeleteCommand.java | 12 +++
2 files changed, 39 insertions(+), 9 deletions(-)
New commits:
commit 4532f5ab0389132ce041938ecbe02273cd6e8c56
Author: Stephen Herr <sherr(a)redhat.com>
Date: Mon Nov 26 15:55:03 2012 -0500
880346 - delete cobbler profiles when deleting an org
diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgDeleteAction.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgDeleteAction.java
index fb6cde6..cebe374 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgDeleteAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgDeleteAction.java
@@ -14,14 +14,20 @@
*/
package com.redhat.rhn.frontend.action.multiorg;
+import com.redhat.rhn.common.db.datasource.DataResult;
import com.redhat.rhn.common.localization.LocalizationService;
import com.redhat.rhn.common.security.PermissionException;
+import com.redhat.rhn.domain.kickstart.KickstartData;
+import com.redhat.rhn.domain.kickstart.KickstartFactory;
import com.redhat.rhn.domain.org.Org;
import com.redhat.rhn.domain.org.OrgFactory;
+import com.redhat.rhn.frontend.dto.kickstart.KickstartDto;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnAction;
import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.manager.acl.AclManager;
+import com.redhat.rhn.manager.kickstart.KickstartLister;
+import com.redhat.rhn.manager.kickstart.KickstartDeleteCommand;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -41,10 +47,11 @@ import javax.servlet.http.HttpServletResponse;
public class OrgDeleteAction extends RhnAction {
/** {@inheritDoc} */
+ @Override
public ActionForward execute(ActionMapping mapping,
- ActionForm formIn,
- HttpServletRequest request,
- HttpServletResponse response) {
+ ActionForm formIn,
+ HttpServletRequest request,
+ HttpServletResponse response) {
RequestContext requestContext = new RequestContext(request);
Long oid = requestContext.getParamAsLong(RequestContext.ORG_ID);
@@ -54,8 +61,8 @@ public class OrgDeleteAction extends RhnAction {
if (!AclManager.hasAcl("user_role(satellite_admin)", request, null)) {
LocalizationService ls = LocalizationService.getInstance();
- PermissionException pex =
- new PermissionException("Only satellite admin's can delete organizations");
+ PermissionException pex = new PermissionException(
+ "Only satellite admin's can delete organizations");
pex.setLocalizedTitle(ls.getMessage("permission.jsp.title.orgdetail"));
pex.setLocalizedSummary(ls.getMessage("permission.jsp.summary.general"));
throw pex;
@@ -68,7 +75,7 @@ public class OrgDeleteAction extends RhnAction {
retval = mapping.findForward("error");
}
else {
- deleteOrg(oid, request);
+ deleteOrg(oid, request, requestContext);
retval = mapping.findForward("success");
}
retval = getStrutsDelegate().forwardParam(retval, "oid", oid.toString());
@@ -85,7 +92,7 @@ public class OrgDeleteAction extends RhnAction {
* @param daForm to populate
*/
private void setupFormValues(HttpServletRequest request,
- DynaActionForm daForm) {
+ DynaActionForm daForm) {
daForm.set("submitted", Boolean.TRUE);
RequestContext requestContext = new RequestContext(request);
@@ -107,10 +114,23 @@ public class OrgDeleteAction extends RhnAction {
* @param oidIn Organization Id to delete
* @return Success or Failure in form of Boolean
*/
- private void deleteOrg(Long oidIn, HttpServletRequest request) {
+ private void deleteOrg(Long oidIn, HttpServletRequest request, RequestContext ctx) {
Org org = OrgFactory.lookupById(oidIn);
String name = org.getName();
+ // delete kickstart profiles
+ DataResult<KickstartDto> results = KickstartLister.getInstance().
+ kickstartsInOrg(org, null);
+ for (KickstartDto ks : results) {
+ KickstartData ksdata = KickstartFactory.lookupKickstartDataByLabelAndOrgId(
+ ks.getLabel(), oidIn);
+ if (ksdata != null) {
+ KickstartDeleteCommand kdc = new KickstartDeleteCommand(ksdata,
+ ctx.getLoggedInUser());
+ kdc.store();
+ }
+ }
+
OrgFactory.deleteOrg(oidIn);
ActionMessages msg = new ActionMessages();
msg.add(ActionMessages.GLOBAL_MESSAGE,
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartDeleteCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartDeleteCommand.java
index 886c977..444a139 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartDeleteCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartDeleteCommand.java
@@ -15,6 +15,7 @@
package com.redhat.rhn.manager.kickstart;
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.user.User;
import com.redhat.rhn.manager.kickstart.cobbler.CobblerProfileDeleteCommand;
@@ -36,10 +37,19 @@ public class KickstartDeleteCommand extends KickstartEditCommand {
}
/**
+ * @param data kickstartdata to delete
+ * @param userIn kickstartdata user
+ */
+ public KickstartDeleteCommand(KickstartData data, User userIn) {
+ super(data, userIn);
+ }
+
+ /**
* This is counter-intuitive however it is done this way to
* reuse BaseKickstartEditAction
* {@inheritDoc}
*/
+ @Override
public ValidatorError store() {
int deleted = KickstartFactory.removeKickstartData(getKickstartData());
if (deleted == 0) {
@@ -47,7 +57,7 @@ public class KickstartDeleteCommand extends KickstartEditCommand {
}
else if (!StringUtils.isBlank(getKickstartData().getCobblerId())) {
CobblerProfileDeleteCommand cmd =
- new CobblerProfileDeleteCommand(getKickstartData(), this.getUser());
+ new CobblerProfileDeleteCommand(getKickstartData(), this.getUser());
cmd.store();
}
return null;
11 years, 5 months
- 1
- 0
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml | 7 -------
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 7 -------
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 6 ------
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 7 -------
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 7 -------
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml | 7 -------
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml | 7 -------
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 7 -------
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 7 -------
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 7 -------
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml | 7 -------
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 7 -------
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 7 -------
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml | 7 -------
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 7 -------
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 7 -------
java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf | 1 -
17 files changed, 112 deletions(-)
New commits:
commit 7f966b209d2bce5b99ba5a49870849ff3cc29de1
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Nov 26 17:48:43 2012 +0100
675193 - removing the confising tip
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
index a2f00be..103d8c5 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
@@ -13529,13 +13529,6 @@ centrally-managed configuration channel, {2}; below is a list of systems you may
</context-group>
<target/>
</trans-unit>
- <trans-unit id="filedetails.jsp.tip.symlink">
- <source><strong>Tip:</strong> Enter the target of the symlink as the file contents</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/configuration/FileDetails.do</context>
- </context-group>
- <target/>
- </trans-unit>
<!-- form error messages -->
<trans-unit id="config-file-form.error.user-invalid">
<source>User must be a valid Linux user name or user id, of 32 characters or less.</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
index db74320..8fc9e78 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
@@ -16570,13 +16570,6 @@ Konfigurationschannel dieser Datei abonnieren, {2}; nachfolgend sehen Sie eine L
</context-group>
<target><strong>Tipp:</strong> Geben Sie den SELinux-Kontext folgendermaßen ein: user_u:role_r:type_t:s0-s15:c0.c1024 (Hinweis: nicht alle Bestandteile sind nötig)</target>
</trans-unit>
- <trans-unit id="filedetails.jsp.tip.symlink">
- <source><strong>Tip:</strong> Enter the target of the symlink as the file contents</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/configuration/FileDetails.do</context>
- </context-group>
- <target><strong>Tipp:</strong> Geben Sie das Ziel des symbolischen Links als Dateiinhalte an</target>
- </trans-unit>
<!-- form error messages -->
<trans-unit id="config-file-form.error.user-invalid">
<source>User must be a valid Linux user name or user id, of 32 characters or less.</source>
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 2e558d6..846dce9 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
@@ -12477,12 +12477,6 @@ centrally-managed configuration channel, {2}; below is a list of systems you may
<context context-type="sourcefile">/rhn/configuration/FileDetails.do</context>
</context-group>
</trans-unit>
- <trans-unit id="filedetails.jsp.tip.symlink">
- <source><strong>Tip:</strong> Enter the target of the symlink as the file contents</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/configuration/FileDetails.do</context>
- </context-group>
- </trans-unit>
<!-- form error messages -->
<trans-unit id="config-file-form.error.user-invalid">
<source>User must be a valid Linux user name or user id, of 32 characters or less.</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
index dabf9a8..0100884 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
@@ -16565,13 +16565,6 @@ centralmente de este archivo, {2}; a continuación encontrará una lista de sist
</context-group>
<target><strong>Consejo:</strong> Introduzca el contexto SELinux así: user_u:role_r:type_t:s0-s15:c0.c1024 (nota: no tiene que introducir todas las partes)</target>
</trans-unit>
- <trans-unit id="filedetails.jsp.tip.symlink">
- <source><strong>Tip:</strong> Enter the target of the symlink as the file contents</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/configuration/FileDetails.do</context>
- </context-group>
- <target><strong>Consejo:</strong> Introduzca el destino del enlace simbólico como el contenido del archivo</target>
- </trans-unit>
<!-- form error messages -->
<trans-unit id="config-file-form.error.user-invalid">
<source>User must be a valid Linux user name or user id, of 32 characters or less.</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
index 7b9f896..c4391be 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
@@ -16568,13 +16568,6 @@ Vous pouvez déployer la dernière version de ce fichier (<a href="{1}">Re
</context-group>
<target><strong>Tip:</strong> Saisir le contexte SELinux context : user_u:role_r:type_t:s0-s15:c0.c1024 (Remarque : vous n'êtes pas obligé de remplir toutes les sections)</target>
</trans-unit>
- <trans-unit id="filedetails.jsp.tip.symlink">
- <source><strong>Tip:</strong> Enter the target of the symlink as the file contents</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/configuration/FileDetails.do</context>
- </context-group>
- <target><strong>Conseil :</strong> Saisir la cible du lien symbolic comme contenu de fichier</target>
- </trans-unit>
<!-- form error messages -->
<trans-unit id="config-file-form.error.user-invalid">
<source>User must be a valid Linux user name or user id, of 32 characters or less.</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
index f8df6b5..fe18f85 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
@@ -13530,13 +13530,6 @@ centrally-managed configuration channel, {2}; below is a list of systems you may
</context-group>
<target/>
</trans-unit>
- <trans-unit id="filedetails.jsp.tip.symlink">
- <source><strong>Tip:</strong> Enter the target of the symlink as the file contents</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/configuration/FileDetails.do</context>
- </context-group>
- <target/>
- </trans-unit>
<!-- form error messages -->
<trans-unit id="config-file-form.error.user-invalid">
<source>User must be a valid Linux user name or user id, of 32 characters or less.</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
index 9e3248a..e98e0cf 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
@@ -13530,13 +13530,6 @@ centrally-managed configuration channel, {2}; below is a list of systems you may
</context-group>
<target/>
</trans-unit>
- <trans-unit id="filedetails.jsp.tip.symlink">
- <source><strong>Tip:</strong> Enter the target of the symlink as the file contents</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/configuration/FileDetails.do</context>
- </context-group>
- <target/>
- </trans-unit>
<!-- form error messages -->
<trans-unit id="config-file-form.error.user-invalid">
<source>User must be a valid Linux user name or user id, of 32 characters or less.</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
index 0f3560e..c3975c7 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
@@ -16549,13 +16549,6 @@ centrally-managed configuration channel, {2}; below is a list of systems you may
</context-group>
<target><strong>Suggerimento:</strong> Inserire il contesto di SELinux: user_u:role_r:type_t:s0-s15:c0.c1024 (Nota: non è necessario inserire tutte le sezioni)</target>
</trans-unit>
- <trans-unit id="filedetails.jsp.tip.symlink">
- <source><strong>Tip:</strong> Enter the target of the symlink as the file contents</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/configuration/FileDetails.do</context>
- </context-group>
- <target><strong>Suggerimento:</strong> Inserire la destinazione del link simbolico come contenuto del file</target>
- </trans-unit>
<!-- form error messages -->
<trans-unit id="config-file-form.error.user-invalid">
<source>User must be a valid Linux user name or user id, of 32 characters or less.</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
index df3cae7..af1fcb9 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
@@ -16553,13 +16553,6 @@ centrally-managed configuration channel, {2}; below is a list of systems you may
</context-group>
<target><strong>ヒント:</strong> user_u:role_r:type_t:s0-s15:c0.c1024 などの SELinux コンテキストを入力します (注記: すべての部分を入力する必要はありません)</target>
</trans-unit>
- <trans-unit id="filedetails.jsp.tip.symlink">
- <source><strong>Tip:</strong> Enter the target of the symlink as the file contents</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/configuration/FileDetails.do</context>
- </context-group>
- <target><strong>ヒント:</strong> ファイルコンテンツとしてシンボリックリンクのターゲットを入力します</target>
- </trans-unit>
<!-- form error messages -->
<trans-unit id="config-file-form.error.user-invalid">
<source>User must be a valid Linux user name or user id, of 32 characters or less.</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
index a0765b5..545f229 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
@@ -16559,13 +16559,6 @@ centrally-managed configuration channel, {2}; below is a list of systems you may
</context-group>
<target><strong>힌트:</strong> user_u:role_r:type_t:s0-s15:c0.c1024과 같은 SELinux 문맥을 입력합니다 (참고: 모든 부분을 입력할 필요는 없습니다)</target>
</trans-unit>
- <trans-unit id="filedetails.jsp.tip.symlink">
- <source><strong>Tip:</strong> Enter the target of the symlink as the file contents</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/configuration/FileDetails.do</context>
- </context-group>
- <target><strong>힌트:</strong> 파일 문맥으로 심볼릭 링크 대상을 입력합니다 </target>
- </trans-unit>
<!-- form error messages -->
<trans-unit id="config-file-form.error.user-invalid">
<source>User must be a valid Linux user name or user id, of 32 characters or less.</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
index 2f5584e..790c9f1 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
@@ -13529,13 +13529,6 @@ centrally-managed configuration channel, {2}; below is a list of systems you may
</context-group>
<target/>
</trans-unit>
- <trans-unit id="filedetails.jsp.tip.symlink">
- <source><strong>Tip:</strong> Enter the target of the symlink as the file contents</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/configuration/FileDetails.do</context>
- </context-group>
- <target/>
- </trans-unit>
<!-- form error messages -->
<trans-unit id="config-file-form.error.user-invalid">
<source>User must be a valid Linux user name or user id, of 32 characters or less.</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
index 2019a82..2df536d 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
@@ -16563,13 +16563,6 @@ de configuração centralmente gerenciado pelo arquivo, {2}; segue abaixo uma li
</context-group>
<target><strong>Dica:</strong> Insira o contexto SELInux, como: user_u:role_r:type_t:s0-s15:c0.c1024 (Perceba que você não precisa entrar todas as partes)</target>
</trans-unit>
- <trans-unit id="filedetails.jsp.tip.symlink">
- <source><strong>Tip:</strong> Enter the target of the symlink as the file contents</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/configuration/FileDetails.do</context>
- </context-group>
- <target><strong>Dica:</strong> Insira a destinação do symlink como conteúdos de arquivo</target>
- </trans-unit>
<!-- form error messages -->
<trans-unit id="config-file-form.error.user-invalid">
<source>User must be a valid Linux user name or user id, of 32 characters or less.</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
index 739a419..13e3bd8 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
@@ -16550,13 +16550,6 @@ centrally-managed configuration channel, {2}; below is a list of systems you may
</context-group>
<target><strong>Подсказка.</strong> Введите контекст SELinux формате user_u:role_r:type_t:s0-s15:c0.c1024. Необязательно указывать все элементы.</target>
</trans-unit>
- <trans-unit id="filedetails.jsp.tip.symlink">
- <source><strong>Tip:</strong> Enter the target of the symlink as the file contents</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/configuration/FileDetails.do</context>
- </context-group>
- <target><strong>Подсказка.</strong> Введите содержимое файла для символьной ссылки.</target>
- </trans-unit>
<!-- form error messages -->
<trans-unit id="config-file-form.error.user-invalid">
<source>User must be a valid Linux user name or user id, of 32 characters or less.</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
index dfaecba..74a724f 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
@@ -13530,13 +13530,6 @@ centrally-managed configuration channel, {2}; below is a list of systems you may
</context-group>
<target/>
</trans-unit>
- <trans-unit id="filedetails.jsp.tip.symlink">
- <source><strong>Tip:</strong> Enter the target of the symlink as the file contents</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/configuration/FileDetails.do</context>
- </context-group>
- <target/>
- </trans-unit>
<!-- form error messages -->
<trans-unit id="config-file-form.error.user-invalid">
<source>User must be a valid Linux user name or user id, of 32 characters or less.</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
index 5b861e7..e02df0f 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
@@ -16563,13 +16563,6 @@ centrally-managed configuration channel, {2}; below is a list of systems you may
</context-group>
<target><strong>提示：</strong>输入 SELinux context，如：user_u:role_r:type_t:s0-s15:c0.c1024（注意：你不需要输入所有部分）</target>
</trans-unit>
- <trans-unit id="filedetails.jsp.tip.symlink">
- <source><strong>Tip:</strong> Enter the target of the symlink as the file contents</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/configuration/FileDetails.do</context>
- </context-group>
- <target><strong>提示：</strong>把 Symlink 的目标作为文件内容输入</target>
- </trans-unit>
<!-- form error messages -->
<trans-unit id="config-file-form.error.user-invalid">
<source>User must be a valid Linux user name or user id, of 32 characters or less.</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
index dd1eaa6..9920454 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
@@ -16565,13 +16565,6 @@ centrally-managed configuration channel, {2}; below is a list of systems you may
</context-group>
<target><strong>提示：</strong>請以此格式輸入 SELinux context：user_u:role_r:type_t:s0-s15:c0.c1024（請注意：您無需輸入所有部分）</target>
</trans-unit>
- <trans-unit id="filedetails.jsp.tip.symlink">
- <source><strong>Tip:</strong> Enter the target of the symlink as the file contents</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/configuration/FileDetails.do</context>
- </context-group>
- <target><strong>提示：</strong>將符號連結的目標作為檔案內容輸入</target>
- </trans-unit>
<!-- form error messages -->
<trans-unit id="config-file-form.error.user-invalid">
<source>User must be a valid Linux user name or user id, of 32 characters or less.</source>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf
index 2accd2c..11625ac 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf
@@ -67,7 +67,6 @@
$('hiddenContentsRow').style.display = '';
});
</script>
- <span class="small-text"><bean:message key="filedetails.jsp.tip.symlink" /></span>
</td>
</tr>
<tr>
11 years, 5 months
- 1
- 0
Changes to 'refs/tags/spacewalk-java-1.9.21-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.9.21-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-11-26 16:39 +0000
Tagging package [spacewalk-java] version [1.9.21-1] in directory [java/].
Changes since spacewalk-java-1.9.20-1:
Jan Pazdziora (2):
864037 - fixing typo.
Automatic commit of package [spacewalk-java] release [1.9.21-1].
---
java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java | 2 +-
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
---
11 years, 5 months
- 1
- 0
java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit bca22b26f60e9e67dc718e98255a0bd7799d834a
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Nov 26 17:39:20 2012 +0100
Automatic commit of package [spacewalk-java] release [1.9.21-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 46a574d..fa670b5 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -23,7 +23,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.9.20
+Version: 1.9.21
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -617,6 +617,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Nov 26 2012 Jan Pazdziora 1.9.21-1
+- 864037 - fixing typo.
+
* Mon Nov 26 2012 Tomas Lestach <tlestach(a)redhat.com> 1.9.20-1
- 879332 - checkstyle issue
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 0294a32..34ef4bc 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.9.20-1 java/
+1.9.21-1 java/
11 years, 5 months
- 1
- 0