spacewalk-commits June 2009

spacewalk-commits@lists.fedorahosted.org

20 participants
611 discussions

java/spacewalk-java.spec rel-eng/packages
by John Matthews 25 Jun '09

25 Jun '09

java/spacewalk-java.spec | 91 +++++++++++++++++++++++++++++++++++++++- rel-eng/packages/spacewalk-java | 2 2 files changed, 91 insertions(+), 2 deletions(-) New commits: commit 8288ee2dd4f507bc9dd9d49f94807f4c724beae7 Author: John Matthews <jmatthew(a)redhat.com> Date: Thu Jun 25 11:42:17 2009 -0400 Automatic commit of package [spacewalk-java] release [0.6.27-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 4e41ef7..e6b5a8e 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -11,7 +11,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 0.6.26 +Version: 0.6.27 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -250,6 +250,95 @@ fi %attr(644, root, root) %{_datadir}/rhn/lib/rhn.jar %changelog +* Thu Jun 25 2009 John Matthews <jmatthew(a)redhat.com> 0.6.27-1 +- Remove catch/log return null of HibernateExceptions. (dgoodwin(a)redhat.com) +- Fix server migration when source org has > 1000 org admins. + (dgoodwin(a)redhat.com) +- Fix to make sure kernel param entries don;t get duplicated (paji(a)redhat.com) +- 492206 - Fixed kickstart template error (paji(a)redhat.com) +- 507533 - added catch around unhandled exception for pkg in mutiple channels + (shughes(a)redhat.com) +- 507862 - Fixed an ise that occured when config deploy was selected on a + profile (paji(a)redhat.com) +- 507863 - fixing issue where enabling remote commands would not be saved + (jsherril(a)redhat.com) +- 507888 - Set the default virt mem value to 512 instead of 256 + (paji(a)redhat.com) +- hopeflly fixing unit test (jsherril(a)redhat.com) +- Fixed a unit test (paji(a)redhat.com) +- 506702 - Converted probe details page to use the new list to get the correct + csv (paji(a)redhat.com) +- Fixed a nitpick that memory didnt sya memMb (paji(a)redhat.com) +- 507097 - Fixed guest provisioning virt settings (paji(a)redhat.com) +- Adding repodata details for a given channel to channelDetails page. + (pkilambi(a)redhat.com) +- 506816 - fixing issue where virt hosts that begin to use sat 5.3 could not + install spacewalk-koan (jsherril(a)redhat.com) +- 506693 - removed more contact.pxt references (shughes(a)redhat.com) +- 507046 & 507048 - Fixed a couple of cobbler issues (paji(a)redhat.com) +- Added a fix to master to ignore profiles that have not yet been synced to + cobbler.. (paji(a)redhat.com) +- Fix for html:errors and html:messages to be consitently viewed in the UI + (paji(a)redhat.com) +- 506726 - do not allow links for null org channel management + (shughes(a)redhat.com) +- 506705 - removed invalid rhn require tag (shughes(a)redhat.com) +- 506693 - remove contact.pxt link from 404 message (shughes(a)redhat.com) +- 506509 - Fixed an ssm query.. Accidental typo.. (paji(a)redhat.com) +- 506509 - Fixed ISE on Config Deploy pages (paji(a)redhat.com) +- Checkstyle fix. (dgoodwin(a)redhat.com) +- 506608 - fixing issue where source packages could not be downloaded from the + package details page (jsherril(a)redhat.com) +- Fix monitoring action unit tests. (dgoodwin(a)redhat.com) +- Attempt to fix ChannelManagerTest.testListErrata. (dgoodwin(a)redhat.com) +- 506342 - fix system count for consumed channel sharing (shughes(a)redhat.com) +- 506341 - fix system count for provided shared channels (shughes(a)redhat.com) +- 495406 - Changed package arch lookup for ACLs to use arch labels instead of + hibernate objects. (jason.dobies(a)redhat.com) +- 506489 - remove the link associated with the org name present in the UI + header (bbuckingham(a)redhat.com) +- Adding missed EusReleaseComparator file. (dgoodwin(a)redhat.com) +- 506492, 506139 - PackageSearch default quick search to searching all arches & + fix no result if systems aren't registered (jmatthew(a)redhat.com) +- 506296 - Repair EUS logic after removal of is_default column. + (dgoodwin(a)redhat.com) +- 506144 - apidoc - packages.search - adding missing files to return value + (bbuckingham(a)redhat.com) +- fix unit test cases (shughes(a)redhat.com) +- removed a duplicate string resources entry (paji(a)redhat.com) +- Fix some of the failing EUS unit tests. (dgoodwin(a)redhat.com) +- 505616 - Fixing the eus logic that gets the latest and the default eus + channels to not depend on is_default column. Thanks to jsherril for his help + on this. (pkilambi(a)redhat.com) +- Fixed a set of unit tests which owere looking for ActtionMessagess instead of + ActionErrors (paji(a)redhat.com) +- Unit test fix (paji(a)redhat.com) +- Fixed unit test: was looking for errors as part of action messages + (jason.dobies(a)redhat.com) +- Remove hibernate mappings for rhnReleaseChannelMap is_default column. + (dgoodwin(a)redhat.com) +- unit test fix (jsherril(a)redhat.com) +- unit test fix (jsherril(a)redhat.com) +- 431673 - reworking rhnServerNeededView for performance fixes. + (mmccune(a)gmail.com) +- 505170 - api - proxy.deactivateProxy - was generating internal exception + (bbuckingham(a)redhat.com) +- 505327 - fixing url parse for advanced kickstart options (shughes(a)redhat.com) +- 498650 - HTML escape monitoring data before displaying. (dgoodwin(a)redhat.com) +- Revert "498650 - html escape of monitoring data before displaying on the + WEBUI" (dgoodwin(a)redhat.com) +- 498650 - html escape of monitoring data before displaying on the WEBUI + (tlestach(a)redhat.com) +- 492206 - Fixed cobbler error url to point to KS file download page which has + better info on cheetah stacktrace (paji(a)redhat.com) +- 505188 - fixing issues causing rhel2.1 provisioning to not work + (jsherril(a)redhat.com) +- 490960 - ErrataSearch, fix for multiorg channel permissions + (jmatthew(a)redhat.com) +- fix to shwo the correct error message css (paji(a)redhat.com) +- 504804 - Need to stuff the relevant flag back into the request so it's used + in the package name URLs. (jason.dobies(a)redhat.com) + * Wed Jun 10 2009 jesus m. rodriguez <jesusr(a)redhat.com> 0.6.26-1 - 504806 - Added missing channel_filter attribute that was being lost during pagination. (jason.dobies(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 19a8cd5..747ed8f 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -0.6.26-1 java/ +0.6.27-1 java/

1 0

java/code
by Devan Goodwin 25 Jun '09

25 Jun '09

java/code/src/com/redhat/rhn/domain/action/ActionFactory.java | 32 - java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java | 13 java/code/src/com/redhat/rhn/domain/config/ConfigurationFactory.java | 179 ++----- java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java | 21 java/code/src/com/redhat/rhn/domain/monitoring/satcluster/SatClusterFactory.java | 16 java/code/src/com/redhat/rhn/domain/org/OrgImpl.java | 22 java/code/src/com/redhat/rhn/domain/rhnpackage/PackageEvrFactory.java | 14 java/code/src/com/redhat/rhn/domain/role/RoleFactory.java | 39 - java/code/src/com/redhat/rhn/domain/satellite/CertificateFactory.java | 15 java/code/src/com/redhat/rhn/domain/satellite/SatelliteFactory.java | 11 java/code/src/com/redhat/rhn/domain/server/ServerFactory.java | 56 -- java/code/src/com/redhat/rhn/domain/session/WebSessionFactory.java | 28 - java/code/src/com/redhat/rhn/domain/task/TaskFactory.java | 37 - java/code/src/com/redhat/rhn/domain/user/UserFactory.java | 236 +++------- 14 files changed, 216 insertions(+), 503 deletions(-) New commits: commit 418c807411eaad10462e9746c2b5d512583d9b8b Author: Devan Goodwin <dgoodwin(a)redhat.com> Date: Thu Jun 25 12:39:14 2009 -0300 Remove catch/log return null of HibernateExceptions. Dangerous thing to do, can result in getting back null or no results, when infact you expect results, and the only indication that something went wrong is a single line error message in the logs. HibernateException indicates something is wrong, should not be hidden. diff --git a/java/code/src/com/redhat/rhn/domain/action/ActionFactory.java b/java/code/src/com/redhat/rhn/domain/action/ActionFactory.java index 1cda1ae..e5a94e2 100644 --- a/java/code/src/com/redhat/rhn/domain/action/ActionFactory.java +++ b/java/code/src/com/redhat/rhn/domain/action/ActionFactory.java @@ -461,17 +461,9 @@ public class ActionFactory extends HibernateFactory { * @return the Action found */ public static Action lookupById(Long id) { - Session session = null; - try { - session = HibernateFactory.getSession(); - Action a = (Action)session.get(Action.class, id); - return a; - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - throw new HibernateRuntimeException( - "HibernateException while trying to lookup Action", he); - } + Session session = HibernateFactory.getSession(); + Action a = (Action)session.get(Action.class, id); + return a; } /** @@ -525,19 +517,11 @@ public class ActionFactory extends HibernateFactory { */ public static ConfigRevisionAction lookupConfigRevisionAction(Long id) { - Session session = null; - try { - session = HibernateFactory.getSession(); - ConfigRevisionAction c = (ConfigRevisionAction) session. - get(ConfigRevisionAction.class, - id); - return c; - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString(), he); - - } - return null; + + Session session = HibernateFactory.getSession(); + ConfigRevisionAction c = (ConfigRevisionAction) session. + get(ConfigRevisionAction.class, id); + return c; } /** diff --git a/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java b/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java index 4837cf1..06d5248 100644 --- a/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java +++ b/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java @@ -70,16 +70,9 @@ public class ChannelFactory extends HibernateFactory { * @return the Channel found */ public static Channel lookupById(Long id) { - Session session = null; - try { - session = HibernateFactory.getSession(); - Channel c = (Channel) session.get(Channel.class, id); - return c; - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session = HibernateFactory.getSession(); + Channel c = (Channel) session.get(Channel.class, id); + return c; } /** diff --git a/java/code/src/com/redhat/rhn/domain/config/ConfigurationFactory.java b/java/code/src/com/redhat/rhn/domain/config/ConfigurationFactory.java index 00592d6..4eabe31 100644 --- a/java/code/src/com/redhat/rhn/domain/config/ConfigurationFactory.java +++ b/java/code/src/com/redhat/rhn/domain/config/ConfigurationFactory.java @@ -26,7 +26,6 @@ import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.user.User; import org.apache.log4j.Logger; -import org.hibernate.HibernateException; import org.hibernate.Session; import org.hibernate.criterion.Restrictions; @@ -318,16 +317,9 @@ public class ConfigurationFactory extends HibernateFactory { * @return the ConfigChannel found or null if not found. */ public static ConfigChannel lookupConfigChannelById(Long id) { - Session session = null; - try { - session = HibernateFactory.getSession(); - ConfigChannel c = (ConfigChannel)session.get(ConfigChannel.class, id); - return c; - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session = HibernateFactory.getSession(); + ConfigChannel c = (ConfigChannel)session.get(ConfigChannel.class, id); + return c; } /** @@ -341,37 +333,24 @@ public class ConfigurationFactory extends HibernateFactory { public static ConfigChannel lookupConfigChannelByLabel(String label, Org org, ConfigChannelType cct) { - Session session = null; - try { - session = HibernateFactory.getSession(); - ConfigChannel c = (ConfigChannel) session.createCriteria(ConfigChannel.class). - add(Restrictions.eq("org", org)). - add(Restrictions.eq("label", label)). - add(Restrictions.eq("configChannelType", cct)). - uniqueResult(); - return c; - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session = HibernateFactory.getSession(); + ConfigChannel c = (ConfigChannel) session.createCriteria(ConfigChannel.class). + add(Restrictions.eq("org", org)). + add(Restrictions.eq("label", label)). + add(Restrictions.eq("configChannelType", cct)). + uniqueResult(); + return c; } + /** * Lookup a ConfigFile by its id * @param id The identifier for the ConfigFile * @return the ConfigFile found or null if not found. */ public static ConfigFile lookupConfigFileById(Long id) { - Session session = null; - try { - session = HibernateFactory.getSession(); - ConfigFile c = (ConfigFile)session.get(ConfigFile.class, id); - return c; - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session = HibernateFactory.getSession(); + ConfigFile c = (ConfigFile)session.get(ConfigFile.class, id); + return c; } /** @@ -381,24 +360,16 @@ public class ConfigurationFactory extends HibernateFactory { * @return the ConfigFile found or null if not found. */ public static ConfigFile lookupConfigFileByChannelAndName(Long channel, Long name) { - Session session = null; - try { - session = HibernateFactory.getSession(); - return (ConfigFile) - session.getNamedQuery("ConfigFile.findByChannelAndName") - .setLong("channel_id", channel.longValue()) - .setLong("name_id", name.longValue()) - .setLong("state_id", ConfigFileState.normal(). - getId().longValue()) - //Retrieve from cache if there - .setCacheable(true) - .uniqueResult(); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - - return null; + Session session = HibernateFactory.getSession(); + return (ConfigFile) + session.getNamedQuery("ConfigFile.findByChannelAndName") + .setLong("channel_id", channel.longValue()) + .setLong("name_id", name.longValue()) + .setLong("state_id", ConfigFileState.normal(). + getId().longValue()) + //Retrieve from cache if there + .setCacheable(true) + .uniqueResult(); } /** @@ -407,16 +378,9 @@ public class ConfigurationFactory extends HibernateFactory { * @return The sought for ConfigRevision or null if not found. */ public static ConfigRevision lookupConfigRevisionById(Long id) { - Session session = null; - try { - session = HibernateFactory.getSession(); - ConfigRevision a = (ConfigRevision)session.get(ConfigRevision.class, id); - return a; - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session = HibernateFactory.getSession(); + ConfigRevision a = (ConfigRevision)session.get(ConfigRevision.class, id); + return a; } /** @@ -425,16 +389,9 @@ public class ConfigurationFactory extends HibernateFactory { * @return The sought for ConfigInfo or null if not found. */ public static ConfigInfo lookupConfigInfoById(Long id) { - Session session = null; - try { - session = HibernateFactory.getSession(); - ConfigInfo c = (ConfigInfo)session.get(ConfigInfo.class, id); - return c; - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session = HibernateFactory.getSession(); + ConfigInfo c = (ConfigInfo)session.get(ConfigInfo.class, id); + return c; } /** @@ -443,16 +400,9 @@ public class ConfigurationFactory extends HibernateFactory { * @return The sought for ConfigFileName or null if not found. */ public static ConfigFileName lookupConfigFileNameById(Long id) { - Session session = null; - try { - session = HibernateFactory.getSession(); - ConfigFileName c = (ConfigFileName)session.get(ConfigFileName.class, id); - return c; - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session = HibernateFactory.getSession(); + ConfigFileName c = (ConfigFileName)session.get(ConfigFileName.class, id); + return c; } @@ -465,21 +415,13 @@ public class ConfigurationFactory extends HibernateFactory { * @return A sought for ConfigChannelType or null */ static ConfigChannelType lookupConfigChannelTypeByLabel(String label) { - Session session = null; - try { - session = HibernateFactory.getSession(); - return (ConfigChannelType) - session.getNamedQuery("ConfigChannelType.findByLabel") - .setString("label", label) - //Retrieve from cache if there - .setCacheable(true) - .uniqueResult(); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - - return null; + Session session = HibernateFactory.getSession(); + return (ConfigChannelType) + session.getNamedQuery("ConfigChannelType.findByLabel") + .setString("label", label) + //Retrieve from cache if there + .setCacheable(true) + .uniqueResult(); } /** @@ -491,20 +433,12 @@ public class ConfigurationFactory extends HibernateFactory { * @return A sought for ConfigFileState or null */ static ConfigFileState lookupConfigFileStateByLabel(String label) { - Session session = null; - try { - session = HibernateFactory.getSession(); - return (ConfigFileState)session.getNamedQuery("ConfigFileState.findByLabel") - .setString("label", label) - //Retrieve from cache if there - .setCacheable(true) - .uniqueResult(); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - - return null; + Session session = HibernateFactory.getSession(); + return (ConfigFileState)session.getNamedQuery("ConfigFileState.findByLabel") + .setString("label", label) + //Retrieve from cache if there + .setCacheable(true) + .uniqueResult(); } /** @@ -513,21 +447,14 @@ public class ConfigurationFactory extends HibernateFactory { * @return config filetype object */ static ConfigFileType lookupConfigFileTypeByLabel(String label) { - Session session = null; - try { - session = HibernateFactory.getSession(); - return (ConfigFileType)session.getNamedQuery("ConfigFileType.findByLabel") - .setString("label", label) - //Retrieve from cache if there - .setCacheable(true) - .uniqueResult(); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - - return null; + Session session = HibernateFactory.getSession(); + return (ConfigFileType)session.getNamedQuery("ConfigFileType.findByLabel") + .setString("label", label) + //Retrieve from cache if there + .setCacheable(true) + .uniqueResult(); } + /** * Return a <code>ConfigInfo</code> for the username, groupname, and * file mode given. If no corresponding entry exists yet in the database, one will be diff --git a/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java b/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java index 22e57c2..d3962d6 100644 --- a/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java +++ b/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java @@ -601,22 +601,15 @@ public class ErrataFactory extends HibernateFactory { * @return the Errata found */ public static Errata lookupById(Long id) { - Session session = null; - try { - //Look for published Errata first - session = HibernateFactory.getSession(); - Errata errata = (Errata) session.get(PublishedErrata.class, id); + //Look for published Errata first + Session session = HibernateFactory.getSession(); + Errata errata = (Errata) session.get(PublishedErrata.class, id); - //If we nothing was found, look for it in the Unpublished Errata table... - if (errata == null) { - errata = (Errata) session.get(UnpublishedErrata.class, id); - } - return errata; - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); + //If we nothing was found, look for it in the Unpublished Errata table... + if (errata == null) { + errata = (Errata) session.get(UnpublishedErrata.class, id); } - return null; + return errata; } /** diff --git a/java/code/src/com/redhat/rhn/domain/monitoring/satcluster/SatClusterFactory.java b/java/code/src/com/redhat/rhn/domain/monitoring/satcluster/SatClusterFactory.java index b64edc8..337681c 100644 --- a/java/code/src/com/redhat/rhn/domain/monitoring/satcluster/SatClusterFactory.java +++ b/java/code/src/com/redhat/rhn/domain/monitoring/satcluster/SatClusterFactory.java @@ -22,7 +22,6 @@ import java.util.List; import org.apache.commons.lang.RandomStringUtils; import org.apache.log4j.Logger; -import org.hibernate.HibernateException; import org.hibernate.Session; import com.redhat.rhn.common.hibernate.HibernateFactory; @@ -50,17 +49,10 @@ public class SatClusterFactory extends HibernateFactory { } private static PhysicalLocation lookupPhysicalLocation(Long id) { - Session session = null; - try { - session = HibernateFactory.getSession(); - PhysicalLocation u = (PhysicalLocation) - session.get(PhysicalLocation.class, id); - return u; - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session = HibernateFactory.getSession(); + PhysicalLocation u = (PhysicalLocation) + session.get(PhysicalLocation.class, id); + return u; } /** diff --git a/java/code/src/com/redhat/rhn/domain/org/OrgImpl.java b/java/code/src/com/redhat/rhn/domain/org/OrgImpl.java index 48cbd7c..ed26a7c 100644 --- a/java/code/src/com/redhat/rhn/domain/org/OrgImpl.java +++ b/java/code/src/com/redhat/rhn/domain/org/OrgImpl.java @@ -29,7 +29,6 @@ import java.util.Set; import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.log4j.Logger; -import org.hibernate.HibernateException; import org.hibernate.Session; import com.redhat.rhn.common.db.datasource.CallableMode; @@ -444,22 +443,15 @@ public class OrgImpl extends BaseDomainHelper implements Org { /** {@inheritDoc} */ public int numActiveOrgAdmins() { - Session session = null; - try { - session = HibernateFactory.getSession(); - List list = session.getNamedQuery("Org.numOfOrgAdmins") - .setParameter("org_id", this.getId()) - // Retrieve from cache if there - .list(); - if (list != null) { - return list.size(); - } - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); + Session session = HibernateFactory.getSession(); + List list = session.getNamedQuery("Org.numOfOrgAdmins") + .setParameter("org_id", this.getId()) + // Retrieve from cache if there + .list(); + if (list != null) { + return list.size(); } return 0; - } /** diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageEvrFactory.java b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageEvrFactory.java index 25e375f..9eaa9bd 100644 --- a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageEvrFactory.java +++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageEvrFactory.java @@ -19,7 +19,6 @@ import com.redhat.rhn.common.db.datasource.ModeFactory; import com.redhat.rhn.common.hibernate.HibernateFactory; import org.apache.log4j.Logger; -import org.hibernate.HibernateException; import org.hibernate.Session; import java.sql.Types; @@ -86,16 +85,9 @@ public class PackageEvrFactory { * @return the PackageEvr found */ public static PackageEvr lookupPackageEvrById(Long id) { - Session session = null; - try { - session = HibernateFactory.getSession(); - return (PackageEvr) session.getNamedQuery("PackageEvr.findById").setString( - "id", id.toString()).uniqueResult(); - } - catch (HibernateException he) { - log.error("Hibernate exception (PackageEvr): " + he.toString()); - } - return null; + Session session = HibernateFactory.getSession(); + return (PackageEvr) session.getNamedQuery("PackageEvr.findById").setString( + "id", id.toString()).uniqueResult(); } } diff --git a/java/code/src/com/redhat/rhn/domain/role/RoleFactory.java b/java/code/src/com/redhat/rhn/domain/role/RoleFactory.java index b2cf5eb..fc2a403 100644 --- a/java/code/src/com/redhat/rhn/domain/role/RoleFactory.java +++ b/java/code/src/com/redhat/rhn/domain/role/RoleFactory.java @@ -17,7 +17,6 @@ package com.redhat.rhn.domain.role; import com.redhat.rhn.common.hibernate.HibernateFactory; import org.apache.log4j.Logger; -import org.hibernate.HibernateException; import org.hibernate.Session; /** @@ -54,19 +53,12 @@ public class RoleFactory extends HibernateFactory { * @return the Role with the given id. */ public static Role lookupById(Long id) { - Session session = null; - try { - session = HibernateFactory.getSession(); - return (Role) session.getNamedQuery("Role.findById") - .setString("id", id.toString()) - //Retrieve from cache if there - .setCacheable(true) - .uniqueResult(); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session = HibernateFactory.getSession(); + return (Role) session.getNamedQuery("Role.findById") + .setString("id", id.toString()) + //Retrieve from cache if there + .setCacheable(true) + .uniqueResult(); } /** @@ -75,19 +67,12 @@ public class RoleFactory extends HibernateFactory { * @return statetype whose name matches the given name. */ public static Role lookupByLabel(String name) { - Session session = null; - try { - session = HibernateFactory.getSession(); - return (Role) session.getNamedQuery("Role.findByLabel") - .setString("label", name) - //Retrieve from cache if there - .setCacheable(true) - .uniqueResult(); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session = HibernateFactory.getSession(); + return (Role) session.getNamedQuery("Role.findByLabel") + .setString("label", name) + //Retrieve from cache if there + .setCacheable(true) + .uniqueResult(); } /** diff --git a/java/code/src/com/redhat/rhn/domain/satellite/CertificateFactory.java b/java/code/src/com/redhat/rhn/domain/satellite/CertificateFactory.java index 9e52ce4..b73c259 100644 --- a/java/code/src/com/redhat/rhn/domain/satellite/CertificateFactory.java +++ b/java/code/src/com/redhat/rhn/domain/satellite/CertificateFactory.java @@ -17,7 +17,6 @@ package com.redhat.rhn.domain.satellite; import com.redhat.rhn.common.hibernate.HibernateFactory; import org.apache.log4j.Logger; -import org.hibernate.HibernateException; /** * SatelliteFactory @@ -44,16 +43,10 @@ public class CertificateFactory extends HibernateFactory { * @return the newest versiono of the satellite's certificate */ public static SatelliteCertificate lookupNewestCertificate() { - try { - return (SatelliteCertificate) singleton.lookupObjectByNamedQuery( - "SatelliteCertificate.lookupNewestCertificate", - null, - false); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + return (SatelliteCertificate) singleton.lookupObjectByNamedQuery( + "SatelliteCertificate.lookupNewestCertificate", + null, + false); } } diff --git a/java/code/src/com/redhat/rhn/domain/satellite/SatelliteFactory.java b/java/code/src/com/redhat/rhn/domain/satellite/SatelliteFactory.java index 6fa05fe..ee0da4f 100644 --- a/java/code/src/com/redhat/rhn/domain/satellite/SatelliteFactory.java +++ b/java/code/src/com/redhat/rhn/domain/satellite/SatelliteFactory.java @@ -17,7 +17,6 @@ package com.redhat.rhn.domain.satellite; import com.redhat.rhn.common.hibernate.HibernateFactory; import org.apache.log4j.Logger; -import org.hibernate.HibernateException; /** * SatelliteFactory @@ -44,13 +43,7 @@ public class SatelliteFactory extends HibernateFactory { * @return the newest version of the satellite's certificate */ public static SatelliteCertificate lookupNewestCertificate() { - try { - return (SatelliteCertificate) singleton.lookupObjectByNamedQuery( - "SatelliteCertificate.lookupNewestCertificate", null, false); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + return (SatelliteCertificate) singleton.lookupObjectByNamedQuery( + "SatelliteCertificate.lookupNewestCertificate", null, false); } } diff --git a/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java b/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java index 36c8ac6..2ac9d88 100644 --- a/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java +++ b/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java @@ -31,7 +31,6 @@ import com.redhat.rhn.manager.system.UpdateBaseChannelCommand; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; -import org.hibernate.HibernateException; import org.hibernate.Session; import java.sql.Types; @@ -69,19 +68,12 @@ public class ServerFactory extends HibernateFactory { return null; } - Session session = null; - try { - session = HibernateFactory.getSession(); - return (CustomDataValue) session.getNamedQuery( - "CustomDataValue.findByServerAndKey").setEntity("server", - server).setEntity("key", key) - // Retrieve from cache if there - .setCacheable(true).uniqueResult(); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session = HibernateFactory.getSession(); + return (CustomDataValue) session.getNamedQuery( + "CustomDataValue.findByServerAndKey").setEntity("server", + server).setEntity("key", key) + // Retrieve from cache if there + .setCacheable(true).uniqueResult(); } /** @@ -325,19 +317,11 @@ public class ServerFactory extends HibernateFactory { * @return The ServerArch */ public static ServerArch lookupServerArchByLabel(String label) { - Session session = null; - try { - session = HibernateFactory.getSession(); - return (ServerArch) session.getNamedQuery("ServerArch.findByLabel") - .setString("label", label) - // Retrieve from cache if there - .setCacheable(true).uniqueResult(); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - - return null; + Session session = HibernateFactory.getSession(); + return (ServerArch) session.getNamedQuery("ServerArch.findByLabel") + .setString("label", label) + // Retrieve from cache if there + .setCacheable(true).uniqueResult(); } /** @@ -346,19 +330,11 @@ public class ServerFactory extends HibernateFactory { * @return The CPUArch */ public static CPUArch lookupCPUArchByName(String name) { - Session session = null; - try { - session = HibernateFactory.getSession(); - return (CPUArch) session.getNamedQuery("CPUArch.findByName") - .setString("name", name) - // Retrieve from cache if there - .setCacheable(true).uniqueResult(); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - - return null; + Session session = HibernateFactory.getSession(); + return (CPUArch) session.getNamedQuery("CPUArch.findByName") + .setString("name", name) + // Retrieve from cache if there + .setCacheable(true).uniqueResult(); } /** diff --git a/java/code/src/com/redhat/rhn/domain/session/WebSessionFactory.java b/java/code/src/com/redhat/rhn/domain/session/WebSessionFactory.java index b8774b5..c90a31f 100644 --- a/java/code/src/com/redhat/rhn/domain/session/WebSessionFactory.java +++ b/java/code/src/com/redhat/rhn/domain/session/WebSessionFactory.java @@ -18,7 +18,6 @@ import com.redhat.rhn.common.hibernate.HibernateFactory; import com.redhat.rhn.domain.user.User; import org.apache.log4j.Logger; -import org.hibernate.HibernateException; import org.hibernate.Query; import org.hibernate.Session; @@ -60,18 +59,8 @@ public class WebSessionFactory extends HibernateFactory { * @return the Session found */ public static WebSession lookupById(Long id) { - - Session session = null; - - try { - session = HibernateFactory.getSession(); - return (WebSession)session.get(WebSessionImpl.class, id); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - - return null; + Session session = HibernateFactory.getSession(); + return (WebSession)session.get(WebSessionImpl.class, id); } /** @@ -98,15 +87,10 @@ public class WebSessionFactory extends HibernateFactory { * @param user the user whose sessions are to be purged. */ public static void purgeUserSessions(User user) { - try { - Session session = HibernateFactory.getSession(); - Query query = session.getNamedQuery("WebSession.deleteByUserId"); - query.setParameter("user_id", user.getId()); - query.executeUpdate(); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } + Session session = HibernateFactory.getSession(); + Query query = session.getNamedQuery("WebSession.deleteByUserId"); + query.setParameter("user_id", user.getId()); + query.executeUpdate(); } } diff --git a/java/code/src/com/redhat/rhn/domain/task/TaskFactory.java b/java/code/src/com/redhat/rhn/domain/task/TaskFactory.java index 57cd66f..70c71f1 100644 --- a/java/code/src/com/redhat/rhn/domain/task/TaskFactory.java +++ b/java/code/src/com/redhat/rhn/domain/task/TaskFactory.java @@ -19,7 +19,6 @@ import com.redhat.rhn.domain.org.Org; import org.apache.log4j.Logger; import org.hibernate.Criteria; -import org.hibernate.HibernateException; import org.hibernate.Session; import org.hibernate.criterion.CriteriaSpecification; import org.hibernate.criterion.Order; @@ -82,19 +81,12 @@ public class TaskFactory extends HibernateFactory { * @return Returns the task that matches all three parameters or null. */ public static Task lookup(Org org, String name, Long data) { - Session session = null; - try { - session = HibernateFactory.getSession(); - return (Task) session.getNamedQuery("Task.lookup") - .setString("name", name) - .setLong("data", data.longValue()) - .setEntity("org", org) - .uniqueResult(); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session = HibernateFactory.getSession(); + return (Task) session.getNamedQuery("Task.lookup") + .setString("name", name) + .setLong("data", data.longValue()) + .setEntity("org", org) + .uniqueResult(); } /** @@ -103,18 +95,11 @@ public class TaskFactory extends HibernateFactory { * @return Returns a list of task objects */ public static List getTaskListByChannel(Org org) { - Session session = null; - try { - session = HibernateFactory.getSession(); - return session.getNamedQuery("Task.lookupByOrgAndName") - .setEntity("org", org) - .setString("name", "update_errata_cache_by_channel") - .list(); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session = HibernateFactory.getSession(); + return session.getNamedQuery("Task.lookupByOrgAndName") + .setEntity("org", org) + .setString("name", "update_errata_cache_by_channel") + .list(); } /** diff --git a/java/code/src/com/redhat/rhn/domain/user/UserFactory.java b/java/code/src/com/redhat/rhn/domain/user/UserFactory.java index fdb0843..0d8b965 100644 --- a/java/code/src/com/redhat/rhn/domain/user/UserFactory.java +++ b/java/code/src/com/redhat/rhn/domain/user/UserFactory.java @@ -31,7 +31,6 @@ import com.redhat.rhn.manager.session.SessionManager; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; -import org.hibernate.HibernateException; import org.hibernate.Query; import org.hibernate.Session; @@ -83,20 +82,13 @@ public class UserFactory extends HibernateFactory { * @return Returns the appropriate state (or null). */ private static State loadState(String label) { - Session session = null; - try { - session = HibernateFactory.getSession(); - State state = (State) session.getNamedQuery("UserState.lookupByLabel") - .setParameter("label", label) - //Retrieve from cache if there - .setCacheable(true) - .uniqueResult(); - return state; - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session = HibernateFactory.getSession(); + State state = (State) session.getNamedQuery("UserState.lookupByLabel") + .setParameter("label", label) + //Retrieve from cache if there + .setCacheable(true) + .uniqueResult(); + return state; } /** @@ -106,25 +98,19 @@ public class UserFactory extends HibernateFactory { * @return the responsible user (first org admin) of the org. */ public static User findResponsibleUser(Long orgId, Role r) { - Session session = null; - try { - session = HibernateFactory.getSession(); - Iterator itr = session.getNamedQuery("User.findResponsibleUser") - .setParameter("org_id", orgId) - .setParameter("type_id", r.getId()) - //Retrieve from cache if there - .list().iterator(); - if (itr.hasNext()) { - // only care about the first one - Object[] row = (Object[])itr.next(); - User u = createUser(); - u.setId((Long) row[0]); - u.setLogin((String)row[1]); - return u; - } - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); + Session session = HibernateFactory.getSession(); + Iterator itr = session.getNamedQuery("User.findResponsibleUser") + .setParameter("org_id", orgId) + .setParameter("type_id", r.getId()) + //Retrieve from cache if there + .list().iterator(); + if (itr.hasNext()) { + // only care about the first one + Object[] row = (Object[])itr.next(); + User u = createUser(); + u.setId((Long) row[0]); + u.setLogin((String)row[1]); + return u; } return null; } @@ -136,21 +122,15 @@ public class UserFactory extends HibernateFactory { */ public static User findRandomOrgAdmin(Org orgIn) { Role r = RoleFactory.ORG_ADMIN; - Session session = null; - try { - session = HibernateFactory.getSession(); - Iterator itr = session.getNamedQuery("User.findRandomOrgAdmin") - .setParameter("org_id", orgIn.getId()) - .setParameter("type_id", r.getId()) - //Retrieve from cache if there - .list().iterator(); - if (itr.hasNext()) { - // only care about the first one - return UserFactory.lookupById((Long)itr.next()); - } - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); + Session session = HibernateFactory.getSession(); + Iterator itr = session.getNamedQuery("User.findRandomOrgAdmin") + .setParameter("org_id", orgIn.getId()) + .setParameter("type_id", r.getId()) + //Retrieve from cache if there + .list().iterator(); + if (itr.hasNext()) { + // only care about the first one + return UserFactory.lookupById((Long)itr.next()); } return null; } @@ -194,16 +174,9 @@ public class UserFactory extends HibernateFactory { * @return the user found */ public static User lookupById(Long id) { - Session session = null; - try { - session = HibernateFactory.getSession(); - User u = (User)session.get(LegacyRhnUserImpl.class, id); - return u; - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session = HibernateFactory.getSession(); + User u = (User)session.get(LegacyRhnUserImpl.class, id); + return u; } @@ -520,19 +493,12 @@ public class UserFactory extends HibernateFactory { * @return TimeZone the requested time zone */ public static RhnTimeZone getTimeZone(int id) { - Session session = null; - try { - session = HibernateFactory.getSession(); - return (RhnTimeZone) session.getNamedQuery("RhnTimeZone.loadTimeZoneById") - .setInteger("tid", id) - //Retrieve from cache if there - .setCacheable(true) - .uniqueResult(); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session = HibernateFactory.getSession(); + return (RhnTimeZone) session.getNamedQuery("RhnTimeZone.loadTimeZoneById") + .setInteger("tid", id) + //Retrieve from cache if there + .setCacheable(true) + .uniqueResult(); } /** @@ -541,20 +507,13 @@ public class UserFactory extends HibernateFactory { * @return TimeZone the requested time zone */ public static RhnTimeZone getTimeZone(String olsonName) { - Session session = null; - try { - session = HibernateFactory.getSession(); - return (RhnTimeZone) session - .getNamedQuery("RhnTimeZone.loadTimeZoneByOlsonName") - .setString("ton", olsonName) - //Retrieve from cache if there - .setCacheable(true) - .uniqueResult(); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session = HibernateFactory.getSession(); + return (RhnTimeZone) session + .getNamedQuery("RhnTimeZone.loadTimeZoneByOlsonName") + .setString("ton", olsonName) + //Retrieve from cache if there + .setCacheable(true) + .uniqueResult(); } /** @@ -574,14 +533,8 @@ public class UserFactory extends HibernateFactory { //whereas the database is not. if (timeZoneList == null) { List timeZones = null; //temporary holding place until sorted - Session session = null; - try { - session = HibernateFactory.getSession(); - timeZones = session.getNamedQuery("RhnTimeZone.loadAll").list(); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } + Session session = HibernateFactory.getSession(); + timeZones = session.getNamedQuery("RhnTimeZone.loadAll").list(); //Now sort the timezones. American timezones come first as they are 'preferred' //All other timezones are sorted and placed after American ones. @@ -688,17 +641,9 @@ public class UserFactory extends HibernateFactory { public UserServerPreference lookupServerPreferenceByUserServerAndName(User user, Server server, String name) { - Session session = null; - try { - UserServerPreferenceId id = new UserServerPreferenceId(user, server, name); - session = HibernateFactory.getSession(); - return (UserServerPreference) session.get(UserServerPreference.class, id); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - - return null; + UserServerPreferenceId id = new UserServerPreferenceId(user, server, name); + Session session = HibernateFactory.getSession(); + return (UserServerPreference) session.get(UserServerPreference.class, id); } /** @@ -713,37 +658,30 @@ public class UserFactory extends HibernateFactory { Server server, String preferenceName, boolean value) { - Session session = null; - try { - UserServerPreferenceId id = new UserServerPreferenceId(user, - server, - preferenceName); - session = HibernateFactory.getSession(); - UserServerPreference usp = (UserServerPreference) - session.get(UserServerPreference.class, id); - - /* Here, we delete the preference's entry if it should be true. - * We would hopefully be ok setting the value to "1," but I'm emulating - * the Perl side here just to be safe - */ - if (value) { - if (usp != null) { - session.delete(usp); - } - } - else { - if (usp == null) { - id = new UserServerPreferenceId(user, server, preferenceName); - usp = new UserServerPreference(); - usp.setId(id); - usp.setValue("0"); - session.save(usp); - } + Session session = HibernateFactory.getSession(); + UserServerPreferenceId id = new UserServerPreferenceId(user, + server, + preferenceName); + UserServerPreference usp = (UserServerPreference) + session.get(UserServerPreference.class, id); + + /* Here, we delete the preference's entry if it should be true. + * We would hopefully be ok setting the value to "1," but I'm emulating + * the Perl side here just to be safe + */ + if (value) { + if (usp != null) { + session.delete(usp); } - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); + else { + if (usp == null) { + id = new UserServerPreferenceId(user, server, preferenceName); + usp = new UserServerPreference(); + usp.setId(id); + usp.setValue("0"); + session.save(usp); + } } } @@ -754,17 +692,10 @@ public class UserFactory extends HibernateFactory { * @return list of users. */ public List<User> findAllUsers(Org inOrg) { - Session session = null; - try { - session = HibernateFactory.getSession(); - Map<String, Object> params = new HashMap<String, Object>(); - params.put("org_id", inOrg.getId()); - return (List<User>)listObjectsByNamedQuery("User.findAllUsersByOrg", params); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session = HibernateFactory.getSession(); + Map<String, Object> params = new HashMap<String, Object>(); + params.put("org_id", inOrg.getId()); + return (List<User>)listObjectsByNamedQuery("User.findAllUsersByOrg", params); } /** @@ -774,17 +705,10 @@ public class UserFactory extends HibernateFactory { * @return list of users. */ public List<User> findAllOrgAdmins(Org inOrg) { - Session session = null; - try { - session = HibernateFactory.getSession(); - Map<String, Object> params = new HashMap<String, Object>(); - params.put("org_id", inOrg.getId()); - return (List<User>)listObjectsByNamedQuery("User.findAllOrgAdmins", params); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session = HibernateFactory.getSession(); + Map<String, Object> params = new HashMap<String, Object>(); + params.put("org_id", inOrg.getId()); + return (List<User>)listObjectsByNamedQuery("User.findAllOrgAdmins", params); } }

1 0

Changes to 'refs/tags/spacewalk-schema-0.6.11-1'
by John Matthews 25 Jun '09

25 Jun '09

Tag 'spacewalk-schema-0.6.11-1' created by John Matthews <jmatthew(a)redhat.com> at 2009-06-25 15:16 +0000 Tagging package [spacewalk-schema] version [0.6.11-1] in directory [schema/spacewalk/]. Changes since spacewalk-backend-0.6.14-1: John Matthews (1): Automatic commit of package [spacewalk-schema] release [0.6.11-1]. --- rel-eng/packages/spacewalk-schema | 2 +- schema/spacewalk/spacewalk-schema.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

rel-eng/packages schema/spacewalk
by John Matthews 25 Jun '09

25 Jun '09

rel-eng/packages/spacewalk-schema | 2 +- schema/spacewalk/spacewalk-schema.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit b2b5c1e02e182e79672115bbb9ac823fbcbb22ed Author: John Matthews <jmatthew(a)redhat.com> Date: Thu Jun 25 11:16:57 2009 -0400 Automatic commit of package [spacewalk-schema] release [0.6.11-1]. diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema index 5515c1a..35a7328 100644 --- a/rel-eng/packages/spacewalk-schema +++ b/rel-eng/packages/spacewalk-schema @@ -1 +1 @@ -0.6.10-1 schema/spacewalk/ +0.6.11-1 schema/spacewalk/ diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec index 3a3957f..31adf3b 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: 0.6.10 +Version: 0.6.11 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz @@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/spacewalk-schema-upgrade* %changelog +* Thu Jun 25 2009 John Matthews <jmatthew(a)redhat.com> 0.6.11-1 +- rebuild + * Thu Jun 25 2009 Milan Zazrivec <mzazrivec(a)redhat.com> 0.6.10-1 - 506272 - insert sub4v rows only if they do not exist - 431673 - reworking rhnServerNeededView for performance fixes.

1 0

Changes to 'refs/tags/spacewalk-backend-0.6.14-1'
by John Matthews 25 Jun '09

25 Jun '09

Tag 'spacewalk-backend-0.6.14-1' created by John Matthews <jmatthew(a)redhat.com> at 2009-06-25 15:09 +0000 Tagging package [spacewalk-backend] version [0.6.14-1] in directory [backend/]. Changes since spacewalk-backend-0.6.13-1: John Matthews (1): Automatic commit of package [spacewalk-backend] release [0.6.14-1]. Pradeep Kilambi (1): fixing indent error --- backend/common/rhnRepository.py | 2 +- backend/spacewalk-backend.spec | 4 ++-- rel-eng/packages/spacewalk-backend | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) ---

1 0

backend/spacewalk-backend.spec rel-eng/packages
by John Matthews 25 Jun '09

25 Jun '09

backend/spacewalk-backend.spec | 4 ++-- rel-eng/packages/spacewalk-backend | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 26846e62da3dc5c277e78f8b89a96de63eee9ef7 Author: John Matthews <jmatthew(a)redhat.com> Date: Thu Jun 25 11:09:58 2009 -0400 Automatic commit of package [spacewalk-backend] release [0.6.14-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 363b0e6..350d207 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.13 +Version: 0.6.14 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -568,7 +568,7 @@ rm -f %{rhnconf}/rhnSecret.py* # $Id$ %changelog -* Thu Jun 25 2009 John Matthews <jmatthew(a)redhat.com> 0.6.13-1 +* Thu Jun 25 2009 John Matthews <jmatthew(a)redhat.com> 0.6.14-1 - change comments to docstrings (msuchy(a)redhat.com) - 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 fc0fa73..f4be8cc 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -0.6.13-1 backend/ +0.6.14-1 backend/

1 0

backend/common
by Pradeep Kilambi 25 Jun '09

25 Jun '09

backend/common/rhnRepository.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2d5fd4346ea458a8d5371387106e32fb533c038b Author: Pradeep Kilambi <pkilambi(a)redhat.com> Date: Thu Jun 25 11:14:20 2009 -0400 fixing indent error diff --git a/backend/common/rhnRepository.py b/backend/common/rhnRepository.py index fabb781..85e0408 100644 --- a/backend/common/rhnRepository.py +++ b/backend/common/rhnRepository.py @@ -106,7 +106,7 @@ class Repository(RPC_Base): if redirectsSupported: log_debug(3, "Client supports redirects.") - filePath = self.getPackagePath(pkg_spec, 1) + filePath = self.getPackagePath(pkg_spec, 1) else: #older clients just return the hosted url and download the package filePath = self.getPackagePath(pkg_spec)

1 0

Changes to 'refs/tags/spacewalk-backend-0.6.13-1'
by John Matthews 25 Jun '09

25 Jun '09

Tag 'spacewalk-backend-0.6.13-1' created by John Matthews <jmatthew(a)redhat.com> at 2009-06-25 14:52 +0000 Tagging package [spacewalk-backend] version [0.6.13-1] in directory [backend/]. Changes since spacewalk-backend-0.6.12-1: John Matthews (1): Automatic commit of package [spacewalk-backend] release [0.6.13-1]. --- backend/spacewalk-backend.spec | 4 ++-- rel-eng/packages/spacewalk-backend | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---

1 0

Changes to 'refs/tags/spacewalk-backend-0.6.12-1'
by John Matthews 25 Jun '09

25 Jun '09

Tag 'spacewalk-backend-0.6.12-1' created by John Matthews <jmatthew(a)redhat.com> at 2009-06-25 14:52 +0000 Tagging package [spacewalk-backend] version [0.6.12-1] in directory [backend/]. Changes since spacewalk-setup-0.6.9-1: Devan Goodwin (2): Fix server migration when source org has > 1000 org admins. Fix mod_jk failure to load. John Matthews (1): Automatic commit of package [spacewalk-backend] release [0.6.12-1]. Milan Zazrivec (1): 508064 - fix osad installation errors on client --- backend/spacewalk-backend.spec | 58 +++++++++- client/tools/osad/osad.spec | 2 java/code/src/com/redhat/rhn/domain/user/UserFactory.java | 42 +++++-- java/code/src/com/redhat/rhn/frontend/xmlrpc/org/test/OrgHandlerTest.java | 1 java/code/src/com/redhat/rhn/manager/org/MigrationManager.java | 6 - rel-eng/packages/spacewalk-backend | 2 spacewalk/config/etc/httpd/conf.d/00-spacewalk-mod_jk.conf | 4 spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf | 4 8 files changed, 100 insertions(+), 19 deletions(-) ---

1 0

2 commits - backend/spacewalk-backend.spec rel-eng/packages
by John Matthews 25 Jun '09

25 Jun '09

backend/spacewalk-backend.spec | 58 ++++++++++++++++++++++++++++++++++++- rel-eng/packages/spacewalk-backend | 2 - 2 files changed, 58 insertions(+), 2 deletions(-) New commits: commit 7cc7272605a1dc0dbc58e9135fba4f23eea7b0f3 Author: John Matthews <jmatthew(a)redhat.com> Date: Thu Jun 25 10:52:38 2009 -0400 Automatic commit of package [spacewalk-backend] release [0.6.13-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index c79cddc..363b0e6 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.12 +Version: 0.6.13 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -568,7 +568,7 @@ rm -f %{rhnconf}/rhnSecret.py* # $Id$ %changelog -* Thu Jun 25 2009 John Matthews <jmatthew(a)redhat.com> 0.6.12-1 +* Thu Jun 25 2009 John Matthews <jmatthew(a)redhat.com> 0.6.13-1 - change comments to docstrings (msuchy(a)redhat.com) - 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 08b83df..fc0fa73 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -0.6.12-1 backend/ +0.6.13-1 backend/ commit d10cf68f0d7d348423d47f1f5d5c7520c9aaf7d2 Author: John Matthews <jmatthew(a)redhat.com> Date: Thu Jun 25 10:52:36 2009 -0400 Automatic commit of package [spacewalk-backend] release [0.6.12-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index f6f334c..c79cddc 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.11 +Version: 0.6.12 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -568,6 +568,62 @@ rm -f %{rhnconf}/rhnSecret.py* # $Id$ %changelog +* Thu Jun 25 2009 John Matthews <jmatthew(a)redhat.com> 0.6.12-1 +- change comments to docstrings (msuchy(a)redhat.com) +- change comments to docstrings (msuchy(a)redhat.com) +- change comments to docstrings (msuchy(a)redhat.com) +- change comments to docstrings (msuchy(a)redhat.com) +- change comments to docstrings (msuchy(a)redhat.com) +- change comments to docstrings (msuchy(a)redhat.com) +- change comments to docstrings (msuchy(a)redhat.com) +- change comments to docstrings (msuchy(a)redhat.com) +- change comments to docstrings (msuchy(a)redhat.com) +- change comments to docstrings (msuchy(a)redhat.com) +- 499723 - accept follow-redirects with value greater then 2 + (msuchy(a)redhat.com) +- change comments to docstrings (msuchy(a)redhat.com) +- change comments to docstrings (msuchy(a)redhat.com) +- 507867 - Schedule repo gen once the channel package associations is complete + (pkilambi(a)redhat.com) +- 505680 - channel_product_id is computed based on the name, product and + version so it will not match the cache as cache is always None. Also dont + update the channel_product_id uless the id is different from whats being + updated (pkilambi(a)redhat.com) +- Update HACKING file for backend test instructions. (dgoodwin(a)redhat.com) +- Integrate some PostgreSQL rhnSQL driver unit tests. (dgoodwin(a)redhat.com) +- First cut of a unit test framework for Python backend. (dgoodwin(a)redhat.com) +- 507593 - fixing eus registration tracebacks (pkilambi(a)redhat.com) +- Adding repodata details for a given channel to channelDetails page. + (pkilambi(a)redhat.com) +- Revert "503090 - Exclude rhnlib from kickstart profile sync." + (dgoodwin(a)redhat.com) +- remove short package dependency on rpms. User might wanna skip the rpms and + still import metadata. (pkilambi(a)redhat.com) +- 422611 - Warn that satrm.py is not a supported script. (dgoodwin(a)redhat.com) +- fixing the unsubscriptable object error when package is not yet in rhnPackage + table (pkilambi(a)redhat.com) +- 506264 - This commit includes: (pkilambi(a)redhat.com) +- 505680 - When satsync tries to do an import it compares whats in cache to db + and tries to import only new content, but since the last_modified date always + differ we end up updating the rhnChannel table even when there is nothing to + sync. Adding last_modified to ignore keys list so that we dont decide the + diff based on this field. We still continue to compare the rest of the + fields. (pkilambi(a)redhat.com) +- 495790 - force uploading a package ends up with duplicate entries in + rhnPackage table. This is because we use md5sum along with name, evr, package + arch and org as a primary key while deciding whether to perform an insert or + an update. Since the solaris packages had same nvrea and org and different + md5 sums it was doing an insert instead of update on the existing row. Fixed + the schema wrapper to only use md5sum as a primary key if nvrea feature is + enabled. Also fixed the package uniquifies to use md5sum only for nvrea. + (pkilambi(a)redhat.com) +- Catch the systemExit and preserve the error code. Also fixing the traceback + issue when db is not accessible (pkilambi(a)redhat.com) +- removing bugzilla handler specific tests (pkilambi(a)redhat.com) +- 502581 - splitting the data to smaller chunks to please cx_oracle to avoid + throwing array too big errors (pkilambi(a)redhat.com) +- 503090 - Exclude rhnlib from kickstart profile sync. (dgoodwin(a)redhat.com) + * Fri Jun 05 2009 jesus m. rodriguez <jesusr(a)redhat.com> 0.6.11-1 - fixing duplicate entries in repogen tables and other clean aup (pkilambi(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index f1b09da..08b83df 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -0.6.11-1 backend/ +0.6.12-1 backend/

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
62
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits June 2009