java/code/src/com/redhat/rhn/domain/monitoring/config/ConfigMacro.hbm.xml | 2 - java/code/src/com/redhat/rhn/domain/monitoring/config/ConfigMacro.java | 20 +--------- java/code/src/com/redhat/rhn/domain/monitoring/config/test/MonitoringConfigTest.java | 3 - java/spacewalk-java.spec | 15 +++++++ rel-eng/packages/spacewalk-java | 2 - 5 files changed, 18 insertions(+), 24 deletions(-)
New commits: commit 4a2f34c78c94fb68fc97b98acf8fc2709421cf8c Author: Miroslav Suchý msuchy@redhat.com Date: Thu Oct 1 17:42:23 2009 +0200
Automatic commit of package [spacewalk-java] release [0.7.7-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index b3f4d10..f1317f0 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -12,7 +12,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 0.7.6 +Version: 0.7.7 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -280,6 +280,19 @@ fi %{jardir}/postgresql-jdbc.jar
%changelog +* Thu Oct 1 2009 Miroslav Suchý msuchy@redhat.com 0.7.7-1 +- 476851 - removing column "ENVIRONMENT" from ConfigMacro +- workaround for hibernate not handling in caluses of more than 1000 jsherril@redhat.com +- 523673 - generate repomd for zstreams too +- adding workaround for hibernate oddity/bug jsherril@redhat.com +- checkstyle fixes jsherril@redhat.com +- 525549 - fixing issue where SSM package operations would run out of memory jsherril@redhat.com +- adding script to help diagnose spacewalk-cobbler login issues jsherril@redhat.com +- Fix audit machine listing/paginatio joshua.roys@gtri.gatech.edu +- Make reviewing empty audit sections possible joshua.roys@gtri.gatech.edu +- Display 'File Type' as 'Symlink' in file details joshua.roys@gtri.gatech.edu +- 523926 - fixing issue with schedule event package list not paginating properly jsherril@redhat.com + * Thu Sep 17 2009 Miroslav Suchý msuchy@redhat.com 0.7.6-1 - 523631 - Files in /etc/rhn/default should not be "noreplace" - fixing broken path in eclipse classpath generation diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index b8448b8..30ef3a5 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -0.7.6-1 java/ +0.7.7-1 java/
commit 372587c40d5935948aa3632ddd0beec068244ee2 Author: Miroslav Suchý msuchy@redhat.com Date: Thu Oct 1 17:41:27 2009 +0200
476851 - removing column "ENVIRONMENT" from ConfigMacro
diff --git a/java/code/src/com/redhat/rhn/domain/monitoring/config/ConfigMacro.hbm.xml b/java/code/src/com/redhat/rhn/domain/monitoring/config/ConfigMacro.hbm.xml index b06f3ec..45b98b6 100644 --- a/java/code/src/com/redhat/rhn/domain/monitoring/config/ConfigMacro.hbm.xml +++ b/java/code/src/com/redhat/rhn/domain/monitoring/config/ConfigMacro.hbm.xml @@ -6,8 +6,6 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" <class name="com.redhat.rhn.domain.monitoring.config.ConfigMacro" table="rhn_config_macro" > <composite-id> - <key-property name="environment" type="string" - column="environment"/> <key-property name="name" type="string" column="name"/> </composite-id> <property name="definition" column="definition" type="string" length="255" /> diff --git a/java/code/src/com/redhat/rhn/domain/monitoring/config/ConfigMacro.java b/java/code/src/com/redhat/rhn/domain/monitoring/config/ConfigMacro.java index 0fc1f79..74da560 100644 --- a/java/code/src/com/redhat/rhn/domain/monitoring/config/ConfigMacro.java +++ b/java/code/src/com/redhat/rhn/domain/monitoring/config/ConfigMacro.java @@ -26,28 +26,12 @@ import java.util.Date; */ public class ConfigMacro implements Serializable {
- private String environment; private String name; private String definition; private String description; private String editable; private String lastUpdateUser; private Date lastUpdateDate; - /** - * Getter for environment - * @return String to get - */ - public String getEnvironment() { - return this.environment; - } - - /** - * Setter for environment - * @param environmentIn to set - */ - public void setEnvironment(String environmentIn) { - this.environment = environmentIn; - }
/** * Getter for name @@ -149,7 +133,7 @@ public class ConfigMacro implements Serializable { * {@inheritDoc} */ public int hashCode() { - return new HashCodeBuilder().append(environment).append(name) + return new HashCodeBuilder().append(name) .toHashCode(); }
@@ -161,7 +145,7 @@ public class ConfigMacro implements Serializable { return false; } ConfigMacro castOther = (ConfigMacro) other; - return new EqualsBuilder().append(environment, castOther.environment) + return new EqualsBuilder() .append(name, castOther.name).isEquals(); }
diff --git a/java/code/src/com/redhat/rhn/domain/monitoring/config/test/MonitoringConfigTest.java b/java/code/src/com/redhat/rhn/domain/monitoring/config/test/MonitoringConfigTest.java index e3f3f69..84a1d5e 100644 --- a/java/code/src/com/redhat/rhn/domain/monitoring/config/test/MonitoringConfigTest.java +++ b/java/code/src/com/redhat/rhn/domain/monitoring/config/test/MonitoringConfigTest.java @@ -44,11 +44,10 @@ public class MonitoringConfigTest extends RhnBaseTestCase { cr.setLastUpdateUser(user.getLogin()); MonitoringConfigFactory.saveConfigMacro(cr); String name = cr.getName(); - String env = cr.getEnvironment(); flushAndEvict(cr); cr = (ConfigMacro) TestUtils.lookupTestObject( "from com.redhat.rhn.domain.monitoring.config.ConfigMacro c where " + - "c.name = '" + name + "' and c.environment = '" + env + "'"); + "c.name = '" + name + "'"); assertTrue(cr.getLastUpdateUser().equals(user.getLogin()));
}
spacewalk-commits@lists.fedorahosted.org