spacewalk-commits August 2011

spacewalk-commits@lists.fedorahosted.org

8 participants
312 discussions

Changes to 'refs/tags/spacewalk-java-1.6.34-1'
by Tomas Lestach 31 Aug '11

31 Aug '11

Tag 'spacewalk-java-1.6.34-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2011-08-31 19:22 +0000 Tagging package [spacewalk-java] version [1.6.34-1] in directory [java/]. Changes since spacewalk-java-1.6.33-1: Tomas Lestach (2): fix NPE for KickstartDetailsEditAction Automatic commit of package [spacewalk-java] release [1.6.34-1]. --- java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java | 16 ++++++---- java/spacewalk-java.spec | 5 ++- rel-eng/packages/spacewalk-java | 2 - 3 files changed, 16 insertions(+), 7 deletions(-) ---

1 0

java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach 31 Aug '11

31 Aug '11

java/spacewalk-java.spec | 5 ++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit d7ef86c2f36f72782c2ec2c4369328682ca61481 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Wed Aug 31 21:22:38 2011 +0200 Automatic commit of package [spacewalk-java] release [1.6.34-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index c0b929c..00e5f8a 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -17,7 +17,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.6.33 +Version: 1.6.34 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -547,6 +547,9 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Wed Aug 31 2011 Tomas Lestach <tlestach(a)redhat.com> 1.6.34-1 +- fix NPE for KickstartDetailsEditAction (tlestach(a)redhat.com) + * Wed Aug 31 2011 Tomas Lestach <tlestach(a)redhat.com> 1.6.33-1 - 725059 - en/disable kickstart profiles using API (tlestach(a)redhat.com) - 725050 - en/disable activation keys using API (tlestach(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 9917f4d..fdd51c3 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.6.33-1 java/ +1.6.34-1 java/

1 0

java/code
by Tomas Lestach 31 Aug '11

31 Aug '11

java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java | 16 ++++++---- 1 file changed, 11 insertions(+), 5 deletions(-) New commits: commit 66bedd40d89522305a446e1b98af1c9386077223 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Wed Aug 31 20:21:11 2011 +0200 fix NPE for KickstartDetailsEditAction this partly reverts 4b9116c6 addressing: java.lang.NullPointerException at com.redhat.rhn.manager.kickstart.KickstartEditCommand.setIsOrgDefault(KickstartEditCommand.java:171) at com.redhat.rhn.frontend.action.kickstart.KickstartDetailsEditAction.processFormValues(KickstartDetailsEditAction.java:223) at com.redhat.rhn.frontend.action.kickstart.BaseKickstartEditAction.execute(BaseKickstartEditAction.java:80) at com.redhat.rhn.frontend.action.kickstart.KickstartDetailsEditAction.execute(KickstartDetailsEditAction.java:95) ... diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java index 64935a4..4b6ed44 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java @@ -36,6 +36,7 @@ import com.redhat.rhn.manager.kickstart.cobbler.CobblerProfileCommand; import com.redhat.rhn.manager.kickstart.cobbler.CobblerProfileEditCommand; 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.ActionForm; import org.apache.struts.action.ActionForward; @@ -219,11 +220,16 @@ public class KickstartDetailsEditAction extends BaseKickstartEditAction { cmd.setLabel(form.getString(LABEL)); - cmd.setActive((Boolean) form.get(ACTIVE)); - cmd.setIsOrgDefault((Boolean) form.get(ORG_DEFAULT)); - cmd.getKickstartData().setPostLog((Boolean) form.get(POST_LOG)); - cmd.getKickstartData().setPreLog((Boolean) form.get(PRE_LOG)); - cmd.getKickstartData().setKsCfg((Boolean) form.get(KS_CFG)); + cmd.setActive(new + Boolean(BooleanUtils.toBoolean((Boolean) form.get(ACTIVE)))); + cmd.setIsOrgDefault(new + Boolean(BooleanUtils.toBoolean((Boolean) form.get(ORG_DEFAULT)))); + cmd.getKickstartData().setPostLog( + BooleanUtils.toBoolean((Boolean) form.get(POST_LOG))); + cmd.getKickstartData().setPreLog( + BooleanUtils.toBoolean((Boolean) form.get(PRE_LOG))); + cmd.getKickstartData().setKsCfg( + BooleanUtils.toBoolean((Boolean) form.get(KS_CFG))); processCobblerFormValues(cmd.getKickstartData(), form, ctx.getLoggedInUser());

1 0

Changes to 'refs/tags/spacewalk-java-1.6.33-1'
by Tomas Lestach 31 Aug '11

31 Aug '11

Tag 'spacewalk-java-1.6.33-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2011-08-31 18:04 +0000 Tagging package [spacewalk-java] version [1.6.33-1] in directory [java/]. Changes since spacewalk-schema-1.6.11-1: Tomas Lestach (3): 725050 - en/disable activation keys using API 725059 - en/disable kickstart profiles using API Automatic commit of package [spacewalk-java] release [1.6.33-1]. --- java/code/src/com/redhat/rhn/domain/token/ActivationKey.java | 9 + java/code/src/com/redhat/rhn/domain/token/ActivationKeyFactory.java | 2 java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java | 5 java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/KickstartHandler.java | 52 ++++++++++ java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/TokenSerializer.java | 1 java/spacewalk-java.spec | 6 - rel-eng/packages/spacewalk-java | 2 7 files changed, 72 insertions(+), 5 deletions(-) ---

1 0

java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach 31 Aug '11

31 Aug '11

java/spacewalk-java.spec | 6 +++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit ee7a139e5fd096cc37dad7efa7ad627349fa645c Author: Tomas Lestach <tlestach(a)redhat.com> Date: Wed Aug 31 20:04:08 2011 +0200 Automatic commit of package [spacewalk-java] release [1.6.33-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 9876dca..c0b929c 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -17,7 +17,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.6.32 +Version: 1.6.33 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -547,6 +547,10 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Wed Aug 31 2011 Tomas Lestach <tlestach(a)redhat.com> 1.6.33-1 +- 725059 - en/disable kickstart profiles using API (tlestach(a)redhat.com) +- 725050 - en/disable activation keys using API (tlestach(a)redhat.com) + * Tue Aug 30 2011 Tomas Lestach <tlestach(a)redhat.com> 1.6.32-1 - 640535 - add extra spaces between topic, description and note in Errata Alert e-mails (tlestach(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 00a27a2..9917f4d 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.6.32-1 java/ +1.6.33-1 java/

1 0

java/code
by Tomas Lestach 31 Aug '11

31 Aug '11

java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/KickstartHandler.java | 52 ++++++++++ 1 file changed, 52 insertions(+) New commits: commit 748338f08a151b9a6683e2fd706688363ce0d868 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Wed Aug 31 13:50:16 2011 +0200 725059 - en/disable kickstart profiles using API diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/KickstartHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/KickstartHandler.java index 1489bd9..ce133bb 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/KickstartHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/KickstartHandler.java @@ -396,6 +396,58 @@ public class KickstartHandler extends BaseHandler { } /** + * En/Disable kickstart profile + * + * @param sessionKey User's session key. + * @param profileLabel Label for tree we want to en/disable + * @param disabled True to disable the profile + * @return 1 if successful, exception otherwise. + * + * @xmlrpc.doc Enable/Disable a Kickstart Profile + * @xmlrpc.param #session_key() + * @xmlrpc.param #param_desc("string", "profileLabel" "Label for the + * kickstart tree you want to en/disable") + * @xmlrpc.param #param_desc("string", "disabled" "true to disable the profile") + * @xmlrpc.returntype #return_int_success() + */ + public int disableProfile(String sessionKey, String profileLabel, Boolean disabled) { + + User loggedInUser = getLoggedInUser(sessionKey); + if (!loggedInUser.hasRole(RoleFactory.CONFIG_ADMIN)) { + throw new PermissionException(RoleFactory.CONFIG_ADMIN); + } + KickstartData ksData = lookupKsData(profileLabel, loggedInUser.getOrg()); + + KickstartEditCommand cmd = new KickstartEditCommand( + ksData.getId(), loggedInUser); + + cmd.setActive(!disabled); + cmd.store(); + + return 1; + } + + /** + * Returns whether a kickstart profile is disabled + * + * @param sessionKey User's session key. + * @param profileLabel kickstart profile label + * @return true if profile is disabled + * + * @xmlrpc.doc Returns whether a kickstart profile is disabled + * @xmlrpc.param #session_key() + * @xmlrpc.param #param_desc("string", "profileLabel" "kickstart profile label") + * @xmlrpc.returntype true if profile is disabled + */ + public boolean isProfileDisabled(String sessionKey, String profileLabel) { + + User loggedInUser = getLoggedInUser(sessionKey); + KickstartData ksData = lookupKsData(profileLabel, loggedInUser.getOrg()); + + return !ksData.isActive(); + } + + /** * Rename a kickstart profile. * * @param sessionKey User's session key.

1 0

java/code
by Tomas Lestach 31 Aug '11

31 Aug '11

java/code/src/com/redhat/rhn/domain/token/ActivationKey.java | 9 +++++++-- java/code/src/com/redhat/rhn/domain/token/ActivationKeyFactory.java | 2 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java | 5 +++++ java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/TokenSerializer.java | 1 + 4 files changed, 14 insertions(+), 3 deletions(-) New commits: commit 4a19cab55087491ea355697e67f2f87fe957345e Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Aug 30 18:29:32 2011 +0200 725050 - en/disable activation keys using API diff --git a/java/code/src/com/redhat/rhn/domain/token/ActivationKey.java b/java/code/src/com/redhat/rhn/domain/token/ActivationKey.java index 210c301..eef6d79 100644 --- a/java/code/src/com/redhat/rhn/domain/token/ActivationKey.java +++ b/java/code/src/com/redhat/rhn/domain/token/ActivationKey.java @@ -196,8 +196,13 @@ public class ActivationKey extends BaseDomainHelper { /** * @param disabled The disabled to set */ - public void setDisabled(Long disabled) { - this.getToken().setDisabled(disabled); + public void setDisabled(Boolean disabled) { + if (disabled) { + this.getToken().disable(); + } + else { + this.getToken().enable(); + } } /** diff --git a/java/code/src/com/redhat/rhn/domain/token/ActivationKeyFactory.java b/java/code/src/com/redhat/rhn/domain/token/ActivationKeyFactory.java index e17e897..a1c2d3d 100644 --- a/java/code/src/com/redhat/rhn/domain/token/ActivationKeyFactory.java +++ b/java/code/src/com/redhat/rhn/domain/token/ActivationKeyFactory.java @@ -137,7 +137,7 @@ public class ActivationKeyFactory extends HibernateFactory { } newKey.setNote((String)Scrubber.scrub(note)); newKey.getToken().setDeployConfigs(false); // Don't deploy configs by default - newKey.setDisabled(new Long(0)); // Enable by default + newKey.setDisabled(Boolean.FALSE); // Enable by default newKey.setUsageLimit(usageLimit); if (baseChannel != null) { diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java index fa83829..f3ff1f7 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java @@ -295,6 +295,7 @@ public class ActivationKeyHandler extends BaseHandler { validKeys.add("usage_limit"); validKeys.add("unlimited_usage_limit"); validKeys.add("universal_default"); + validKeys.add("disabled"); validateMap(validKeys, details); User user = getLoggedInUser(sessionKey); @@ -345,6 +346,10 @@ public class ActivationKeyHandler extends BaseHandler { aKey.setUniversalDefault(universalDefault.booleanValue()); } + if (details.containsKey("disabled")) { + aKey.setDisabled((Boolean)details.get("disabled")); + } + manager.update(aKey, description, baseChannel); return 1; } diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/TokenSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/TokenSerializer.java index ef5725c..6093895 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/TokenSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/TokenSerializer.java @@ -138,5 +138,6 @@ public class TokenSerializer implements XmlRpcCustomSerializer { Boolean universalDefault = Boolean.valueOf(token.isOrgDefault()); helper.add("universal_default", universalDefault); + helper.add("disabled", Boolean.valueOf(token.isTokenDisabled())); } }

1 0

Changes to 'refs/tags/spacewalk-schema-1.6.11-1'
by Michael Mraka 31 Aug '11

31 Aug '11

Tag 'spacewalk-schema-1.6.11-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-08-31 11:23 +0000 Tagging package [spacewalk-schema] version [1.6.11-1] in directory [schema/spacewalk/]. Changes since spacewalk-java-1.6.32-1: Michael Mraka (3): Fedora 15 needs explicit BuildRequires for python removed obsoleted warning Automatic commit of package [spacewalk-schema] release [1.6.11-1]. --- rel-eng/packages/spacewalk-schema | 2 +- schema/spacewalk/blend | 2 +- schema/spacewalk/common/Makefile | 4 ---- schema/spacewalk/spacewalk-schema.spec | 7 ++++++- 4 files changed, 8 insertions(+), 7 deletions(-) ---

1 0

rel-eng/packages schema/spacewalk
by Michael Mraka 31 Aug '11

31 Aug '11

rel-eng/packages/spacewalk-schema | 2 +- schema/spacewalk/spacewalk-schema.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit 353a20892d33f7272f77e8f48655ed37c0fe4682 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Aug 31 13:23:25 2011 +0200 Automatic commit of package [spacewalk-schema] release [1.6.11-1]. diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema index a0d4d98..5292545 100644 --- a/rel-eng/packages/spacewalk-schema +++ b/rel-eng/packages/spacewalk-schema @@ -1 +1 @@ -1.6.10-1 schema/spacewalk/ +1.6.11-1 schema/spacewalk/ diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec index 7156a9c..c1fe438 100644 --- a/schema/spacewalk/spacewalk-schema.spec +++ b/schema/spacewalk/spacewalk-schema.spec @@ -2,7 +2,7 @@ Name: spacewalk-schema Group: Applications/Internet Summary: Oracle SQL schema for Spacewalk server -Version: 1.6.10 +Version: 1.6.11 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz @@ -66,6 +66,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/spacewalk-sql* %changelog +* Wed Aug 31 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.6.11-1 +- removed obsoleted warning +- Fedora 15 needs explicit BuildRequires for python + * Tue Aug 30 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.6.10-1 - fixed rhnReleaseChannelMap upgrade from 0.5 to 0.6

1 0

2 commits - schema/spacewalk
by Michael Mraka 31 Aug '11

31 Aug '11

schema/spacewalk/blend | 2 +- schema/spacewalk/common/Makefile | 4 ---- schema/spacewalk/spacewalk-schema.spec | 1 + 3 files changed, 2 insertions(+), 5 deletions(-) New commits: commit 74b7fe22fec70f1b0d1fe362e73f257705a60f0e Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Aug 31 12:59:11 2011 +0200 removed obsoleted warning diff --git a/schema/spacewalk/common/Makefile b/schema/spacewalk/common/Makefile index ee8847a..e4bca8f 100644 --- a/schema/spacewalk/common/Makefile +++ b/schema/spacewalk/common/Makefile @@ -11,10 +11,6 @@ # in this software or its documentation. # -ifndef STYLE -STYLE := oracle -$(warning STYLE not defined, using $(STYLE)) -endif ifndef COMMON COMMON := ../../../common $(warning COMMON not defined, using $(COMMON)) commit 1d56a303a582ebc8cff9143f05ad06c32dae0553 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Aug 31 12:57:04 2011 +0200 Fedora 15 needs explicit BuildRequires for python diff --git a/schema/spacewalk/blend b/schema/spacewalk/blend index 108e1d5..6610620 100755 --- a/schema/spacewalk/blend +++ b/schema/spacewalk/blend @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python # This program is free software; you can redistribute it and/or modify # it under the terms of the (LGPL) GNU Lesser General Public License as # published by the Free Software Foundation; either version 3 of the diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec index a8b048f..7156a9c 100644 --- a/schema/spacewalk/spacewalk-schema.spec +++ b/schema/spacewalk/spacewalk-schema.spec @@ -12,6 +12,7 @@ BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(Digest::SHA1) +BuildRequires: python Obsoletes: rhn-satellite-schema <= 5.1.0

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits August 2011