java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 21 ++++++++++++++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 21 insertions(+), 2 deletions(-)
New commits:
commit ca1b04dde4ae63779c4dc7a7d0e0c0a4e8170ab8
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Apr 10 14:57:29 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.39-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 62359bc..a1d852b 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -22,7 +22,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.38
+Version: 1.8.39
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -605,6 +605,25 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Apr 10 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.39-1
+- fix ServerConfigHandlerTest revision comparism (tlestach(a)redhat.com)
+- fix ServerConfigHandlerTest.createRevision (tlestach(a)redhat.com)
+- tests - set user's org to the channel created by him (tlestach(a)redhat.com)
+- fix ProfileManagerTest (tlestach(a)redhat.com)
+- fix org.trusts.getDetails API (tlestach(a)redhat.com)
+- check whether it's a trusted org before accessing its attributes
+ (tlestach(a)redhat.com)
+- fix ActivationKeyTest.testDuplicateKeyCreation (tlestach(a)redhat.com)
+- fix TraceBackEventTest (tlestach(a)redhat.com)
+- fix SessionCancelActionTest (tlestach(a)redhat.com)
+- run oracle specific tests only with oracle DB (tlestach(a)redhat.com)
+- fix AdvDataSourceTest suite part (tlestach(a)redhat.com)
+- fix CobblerCommandTest (tlestach(a)redhat.com)
+- refactor how PackageEvr gets stored (tlestach(a)redhat.com)
+- removing unnecessary casts (tlestach(a)redhat.com)
+- removing unnecessary else statement (tlestach(a)redhat.com)
+- fix ProvisionVirtualizationWizardActionTest.testStepOne (tlestach(a)redhat.com)
+
* Tue Apr 10 2012 Jan Pazdziora 1.8.38-1
- OpenSCAP integration -- view latest results of whole infrastructure
(slukasik(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 8ce821e..11a2815 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.38-1 java/
+1.8.39-1 java/
12 years, 1 month
17 commits - java/code schema/spacewalk
by Tomas Lestach
java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java | 184 +++++-----
java/code/src/com/redhat/rhn/domain/action/ActionFactory.java | 2
java/code/src/com/redhat/rhn/domain/channel/test/ChannelFactoryTest.java | 2
java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java | 2
java/code/src/com/redhat/rhn/domain/org/OrgFactory.java | 8
java/code/src/com/redhat/rhn/domain/rhnpackage/PackageEvrFactory.java | 34 +
java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageEvrFactoryTest.java | 2
java/code/src/com/redhat/rhn/domain/server/ProxyInfo.java | 2
java/code/src/com/redhat/rhn/domain/server/SatelliteServer.java | 2
java/code/src/com/redhat/rhn/domain/server/ServerFactory.java | 2
java/code/src/com/redhat/rhn/domain/token/test/ActivationKeyTest.java | 13
java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgTrustDetailsAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/systems/audit/RuleDetailsAction.java | 4
java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/kickstart/test/SessionCancelActionTest.java | 3
java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/test/ProvisionVirtualizationWizardActionTest.java | 2
java/code/src/com/redhat/rhn/frontend/events/TraceBackEvent.java | 2
java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/test/ErrataHandlerTest.java | 2
java/code/src/com/redhat/rhn/frontend/xmlrpc/org/trusts/OrgTrustHandler.java | 8
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/test/ServerConfigHandlerTest.java | 7
java/code/src/com/redhat/rhn/manager/audit/ScapManager.java | 4
java/code/src/com/redhat/rhn/manager/errata/cache/test/ErrataCacheManagerTest.java | 4
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/test/CobblerCommandTest.java | 4
java/code/src/com/redhat/rhn/manager/org/OrgManager.java | 20 -
java/code/src/com/redhat/rhn/manager/profile/test/ProfileManagerTest.java | 5
java/code/src/com/redhat/rhn/manager/rhnpackage/test/PackageManagerTest.java | 2
java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java | 2
java/code/src/com/redhat/rhn/testing/ServerTestUtils.java | 3
schema/spacewalk/postgres/procs/lookup_transaction_package.sql | 2
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/021-lookup_transaction_package.sql.oracle | 1
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/021-lookup_transaction_package.sql.postgresql | 80 ++++
30 files changed, 274 insertions(+), 136 deletions(-)
New commits:
commit ecb8ebef9c8bf6756917583120a0603728b2cb3c
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Apr 6 16:36:35 2012 +0200
fix ServerConfigHandlerTest revision comparism
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/test/ServerConfigHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/test/ServerConfigHandlerTest.java
index 84b0fe4..e3482a6 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/test/ServerConfigHandlerTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/test/ServerConfigHandlerTest.java
@@ -277,9 +277,8 @@ public class ServerConfigHandlerTest extends BaseHandlerTestCase {
boolean lookLocal) {
List<String> paths = new ArrayList<String>(1);
paths.add(path);
- assertEquals(rev, handler.lookupFileInfo(adminKey,
- server.getId().intValue(),
- paths, lookLocal).get(0));
+ assertTrue(rev.matches(handler.lookupFileInfo(adminKey, server.getId().intValue(),
+ paths, lookLocal).get(0)));
}
public void testLookupFileInfoNoData() throws Exception {
commit 473f303f6162451422f4a10554af6485b5ad559d
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Apr 6 16:36:13 2012 +0200
fix ServerConfigHandlerTest.createRevision
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/test/ServerConfigHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/test/ServerConfigHandlerTest.java
index cec652a..84b0fe4 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/test/ServerConfigHandlerTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/test/ServerConfigHandlerTest.java
@@ -197,7 +197,6 @@ public class ServerConfigHandlerTest extends BaseHandlerTestCase {
Server server, boolean commitToLocal, String selinuxCtx)
throws ValidatorException {
Map <String, Object> data = new HashMap<String, Object>();
- data.put("contents", contents);
data.put(ConfigRevisionSerializer.GROUP, group);
data.put(ConfigRevisionSerializer.OWNER, owner);
data.put(ConfigRevisionSerializer.PERMISSIONS, perms);
@@ -205,6 +204,7 @@ public class ServerConfigHandlerTest extends BaseHandlerTestCase {
String start = "#@";
String end = "@#";
if (!isDir) {
+ data.put(ConfigRevisionSerializer.CONTENTS, contents);
data.put(ConfigRevisionSerializer.MACRO_START, start);
data.put(ConfigRevisionSerializer.MACRO_END, end);
}
commit d018e99c137388f3bcd9072586e52da5b682d56a
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Apr 6 16:17:35 2012 +0200
tests - set user's org to the channel created by him
diff --git a/java/code/src/com/redhat/rhn/domain/channel/test/ChannelFactoryTest.java b/java/code/src/com/redhat/rhn/domain/channel/test/ChannelFactoryTest.java
index 98524bc..b0f195f 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/test/ChannelFactoryTest.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/test/ChannelFactoryTest.java
@@ -80,7 +80,7 @@ public class ChannelFactoryTest extends RhnBaseTestCase {
public static Channel createBaseChannel(User user) throws Exception {
Channel c = createTestChannel(user);
- c.setOrg(null);
+ c.setOrg(user.getOrg());
ProductName pn = lookupOrCreateProductName(ChannelManager.RHEL_PRODUCT_NAME);
c.setProductName(pn);
commit 1d000e6df1af8c8fc1ff9b8b9b4807129e70d064
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Apr 6 15:43:38 2012 +0200
fix ProfileManagerTest
diff --git a/java/code/src/com/redhat/rhn/manager/profile/test/ProfileManagerTest.java b/java/code/src/com/redhat/rhn/manager/profile/test/ProfileManagerTest.java
index a0526c9..93b51d5 100644
--- a/java/code/src/com/redhat/rhn/manager/profile/test/ProfileManagerTest.java
+++ b/java/code/src/com/redhat/rhn/manager/profile/test/ProfileManagerTest.java
@@ -21,6 +21,8 @@ import com.redhat.rhn.domain.channel.ChannelFactory;
import com.redhat.rhn.domain.channel.NoBaseChannelFoundException;
import com.redhat.rhn.domain.channel.test.ChannelFactoryTest;
import com.redhat.rhn.domain.rhnpackage.Package;
+import com.redhat.rhn.domain.rhnpackage.PackageArch;
+import com.redhat.rhn.domain.rhnpackage.PackageFactory;
import com.redhat.rhn.domain.rhnpackage.profile.Profile;
import com.redhat.rhn.domain.rhnpackage.test.PackageTest;
import com.redhat.rhn.domain.rhnset.RhnSet;
@@ -439,6 +441,9 @@ public class ProfileManagerTest extends RhnBaseTestCase {
pli.setIdCombo(nameId + "|" + evrString.hashCode());
pli.setEvr(evrString);
pli.setNameId(new Long(nameId));
+ PackageArch pa = PackageFactory.lookupPackageArchByLabel("x86_64");
+ pli.setArch(pa.getLabel());
+ pli.setArchId(pa.getId());
return pli;
}
commit 7d5b103704271058cef3ec9c605f3daee85fa6bc
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Apr 6 15:43:24 2012 +0200
fix PG lookup_transaction_package stored procedure
causes syntax errors
diff --git a/schema/spacewalk/postgres/procs/lookup_transaction_package.sql b/schema/spacewalk/postgres/procs/lookup_transaction_package.sql
index 599d209..f07a703 100644
--- a/schema/spacewalk/postgres/procs/lookup_transaction_package.sql
+++ b/schema/spacewalk/postgres/procs/lookup_transaction_package.sql
@@ -62,7 +62,7 @@ begin
perform pg_dblink_exec(
'insert into rhnTransactionPackage (id, operation, name_id, evr_id, package_arch_id)' ||
' values (' || tp_id || ', ' || o_id || ', ' || n_id || ', ' || e_id ||
- ', ' || ', ' || p_arch_id || ')');
+ ', ' || p_arch_id || ')');
exception when unique_violation then
select id
into strict tp_id
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/021-lookup_transaction_package.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/021-lookup_transaction_package.sql.oracle
new file mode 100644
index 0000000..cf2393b
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/021-lookup_transaction_package.sql.oracle
@@ -0,0 +1 @@
+-- This file has intentionally been left empty.
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/021-lookup_transaction_package.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/021-lookup_transaction_package.sql.postgresql
new file mode 100644
index 0000000..e498de2
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/021-lookup_transaction_package.sql.postgresql
@@ -0,0 +1,80 @@
+-- oracle equivalent source sha1 b04dab2ff31049a8744e5ce1531ccd8b00152bbc
+--
+-- Copyright (c) 2008--2012 Red Hat, Inc.
+--
+-- This software is licensed to you under the GNU General Public License,
+-- version 2 (GPLv2). There is NO WARRANTY for this software, express or
+-- implied, including the implied warranties of MERCHANTABILITY or FITNESS
+-- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+-- along with this software; if not, see
+-- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+--
+-- Red Hat trademarks are not licensed under GPLv2. No permission is
+-- granted to use or replicate Red Hat trademarks that are incorporated
+-- in this software or its documentation.
+
+create or replace function
+lookup_transaction_package(
+ o_in in varchar,
+ n_in in varchar,
+ e_in in varchar,
+ v_in in varchar,
+ r_in in varchar,
+ a_in in varchar)
+returns numeric
+as
+$$
+declare
+ o_id numeric;
+ n_id numeric;
+ e_id numeric;
+ p_arch_id numeric;
+ tp_id numeric;
+begin
+ select id
+ into o_id
+ from rhnTransactionOperation
+ where label = o_in;
+
+ if not found then
+ perform rhn_exception.raise_exception('invalid_transaction_operation');
+ end if;
+
+ n_id := lookup_package_name(n_in);
+ e_id := lookup_evr(e_in, v_in, r_in);
+ p_arch_id := null;
+
+ if a_in is not null then
+ p_arch_id := lookup_package_arch(a_in);
+ end if;
+
+ select id
+ into tp_id
+ from rhnTransactionPackage
+ where operation = o_id and
+ name_id = n_id and
+ evr_id = e_id and
+ (package_arch_id = p_arch_id or (p_arch_id is null and package_arch_id is null));
+
+ if not found then
+ tp_id := nextval('rhn_transpack_id_seq');
+ begin
+ perform pg_dblink_exec(
+ 'insert into rhnTransactionPackage (id, operation, name_id, evr_id, package_arch_id)' ||
+ ' values (' || tp_id || ', ' || o_id || ', ' || n_id || ', ' || e_id ||
+ ', ' || p_arch_id || ')');
+ exception when unique_violation then
+ select id
+ into strict tp_id
+ from rhnTransactionPackage
+ where operation = o_id and
+ name_id = n_id and
+ evr_id = e_id and
+ (package_arch_id = p_arch_id or (p_arch_id is null and package_arch_id is null));
+ end;
+ end if;
+
+ return tp_id;
+end;
+$$
+language plpgsql immutable;
commit 8fdcf1790c9f2a2110ded070b40d158111c5d6b0
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Apr 6 14:27:39 2012 +0200
fix org.trusts.getDetails API
and appropriate test
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 9d78de8..19ff56c 100644
--- a/java/code/src/com/redhat/rhn/domain/org/OrgFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/org/OrgFactory.java
@@ -19,7 +19,6 @@ import com.redhat.rhn.common.db.datasource.DataList;
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.common.localization.LocalizationService;
import com.redhat.rhn.domain.channel.ChannelFamily;
import com.redhat.rhn.domain.role.RoleFactory;
@@ -417,15 +416,14 @@ public class OrgFactory extends HibernateFactory {
/**
* @param org Our org
* @param trustedOrg the org we trust
- * @return Formated created String for Trusted Org
+ * @return date created for Trusted Org
*/
- public static String getTrustedSince(Long org, Long trustedOrg) {
+ public static Date getTrustedSince(Long org, Long trustedOrg) {
Map<String, Object> params = new HashMap<String, Object>();
params.put("org_id", org);
params.put("trusted_org_id", trustedOrg);
- Date date = (Date)singleton.lookupObjectByNamedQuery(
+ return (Date)singleton.lookupObjectByNamedQuery(
"Org.getTrustedSince", params);
- return LocalizationService.getInstance().formatDate(date);
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgTrustDetailsAction.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgTrustDetailsAction.java
index 5035157..9a79778 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgTrustDetailsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgTrustDetailsAction.java
@@ -53,7 +53,7 @@ public class OrgTrustDetailsAction extends RhnAction {
String created = LocalizationService.getInstance()
.formatDate(trustOrg.getCreated());
- String since = OrgManager.getTrustedSince(user, org, trustOrg);
+ String since = OrgManager.getTrustedSinceString(user, org, trustOrg);
request.setAttribute("orgtrust", trustOrg.getName());
request.setAttribute("created", created);
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/trusts/OrgTrustHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/trusts/OrgTrustHandler.java
index c3b7dcb..8eab378 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/trusts/OrgTrustHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/trusts/OrgTrustHandler.java
@@ -202,10 +202,9 @@ public class OrgTrustHandler extends BaseHandler {
details.put("created", trustOrg.getCreated());
}
- String since = OrgManager.getTrustedSince(user, user.getOrg(), trustOrg);
+ Date since = OrgManager.getTrustedSince(user, user.getOrg(), trustOrg);
if (since != null) {
- Date dateSince = new Date(since);
- details.put("trusted_since", dateSince);
+ details.put("trusted_since", since);
}
details.put("channels_provided",
OrgManager.getSharedChannels(user, trustOrg, user.getOrg()));
diff --git a/java/code/src/com/redhat/rhn/manager/org/OrgManager.java b/java/code/src/com/redhat/rhn/manager/org/OrgManager.java
index 52f34c1..c06d8da 100644
--- a/java/code/src/com/redhat/rhn/manager/org/OrgManager.java
+++ b/java/code/src/com/redhat/rhn/manager/org/OrgManager.java
@@ -38,6 +38,7 @@ import com.redhat.rhn.manager.entitlement.EntitlementManager;
import java.util.Collections;
import java.util.Comparator;
+import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -334,9 +335,9 @@ public class OrgManager extends BaseManager {
* @param user currently logged in user
* @param org our org
* @param trustOrg the org we trust
- * @return String representing date we started trusting this org
+ * @return date we started trusting this org
*/
- public static String getTrustedSince(User user, Org org, Org trustOrg) {
+ public static Date getTrustedSince(User user, Org org, Org trustOrg) {
if (!user.hasRole(RoleFactory.ORG_ADMIN)) {
// Throw an exception w/error msg so the user knows what went wrong.
LocalizationService ls = LocalizationService.getInstance();
@@ -353,6 +354,21 @@ public class OrgManager extends BaseManager {
/**
* Returns the date which this org trusted the supplied orgId
* @param user currently logged in user
+ * @param org our org
+ * @param trustOrg the org we trust
+ * @return String representing date we started trusting this org
+ */
+ public static String getTrustedSinceString(User user, Org org, Org trustOrg) {
+ Date since = getTrustedSince(user, org, trustOrg);
+ if (since == null) {
+ return null;
+ }
+ return LocalizationService.getInstance().formatDate(since);
+ }
+
+ /**
+ * Returns the date which this org trusted the supplied orgId
+ * @param user currently logged in user
* @param orgTo Org to calculate the number of System migrations to
* @param orgFrom Org to calculate the number of System migrations from
* @return number of systems migrated to OrgIn
commit b1fcf685e6307e667a3c91e63172d611d69668d7
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Apr 6 14:20:19 2012 +0200
check whether it's a trusted org before accessing its attributes
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/trusts/OrgTrustHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/trusts/OrgTrustHandler.java
index 5687288..c3b7dcb 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/trusts/OrgTrustHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/trusts/OrgTrustHandler.java
@@ -192,6 +192,9 @@ public class OrgTrustHandler extends BaseHandler {
if (trustOrg == null) {
throw new NoSuchOrgException(trustOrgId.toString());
}
+ if (!user.getOrg().getTrustedOrgs().contains(trustOrg)) {
+ throw new OrgNotInTrustException(trustOrgId);
+ }
Map<String, Object> details = new HashMap<String, Object>();
commit 02a7282c4477fe07e5e2a103f7fc0742a93e1f08
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Apr 6 13:22:13 2012 +0200
fix ActivationKeyTest.testDuplicateKeyCreation
diff --git a/java/code/src/com/redhat/rhn/domain/token/test/ActivationKeyTest.java b/java/code/src/com/redhat/rhn/domain/token/test/ActivationKeyTest.java
index c624955..742696f 100644
--- a/java/code/src/com/redhat/rhn/domain/token/test/ActivationKeyTest.java
+++ b/java/code/src/com/redhat/rhn/domain/token/test/ActivationKeyTest.java
@@ -14,6 +14,7 @@
*/
package com.redhat.rhn.domain.token.test;
+import com.redhat.rhn.common.validator.ValidatorError;
import com.redhat.rhn.common.validator.ValidatorException;
import com.redhat.rhn.domain.channel.Channel;
import com.redhat.rhn.domain.channel.test.ChannelFactoryTest;
@@ -39,8 +40,6 @@ import com.redhat.rhn.testing.ServerGroupTestUtils;
import com.redhat.rhn.testing.TestUtils;
import com.redhat.rhn.testing.UserTestUtils;
-import org.hibernate.NonUniqueObjectException;
-
import java.util.List;
/**
@@ -234,8 +233,14 @@ public class ActivationKeyTest extends BaseTestCaseWithUser {
String msg = "Duplicate Key exception not raised..";
fail(msg);
}
- catch (NonUniqueObjectException e) {
- //sweet duplicate object exception
+ catch (ValidatorException e) {
+ for (ValidatorError er : e.getResult().getErrors()) {
+ if (er.getKey().equals("activation-key.java.exists")) {
+ // sweet duplicate object exception
+ return;
+ }
+ }
+ throw e;
}
}
}
commit 92b182678dfce7d46d3a3858c34d0c96f8b2eb86
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Apr 6 12:03:29 2012 +0200
fix TraceBackEventTest
diff --git a/java/code/src/com/redhat/rhn/frontend/events/TraceBackEvent.java b/java/code/src/com/redhat/rhn/frontend/events/TraceBackEvent.java
index b90e3f7..6017d14 100644
--- a/java/code/src/com/redhat/rhn/frontend/events/TraceBackEvent.java
+++ b/java/code/src/com/redhat/rhn/frontend/events/TraceBackEvent.java
@@ -51,7 +51,7 @@ public class TraceBackEvent extends BaseEvent implements EventMessage {
if (request != null) {
out.println(ls.getMessage("traceback message header"));
out.print(request.getMethod());
- out.println(" " + request.getAttribute("requestedUri"));
+ out.println(" " + request.getRequestURI());
out.println();
out.print(ls.getMessage("date", getUserLocale()));
out.print(":");
commit 46c4b3f8c728f5c8fdce2a02d196a4459ea33066
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Apr 6 11:19:22 2012 +0200
fix SessionCancelActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/kickstart/test/SessionCancelActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/kickstart/test/SessionCancelActionTest.java
index 64cd0cd..6e50953 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/kickstart/test/SessionCancelActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/kickstart/test/SessionCancelActionTest.java
@@ -17,6 +17,8 @@ package com.redhat.rhn.frontend.action.systems.provisioning.kickstart.test;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnAction;
+import servletunit.HttpServletRequestSimulator;
+
/**
* SessionCancelActionTest
* @version $Rev: 1 $
@@ -33,6 +35,7 @@ public class SessionCancelActionTest extends BaseSessionTestCase {
public void testExecuteSubmit() {
addRequestParameter(RhnAction.SUBMITTED, Boolean.TRUE.toString());
setRequestPathInfo("/systems/details/kickstart/SessionCancel");
+ request.setMethod(HttpServletRequestSimulator.POST);
actionPerform();
verifyActionMessage("kickstart.session_cancel.success");
assertEquals("/systems/details/kickstart/SessionStatus.do?sid=" + s.getId(),
commit 9fb4ad2b137080cd22bb857ac0bd6371394d2424
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Apr 6 10:41:13 2012 +0200
run oracle specific tests only with oracle DB
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java b/java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java
index afd615e..5935e21 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java
@@ -87,75 +87,81 @@ public class AdvDataSourceTest extends RhnBaseTestCase {
* Test for ModeFactory.getMode methods
*/
public void testDate() {
- SelectMode m = ModeFactory.getMode("test_queries", "date_dto_test");
- DataResult dr = m.execute(new HashMap());
- assertTrue(dr.get(0) instanceof TestDateDto);
- TestDateDto d = (TestDateDto) dr.get(0);
- assertTrue(d.getCreated() instanceof Timestamp);
+ if (ConfigDefaults.get().isOracle()) {
+ SelectMode m = ModeFactory.getMode("test_queries", "date_dto_test");
+ DataResult dr = m.execute(new HashMap());
+ assertTrue(dr.get(0) instanceof TestDateDto);
+ TestDateDto d = (TestDateDto) dr.get(0);
+ assertTrue(d.getCreated() instanceof Timestamp);
+ }
}
public void testMaxRows() {
- SelectMode m = ModeFactory.getMode("test_queries", "withClass");
- try {
- m.setMaxRows(-10);
- fail("setMaxRows should NOT allow negative numbers.");
- }
- catch (IllegalArgumentException e) {
- // expected.
+ if (ConfigDefaults.get().isOracle()) {
+ SelectMode m = ModeFactory.getMode("test_queries", "withClass");
+ try {
+ m.setMaxRows(-10);
+ fail("setMaxRows should NOT allow negative numbers.");
+ }
+ catch (IllegalArgumentException e) {
+ // expected.
+ }
+ m.setMaxRows(10);
+ Map params = null;
+ DataResult dr = m.execute(params);
+ assertNotNull(dr);
+ assertTrue(dr.size() == 10);
}
- m.setMaxRows(10);
- Map params = null;
- DataResult dr = m.execute(params);
- assertNotNull(dr);
- assertTrue(dr.size() == 10);
}
/**
* Test for ModeFactory.getMode methods
*/
public void testModes() {
- SelectMode m = ModeFactory.getMode("test_queries", "withClass");
- Map params = null;
- DataResult dr = m.execute(params);
- assertNotNull(dr);
- assertTrue(dr.size() > 1);
- Object obj = dr.iterator().next();
- /* The withClass query in test_queries should have a class defined. We don't really
- * care what it is as long as it isn't a Map.
- */
- assertTrue(!obj.getClass().getName().equals("java.util.Map"));
-
- //Try over-riding and getting a Map back
- SelectMode m2 = ModeFactory.getMode("test_queries", "withClass", Map.class);
- dr = m2.execute(params);
- assertNotNull(dr);
- assertTrue(dr.size() > 1);
- obj = dr.iterator().next();
- //make sure we got some sort of a Map back
- assertEquals("java.util.HashMap", obj.getClass().getName());
+ if (ConfigDefaults.get().isOracle()) {
+ SelectMode m = ModeFactory.getMode("test_queries", "withClass");
+ Map params = null;
+ DataResult dr = m.execute(params);
+ assertNotNull(dr);
+ assertTrue(dr.size() > 1);
+ Object obj = dr.iterator().next();
+ /* The withClass query in test_queries should have a class defined. We don't
+ * really care what it is as long as it isn't a Map.
+ */
+ assertTrue(!obj.getClass().getName().equals("java.util.Map"));
+
+ //Try over-riding and getting a Map back
+ SelectMode m2 = ModeFactory.getMode("test_queries", "withClass", Map.class);
+ dr = m2.execute(params);
+ assertNotNull(dr);
+ assertTrue(dr.size() > 1);
+ obj = dr.iterator().next();
+ //make sure we got some sort of a Map back
+ assertEquals("java.util.HashMap", obj.getClass().getName());
+
+ //Try over-riding with something incompatible
+ SelectMode m3 = ModeFactory.getMode("test_queries", "withClass", Set.class);
+ try {
+ dr = m3.execute(params);
+ fail();
+ }
+ catch (ObjectCreateWrapperException e) {
+ //success!
+ }
- //Try over-riding with something incompatible
- SelectMode m3 = ModeFactory.getMode("test_queries", "withClass", Set.class);
- try {
- dr = m3.execute(params);
- fail();
- }
- catch (ObjectCreateWrapperException e) {
- //success!
+ //Make sure our selectMode object was a copy and not the one cached
+ SelectMode m2a = ModeFactory.getMode("test_queries", "withClass");
+ assertFalse(m2a.getClassString().equals("java.util.Set"));
+ assertFalse(m2a.getClassString().equals("java.util.Map"));
+
+ //finally, make sure that by default our DataResult objects contain Maps
+ SelectMode m4 = ModeFactory.getMode("test_queries", "all_tables");
+ dr = m4.execute(params);
+ assertNotNull(dr);
+ assertTrue(dr.size() > 1);
+ obj = dr.iterator().next();
+ assertEquals("java.util.HashMap", obj.getClass().getName());
}
-
- //Make sure our selectMode object was a copy and not the one cached
- SelectMode m2a = ModeFactory.getMode("test_queries", "withClass");
- assertFalse(m2a.getClassString().equals("java.util.Set"));
- assertFalse(m2a.getClassString().equals("java.util.Map"));
-
- //finally, make sure that by default our DataResult objects contain Maps
- SelectMode m4 = ModeFactory.getMode("test_queries", "all_tables");
- dr = m4.execute(params);
- assertNotNull(dr);
- assertTrue(dr.size() > 1);
- obj = dr.iterator().next();
- assertEquals("java.util.HashMap", obj.getClass().getName());
}
public void testInsert() throws Exception {
@@ -287,21 +293,23 @@ public class AdvDataSourceTest extends RhnBaseTestCase {
}
public void testDoubleElaboration() throws Exception {
- SelectMode m = ModeFactory.getMode("test_queries", "withClass");
- DataResult<TableData> dr = m.execute(Collections.EMPTY_MAP);
- assertTrue(dr.size() >= 1);
- dr.elaborate();
- TableData rowA = dr.get(0);
- String tableNameA = rowA.getTableName();
- String columnNameA = StringUtils.join(rowA.getColumnName().iterator(), ",");
- // Elaborate 2nd time
- dr.elaborate();
- TableData rowB = dr.get(0);
- String tableNameB = rowB.getTableName();
- String columnNameB = StringUtils.join(rowB.getColumnName().iterator(), ",");
-
- assertEquals(tableNameA, tableNameB);
- assertEquals(columnNameA, columnNameB);
+ if (ConfigDefaults.get().isOracle()) {
+ SelectMode m = ModeFactory.getMode("test_queries", "withClass");
+ DataResult<TableData> dr = m.execute(Collections.EMPTY_MAP);
+ assertTrue(dr.size() >= 1);
+ dr.elaborate();
+ TableData rowA = dr.get(0);
+ String tableNameA = rowA.getTableName();
+ String columnNameA = StringUtils.join(rowA.getColumnName().iterator(), ",");
+ // Elaborate 2nd time
+ dr.elaborate();
+ TableData rowB = dr.get(0);
+ String tableNameB = rowB.getTableName();
+ String columnNameB = StringUtils.join(rowB.getColumnName().iterator(), ",");
+
+ assertEquals(tableNameA, tableNameB);
+ assertEquals(columnNameA, columnNameB);
+ }
}
public void testMaxRowsWithElaboration() throws Exception {
commit aed68551c80c4a3b720c61095f34a3be22a8c217
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Apr 6 10:10:54 2012 +0200
fix AdvDataSourceTest suite part
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java b/java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java
index 84c4db9..afd615e 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java
@@ -15,6 +15,7 @@
package com.redhat.rhn.common.db.datasource.test;
import com.redhat.rhn.common.ObjectCreateWrapperException;
+import com.redhat.rhn.common.conf.ConfigDefaults;
import com.redhat.rhn.common.db.datasource.CallableMode;
import com.redhat.rhn.common.db.datasource.DataResult;
import com.redhat.rhn.common.db.datasource.ModeFactory;
@@ -364,16 +365,29 @@ public class AdvDataSourceTest extends RhnBaseTestCase {
}
catch (SQLException e) {
// Couldn't select 1, so the table didn't exist, create it
- stmt.execute("create table adv_datasource " +
- "( " +
- " foobar VarChar2(32)," +
- " test_column VarChar2(25)," +
- " pin number, " +
- " id number" +
- " constraint adv_datasource_pk primary key" +
- ")");
+ if (ConfigDefaults.get().isOracle()) {
+ stmt.execute("create table adv_datasource " +
+ "( " +
+ " foobar VarChar2(32)," +
+ " test_column VarChar2(25)," +
+ " pin number, " +
+ " id number" +
+ " constraint adv_datasource_pk primary key" +
+ ")");
+ }
+ else {
+ c.rollback();
+ stmt.execute("create table adv_datasource " +
+ "( " +
+ " foobar VarChar," +
+ " test_column VarChar," +
+ " pin numeric, " +
+ " id numeric" +
+ " constraint adv_datasource_pk primary key" +
+ ");");
+ }
stmt.execute("insert into adv_datasource(foobar, id) " +
- "values ('Blarg', 1)");
+ "values ('Blarg', 1);");
c.commit();
}
finally {
commit 29c3067825890dc6097fce8bb83dce3ce0f28129
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Apr 5 17:11:02 2012 +0200
fix CobblerCommandTest
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/test/CobblerCommandTest.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/test/CobblerCommandTest.java
index 52c72f5..1af5e11 100755
--- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/test/CobblerCommandTest.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/test/CobblerCommandTest.java
@@ -16,6 +16,7 @@ package com.redhat.rhn.manager.kickstart.cobbler.test;
import com.redhat.rhn.domain.kickstart.KickstartData;
import com.redhat.rhn.domain.kickstart.test.KickstartDataTest;
+import com.redhat.rhn.domain.kickstart.test.KickstartableTreeTest;
import com.redhat.rhn.domain.role.RoleFactory;
import com.redhat.rhn.domain.server.NetworkInterface;
import com.redhat.rhn.domain.server.Server;
@@ -49,7 +50,7 @@ public class CobblerCommandTest extends BaseTestCaseWithUser {
user = UserTestUtils.createUserInOrgOne();
user.addRole(RoleFactory.ORG_ADMIN);
this.ksdata = KickstartDataTest.createKickstartWithDefaultKey(this.user.getOrg());
- this.ksdata.getTree().setBasePath("/opt/repo/f9-x86_64/");
+ this.ksdata.getTree().setBasePath("/tmp/opt/repo/f9-x86_64/");
// Uncomment this if you want the tests to actually talk to cobbler
//Config.get().setString(CobblerXMLRPCHelper.class.getName(),
@@ -58,6 +59,7 @@ public class CobblerCommandTest extends BaseTestCaseWithUser {
// CobblerConnection.class.getName());
//commitAndCloseSession();
+ KickstartableTreeTest.createKickstartTreeItems(this.ksdata.getTree());
CobblerDistroCreateCommand dcreate = new
CobblerDistroCreateCommand(ksdata.getTree(), user);
dcreate.store();
commit d8bab804a19c318e5bb8e5c2fa3f31efd05b34ad
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Apr 5 16:37:20 2012 +0200
refactor how PackageEvr gets stored
not good, if data is stored by stored proc and hibernate at the same time
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 94fa65d..0d43cf5 100644
--- a/java/code/src/com/redhat/rhn/domain/action/ActionFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/action/ActionFactory.java
@@ -540,7 +540,7 @@ public class ActionFactory extends HibernateFactory {
// It is possible to have a Package Action with only a package name
if (evr != null) {
//commit each packageEvr
- PackageEvr newEvr = PackageEvrFactory.save(evr);
+ PackageEvr newEvr = PackageEvrFactory.lookupOrCreatePackageEvr(evr);
detail.setEvr(newEvr);
}
}
diff --git a/java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java b/java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java
index 15852ce..c6e4b30 100644
--- a/java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java
+++ b/java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java
@@ -132,7 +132,7 @@ public class ErrataFactoryTest extends BaseTestCaseWithUser {
Package chanPack = PackageTest.createTestPackage(user.getOrg());
//we have to set the 2nd package to a different EVR to not violate a
// unique constraint
- PackageEvr evr = PackageEvrFactory.createPackageEvr("45", "99", "983");
+ PackageEvr evr = PackageEvrFactory.lookupOrCreatePackageEvr("45", "99", "983");
chanPack.setPackageName(errataPack.getPackageName());
chanPack.setPackageEvr(evr);
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 02368b9..24ba5d4 100644
--- a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageEvrFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageEvrFactory.java
@@ -41,23 +41,35 @@ public class PackageEvrFactory {
* @param evrIn PackageEvr to commit to db
* @return Returns a new/committed PackageEvr object.
*/
- public static PackageEvr save(PackageEvr evrIn) {
+ private static Long lookupPackageEvr(String epoch, String version,
+ String release) {
CallableMode m = ModeFactory.getCallableMode("Package_queries", "lookup_evr");
Map inParams = new HashMap();
- inParams.put("epoch", evrIn.getEpoch());
- inParams.put("version", evrIn.getVersion());
- inParams.put("release", evrIn.getRelease());
+ inParams.put("epoch", epoch);
+ inParams.put("version", version);
+ inParams.put("release", release);
Map outParams = new HashMap();
outParams.put("evrId", new Integer(Types.NUMERIC));
Map result = m.execute(inParams, outParams);
- Long newEvrId = new Long(result.get("evrId").toString());
+ return (Long) result.get("evrId");
+ }
- return lookupPackageEvrById(newEvrId);
+ /**
+ * Creates a new PackageEvr object
+ * @param evr PackageEvr
+ * @return Returns a committed PackageEvr
+ */
+ public static PackageEvr lookupOrCreatePackageEvr(PackageEvr evr) {
+ if (evr.getId() != null) {
+ return lookupPackageEvrById(evr.getId());
+ }
+ return lookupOrCreatePackageEvr(evr.getEpoch(), evr.getVersion(),
+ evr.getRelease());
}
/**
@@ -67,13 +79,9 @@ public class PackageEvrFactory {
* @param r PackageEvr Release
* @return Returns a committed PackageEvr
*/
- public static PackageEvr createPackageEvr(String e, String v, String r) {
- PackageEvr evr = new PackageEvr();
- evr.setEpoch(e);
- evr.setVersion(v);
- evr.setRelease(r);
-
- return PackageEvrFactory.save(evr);
+ public static PackageEvr lookupOrCreatePackageEvr(String e, String v, String r) {
+ Long id = lookupPackageEvr(e, v, r);
+ return lookupPackageEvrById(id);
}
/**
diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageEvrFactoryTest.java b/java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageEvrFactoryTest.java
index 7e0e0eb..325d068 100644
--- a/java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageEvrFactoryTest.java
+++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageEvrFactoryTest.java
@@ -49,6 +49,6 @@ public class PackageEvrFactoryTest extends RhnBaseTestCase {
String version = "1.0.0";
String release = "1";
- return PackageEvrFactory.createPackageEvr(epoch, version, release);
+ return PackageEvrFactory.lookupOrCreatePackageEvr(epoch, version, release);
}
}
diff --git a/java/code/src/com/redhat/rhn/domain/server/ProxyInfo.java b/java/code/src/com/redhat/rhn/domain/server/ProxyInfo.java
index fe3ecb6..31b099b 100644
--- a/java/code/src/com/redhat/rhn/domain/server/ProxyInfo.java
+++ b/java/code/src/com/redhat/rhn/domain/server/ProxyInfo.java
@@ -64,7 +64,7 @@ public class ProxyInfo {
* @param r Release
*/
public void setVersion(String e, String v, String r) {
- setVersion(PackageEvrFactory.createPackageEvr(e, v, r));
+ setVersion(PackageEvrFactory.lookupOrCreatePackageEvr(e, v, r));
}
diff --git a/java/code/src/com/redhat/rhn/domain/server/SatelliteServer.java b/java/code/src/com/redhat/rhn/domain/server/SatelliteServer.java
index c88f32b..9b5ac10 100644
--- a/java/code/src/com/redhat/rhn/domain/server/SatelliteServer.java
+++ b/java/code/src/com/redhat/rhn/domain/server/SatelliteServer.java
@@ -147,7 +147,7 @@ public class SatelliteServer extends Server {
* @param v Version
*/
public void setVersion(String v) {
- setVersion(PackageEvrFactory.createPackageEvr(null, v, "1"));
+ setVersion(PackageEvrFactory.lookupOrCreatePackageEvr(null, v, "1"));
}
/**
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 6c9d742..fb45cda 100644
--- a/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java
@@ -313,7 +313,7 @@ public class ServerFactory extends HibernateFactory {
public static void save(Server serverIn) {
if (serverIn.isSatellite()) {
SatelliteServer ss = (SatelliteServer) serverIn;
- PackageEvrFactory.save(ss.getVersion());
+ PackageEvrFactory.lookupOrCreatePackageEvr(ss.getVersion());
}
singleton.saveObject(serverIn);
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/test/ErrataHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/test/ErrataHandlerTest.java
index ff03892..2c7ef0d 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/test/ErrataHandlerTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/test/ErrataHandlerTest.java
@@ -341,7 +341,7 @@ public class ErrataHandlerTest extends BaseHandlerTestCase {
Package chanPack = PackageTest.createTestPackage(admin.getOrg());
//we have to set the 2nd package to a different EVR to not violate a
// unique constraint
- PackageEvr evr = PackageEvrFactory.createPackageEvr("45", "99", "983");
+ PackageEvr evr = PackageEvrFactory.lookupOrCreatePackageEvr("45", "99", "983");
chanPack.setPackageName(errataPack.getPackageName());
chanPack.setPackageEvr(evr);
diff --git a/java/code/src/com/redhat/rhn/manager/errata/cache/test/ErrataCacheManagerTest.java b/java/code/src/com/redhat/rhn/manager/errata/cache/test/ErrataCacheManagerTest.java
index d6379aa..c588972 100644
--- a/java/code/src/com/redhat/rhn/manager/errata/cache/test/ErrataCacheManagerTest.java
+++ b/java/code/src/com/redhat/rhn/manager/errata/cache/test/ErrataCacheManagerTest.java
@@ -137,8 +137,8 @@ public class ErrataCacheManagerTest extends RhnBaseTestCase {
TestUtils.flushAndEvict(s);
retval.put("server", s);
Package p = PackageTest.createTestPackage(userIn.getOrg());
- PackageEvr evr = PackageEvrFactory.createPackageEvr(p.getPackageEvr().getEpoch(),
- p.getPackageEvr().getVersion(), "2");
+ PackageEvr evr = PackageEvrFactory.lookupOrCreatePackageEvr(
+ p.getPackageEvr().getEpoch(), p.getPackageEvr().getVersion(), "2");
evr = (PackageEvr) TestUtils.saveAndReload(evr);
Package newPackage = PackageTest.createTestPackage(userIn.getOrg());
newPackage.setPackageName(p.getPackageName());
diff --git a/java/code/src/com/redhat/rhn/manager/rhnpackage/test/PackageManagerTest.java b/java/code/src/com/redhat/rhn/manager/rhnpackage/test/PackageManagerTest.java
index e035561..705dcfd 100644
--- a/java/code/src/com/redhat/rhn/manager/rhnpackage/test/PackageManagerTest.java
+++ b/java/code/src/com/redhat/rhn/manager/rhnpackage/test/PackageManagerTest.java
@@ -645,7 +645,7 @@ public class PackageManagerTest extends BaseTestCaseWithUser {
// Create upgraded package EVR so package will show up from the query
PackageEvr upgradedPackageEvr =
- PackageEvrFactory.createPackageEvr("1", "1.0.0", "2");
+ PackageEvrFactory.lookupOrCreatePackageEvr("1", "1.0.0", "2");
upgradedPackageEvr =
(PackageEvr)TestUtils.saveAndReload(upgradedPackageEvr);
diff --git a/java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java b/java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java
index 244a721..93ac610 100644
--- a/java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java
+++ b/java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java
@@ -862,7 +862,7 @@ public class SystemManagerTest extends RhnBaseTestCase {
// Will be used for both errata types. Represents an upgraded version of a package
// that comes with the errata.
PackageEvr upgradedPackageEvr =
- PackageEvrFactory.createPackageEvr("1", "1.0.0", "2");
+ PackageEvrFactory.lookupOrCreatePackageEvr("1", "1.0.0", "2");
upgradedPackageEvr =
(PackageEvr)TestUtils.saveAndReload(upgradedPackageEvr);
diff --git a/java/code/src/com/redhat/rhn/testing/ServerTestUtils.java b/java/code/src/com/redhat/rhn/testing/ServerTestUtils.java
index c44a5b0..86c89df 100644
--- a/java/code/src/com/redhat/rhn/testing/ServerTestUtils.java
+++ b/java/code/src/com/redhat/rhn/testing/ServerTestUtils.java
@@ -93,7 +93,8 @@ public class ServerTestUtils {
InstalledPackage testInstPack = new InstalledPackage();
String epoch = "";
- PackageEvr evr = PackageEvrFactory.createPackageEvr(epoch, version, release);
+ PackageEvr evr = PackageEvrFactory.lookupOrCreatePackageEvr(epoch, version,
+ release);
testInstPack.setEvr(evr);
PackageArch parch = (PackageArch) TestUtils.lookupFromCacheById(
commit cc6dbd5a25233c948147d099d2d968d7bfd8081b
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Apr 5 13:49:00 2012 +0200
removing unnecessary casts
diff --git a/java/code/src/com/redhat/rhn/manager/audit/ScapManager.java b/java/code/src/com/redhat/rhn/manager/audit/ScapManager.java
index cc527b2..222eb18 100644
--- a/java/code/src/com/redhat/rhn/manager/audit/ScapManager.java
+++ b/java/code/src/com/redhat/rhn/manager/audit/ScapManager.java
@@ -101,7 +101,7 @@ public class ScapManager extends BaseManager {
"ruleresult_by_id");
HashMap params = new HashMap();
params.put("rr_id", ruleResultId);
- List<XccdfRuleResultDto> result = (List<XccdfRuleResultDto>) m.execute(params);
+ List<XccdfRuleResultDto> result = m.execute(params);
return result.isEmpty() ? null : result.get(0);
}
@@ -115,7 +115,7 @@ public class ScapManager extends BaseManager {
"idents_per_ruleresult");
HashMap params = new HashMap();
params.put("rr_id", ruleResultId);
- return (List<XccdfIdentDto>) m.execute(params);
+ return m.execute(params);
}
private static List<Map<String, Object>> transposeView(DataResult testResultsRaw) {
commit 7893444cb28e87709238da737df58a2aef4f265a
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Apr 5 13:48:24 2012 +0200
removing unnecessary else statement
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/audit/RuleDetailsAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/audit/RuleDetailsAction.java
index 40ca594..ff36b53 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/audit/RuleDetailsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/audit/RuleDetailsAction.java
@@ -76,8 +76,6 @@ public class RuleDetailsAction extends RhnAction implements Listable {
if (ruleResult == null) {
return null;
}
- else {
- return ruleResult.getIdentsWithoutIdref();
- }
+ return ruleResult.getIdentsWithoutIdref();
}
}
commit c743f7422875e557f7c284f314725596b5895ea5
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Apr 4 18:30:26 2012 +0200
fix ProvisionVirtualizationWizardActionTest.testStepOne
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/test/ProvisionVirtualizationWizardActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/test/ProvisionVirtualizationWizardActionTest.java
index 8caf11c..40b6fd6 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/test/ProvisionVirtualizationWizardActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/test/ProvisionVirtualizationWizardActionTest.java
@@ -83,8 +83,6 @@ public class ProvisionVirtualizationWizardActionTest extends RhnMockStrutsTestCa
public void testStepOne() throws Exception {
actionPerform();
verifyNoActionErrors();
- assertNotNull(request.getAttribute(RequestContext.SYSTEM));
- assertNotNull(request.getAttribute(ScheduleKickstartWizardAction.HAS_PROFILES));
}
public void testStepTwo() throws Exception {
12 years, 1 month
Changes to 'refs/tags/oracle-xe-selinux-10.2.0.24-1'
by Jan Pazdziora
Tag 'oracle-xe-selinux-10.2.0.24-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-10 12:39 +0000
Tagging package [oracle-xe-selinux] version [10.2.0.24-1] in directory [selinux/oracle-xe-selinux/].
Changes since spacewalk-java-1.8.38-1:
Jan Pazdziora (4):
The backup.sh from Oracle XE 10g seems to want to access urandom.
The backup.sh and restore.sh need to run as sqlplus, so that their log files can be used by sqlplus.
The rman is more like the database server process.
Automatic commit of package [oracle-xe-selinux] release [10.2.0.24-1].
---
rel-eng/packages/oracle-xe-selinux | 2 +-
selinux/oracle-xe-selinux/oracle-xe-selinux.spec | 9 ++++++++-
selinux/oracle-xe-selinux/oracle-xe.fc | 3 +++
selinux/oracle-xe-selinux/oracle-xe.te | 3 +++
4 files changed, 15 insertions(+), 2 deletions(-)
---
12 years, 1 month
4 commits - rel-eng/packages selinux/oracle-xe-selinux
by Jan Pazdziora
rel-eng/packages/oracle-xe-selinux | 2 +-
selinux/oracle-xe-selinux/oracle-xe-selinux.spec | 9 ++++++++-
selinux/oracle-xe-selinux/oracle-xe.fc | 3 +++
selinux/oracle-xe-selinux/oracle-xe.te | 3 +++
4 files changed, 15 insertions(+), 2 deletions(-)
New commits:
commit 12275e225f6a9086364100fa882303d38e38b6f9
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Apr 10 14:39:42 2012 +0200
Automatic commit of package [oracle-xe-selinux] release [10.2.0.24-1].
diff --git a/rel-eng/packages/oracle-xe-selinux b/rel-eng/packages/oracle-xe-selinux
index 6c4a872..a24727f 100644
--- a/rel-eng/packages/oracle-xe-selinux
+++ b/rel-eng/packages/oracle-xe-selinux
@@ -1 +1 @@
-10.2.0.23-1 selinux/oracle-xe-selinux/
+10.2.0.24-1 selinux/oracle-xe-selinux/
diff --git a/selinux/oracle-xe-selinux/oracle-xe-selinux.spec b/selinux/oracle-xe-selinux/oracle-xe-selinux.spec
index eb2f7da..6a224b5 100644
--- a/selinux/oracle-xe-selinux/oracle-xe-selinux.spec
+++ b/selinux/oracle-xe-selinux/oracle-xe-selinux.spec
@@ -5,7 +5,7 @@
%define modulename oracle-xe
Name: oracle-xe-selinux
-Version: 10.2.0.23
+Version: 10.2.0.24
Release: 1%{?dist}
Summary: SELinux policy module supporting Oracle XE
Group: System Environment/Base
@@ -145,6 +145,13 @@ fi
%attr(0755,root,root) %{_sbindir}/%{name}-enable
%changelog
+* Tue Apr 10 2012 Jan Pazdziora 10.2.0.24-1
+- The rman is more like the database server process.
+- The backup.sh and restore.sh need to run as sqlplus, so that their log files
+ can be used by sqlplus.
+- The backup.sh from Oracle XE 10g seems to want to access urandom.
+- Allow Oracle database to ptrace self.
+
* Wed Nov 30 2011 Michael Mraka <michael.mraka(a)redhat.com> 10.2.0.23-1
- system user uids are < 1000 on Fedora 16
commit 2ca684a5690fe714dcee98f82b1ff2653918098c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Apr 10 14:31:13 2012 +0200
The rman is more like the database server process.
Addressing
avc: denied { read } for pid=32408 comm="rman" name="spfile2init.ora" dev=dm-0 ino=81133643 scontext=root:system_r:oracle_sqlplus_t:s0-s0:c0.c1023 tcontext=root:object_r:oracle_db_log_t:s0 tclass=file
during restore.sh.
diff --git a/selinux/oracle-xe-selinux/oracle-xe.fc b/selinux/oracle-xe-selinux/oracle-xe.fc
index 1a46a00..0d5491d 100644
--- a/selinux/oracle-xe-selinux/oracle-xe.fc
+++ b/selinux/oracle-xe-selinux/oracle-xe.fc
@@ -22,6 +22,7 @@
/usr/lib/oracle/xe/app/oracle/product/(.*/)?bin/orapwd gen_context(system_u:object_r:oracle_db_exec_t,s0)
/usr/lib/oracle/xe/app/oracle/product/(.*/)?bin/sqlplus gen_context(system_u:object_r:oracle_sqlplus_exec_t,s0)
/usr/lib/oracle/xe/app/oracle/product/(.*/)?bin/tnslsnr gen_context(system_u:object_r:oracle_tnslsnr_exec_t,s0)
+/usr/lib/oracle/xe/app/oracle/product/(.*/)?bin/rman gen_context(system_u:object_r:oracle_db_exec_t,s0)
# many jars are not located under lib, jre, or java directories
/usr/lib/oracle/xe/app/oracle/product/(.*/)?.+\.jar gen_context(system_u:object_r:shlib_t,s0)
commit 21c06b9808b6fca4c7efd3d113fcc2163f4fee03
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Apr 10 14:22:23 2012 +0200
The backup.sh and restore.sh need to run as sqlplus, so that their log files can be used by sqlplus.
Addressing
avc: denied { write } for pid=26511 comm="sqlplus" path="/tmp/rman_normlog26505.log" dev=dm-0 ino=62193725 scontext=root:system_r:oracle_sqlplus_t:s0-s0:c0.c1023 tcontext=root:object_r:tmp_t:s0 tclass=file
diff --git a/selinux/oracle-xe-selinux/oracle-xe.fc b/selinux/oracle-xe-selinux/oracle-xe.fc
index d5d818c..1a46a00 100644
--- a/selinux/oracle-xe-selinux/oracle-xe.fc
+++ b/selinux/oracle-xe-selinux/oracle-xe.fc
@@ -13,6 +13,8 @@
/usr/lib/oracle/xe/app/oracle/product/(.*/)?audit(/.*)? gen_context(user_u:object_r:oracle_db_log_t,s0)
/usr/lib/oracle/xe/app/oracle/product/(.*/)?server/config(/.*)? gen_context(user_u:object_r:oracle_db_log_t,s0)
/usr/lib/oracle/xe/app/oracle/product/(.*/)?server/config/scripts(/.*)? gen_context(user_u:object_r:oracle_sqlplus_log_t,s0)
+/usr/lib/oracle/xe/app/oracle/product/(.*/)?server/config/scripts/backup\.sh gen_context(user_u:object_r:oracle_sqlplus_exec_t,s0)
+/usr/lib/oracle/xe/app/oracle/product/(.*/)?server/config/scripts/restore\.sh gen_context(user_u:object_r:oracle_sqlplus_exec_t,s0)
# otherwise these would default to bin_t
/usr/lib/oracle/xe/app/oracle/product/(.*/)?bin/lsnrctl gen_context(system_u:object_r:oracle_lsnrctl_exec_t,s0)
commit 496b6002344115868f4c587262aa07aee2a86972
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Apr 10 14:19:08 2012 +0200
The backup.sh from Oracle XE 10g seems to want to access urandom.
Addressing
avc: denied { read } for pid=26280 comm="backup.sh" name="urandom" dev=tmpfs ino=969 scontext=root:system_r:oracle_sqlplus_t:s0-s0:c0.c1023 tcontext=system_u:object_r:urandom_device_t:s0 tclass=chr_file
diff --git a/selinux/oracle-xe-selinux/oracle-xe.te b/selinux/oracle-xe-selinux/oracle-xe.te
index af31a47..e3c9cbf 100644
--- a/selinux/oracle-xe-selinux/oracle-xe.te
+++ b/selinux/oracle-xe-selinux/oracle-xe.te
@@ -10,6 +10,7 @@ require {
type oracle_db_log_t;
type http_cache_port_t;
type initrc_t;
+ type urandom_device_t;
}
rw_files_pattern(oracle_db_t, oracle_sqlplus_log_t, oracle_sqlplus_log_t)
@@ -36,3 +37,5 @@ term_dontaudit_use_console(oracle_db_t)
term_dontaudit_use_console(oracle_tnslsnr_t)
mcs_ptrace_all(oracle_db_t)
+
+allow oracle_sqlplus_t urandom_device_t:chr_file read;
12 years, 1 month
Changes to 'refs/tags/spacewalk-java-1.8.38-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.8.38-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-10 12:38 +0000
Tagging package [spacewalk-java] version [1.8.38-1] in directory [java/].
Changes since spacewalk-backend-1.8.13-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-java] release [1.8.38-1].
---
java/spacewalk-java.spec | 12 +++++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 12 insertions(+), 2 deletions(-)
---
12 years, 1 month
java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora
java/spacewalk-java.spec | 12 +++++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 12 insertions(+), 2 deletions(-)
New commits:
commit ca6a4ebc2a8e5292ca21fab79686401facea5176
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Apr 10 14:38:47 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.38-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 4ee6d87..62359bc 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -22,7 +22,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.37
+Version: 1.8.38
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -605,6 +605,16 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Apr 10 2012 Jan Pazdziora 1.8.38-1
+- OpenSCAP integration -- view latest results of whole infrastructure
+ (slukasik(a)redhat.com)
+- The tool is called OpenSCAP actually. (slukasik(a)redhat.com)
+- Add missing </a> tag in case when the serverName is unknown.
+ (slukasik(a)redhat.com)
+- The system.config.listFiles should return channel label, not name.
+- 810871 - Reduce languages available in editarea to only common / useful ones.
+ (sherr(a)redhat.com)
+
* Fri Apr 06 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.37-1
- improved performance of repomd generation
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index ab22b37..8ce821e 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.37-1 java/
+1.8.38-1 java/
12 years, 1 month
Changes to 'refs/tags/spacewalk-backend-1.8.13-1'
by Jan Pazdziora
Tag 'spacewalk-backend-1.8.13-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-10 12:38 +0000
Tagging package [spacewalk-backend] version [1.8.13-1] in directory [backend/].
Changes since spacewalk-setup-1.8.5-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-backend] release [1.8.13-1].
---
backend/spacewalk-backend.spec | 8 +++++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
---
12 years, 1 month
backend/spacewalk-backend.spec rel-eng/packages
by Jan Pazdziora
backend/spacewalk-backend.spec | 8 +++++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 1579b4ed15841da5ce1cff5af753403b4fd6cce8
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Apr 10 14:38:10 2012 +0200
Automatic commit of package [spacewalk-backend] release [1.8.13-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 2ca49a3..62b82a5 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -12,7 +12,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 1.8.12
+Version: 1.8.13
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -688,6 +688,12 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Tue Apr 10 2012 Jan Pazdziora 1.8.13-1
+- rhn-schema-stats: update manual page (mzazrivec(a)redhat.com)
+- rhn-schema-stats: support for PostgreSQL (mzazrivec(a)redhat.com)
+- rhn-db-stats: update manual page (mzazrivec(a)redhat.com)
+- rhn-db-stats: support for PostgreSQL (mzazrivec(a)redhat.com)
+
* Thu Apr 05 2012 Jan Pazdziora 1.8.12-1
- 809936 - we need to insert NULLs to avoid vn_rhnserverhistory_details.
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 882ce41..68d47e4 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.8.12-1 backend/
+1.8.13-1 backend/
12 years, 1 month
Changes to 'refs/tags/spacewalk-setup-1.8.5-1'
by Jan Pazdziora
Tag 'spacewalk-setup-1.8.5-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-10 12:37 +0000
Tagging package [spacewalk-setup] version [1.8.5-1] in directory [spacewalk/setup/].
Changes since osad-5.10.43-1:
Jan Pazdziora (4):
The system.config.listFiles should return channel label, not name.
The spacewalk-setup script does not seem to need Net::LibIDN directly.
To support the whole Unicode with idn_to_ascii, we need to specify utf8.
Automatic commit of package [spacewalk-setup] release [1.8.5-1].
Simon Lukasik (3):
Add missing </a> tag in case when the serverName is unknown.
The tool is called OpenSCAP actually.
OpenSCAP integration -- view latest results of whole infrastructure
---
java/code/src/com/redhat/rhn/common/db/datasource/xml/scap_queries.xml | 37 +
java/code/src/com/redhat/rhn/frontend/action/audit/ListXccdfAction.java | 67 +++
java/code/src/com/redhat/rhn/frontend/dto/XccdfTestResultCounts.java | 189 ++++++++++
java/code/src/com/redhat/rhn/frontend/dto/XccdfTestResultDto.java | 112 +++++
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 6
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 26 +
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigFileNameDtoSerializer.java | 2
java/code/src/com/redhat/rhn/manager/audit/ScapManager.java | 14
java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml | 1
java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp | 23 +
java/code/webapp/WEB-INF/pages/common/fragments/audit/xccdf-easy-list.jspf | 38 ++
java/code/webapp/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf | 3
java/code/webapp/WEB-INF/struts-config.xml | 7
rel-eng/packages/spacewalk-setup | 2
satellite/install/install.pl | 2
spacewalk/setup/bin/spacewalk-setup | 1
spacewalk/setup/lib/Spacewalk/Setup.pm | 6
spacewalk/setup/spacewalk-setup.spec | 6
18 files changed, 532 insertions(+), 10 deletions(-)
---
12 years, 1 month
rel-eng/packages spacewalk/setup
by Jan Pazdziora
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/spacewalk-setup.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 59e6d8f92328e68c9114677e31202e1f277b9c14
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Apr 10 14:37:33 2012 +0200
Automatic commit of package [spacewalk-setup] release [1.8.5-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index b3beab2..be6a65e 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-1.8.4-1 spacewalk/setup/
+1.8.5-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index 07544a3..708c31e 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup
-Version: 1.8.4
+Version: 1.8.5
Release: 1%{?dist}
Summary: Initial setup tools for Red Hat Spacewalk
@@ -106,6 +106,10 @@ rm -rf %{buildroot}
%{_mandir}/man8/spacewalk-make-mount-points*
%changelog
+* Tue Apr 10 2012 Jan Pazdziora 1.8.5-1
+- To support the whole Unicode with idn_to_ascii, we need to specify utf8.
+- The spacewalk-setup script does not seem to need Net::LibIDN directly.
+
* Thu Apr 05 2012 Jan Pazdziora 1.8.4-1
- fixed clearing db for postgresql installation (michael.mraka(a)redhat.com)
12 years, 1 month