Changes to 'refs/tags/spacewalk-search-1.8.3-1'
by Jan Pazdziora
Tag 'spacewalk-search-1.8.3-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-05-31 11:33 +0000
Tagging package [spacewalk-search] version [1.8.3-1] in directory [search-server/spacewalk-search/].
Changes since spacewalk-schema-1.8.45-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-search] release [1.8.3-1].
---
rel-eng/packages/spacewalk-search | 2 +-
search-server/spacewalk-search/spacewalk-search.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
11 years, 11 months
rel-eng/packages search-server/spacewalk-search
by Jan Pazdziora
rel-eng/packages/spacewalk-search | 2 +-
search-server/spacewalk-search/spacewalk-search.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 62df139d0367481b9c9fdf19c1ff3a1534fa9be5
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu May 31 13:33:33 2012 +0200
Automatic commit of package [spacewalk-search] release [1.8.3-1].
diff --git a/rel-eng/packages/spacewalk-search b/rel-eng/packages/spacewalk-search
index f5b3955..d969dbb 100644
--- a/rel-eng/packages/spacewalk-search
+++ b/rel-eng/packages/spacewalk-search
@@ -1 +1 @@
-1.8.2-1 search-server/spacewalk-search/
+1.8.3-1 search-server/spacewalk-search/
diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec
index 883810f..0e501a8 100644
--- a/search-server/spacewalk-search/spacewalk-search.spec
+++ b/search-server/spacewalk-search/spacewalk-search.spec
@@ -4,7 +4,7 @@ Name: spacewalk-search
Summary: Spacewalk Full Text Search Server
Group: Applications/Internet
License: GPLv2
-Version: 1.8.2
+Version: 1.8.3
Release: 1%{?dist}
# This src.rpm is cannonical upstream
# You can obtain it using this set of commands
@@ -123,6 +123,9 @@ fi
%{_sysconfdir}/logrotate.d/rhn-search
%changelog
+* Thu May 31 2012 Jan Pazdziora 1.8.3-1
+- Start indexing XCCDF idents.
+
* Fri Apr 27 2012 Jan Pazdziora 1.8.2-1
- 816299 - Updating default config files with additional options for heapdump
directory (sherr(a)redhat.com)
11 years, 11 months
Changes to 'refs/tags/spacewalk-schema-1.8.45-1'
by Jan Pazdziora
Tag 'spacewalk-schema-1.8.45-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-05-31 11:32 +0000
Tagging package [spacewalk-schema] version [1.8.45-1] in directory [schema/spacewalk/].
Changes since spacewalk-java-1.8.80-1:
Jan Pazdziora (11):
Disable rhn_servernetwork_mod_trig while updating rhnServerNetwork, so that modified does not get modified.
Disable rhn_server_channel_mod_trig while updating rhnServerChannel, so that modified does not get modified.
Disable rhn_privcf_mod_trig while updating rhnPrivateChannelFamily, so that modified does not get modified.
Fixing misleading comment.
Disable rhn_confcontent_mod_trig while updating rhnConfigContent, so that modified does not get modified.
Disable rhn_channel_mod_trig while updating rhnChannel, so that modified does not get modified.
Disable rhn_errata_file_mod_trig while updating rhnErrataFile, so that modified does not get modified.
Disable rhn_erratafiletmp_mod_trig while updating rhnErrataFileTmp, so that modified does not get modified.
Disable rhn_ks_mod_trig while updating rhnKsData, so that modified does not get modified.
Disable rhn_pkgsrc_mod_trig while updating rhnPackageSource, so that modified does not get modified.
Automatic commit of package [spacewalk-schema] release [1.8.45-1].
---
rel-eng/packages/spacewalk-schema | 2
schema/spacewalk/spacewalk-schema.spec | 23 +++++++++-
schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/191-rhnChannel.sql | 4 +
schema/spacewalk/upgrade/spacewalk-schema-0.7-to-spacewalk-schema-0.8/009-rhnChannel-checksum_type.sql | 2
schema/spacewalk/upgrade/spacewalk-schema-0.7-to-spacewalk-schema-0.8/013-2-rhnErrataFile-data.sql | 3 +
schema/spacewalk/upgrade/spacewalk-schema-0.7-to-spacewalk-schema-0.8/014-2-rhnErrataFileTmp-data.sql | 3 +
schema/spacewalk/upgrade/spacewalk-schema-0.7-to-spacewalk-schema-0.8/016-2-rhnConfigContent-data.sql | 3 +
schema/spacewalk/upgrade/spacewalk-schema-0.7-to-spacewalk-schema-0.8/017-2-rhnPackageSource-data.sql | 3 +
schema/spacewalk/upgrade/spacewalk-schema-1.0-to-spacewalk-schema-1.1/003-rhnPrivateChannelFamily.sql | 3 +
schema/spacewalk/upgrade/spacewalk-schema-1.0-to-spacewalk-schema-1.1/004-rhnServerChannel.sql | 2
schema/spacewalk/upgrade/spacewalk-schema-1.0-to-spacewalk-schema-1.1/101-update-config-schema.sql | 4 +
schema/spacewalk/upgrade/spacewalk-schema-1.0-to-spacewalk-schema-1.1/106-rhnServerNetwork.sql | 2
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/052-rhnKSData-nobase.sql | 6 ++
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/102-rhnKickstartTimeZone_data.sql | 2
14 files changed, 56 insertions(+), 6 deletions(-)
---
11 years, 11 months
rel-eng/packages schema/spacewalk
by Jan Pazdziora
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 23 ++++++++++++++++++++++-
2 files changed, 23 insertions(+), 2 deletions(-)
New commits:
commit 3f6148e8f928521ea56b41c373a561af113aa9b7
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu May 31 13:32:38 2012 +0200
Automatic commit of package [spacewalk-schema] release [1.8.45-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index e1e436e..5d729c9 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.8.44-1 schema/spacewalk/
+1.8.45-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index fbb1236..2c6bb8ec 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.8.44
+Version: 1.8.45
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -68,6 +68,27 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Thu May 31 2012 Jan Pazdziora 1.8.45-1
+- Disable rhn_pkgsrc_mod_trig while updating rhnPackageSource, so that modified
+ does not get modified.
+- Disable rhn_ks_mod_trig while updating rhnKsData, so that modified does not
+ get modified.
+- Disable rhn_erratafiletmp_mod_trig while updating rhnErrataFileTmp, so that
+ modified does not get modified.
+- Disable rhn_errata_file_mod_trig while updating rhnErrataFile, so that
+ modified does not get modified.
+- Disable rhn_channel_mod_trig while updating rhnChannel, so that modified does
+ not get modified.
+- Disable rhn_confcontent_mod_trig while updating rhnConfigContent, so that
+ modified does not get modified.
+- Fixing misleading comment.
+- Disable rhn_privcf_mod_trig while updating rhnPrivateChannelFamily, so that
+ modified does not get modified.
+- Disable rhn_server_channel_mod_trig while updating rhnServerChannel, so that
+ modified does not get modified.
+- Disable rhn_servernetwork_mod_trig while updating rhnServerNetwork, so that
+ modified does not get modified.
+
* Wed May 30 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.44-1
- fixed build time sanity check errors
11 years, 11 months
10 commits - schema/spacewalk
by Jan Pazdziora
schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/191-rhnChannel.sql | 4 ++++
schema/spacewalk/upgrade/spacewalk-schema-0.7-to-spacewalk-schema-0.8/009-rhnChannel-checksum_type.sql | 2 ++
schema/spacewalk/upgrade/spacewalk-schema-0.7-to-spacewalk-schema-0.8/013-2-rhnErrataFile-data.sql | 3 +++
schema/spacewalk/upgrade/spacewalk-schema-0.7-to-spacewalk-schema-0.8/014-2-rhnErrataFileTmp-data.sql | 3 +++
schema/spacewalk/upgrade/spacewalk-schema-0.7-to-spacewalk-schema-0.8/016-2-rhnConfigContent-data.sql | 3 +++
schema/spacewalk/upgrade/spacewalk-schema-0.7-to-spacewalk-schema-0.8/017-2-rhnPackageSource-data.sql | 3 +++
schema/spacewalk/upgrade/spacewalk-schema-1.0-to-spacewalk-schema-1.1/003-rhnPrivateChannelFamily.sql | 3 +++
schema/spacewalk/upgrade/spacewalk-schema-1.0-to-spacewalk-schema-1.1/004-rhnServerChannel.sql | 2 ++
schema/spacewalk/upgrade/spacewalk-schema-1.0-to-spacewalk-schema-1.1/101-update-config-schema.sql | 4 +++-
schema/spacewalk/upgrade/spacewalk-schema-1.0-to-spacewalk-schema-1.1/106-rhnServerNetwork.sql | 2 ++
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/052-rhnKSData-nobase.sql | 6 +++++-
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/102-rhnKickstartTimeZone_data.sql | 2 --
12 files changed, 33 insertions(+), 4 deletions(-)
New commits:
commit 53f529172f66141bef8066d22dd10d9548e45df0
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed May 30 14:29:09 2012 +0200
Disable rhn_pkgsrc_mod_trig while updating rhnPackageSource, so that modified does not get modified.
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.7-to-spacewalk-schema-0.8/017-2-rhnPackageSource-data.sql b/schema/spacewalk/upgrade/spacewalk-schema-0.7-to-spacewalk-schema-0.8/017-2-rhnPackageSource-data.sql
index 5db4768..5e4eb45 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-0.7-to-spacewalk-schema-0.8/017-2-rhnPackageSource-data.sql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-0.7-to-spacewalk-schema-0.8/017-2-rhnPackageSource-data.sql
@@ -1,3 +1,5 @@
+alter trigger rhn_pkgsrc_mod_trig disable;
+
declare
md5_id number;
begin
@@ -37,3 +39,4 @@ begin
end;
/
+alter trigger rhn_pkgsrc_mod_trig enable;
commit 6c7c20dc41bd3249df3dc8bce9d4510b61cfa938
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed May 30 13:27:11 2012 +0200
Disable rhn_ks_mod_trig while updating rhnKsData, so that modified does not get modified.
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/052-rhnKSData-nobase.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/052-rhnKSData-nobase.sql
index f822104..3ab4d30 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/052-rhnKSData-nobase.sql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/052-rhnKSData-nobase.sql
@@ -1,5 +1,5 @@
--
--- Copyright (c) 2010 Red Hat, Inc.
+-- Copyright (c) 2010--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
@@ -13,6 +13,8 @@
-- in this software or its documentation.
--
+alter trigger rhn_ks_mod_trig disable;
+
alter table rhnKsData add (
no_base CHAR(1)
DEFAULT ('N') NOT NULL
@@ -23,3 +25,5 @@ alter table rhnKsData add (
CONSTRAINT rhn_ks_ignore_missing_ck
CHECK (ignore_missing in ( 'Y' , 'N' ))
);
+
+alter trigger rhn_ks_mod_trig enable;
commit 069d8a41a09524cac0e7449a2cb35e2b675cc37e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed May 30 13:19:20 2012 +0200
Disable rhn_erratafiletmp_mod_trig while updating rhnErrataFileTmp, so that modified does not get modified.
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.7-to-spacewalk-schema-0.8/014-2-rhnErrataFileTmp-data.sql b/schema/spacewalk/upgrade/spacewalk-schema-0.7-to-spacewalk-schema-0.8/014-2-rhnErrataFileTmp-data.sql
index defbe4e..f07d797 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-0.7-to-spacewalk-schema-0.8/014-2-rhnErrataFileTmp-data.sql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-0.7-to-spacewalk-schema-0.8/014-2-rhnErrataFileTmp-data.sql
@@ -1,3 +1,5 @@
+alter trigger rhn_erratafiletmp_mod_trig disable;
+
declare
md5_id number;
begin
@@ -24,3 +26,4 @@ begin
end;
/
+alter trigger rhn_erratafiletmp_mod_trig enable;
commit c392d5a7e6d788294bdb77e2894e797742cf700f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed May 30 11:25:50 2012 +0200
Disable rhn_errata_file_mod_trig while updating rhnErrataFile, so that modified does not get modified.
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.7-to-spacewalk-schema-0.8/013-2-rhnErrataFile-data.sql b/schema/spacewalk/upgrade/spacewalk-schema-0.7-to-spacewalk-schema-0.8/013-2-rhnErrataFile-data.sql
index b5eac75..a02e840 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-0.7-to-spacewalk-schema-0.8/013-2-rhnErrataFile-data.sql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-0.7-to-spacewalk-schema-0.8/013-2-rhnErrataFile-data.sql
@@ -1,3 +1,5 @@
+alter trigger rhn_errata_file_mod_trig disable;
+
declare
md5_id number;
begin
@@ -24,3 +26,4 @@ begin
end;
/
+alter trigger rhn_errata_file_mod_trig enable;
commit 0abbf3e86d3f53b28347219098e5b3eacc1ce559
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed May 30 11:16:52 2012 +0200
Disable rhn_channel_mod_trig while updating rhnChannel, so that modified does not get modified.
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/191-rhnChannel.sql b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/191-rhnChannel.sql
index ceb0bd8..80b38bf 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/191-rhnChannel.sql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/191-rhnChannel.sql
@@ -4,6 +4,8 @@ ALTER TABLE rhnChannel
CONSTRAINT rhn_channel_checksum_fk
REFERENCES rhnChecksumType(id);
+alter trigger rhn_channel_mod_trig disable;
+
-- Update any existing channels that are not set
UPDATE rhnChannel SET
checksum_type_id = (select id
@@ -11,4 +13,6 @@ UPDATE rhnChannel SET
where LABEL = 'sha1')
WHERE checksum_type_id is null;
+alter trigger rhn_channel_mod_trig enable;
+
show errors
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.7-to-spacewalk-schema-0.8/009-rhnChannel-checksum_type.sql b/schema/spacewalk/upgrade/spacewalk-schema-0.7-to-spacewalk-schema-0.8/009-rhnChannel-checksum_type.sql
index 2ffa979..6ff9b07 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-0.7-to-spacewalk-schema-0.8/009-rhnChannel-checksum_type.sql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-0.7-to-spacewalk-schema-0.8/009-rhnChannel-checksum_type.sql
@@ -1,3 +1,4 @@
+alter trigger rhn_channel_mod_trig disable;
update rhnChannel
set checksum_type_id = (select id from rhnChecksumType where label = 'sha1')
where checksum_type_id is null
@@ -6,3 +7,4 @@ update rhnChannel
or parent_channel in (select id from rhnChannel
where label like 'rhel-%-server-5'
or label like 'rhel-%-client-5'));
+alter trigger rhn_channel_mod_trig enable;
commit 33d9dc18425007d2a2832eb78994673e85705cdb
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed May 30 10:25:55 2012 +0200
Disable rhn_confcontent_mod_trig while updating rhnConfigContent, so that modified does not get modified.
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.7-to-spacewalk-schema-0.8/016-2-rhnConfigContent-data.sql b/schema/spacewalk/upgrade/spacewalk-schema-0.7-to-spacewalk-schema-0.8/016-2-rhnConfigContent-data.sql
index 38dca0e..129a2b0 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-0.7-to-spacewalk-schema-0.8/016-2-rhnConfigContent-data.sql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-0.7-to-spacewalk-schema-0.8/016-2-rhnConfigContent-data.sql
@@ -1,3 +1,5 @@
+alter trigger rhn_confcontent_mod_trig disable;
+
declare
md5_id number;
begin
@@ -24,3 +26,4 @@ begin
end;
/
+alter trigger rhn_confcontent_mod_trig enable;
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.0-to-spacewalk-schema-1.1/101-update-config-schema.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.0-to-spacewalk-schema-1.1/101-update-config-schema.sql
index 11a6d78..8d1f879 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.0-to-spacewalk-schema-1.1/101-update-config-schema.sql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.0-to-spacewalk-schema-1.1/101-update-config-schema.sql
@@ -1,5 +1,5 @@
--
--- Copyright (c) 2008--2010 Red Hat, Inc.
+-- 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
@@ -27,6 +27,7 @@ CREATE UNIQUE INDEX rhn_confinfo_ugf_uq
alter table rhnConfigContent add delim_start VARCHAR2(16);
alter table rhnConfigContent add delim_end VARCHAR2(16);
+alter trigger rhn_confcontent_mod_trig disable;
DECLARE
CURSOR config_content_delimeters is
select CONFIG_CONTENT_ID, DELIM_START, DELIM_END
@@ -44,6 +45,7 @@ BEGIN
commit;
END;
/
+alter trigger rhn_confcontent_mod_trig enable;
alter table rhnConfigContent modify delim_start not null;
alter table rhnConfigContent modify delim_end not null;
commit 19eb58051ad0f5ce7ac34d4a5ac16698a971c638
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue May 29 17:13:42 2012 +0200
Fixing misleading comment.
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/102-rhnKickstartTimeZone_data.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/102-rhnKickstartTimeZone_data.sql
index 89c2964..a78bb78 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/102-rhnKickstartTimeZone_data.sql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/102-rhnKickstartTimeZone_data.sql
@@ -14,8 +14,6 @@
--
--- A view that displays packages which can be updated on selected client.
--- This is an uncached version of rhnServerNeededCache.
-- RHEL 6 timezones
insert into rhnKickstartTimezone (id, label, name, install_type)
commit 0ca989826e19bde678162930d73cf9855f28c709
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue May 29 11:48:31 2012 +0200
Disable rhn_privcf_mod_trig while updating rhnPrivateChannelFamily, so that modified does not get modified.
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.0-to-spacewalk-schema-1.1/003-rhnPrivateChannelFamily.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.0-to-spacewalk-schema-1.1/003-rhnPrivateChannelFamily.sql
index ab23540..54a2cb8 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.0-to-spacewalk-schema-1.1/003-rhnPrivateChannelFamily.sql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.0-to-spacewalk-schema-1.1/003-rhnPrivateChannelFamily.sql
@@ -1,3 +1,6 @@
+
+alter trigger rhn_privcf_mod_trig disable;
alter table rhnPrivateChannelFamily add FVE_MAX_MEMBERS NUMBER default (0);
alter table rhnPrivateChannelFamily add FVE_CURRENT_MEMBERS NUMBER
DEFAULT (0) NOT NULL;
+alter trigger rhn_privcf_mod_trig enable;
commit a35ebe422a16df70487524bff28fcc43fa99312f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue May 29 11:21:47 2012 +0200
Disable rhn_server_channel_mod_trig while updating rhnServerChannel, so that modified does not get modified.
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.0-to-spacewalk-schema-1.1/004-rhnServerChannel.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.0-to-spacewalk-schema-1.1/004-rhnServerChannel.sql
index 3a86e4d..9d01249 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.0-to-spacewalk-schema-1.1/004-rhnServerChannel.sql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.0-to-spacewalk-schema-1.1/004-rhnServerChannel.sql
@@ -1,4 +1,6 @@
+alter trigger rhn_server_channel_mod_trig disable;
alter TABLE rhnServerChannel add is_fve char default 'N'
CONSTRAINT rhn_server_channel_is_fve_nn NOT NULL
CONSTRAINT rhn_server_channel_is_fve_ck CHECK (IS_FVE IN ('Y', 'N'));
+alter trigger rhn_server_channel_mod_trig enable;
commit 8b30385ccd7e0c9ee2b372fda84b7b1986bc995c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue May 29 11:14:58 2012 +0200
Disable rhn_servernetwork_mod_trig while updating rhnServerNetwork, so that modified does not get modified.
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.0-to-spacewalk-schema-1.1/106-rhnServerNetwork.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.0-to-spacewalk-schema-1.1/106-rhnServerNetwork.sql
index 09357f8..10b82f0 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.0-to-spacewalk-schema-1.1/106-rhnServerNetwork.sql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.0-to-spacewalk-schema-1.1/106-rhnServerNetwork.sql
@@ -1,2 +1,4 @@
alter table rhnServerNetwork modify (ipaddr varchar(16));
+alter trigger rhn_servernetwork_mod_trig disable;
update rhnServerNetwork set ipaddr=trim(ipaddr);
+alter trigger rhn_servernetwork_mod_trig enable;
11 years, 11 months
Changes to 'refs/tags/spacewalk-java-1.8.80-1'
by Tomas Lestach
Tag 'spacewalk-java-1.8.80-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-05-30 16:21 +0000
Tagging package [spacewalk-java] version [1.8.80-1] in directory [java/].
Changes since spacewalk-java-1.8.79-1:
Tomas Lestach (10):
checkstyle 5: TreeWalker is not allowed as a parent of RegexpHeader
checkstyle 5: cannot initialize module TreeWalker - Unable to instantiate TabCharacter
checkstyle 5: cannot initialize module TreeWalker - Unable to instantiate GenericIllegalRegexp
checkstyle: SetLabels - Utility classes should not have a public or default constructor.
checkstyle: the name [todo] is not a valid Javadoc tag name
checkstyle: TaskConstants - Utility classes should not have a public or default constructor.
checkstyle: TestStatics - Utility classes should not have a public or default constructor.
checkstyle: VirtualInstanceFactory - Redundant 'static' modifier.
switch checkstyle to be run on RHEL6
Automatic commit of package [spacewalk-java] release [1.8.80-1].
---
java/buildconf/checkstyle.xml | 42 ++++------
java/code/src/com/redhat/rhn/domain/server/VirtualInstanceFactory.java | 2
java/code/src/com/redhat/rhn/frontend/action/SetLabels.java | 2
java/code/src/com/redhat/rhn/frontend/xmlrpc/XmlRpcServlet.java | 4
java/code/src/com/redhat/rhn/taskomatic/task/TaskConstants.java | 2
java/code/src/com/redhat/rhn/testing/TestStatics.java | 2
java/spacewalk-java.spec | 23 ++++-
rel-eng/packages/spacewalk-java | 2
8 files changed, 49 insertions(+), 30 deletions(-)
---
11 years, 11 months
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 18 +++++++++++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 18 insertions(+), 2 deletions(-)
New commits:
commit 6648a19a16296c55e55e2b5fd3199256da303360
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed May 30 18:21:20 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.80-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index fb1fe07..d884638 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -23,7 +23,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.79
+Version: 1.8.80
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -606,6 +606,22 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed May 30 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.80-1
+- switch checkstyle to be run on RHEL6
+- checkstyle: VirtualInstanceFactory - Redundant 'static' modifier.
+- checkstyle: TestStatics - Utility classes should not have a public or default
+ constructor.
+- checkstyle: TaskConstants - Utility classes should not have a public or
+ default constructor.
+- checkstyle: the name [todo] is not a valid Javadoc tag name
+- checkstyle: SetLabels - Utility classes should not have a public or default
+ constructor.
+- checkstyle 5: cannot initialize module TreeWalker - Unable to instantiate
+ GenericIllegalRegexp
+- checkstyle 5: cannot initialize module TreeWalker - Unable to instantiate
+ TabCharacter
+- checkstyle 5: TreeWalker is not allowed as a parent of RegexpHeader
+
* Wed May 30 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.79-1
- checkstyle fix
- omit accessible parameter
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 7bbf6a5..f2c405b 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.79-1 java/
+1.8.80-1 java/
11 years, 11 months
9 commits - java/buildconf java/code java/spacewalk-java.spec
by Tomas Lestach
java/buildconf/checkstyle.xml | 42 ++++------
java/code/src/com/redhat/rhn/domain/server/VirtualInstanceFactory.java | 2
java/code/src/com/redhat/rhn/frontend/action/SetLabels.java | 2
java/code/src/com/redhat/rhn/frontend/xmlrpc/XmlRpcServlet.java | 4
java/code/src/com/redhat/rhn/taskomatic/task/TaskConstants.java | 2
java/code/src/com/redhat/rhn/testing/TestStatics.java | 2
java/spacewalk-java.spec | 5 -
7 files changed, 31 insertions(+), 28 deletions(-)
New commits:
commit 0bed52d0b835a9453da34a979e68855b3325577d
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed May 30 16:17:32 2012 +0200
switch checkstyle to be run on RHEL6
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 4912003..fb1fe07 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -13,8 +13,9 @@
%define jardir %{_localstatedir}/lib/tomcat6/webapps/rhn/WEB-INF/lib
%endif
-%if 0%{?rhel} && 0%{?rhel} < 6
-# checkstyle is broken on Fedora 14 - we skip for now
+%if 0%{?rhel} && 0%{?rhel} >= 6
+# checkstyle is broken on Fedoras - we skip for now
+# RHEL5 checkstyle4 is incompatible with checkstyle5
%define run_checkstyle 1
%endif
commit c213bff185085c2c58201aec662fdb53989e3f71
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed May 30 16:39:06 2012 +0200
checkstyle: VirtualInstanceFactory - Redundant 'static' modifier.
diff --git a/java/code/src/com/redhat/rhn/domain/server/VirtualInstanceFactory.java b/java/code/src/com/redhat/rhn/domain/server/VirtualInstanceFactory.java
index de00456..e09faae 100644
--- a/java/code/src/com/redhat/rhn/domain/server/VirtualInstanceFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/server/VirtualInstanceFactory.java
@@ -53,7 +53,7 @@ public class VirtualInstanceFactory extends HibernateFactory {
private static Logger log = Logger
.getLogger(VirtualInstanceFactory.class);
- private static interface HibernateCallback {
+ private interface HibernateCallback {
Object executeInSession(Session session);
}
commit c0b99dc2f9aa2ca53697ee3cf2cb797ee92d0089
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed May 30 09:44:36 2012 -0400
checkstyle: TestStatics - Utility classes should not have a public or default constructor.
diff --git a/java/code/src/com/redhat/rhn/testing/TestStatics.java b/java/code/src/com/redhat/rhn/testing/TestStatics.java
index 2354776..aebbe78 100644
--- a/java/code/src/com/redhat/rhn/testing/TestStatics.java
+++ b/java/code/src/com/redhat/rhn/testing/TestStatics.java
@@ -24,4 +24,6 @@ public class TestStatics {
*/
public static final String TESTORG = "testOrg";
public static final String TESTUSER = "testUser";
+
+ private TestStatics() { }
}
commit 4e46909066c9c3d838ea3990b1facf1823a87f94
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed May 30 09:44:06 2012 -0400
checkstyle: TaskConstants - Utility classes should not have a public or default constructor.
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/TaskConstants.java b/java/code/src/com/redhat/rhn/taskomatic/task/TaskConstants.java
index c1c75c3..ba47c52 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/TaskConstants.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/TaskConstants.java
@@ -161,4 +161,6 @@ public class TaskConstants {
"repomdgenerator_package_changelog";
public static final String MODE_NAME = "Task_queries";
+
+ private TaskConstants() { }
}
commit d61ea11e575cba5c8604e579ce48f93b9f2b57c4
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed May 30 09:42:36 2012 -0400
checkstyle: the name [todo] is not a valid Javadoc tag name
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/XmlRpcServlet.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/XmlRpcServlet.java
index 2c61e19..815763b 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/XmlRpcServlet.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/XmlRpcServlet.java
@@ -33,8 +33,8 @@ import redstone.xmlrpc.XmlRpcCustomSerializer;
* A basic servlet class that registers handlers for xmlrpc calls
*
* @version $Rev$
- * @todo pull in namespace + classes for handlers from, say, a properties file
- * @todo perhaps override doGet ??
+ * todo pull in namespace + classes for handlers from, say, a properties file
+ * todo perhaps override doGet ??
*/
public class XmlRpcServlet extends HttpServlet {
commit 71b3d0be7efc17fbde9f704fd72e64d8af451e0d
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed May 30 09:41:08 2012 -0400
checkstyle: SetLabels - Utility classes should not have a public or default constructor.
diff --git a/java/code/src/com/redhat/rhn/frontend/action/SetLabels.java b/java/code/src/com/redhat/rhn/frontend/action/SetLabels.java
index 26e7855..b25192d 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/SetLabels.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/SetLabels.java
@@ -26,4 +26,6 @@ public final class SetLabels {
public static final String PATCH_INSTALL_SET = "install_patch_list";
public static final String PATCH_REMOVE_SET = "removable_patch_list";
public static final String PACKAGE_UPGRADE_SET = "upgrade_package_list";
+
+ private SetLabels() { }
}
commit 061abe4ad194f7b1da0fd4a16420f020b5e05ec5
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed May 30 16:07:17 2012 +0200
checkstyle 5: cannot initialize module TreeWalker - Unable to instantiate GenericIllegalRegexp
diff --git a/java/buildconf/checkstyle.xml b/java/buildconf/checkstyle.xml
index 5208a6a..b8cb442 100644
--- a/java/buildconf/checkstyle.xml
+++ b/java/buildconf/checkstyle.xml
@@ -145,13 +145,6 @@ MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, S
<module name="MethodParamPad">
<property name="allowLineBreaks" value="true"/>
</module>
- <module name="GenericIllegalRegexp">
- <!-- \s matches whitespace character, $ matches end of line. -->
- <property name="format" value="\s+$"/>
- <property name="message" value="Line has trailing spaces."/>
- </module>
-
-
<!-- Modifier Checks -->
<!-- See http://checkstyle.sf.net/config_modifiers.html -->
@@ -232,4 +225,10 @@ MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, S
<module name="FileTabCharacter"/>
+ <module name="RegexpSingleline">
+ <!-- \s matches whitespace character, $ matches end of line. -->
+ <property name="format" value="\s+$"/>
+ <property name="message" value="Line has trailing spaces."/>
+ </module>
+
</module>
commit 3d36b0139a1d650fe911d44782a67d6733aa4ea4
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed May 30 16:04:37 2012 +0200
checkstyle 5: cannot initialize module TreeWalker - Unable to instantiate TabCharacter
diff --git a/java/buildconf/checkstyle.xml b/java/buildconf/checkstyle.xml
index fc5d174..5208a6a 100644
--- a/java/buildconf/checkstyle.xml
+++ b/java/buildconf/checkstyle.xml
@@ -133,8 +133,6 @@
<property name="option" value="eol" />
</module>
<module name="ParenPad"/>
-<!-- <module name="TypecastParenPad"/> -->
- <module name="TabCharacter"/>
<module name="WhitespaceAfter">
<property name="tokens" value="COMMA, SEMI, GENERIC_END"/>
</module>
@@ -232,4 +230,6 @@ MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, S
<property name="headerFile" value="${checkstyle.header.file}"/>
</module>
+ <module name="FileTabCharacter"/>
+
</module>
commit fef0aaad34675b53c5f50415f4bc006f448c6edd
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed May 30 16:01:02 2012 +0200
checkstyle 5: TreeWalker is not allowed as a parent of RegexpHeader
diff --git a/java/buildconf/checkstyle.xml b/java/buildconf/checkstyle.xml
index 9b33b04..fc5d174 100644
--- a/java/buildconf/checkstyle.xml
+++ b/java/buildconf/checkstyle.xml
@@ -100,20 +100,6 @@
<module name="StaticVariableName"/>
<module name="TypeName"/>
-
- <!-- Checks for Headers -->
- <!-- See http://checkstyle.sourceforge.net/config_header.html#RegexpHeader -->
- <!-- Following interprets the header file as regular expressions. -->
- <module name="RegexpHeader">
- <!-- The follow property value demonstrates the ability -->
- <!-- to have access to ANT properties. In this case it uses -->
- <!-- the ${basedir} property to allow Checkstyle to be run -->
- <!-- from any directory within a project. -->
- <property name="headerFile" value="${checkstyle.header.file}"/>
- </module>
-
-
-
<!-- Checks for imports -->
<!-- See http://checkstyle.sf.net/config_import.html -->
<module name="AvoidStarImport"/>
@@ -235,4 +221,15 @@ MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, S
-->
</module>
+ <!-- Checks for Headers -->
+ <!-- See http://checkstyle.sourceforge.net/config_header.html#RegexpHeader -->
+ <!-- Following interprets the header file as regular expressions. -->
+ <module name="RegexpHeader">
+ <!-- The follow property value demonstrates the ability -->
+ <!-- to have access to ANT properties. In this case it uses -->
+ <!-- the ${basedir} property to allow Checkstyle to be run -->
+ <!-- from any directory within a project. -->
+ <property name="headerFile" value="${checkstyle.header.file}"/>
+ </module>
+
</module>
11 years, 11 months
Changes to 'refs/tags/spacewalk-java-1.8.79-1'
by Michael Mraka
Tag 'spacewalk-java-1.8.79-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-05-30 09:04 +0000
Tagging package [spacewalk-java] version [1.8.79-1] in directory [java/].
Changes since spacewalk-schema-1.8.44-1:
Michael Mraka (1):
Automatic commit of package [spacewalk-java] release [1.8.79-1].
---
java/spacewalk-java.spec | 9 ++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
---
11 years, 11 months
java/spacewalk-java.spec rel-eng/packages
by Michael Mraka
java/spacewalk-java.spec | 9 ++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit b46fd3992992a714c0ccc432997d54dff36cbea0
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed May 30 11:04:41 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.79-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 4c7e971..4912003 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.78
+Version: 1.8.79
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -605,6 +605,13 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed May 30 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.79-1
+- checkstyle fix
+- omit accessible parameter
+- simplify construct
+- remove unnecessarily nested else clause
+- remove unused imports
+
* Tue May 29 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.78-1
- modified java stack to use new user_role_check_debug()
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index f6dc9a0..7bbf6a5 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.78-1 java/
+1.8.79-1 java/
11 years, 11 months