Changes to 'refs/tags/spacewalk-schema-1.1.7-1'
by Miroslav Suchý
Tag 'spacewalk-schema-1.1.7-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2010-07-02 09:18 +0000
Tagging package [spacewalk-schema] version [1.1.7-1] in directory [schema/spacewalk/].
Changes since spacewalk-setup-1.1.5-1:
Jan Pazdziora (1):
Match the types of parameters of create_new_user to those given to us by the Java code.
Miroslav Suchý (2):
table rhnChannelContentSource depends on rhnContentSource
Automatic commit of package [spacewalk-schema] release [1.1.7-1].
Partha Aji (1):
fixed a couple of issues with the sat scrubber test
Shannon Hughes (1):
fix broken repo sync download log file logic
---
java/code/src/com/redhat/rhn/common/db/datasource/xml/test_queries.xml | 10 +
java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java | 2
java/code/src/com/redhat/rhn/frontend/xmlrpc/test/SatScrubberTest.java | 69 +++++++---
rel-eng/packages/spacewalk-schema | 2
schema/spacewalk/common/tables/tables.deps | 2
schema/spacewalk/postgres/procs/create_new_user.sql | 8 -
schema/spacewalk/spacewalk-schema.spec | 7 -
7 files changed, 74 insertions(+), 26 deletions(-)
---
13 years, 9 months
2 commits - rel-eng/packages schema/spacewalk
by Miroslav Suchý
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/common/tables/tables.deps | 2 +-
schema/spacewalk/spacewalk-schema.spec | 7 ++++++-
3 files changed, 8 insertions(+), 3 deletions(-)
New commits:
commit a7a232971c333f5cc5b1ea6d9a793ea0dc595249
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Jul 2 11:18:10 2010 +0200
Automatic commit of package [spacewalk-schema] release [1.1.7-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 622944d..a594d61 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.1.6-1 schema/spacewalk/
+1.1.7-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index ab03e50..fc7a760 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -2,7 +2,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 1.1.6
+Version: 1.1.7
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -58,6 +58,11 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-schema-upgrade*
%changelog
+* Fri Jul 02 2010 Miroslav Suchý <msuchy(a)redhat.com> 1.1.7-1
+- table rhnChannelContentSource depends on rhnContentSource (msuchy(a)redhat.com)
+- Match the types of parameters of create_new_user to those given to us by the
+ Java code. (jpazdziora(a)redhat.com)
+
* Thu Jul 01 2010 Miroslav Suchý <msuchy(a)redhat.com> 1.1.6-1
- syntax error on rhnContentSource table sql (shughes(a)redhat.com)
- modify last_synced column for repo sync (shughes(a)redhat.com)
commit 7ef13550dcdc99ac3db6e59dbc27a18a6143f3c1
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Jul 2 11:14:41 2010 +0200
table rhnChannelContentSource depends on rhnContentSource
diff --git a/schema/spacewalk/common/tables/tables.deps b/schema/spacewalk/common/tables/tables.deps
index ce3799a..6c18f12 100644
--- a/schema/spacewalk/common/tables/tables.deps
+++ b/schema/spacewalk/common/tables/tables.deps
@@ -65,7 +65,7 @@ rhnChannelPackageArchCompat :: rhnPackageArch rhnChannelArch
rhnChannelPermission :: rhnChannelPermissionRole rhnChannel web_contact
rhnChannelRelationship :: rhnRelationshipType rhnChannel
rhnChannelTrust :: rhnChannel
-rhnChannelContentSource :: rhnChannel rhnContentSourceType
+rhnChannelContentSource :: rhnChannel rhnContentSourceType rhnContentSource
rhnChecksum :: rhnChecksumType
rhnClientCapability :: rhnClientCapabilityName
rhnClientOptionVersionMap :: rhnClientConfigOption rhnPackageEVR
13 years, 9 months
java/code
by Shannon Hughes
java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e7ca3deca9c359203b11c49d511af05b23f894de
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Thu Jul 1 13:33:30 2010 -0400
fix broken repo sync download log file logic
diff --git a/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java b/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java
index a4d9f87..adc1202 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java
@@ -372,7 +372,7 @@ public class DownloadFile extends DownloadAction {
(int) patch.getReadme().length()));
}
else if (type.equals(DownloadManager.DOWNLOAD_TYPE_REPO_LOG)) {
- Channel c = ChannelFactory.lookupById((Long)params.get(fileId));
+ Channel c = ChannelFactory.lookupById(fileId);
ChannelManager.verifyChannelAdmin(user, fileId);
File file = new File(ChannelManager.getLatestSyncLogFile(c));
13 years, 9 months
java/code
by Partha Aji
java/code/src/com/redhat/rhn/common/db/datasource/xml/test_queries.xml | 10 +
java/code/src/com/redhat/rhn/frontend/xmlrpc/test/SatScrubberTest.java | 69 +++++++---
2 files changed, 61 insertions(+), 18 deletions(-)
New commits:
commit 3934c77ac94f4d8d83f82d183c8846c1f237c4c0
Author: Partha Aji <paji(a)redhat.com>
Date: Thu Jul 1 12:06:42 2010 -0400
fixed a couple of issues with the sat scrubber test
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/test_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/test_queries.xml
index 5735de1..724164b 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/test_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/test_queries.xml
@@ -458,14 +458,20 @@ SELECT * FROM time_series order by entry_time
<mode name="get_test_users">
<query params="">
-SELECT id from web_customer where UPPER(name) like 'TEST%'
+SELECT id from web_contact where UPPER(login) like 'TEST%'
+ </query>
+</mode>
+
+<mode name="get_test_channels">
+ <query params="">
+SELECT id from rhnChannel where UPPER(name) like 'CHANNELNAME%' or UPPER(label) like 'CHANNELLABEL%'
</query>
</mode>
<mode name="get_test_orgs">
<query params="">
-SELECT id from web_customer where UPPER(name) like 'TESTORG%'
+SELECT id from web_customer where UPPER(name) like 'TEST%'
</query>
</mode>
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/test/SatScrubberTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/test/SatScrubberTest.java
index da0c2d0..49a5585 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/test/SatScrubberTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/test/SatScrubberTest.java
@@ -17,8 +17,7 @@ package com.redhat.rhn.frontend.xmlrpc.test;
import com.redhat.rhn.common.db.datasource.CallableMode;
import com.redhat.rhn.common.db.datasource.DataResult;
import com.redhat.rhn.common.db.datasource.ModeFactory;
-import com.redhat.rhn.domain.channel.Channel;
-import com.redhat.rhn.domain.channel.ChannelFactory;
+import com.redhat.rhn.common.hibernate.HibernateFactory;
import com.redhat.rhn.domain.kickstart.KickstartData;
import com.redhat.rhn.domain.kickstart.KickstartFactory;
import com.redhat.rhn.domain.kickstart.KickstartableTree;
@@ -27,35 +26,39 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.domain.user.UserFactory;
import com.redhat.rhn.frontend.dto.kickstart.KickstartDto;
import com.redhat.rhn.frontend.dto.kickstart.KickstartableTreeDto;
-import com.redhat.rhn.manager.channel.ChannelManager;
import com.redhat.rhn.manager.kickstart.KickstartLister;
-import com.redhat.rhn.testing.RhnBaseTestCase;
+import com.redhat.rhn.testing.TestCaseHelper;
import com.redhat.rhn.testing.TestUtils;
import org.apache.log4j.Logger;
+import org.hibernate.HibernateException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import junit.framework.TestCase;
+
/**
* SatScrubberTest - this test actually cleans up old junit created test data.
* After the 410 build is turned off on digdug/cruisecontrol we can remove this
* test. Didn't want to check it into our release branch.
* @version $Rev$
*/
-public class SatScrubberTest extends RhnBaseTestCase {
+public class SatScrubberTest extends TestCase {
private User orgAdmin;
private static Logger log = Logger.getLogger(SatScrubberTest.class);
+
+
public void testNothing() throws Exception {
cleanupKickstarts();
cleanupChannels();
cleanupServers();
cleanupUsers();
cleanupOrgs();
-
+ commitAndCloseSession();
}
public void cleanupKickstarts() throws Exception {
@@ -86,20 +89,32 @@ public class SatScrubberTest extends RhnBaseTestCase {
public void cleanupChannels() throws Exception {
- orgAdmin = UserFactory.findRandomOrgAdmin(OrgFactory.getSatelliteOrg());
- List channels = ChannelManager.allChannelsTree(orgAdmin);
- for (int i = 0; i < channels.size(); i++) {
- Map row = (Map) channels.get(i);
+ // testOrg
+ DataResult dr = TestUtils.runTestQuery("get_test_channels", new HashMap());
+ for (int i = 0; i < dr.size(); i++) {
+ Map row = (Map) dr.get(i);
Long id = (Long) row.get("id");
- String name = (String) row.get("name");
- if (name.startsWith("ChannelName")) {
- Channel c = ChannelFactory.lookupById(id.longValue());
- ChannelFactory.remove(c);
+ log.debug("Deleting channel: " + id);
+ try {
+ deleteChannel(id);
+ }
+ catch (Exception e) {
+ log.warn("Error deleting channel: " + id, e);
+ }
+ if (i % 10 == 0) {
+ log.debug("Deleted [" + i + "] orgs");
+ commitAndCloseSession();
}
}
- commitAndCloseSession();
+ commitAndCloseSession();
+ }
+ private void deleteChannel(long cid) throws Exception {
+ CallableMode m = ModeFactory.getCallableMode(
+ "Channel_queries", "delete_channel");
+ Map inParams = new HashMap();
+ inParams.put("cid", cid);
+ m.execute(inParams, new HashMap());
}
-
public void cleanupUsers() throws Exception {
DataResult dr = TestUtils.runTestQuery("get_test_users", new HashMap());
@@ -170,5 +185,27 @@ public class SatScrubberTest extends RhnBaseTestCase {
commitAndCloseSession();
}
}
+ commitAndCloseSession();
}
+
+ /**
+ * Tears down the fixture, and closes the HibernateSession.
+ * @see TestCase#tearDown()
+ * @see HibernateFactory#closeSession()
+ */
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ TestCaseHelper.tearDownHelper();
+ }
+
+ /**
+ * PLEASE Refrain from using this unless you really have to.
+ *
+ * Try clearSession() instead
+ * @throws HibernateException
+ */
+ protected void commitAndCloseSession() throws HibernateException {
+ HibernateFactory.commitTransaction();
+ HibernateFactory.closeSession();
+ }
}
13 years, 9 months
schema/spacewalk
by Jan Pazdziora
schema/spacewalk/postgres/procs/create_new_user.sql | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 8137f83e27373f9f452ff8787bf5140737a09f5e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Jul 1 17:32:02 2010 +0200
Match the types of parameters of create_new_user to those given to us by the Java code.
diff --git a/schema/spacewalk/postgres/procs/create_new_user.sql b/schema/spacewalk/postgres/procs/create_new_user.sql
index cffac02..6adc000 100644
--- a/schema/spacewalk/postgres/procs/create_new_user.sql
+++ b/schema/spacewalk/postgres/procs/create_new_user.sql
@@ -1,5 +1,5 @@
--
--- Copyright (c) 2008 Red Hat, Inc.
+-- Copyright (c) 2008--2010 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
@@ -21,7 +21,7 @@ create_new_user
org_id_in in numeric,
login_in in varchar,
password_in in varchar,
- oracle_contact_id_in in numeric,
+ oracle_contact_id_in in varchar,
prefix_in in varchar,
first_names_in in varchar,
last_name_in in varchar,
@@ -32,7 +32,7 @@ create_new_user
phone_in in varchar,
fax_in in varchar,
email_in in varchar,
- pin_in in varchar,
+ pin_in in numeric,
first_names_ol_in in varchar,
last_name_ol_in in varchar,
address1_in in varchar,
@@ -67,7 +67,7 @@ begin
insert into web_contact
(id, org_id, login, login_uc, password, old_password, oracle_contact_id)
values
- (user_id_tmp, org_id_in, login_in, upper(login_in), password_in, null, oracle_contact_id_in);
+ (user_id_tmp, org_id_in, login_in, upper(login_in), password_in, null, oracle_contact_id_in::numeric);
insert into web_user_contact_permission
(web_user_id, call, mail, email, fax)
13 years, 9 months
Changes to 'refs/tags/spacewalk-setup-1.1.5-1'
by Miroslav Suchý
Tag 'spacewalk-setup-1.1.5-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2010-07-01 15:15 +0000
Tagging package [spacewalk-setup] version [1.1.5-1] in directory [spacewalk/setup/].
Changes since rhn-client-tools-1.1.9-1:
Miroslav Suchý (1):
Automatic commit of package [spacewalk-setup] release [1.1.5-1].
---
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/spacewalk-setup.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
---
13 years, 9 months
Changes to 'refs/tags/rhn-client-tools-1.1.9-1'
by Miroslav Suchý
Tag 'rhn-client-tools-1.1.9-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2010-07-01 15:14 +0000
Tagging package [rhn-client-tools] version [1.1.9-1] in directory [client/rhel/rhn-client-tools/].
Changes since rhnlib-2.5.25-1:
Miroslav Suchý (1):
Automatic commit of package [rhn-client-tools] release [1.1.9-1].
---
client/rhel/rhn-client-tools/rhn-client-tools.spec | 7 ++++++-
rel-eng/packages/rhn-client-tools | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
---
13 years, 9 months
2 commits - client/rhel rel-eng/packages spacewalk/setup
by Miroslav Suchý
client/rhel/rhn-client-tools/rhn-client-tools.spec | 7 ++++++-
rel-eng/packages/rhn-client-tools | 2 +-
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/spacewalk-setup.spec | 6 +++++-
4 files changed, 13 insertions(+), 4 deletions(-)
New commits:
commit 33f7b1ef352da04f12931d27873091648526e880
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Jul 1 17:15:03 2010 +0200
Automatic commit of package [spacewalk-setup] release [1.1.5-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index 67808cb..fe43415 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-1.1.4-1 spacewalk/setup/
+1.1.5-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index 756d89f..b629ed2 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup
-Version: 1.1.4
+Version: 1.1.5
Release: 1%{?dist}
Summary: Initial setup tools for Red Hat Spacewalk
@@ -99,6 +99,10 @@ rm -rf %{buildroot}
%attr(755, apache, root) %{_var}/spacewalk
%changelog
+* Thu Jul 01 2010 Miroslav Suchý <msuchy(a)redhat.com> 1.1.5-1
+- For local database, we shall use the syntax without slashes. Even if the jdbc
+ driver goes via TCP anyway. (jpazdziora(a)redhat.com)
+
* Mon Jun 28 2010 Jan Pazdziora 1.1.4-1
- The default_db has username and password in Oracle case, let's make it the
same for PostgreSQL.
commit a221b0936a9d703a8ef231e04cb51e6b8c0070e8
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Jul 1 17:14:23 2010 +0200
Automatic commit of package [rhn-client-tools] release [1.1.9-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 7afc17c..179d7d1 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -4,7 +4,7 @@ Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL: https://fedorahosted.org/spacewalk
Name: rhn-client-tools
-Version: 1.1.8
+Version: 1.1.9
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -280,6 +280,11 @@ make -f Makefile.rhn-client-tools test
%endif
%changelog
+* Thu Jul 01 2010 Miroslav Suchý <msuchy(a)redhat.com> 1.1.9-1
+- Clean up a few remaining references to kbase 6227
+ (joshua.roys(a)gtri.gatech.edu)
+- 604101 - kbase article 6227 changed name & location (mzazrivec(a)redhat.com)
+
* Fri Jun 18 2010 Miroslav Suchý <msuchy(a)redhat.com> 1.1.8-1
- fix syntax error (msuchy(a)redhat.com)
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index 731ee13..5b965a6 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-1.1.8-1 client/rhel/rhn-client-tools/
+1.1.9-1 client/rhel/rhn-client-tools/
13 years, 9 months
Changes to 'refs/tags/spacewalk-web-1.1.4-1'
by Miroslav Suchý
Tag 'spacewalk-web-1.1.4-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2010-07-01 15:06 +0000
Tagging package [spacewalk-web] version [1.1.4-1] in directory [web/].
Changes since spacewalk-backend-1.1.26-1:
Miroslav Suchý (1):
Automatic commit of package [spacewalk-web] release [1.1.4-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
---
13 years, 9 months
Changes to 'refs/tags/spacewalk-schema-1.1.6-1'
by Miroslav Suchý
Tag 'spacewalk-schema-1.1.6-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2010-07-01 15:07 +0000
Tagging package [spacewalk-schema] version [1.1.6-1] in directory [schema/spacewalk/].
Changes since spacewalk-backend-1.1.26-1:
Miroslav Suchý (2):
Automatic commit of package [spacewalk-web] release [1.1.4-1].
Automatic commit of package [spacewalk-schema] release [1.1.6-1].
---
rel-eng/packages/spacewalk-schema | 2 -
rel-eng/packages/spacewalk-web | 2 -
schema/spacewalk/spacewalk-schema.spec | 48 ++++++++++++++++++++++++++++++++-
web/spacewalk-web.spec | 6 +++-
4 files changed, 54 insertions(+), 4 deletions(-)
---
13 years, 9 months