February 2012 - spacewalk-commits - Fedora Mailing-Lists

Changes to 'refs/tags/spacewalk-schema-1.7.46-1'

by Jan Pazdziora

Tag 'spacewalk-schema-1.7.46-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-02-28 11:49 +0000 Tagging package [spacewalk-schema] version [1.7.46-1] in directory [schema/spacewalk/]. Changes since spacewalk-java-1.7.46-1: Jan Pazdziora (1): Automatic commit of package [spacewalk-schema] release [1.7.46-1]. Milan Zazrivec (4): lookup_evr: use autonomous_transaction for insert only use pg_dblink_exec to execute insert inside lookup_evr lookup_evr: schema upgrade fix insert_evr's return --- rel-eng/packages/spacewalk-schema | 2 schema/spacewalk/oracle/procs/insert_evr.sql | 30 ++++ schema/spacewalk/oracle/procs/lookup_evr.sql | 63 ++++----- schema/spacewalk/oracle/procs/procs.deps | 3 schema/spacewalk/postgres/procs/insert_evr.sql | 2 schema/spacewalk/postgres/procs/lookup_evr.sql | 64 ++++++---- schema/spacewalk/postgres/procs/procs.deps | 2 schema/spacewalk/spacewalk-schema.spec | 26 +++- schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/096-lookup_evr.sql.oracle | 48 +++++++ schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/096-lookup_evr.sql.postgresql | 56 ++++++++ 10 files changed, 234 insertions(+), 62 deletions(-) ---

12 years, 2 months

1
0
0 / 0

rel-eng/packages schema/spacewalk

by Jan Pazdziora

rel-eng/packages/spacewalk-schema | 2 +- schema/spacewalk/spacewalk-schema.spec | 26 +++++++++++++++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) New commits: commit 5aaa4d16d386e3e359be85d7a410b304f00a9021 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Feb 28 12:49:22 2012 +0100 Automatic commit of package [spacewalk-schema] release [1.7.46-1]. diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema index 9f90fb1..86a84c7 100644 --- a/rel-eng/packages/spacewalk-schema +++ b/rel-eng/packages/spacewalk-schema @@ -1 +1 @@ -1.7.45-1 schema/spacewalk/ +1.7.46-1 schema/spacewalk/ diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec index 79253e8..023c2ae 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.7.45 +Version: 1.7.46 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz @@ -66,6 +66,30 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/spacewalk-sql* %changelog +* Tue Feb 28 2012 Jan Pazdziora 1.7.46-1 +- fix insert_evr's return (mzazrivec(a)redhat.com) +- lookup_evr: schema upgrade (mzazrivec(a)redhat.com) +- use pg_dblink_exec to execute insert inside lookup_evr (mzazrivec(a)redhat.com) +- lookup_evr: use autonomous_transaction for insert only (mzazrivec(a)redhat.com) +- no need for autonomous_transaction in lookup_erratafile_type + (mzazrivec(a)redhat.com) +- lookup_cve: postgresql schema upgrade (mzazrivec(a)redhat.com) +- use pg_dblink_exec to execute insert inside lookup_cve (mzazrivec(a)redhat.com) +- lookup_cve: oracle schema upgrade (mzazrivec(a)redhat.com) +- use autonomous_transaction for insert only (mzazrivec(a)redhat.com) +- we don't need the autonomous_transaction pragma in lookup_config_info anymore + (mzazrivec(a)redhat.com) +- update postgresql procs dependencies (mzazrivec(a)redhat.com) +- lookup_config_info: postgresql schema ugprade (mzazrivec(a)redhat.com) +- use pg_dblink_exec to execute insert inside lookup_config_info + (mzazrivec(a)redhat.com) +- lookup_config_info: correct proc dependencies (mzazrivec(a)redhat.com) +- lookup_config_info: schema upgrade (mzazrivec(a)redhat.com) +- restrict autonomous_transaction to insert only (mzazrivec(a)redhat.com) +- create equivalent (empty) files for postgresql (mzazrivec(a)redhat.com) +- fixing oracle equivalent source sha1s for upgrade scripts 081-092 + (tlestach(a)redhat.com) + * Mon Feb 27 2012 Simon Lukasik <slukasik(a)redhat.com> 1.7.45-1 - Correct sha1sum of oracle equivalents (slukasik(a)redhat.com)

12 years, 2 months

1
0
0 / 0

schema/spacewalk

by Milan Zazrivec

schema/spacewalk/oracle/procs/insert_evr.sql | 1 schema/spacewalk/postgres/procs/insert_evr.sql | 2 - schema/spacewalk/postgres/procs/lookup_evr.sql | 2 - schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/096-lookup_evr.sql.oracle | 18 ++++++++++ schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/096-lookup_evr.sql.postgresql | 2 - 5 files changed, 22 insertions(+), 3 deletions(-) New commits: commit 3660c63bad2505a278860864ebc2de294685e35c Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Tue Feb 28 12:36:31 2012 +0100 fix insert_evr's return diff --git a/schema/spacewalk/oracle/procs/insert_evr.sql b/schema/spacewalk/oracle/procs/insert_evr.sql index 4f5fec2..016ee0b 100644 --- a/schema/spacewalk/oracle/procs/insert_evr.sql +++ b/schema/spacewalk/oracle/procs/insert_evr.sql @@ -24,6 +24,7 @@ begin r_in, evr_t(e_in, v_in, r_in)) returning id into evr_id; commit; + return evr_id; end; / show errors diff --git a/schema/spacewalk/postgres/procs/insert_evr.sql b/schema/spacewalk/postgres/procs/insert_evr.sql index fdd7cec..843564b 100644 --- a/schema/spacewalk/postgres/procs/insert_evr.sql +++ b/schema/spacewalk/postgres/procs/insert_evr.sql @@ -1,2 +1,2 @@ --- oracle equivalent source sha1 873017e2b56a8c100659f47d5158fcb5e0f936dd +-- oracle equivalent source sha1 3b34c56a2f9af5419b343fde3245d9bfd6822983 -- This file is intentionally left empty. diff --git a/schema/spacewalk/postgres/procs/lookup_evr.sql b/schema/spacewalk/postgres/procs/lookup_evr.sql index 1952e4d..af24ae7 100644 --- a/schema/spacewalk/postgres/procs/lookup_evr.sql +++ b/schema/spacewalk/postgres/procs/lookup_evr.sql @@ -1,4 +1,4 @@ --- oracle equivalent source sha1 741172a1f8f23e20540fd2b5dd50a5b193e6cab3 +-- oracle equivalent source sha1 231a317e7ec144399cc913861269e968d41b8840 -- -- Copyright (c) 2008--2012 Red Hat, Inc. -- diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/096-lookup_evr.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/096-lookup_evr.sql.oracle index ac2a8af..90e2348 100644 --- a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/096-lookup_evr.sql.oracle +++ b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/096-lookup_evr.sql.oracle @@ -1,3 +1,21 @@ +create or replace function insert_evr(e_in in varchar2, v_in in varchar2, r_in in varchar2) +return number +is + pragma autonomous_transaction; + evr_id number; +begin + insert into rhnPackageEVR(id, epoch, version, release, evr) + values (rhn_pkg_evr_seq.nextval, + e_in, + v_in, + r_in, + evr_t(e_in, v_in, r_in)) returning id into evr_id; + commit; + return evr_id; +end; +/ +show errors + create or replace function lookup_evr(e_in in varchar2, v_in in varchar2, r_in in varchar2) return number diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/096-lookup_evr.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/096-lookup_evr.sql.postgresql index ab27070..88d9ccb 100644 --- a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/096-lookup_evr.sql.postgresql +++ b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/096-lookup_evr.sql.postgresql @@ -1,4 +1,4 @@ --- oracle equivalent source sha1 d6056fb46cefe089db3dead9e49d58defa74cd08 +-- oracle equivalent source sha1 6ec664be14c5ce243efe64643024138b2864c8eb -- -- Copyright (c) 2008--2012 Red Hat, Inc. --

12 years, 2 months

1
0
0 / 0

3 commits - schema/spacewalk

by Milan Zazrivec

schema/spacewalk/oracle/procs/insert_evr.sql | 29 ++++ schema/spacewalk/oracle/procs/lookup_evr.sql | 63 ++++----- schema/spacewalk/oracle/procs/procs.deps | 3 schema/spacewalk/postgres/procs/insert_evr.sql | 2 schema/spacewalk/postgres/procs/lookup_evr.sql | 64 ++++++---- schema/spacewalk/postgres/procs/procs.deps | 2 schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/096-lookup_evr.sql.oracle | 30 ++++ schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/096-lookup_evr.sql.postgresql | 56 ++++++++ 8 files changed, 189 insertions(+), 60 deletions(-) New commits: commit 8e1341fe430ae3201ef5db8793897d6bd2a4f5f9 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Tue Feb 28 12:26:27 2012 +0100 lookup_evr: schema upgrade diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/096-lookup_evr.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/096-lookup_evr.sql.oracle new file mode 100644 index 0000000..ac2a8af --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/096-lookup_evr.sql.oracle @@ -0,0 +1,30 @@ +create or replace function +lookup_evr(e_in in varchar2, v_in in varchar2, r_in in varchar2) +return number +is + evr_id number; +begin + select id + into evr_id + from rhnPackageEVR + where ((epoch is null and e_in is null) or (epoch = e_in)) and + version = v_in and + release = r_in; + + return evr_id; +exception when no_data_found then + begin + evr_id := insert_evr(e_in, v_in, r_in); + exception when dup_val_on_index then + select id + into evr_id + from rhnPackageEVR + where ((epoch is null and e_in is null) or (epoch = e_in)) and + version = v_in and + release = r_in; + end; + + return evr_id; +end; +/ +show errors diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/096-lookup_evr.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/096-lookup_evr.sql.postgresql new file mode 100644 index 0000000..ab27070 --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/096-lookup_evr.sql.postgresql @@ -0,0 +1,56 @@ +-- oracle equivalent source sha1 d6056fb46cefe089db3dead9e49d58defa74cd08 +-- +-- 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_evr(e_in in varchar, v_in in varchar, r_in in varchar) +returns numeric +as +$$ +declare + evr_id numeric; +begin + select id + into evr_id + from rhnPackageEVR + where ((epoch is null and e_in is null) or (epoch = e_in)) and + version = v_in and + release = r_in; + + if not found then + evr_id := nextval('rhn_pkg_evr_seq'); + begin + perform pg_dblink_exec( + 'insert into rhnPackageEVR(id, epoch, version, release, evr) values (' || + evr_id || ', ' || + coalesce(quote_literal(e_in), 'NULL') || ', ' || + coalesce(quote_literal(v_in), 'NULL') || ', ' || + coalesce(quote_literal(r_in), 'NULL') || ', ' || + evr_t(coalesce(quote_literal(e_in), 'NULL'), + coalesce(quote_literal(v_in), 'NULL'), + coalesce(quote_literal(r_in), 'NULL')) || ')' + ); + exception when unique_violation then + select id + into strict evr_id + from rhnPackageEVR + where ((epoch is null and e_in is null) or (epoch = e_in)) and + version = v_in and + release = r_in; + end; + end if; + + return evr_id; +end; +$$ language plpgsql immutable; commit 54c9ad233d116ea5c311305cf09af891979364ba Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Tue Feb 28 12:24:24 2012 +0100 use pg_dblink_exec to execute insert inside lookup_evr diff --git a/schema/spacewalk/postgres/procs/lookup_evr.sql b/schema/spacewalk/postgres/procs/lookup_evr.sql index 42b1198..1952e4d 100644 --- a/schema/spacewalk/postgres/procs/lookup_evr.sql +++ b/schema/spacewalk/postgres/procs/lookup_evr.sql @@ -1,7 +1,6 @@ -- oracle equivalent source sha1 741172a1f8f23e20540fd2b5dd50a5b193e6cab3 --- retrieved from ./1241042199/53fa26df463811901487b608eecc3f77ca7783a1/schema/spacewalk/oracle/procs/lookup_evr.sql -- --- 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 @@ -13,28 +12,45 @@ -- 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_EVR(e_in IN VARCHAR, v_in IN VARCHAR, r_in IN VARCHAR) -RETURNS NUMERIC -AS +create or replace function +lookup_evr(e_in in varchar, v_in in varchar, r_in in varchar) +returns numeric +as $$ -DECLARE - evr_id NUMERIC; -BEGIN - SELECT id INTO evr_id - FROM rhnPackageEvr - WHERE ((epoch IS NULL and e_in IS NULL) OR (epoch = e_in)) - AND version = v_in AND release = r_in; +declare + evr_id numeric; +begin + select id + into evr_id + from rhnPackageEVR + where ((epoch is null and e_in is null) or (epoch = e_in)) and + version = v_in and + release = r_in; - IF NOT FOUND THEN - INSERT INTO rhnPackageEvr (id, epoch, version, release, evr) - VALUES (nextval('rhn_pkg_evr_seq'), e_in, v_in, r_in,EVR_T(e_in, v_in, r_in)); - - evr_id := currval('rhn_pkg_evr_seq'); - END IF; + if not found then + evr_id := nextval('rhn_pkg_evr_seq'); + begin + perform pg_dblink_exec( + 'insert into rhnPackageEVR(id, epoch, version, release, evr) values (' || + evr_id || ', ' || + coalesce(quote_literal(e_in), 'NULL') || ', ' || + coalesce(quote_literal(v_in), 'NULL') || ', ' || + coalesce(quote_literal(r_in), 'NULL') || ', ' || + evr_t(coalesce(quote_literal(e_in), 'NULL'), + coalesce(quote_literal(v_in), 'NULL'), + coalesce(quote_literal(r_in), 'NULL')) || ')' + ); + exception when unique_violation then + select id + into strict evr_id + from rhnPackageEVR + where ((epoch is null and e_in is null) or (epoch = e_in)) and + version = v_in and + release = r_in; + end; + end if; - RETURN evr_id; -END; -$$ LANGUAGE PLPGSQL; + return evr_id; +end; +$$ language plpgsql immutable; diff --git a/schema/spacewalk/postgres/procs/procs.deps b/schema/spacewalk/postgres/procs/procs.deps index 49a446e..6b34819 100644 --- a/schema/spacewalk/postgres/procs/procs.deps +++ b/schema/spacewalk/postgres/procs/procs.deps @@ -69,7 +69,7 @@ lookup_config_filename :: pg_dblink_exec lookup_config_info :: pg_dblink_exec lookup_cve :: rhnCVE pg_dblink_exec lookup_erratafile_type :: rhnErrataFileType data/rhnErrataFileType -lookup_evr :: rhnPackageEVR +lookup_evr :: rhnPackageEVR pg_dblink_exec lookup_feature_type :: rhnFeature lookup_first_matching_cf :: rhnConfigFile rhnConfigChannel \ rhnServerConfigChannel lookup_cf_state \ commit fda792c1c034e0b67bd19a3e855860203ef56972 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Tue Feb 28 12:12:28 2012 +0100 lookup_evr: use autonomous_transaction for insert only diff --git a/schema/spacewalk/oracle/procs/insert_evr.sql b/schema/spacewalk/oracle/procs/insert_evr.sql new file mode 100644 index 0000000..4f5fec2 --- /dev/null +++ b/schema/spacewalk/oracle/procs/insert_evr.sql @@ -0,0 +1,29 @@ +-- Copyright (c) 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 insert_evr(e_in in varchar2, v_in in varchar2, r_in in varchar2) +return number +is + pragma autonomous_transaction; + evr_id number; +begin + insert into rhnPackageEVR(id, epoch, version, release, evr) + values (rhn_pkg_evr_seq.nextval, + e_in, + v_in, + r_in, + evr_t(e_in, v_in, r_in)) returning id into evr_id; + commit; +end; +/ +show errors diff --git a/schema/spacewalk/oracle/procs/lookup_evr.sql b/schema/spacewalk/oracle/procs/lookup_evr.sql index 57f8e43..d0e6f00 100644 --- a/schema/spacewalk/oracle/procs/lookup_evr.sql +++ b/schema/spacewalk/oracle/procs/lookup_evr.sql @@ -1,5 +1,4 @@ --- --- Copyright (c) 2008 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 @@ -11,38 +10,34 @@ -- 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_EVR(e_in IN VARCHAR2, v_in IN VARCHAR2, r_in IN VARCHAR2) -RETURN NUMBER -IS - PRAGMA AUTONOMOUS_TRANSACTION; - evr_id NUMBER; -BEGIN - SELECT id INTO evr_id - FROM rhnPackageEvr - WHERE ((epoch IS NULL and e_in IS NULL) OR (epoch = e_in)) - AND version = v_in AND release = r_in; +create or replace function +lookup_evr(e_in in varchar2, v_in in varchar2, r_in in varchar2) +return number +is + evr_id number; +begin + select id + into evr_id + from rhnPackageEVR + where ((epoch is null and e_in is null) or (epoch = e_in)) and + version = v_in and + release = r_in; - RETURN evr_id; -EXCEPTION - WHEN NO_DATA_FOUND THEN - INSERT INTO rhnPackageEvr (id, epoch, version, release, evr) - VALUES (rhn_pkg_evr_seq.nextval, e_in, v_in, r_in, - EVR_T(e_in, v_in, r_in)) - RETURNING id INTO evr_id; - COMMIT; - RETURN evr_id; -END; -/ -SHOW ERRORS + return evr_id; +exception when no_data_found then + begin + evr_id := insert_evr(e_in, v_in, r_in); + exception when dup_val_on_index then + select id + into evr_id + from rhnPackageEVR + where ((epoch is null and e_in is null) or (epoch = e_in)) and + version = v_in and + release = r_in; + end; --- --- Revision 1.3 2002/05/13 22:53:38 pjones --- cvs id/log --- some (note enough) readability fixes --- + return evr_id; +end; +/ +show errors diff --git a/schema/spacewalk/oracle/procs/procs.deps b/schema/spacewalk/oracle/procs/procs.deps index 1e72734..1691918 100644 --- a/schema/spacewalk/oracle/procs/procs.deps +++ b/schema/spacewalk/oracle/procs/procs.deps @@ -62,6 +62,7 @@ insert_client_capability :: rhnClientCapabilityName insert_checksum :: rhnChecksum rhnChecksumType insert_config_filename :: rhnConfigFileName insert_config_info :: rhnConfigInfo +insert_evr :: rhnPackageEVR is_user_applicant :: rhnUserGroupType web_contact rhnUserGroup \ rhnUserGroupMembers lookup_arch_type :: data/rhnArchType rhn_exception.pks @@ -74,7 +75,7 @@ lookup_config_filename :: insert_config_filename lookup_config_info :: insert_config_info lookup_cve :: rhnCVE insert_cve lookup_erratafile_type :: rhnErrataFileType data/rhnErrataFileType -lookup_evr :: rhnPackageEVR +lookup_evr :: rhnPackageEVR insert_evr lookup_feature_type :: rhnFeature lookup_first_matching_cf :: rhnConfigFile rhnConfigChannel \ rhnServerConfigChannel lookup_cf_state \ diff --git a/schema/spacewalk/postgres/procs/insert_evr.sql b/schema/spacewalk/postgres/procs/insert_evr.sql new file mode 100644 index 0000000..fdd7cec --- /dev/null +++ b/schema/spacewalk/postgres/procs/insert_evr.sql @@ -0,0 +1,2 @@ +-- oracle equivalent source sha1 873017e2b56a8c100659f47d5158fcb5e0f936dd +-- This file is intentionally left empty. diff --git a/schema/spacewalk/postgres/procs/lookup_evr.sql b/schema/spacewalk/postgres/procs/lookup_evr.sql index ac3e849..42b1198 100644 --- a/schema/spacewalk/postgres/procs/lookup_evr.sql +++ b/schema/spacewalk/postgres/procs/lookup_evr.sql @@ -1,4 +1,4 @@ --- oracle equivalent source sha1 72b90c220b6786603547c31360870fcfeadeed9a +-- oracle equivalent source sha1 741172a1f8f23e20540fd2b5dd50a5b193e6cab3 -- retrieved from ./1241042199/53fa26df463811901487b608eecc3f77ca7783a1/schema/spacewalk/oracle/procs/lookup_evr.sql -- -- Copyright (c) 2008--2010 Red Hat, Inc.

12 years, 2 months

1
0
0 / 0

Changes to 'refs/tags/spacewalk-java-1.7.46-1'

by Tomas Lestach

Tag 'spacewalk-java-1.7.46-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-02-28 11:05 +0000 Tagging package [spacewalk-java] version [1.7.46-1] in directory [java/]. Changes since spacewalk-setup-1.7.7-1: Milan Zazrivec (12): restrict autonomous_transaction to insert only lookup_config_info: schema upgrade lookup_config_info: correct proc dependencies use pg_dblink_exec to execute insert inside lookup_config_info lookup_config_info: postgresql schema ugprade update postgresql procs dependencies we don't need the autonomous_transaction pragma in lookup_config_info anymore use autonomous_transaction for insert only lookup_cve: oracle schema upgrade use pg_dblink_exec to execute insert inside lookup_cve lookup_cve: postgresql schema upgrade no need for autonomous_transaction in lookup_erratafile_type Tomas Lestach (51): removing unused private method from SystemEntitlementsSubmitAction remove unused private method remove unused private methods remove unused method remove unused method remove unused private static attributes remove unused private static attribute remove unused private static final attribute remove unused logger remove unused private attribute remove unused private static final attribute remove unused private logger remove unused private logger remove unused private logger remove unused private logger remove unused private logger remove unused private static sttribute remove unused test part remove unused private static final attributes remove unused private static final attribute remove unused private final attributes remove unused private static log remove unused private static log remove unused private attributes remove unused private log remove unused private attribute remove unused private final log remove unused private attribute remove unused private static log remove unused private static log remove unused private static log remove empty test remove unused private attribute remove unused static final LOG remove unused private static final attributes remove unused private attribute remove unused private static log remove unused private static array remove unused private static log remove unused private final log remove unused private log remove unused private static log remove unused private static log remove unused private static log remove unused private static log remove unused private static log remove unused private static log removing unused method remove unused private attribute remove unused class Automatic commit of package [spacewalk-java] release [1.7.46-1]. --- java/code/internal/src/com/redhat/rhn/internal/doclet/SinglePageWriter.java | 3 java/code/src/com/redhat/rhn/common/hibernate/NestedTransactionFactory.java | 175 ---------- java/code/src/com/redhat/rhn/common/security/acl/PackageAclHandler.java | 5 java/code/src/com/redhat/rhn/common/translation/test/TestTranslations.java | 6 java/code/src/com/redhat/rhn/common/util/RecurringEventPicker.java | 7 java/code/src/com/redhat/rhn/domain/channel/ChannelVersion.java | 3 java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java | 1 java/code/src/com/redhat/rhn/domain/rhnpackage/Package.java | 1 java/code/src/com/redhat/rhn/domain/rhnpackage/PackageEvrFactory.java | 3 java/code/src/com/redhat/rhn/domain/session/WebSessionImpl.java | 4 java/code/src/com/redhat/rhn/frontend/action/audit/AuditAction.java | 3 java/code/src/com/redhat/rhn/frontend/action/kickstart/AdvancedModeDetailsAction.java | 6 java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteListSetupActionTest.java | 5 java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgSoftwareSubscriptionsAction.java | 3 java/code/src/com/redhat/rhn/frontend/action/multiorg/SystemEntitlementOrgsAction.java | 29 - java/code/src/com/redhat/rhn/frontend/action/multiorg/test/SoftwareEntitlementSubscriptionsActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/FlexGuestAction.java | 4 java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/SystemEntitlementsSubmitAction.java | 8 java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeGraphActionCsvTest.java | 88 ----- java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/kickstart/SessionStatusAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemMigrateAction.java | 31 - java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemNoteDeleteAction.java | 26 - java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemNoteEditAction.java | 30 - java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyChildChannelsAction.java | 4 java/code/src/com/redhat/rhn/frontend/action/user/test/CreateUserActionTest.java | 20 - java/code/src/com/redhat/rhn/frontend/dto/OrgSystemEntitlementDto.java | 4 java/code/src/com/redhat/rhn/frontend/security/PxtAuthenticationService.java | 3 java/code/src/com/redhat/rhn/frontend/taglibs/list/AlphaBarHelper.java | 5 java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/provider/PackagesProviderHandler.java | 4 java/code/src/com/redhat/rhn/manager/channel/repo/BaseRepoCommand.java | 5 java/code/src/com/redhat/rhn/manager/configuration/file/ConfigFileData.java | 1 java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java | 4 java/code/src/com/redhat/rhn/manager/kickstart/KickstartPartitionCommand.java | 3 java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCommand.java | 4 java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroEditCommand.java | 3 java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCreateCommand.java | 4 java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileEditCommand.java | 3 java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSnippetLister.java | 6 java/code/src/com/redhat/rhn/manager/org/UpdateOrgSoftwareEntitlementsCommand.java | 5 java/code/src/com/redhat/rhn/manager/org/UpdateOrgSystemEntitlementsCommand.java | 4 java/code/src/com/redhat/rhn/manager/ssm/SsmManager.java | 5 java/code/src/com/redhat/rhn/manager/ssm/SsmOperationManager.java | 5 java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java | 35 -- java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java | 26 - java/code/src/com/redhat/rhn/taskomatic/task/RhnQueueJob.java | 2 java/code/src/com/redhat/rhn/taskomatic/task/repomd/OtherXmlWriter.java | 3 java/code/src/com/redhat/rhn/taskomatic/task/repomd/PackageCapabilityIterator.java | 1 java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java | 3 java/code/src/com/redhat/rhn/taskomatic/task/test/ErrataQueueTest.java | 24 - java/spacewalk-java.spec | 55 +++ rel-eng/packages/spacewalk-java | 2 schema/spacewalk/oracle/procs/insert_config_info.sql | 34 + schema/spacewalk/oracle/procs/insert_cve.sql | 26 + schema/spacewalk/oracle/procs/lookup_config_info.sql | 22 - schema/spacewalk/oracle/procs/lookup_cve.sql | 62 +-- schema/spacewalk/oracle/procs/lookup_erratafile_type.sql | 1 schema/spacewalk/oracle/procs/procs.deps | 4 schema/spacewalk/postgres/procs/insert_config_info.sql | 2 schema/spacewalk/postgres/procs/insert_cve.sql | 2 schema/spacewalk/postgres/procs/lookup_config_info.sql | 24 + schema/spacewalk/postgres/procs/lookup_cve.sql | 54 +-- schema/spacewalk/postgres/procs/lookup_erratafile_type.sql | 2 schema/spacewalk/postgres/procs/procs.deps | 3 schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/093-lookup_config_info.sql.oracle | 61 +++ schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/093-lookup_config_info.sql.postgresql | 67 +++ schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/094-lookup_cve.sql.oracle | 39 ++ schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/094-lookup_cve.sql.postgresql | 43 ++ schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/095-lookup_erratafile_type.sql.oracle | 18 + schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/095-lookup_erratafile_type.sql.postgresql | 2 69 files changed, 488 insertions(+), 668 deletions(-) ---

12 years, 2 months

1
0
0 / 0

java/spacewalk-java.spec rel-eng/packages

by Tomas Lestach

java/spacewalk-java.spec | 55 +++++++++++++++++++++++++++++++++++++++- rel-eng/packages/spacewalk-java | 2 - 2 files changed, 55 insertions(+), 2 deletions(-) New commits: commit 56089210dfa1993a6710b2ec1e3182447f64feee Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 12:05:19 2012 +0100 Automatic commit of package [spacewalk-java] release [1.7.46-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index a26876d..47c85bf 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -17,7 +17,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.7.45 +Version: 1.7.46 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -585,6 +585,59 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Tue Feb 28 2012 Tomas Lestach <tlestach(a)redhat.com> 1.7.46-1 +- remove unused class (tlestach(a)redhat.com) +- remove unused private attribute (tlestach(a)redhat.com) +- removing unused method (tlestach(a)redhat.com) +- remove unused private static log (tlestach(a)redhat.com) +- remove unused private static log (tlestach(a)redhat.com) +- remove unused private static log (tlestach(a)redhat.com) +- remove unused private static log (tlestach(a)redhat.com) +- remove unused private static log (tlestach(a)redhat.com) +- remove unused private static log (tlestach(a)redhat.com) +- remove unused private log (tlestach(a)redhat.com) +- remove unused private final log (tlestach(a)redhat.com) +- remove unused private static log (tlestach(a)redhat.com) +- remove unused private static array (tlestach(a)redhat.com) +- remove unused private static log (tlestach(a)redhat.com) +- remove unused private attribute (tlestach(a)redhat.com) +- remove unused private static final attributes (tlestach(a)redhat.com) +- remove unused static final LOG (tlestach(a)redhat.com) +- remove unused private attribute (tlestach(a)redhat.com) +- remove empty test (tlestach(a)redhat.com) +- remove unused private static log (tlestach(a)redhat.com) +- remove unused private static log (tlestach(a)redhat.com) +- remove unused private static log (tlestach(a)redhat.com) +- remove unused private attribute (tlestach(a)redhat.com) +- remove unused private final log (tlestach(a)redhat.com) +- remove unused private attribute (tlestach(a)redhat.com) +- remove unused private log (tlestach(a)redhat.com) +- remove unused private attributes (tlestach(a)redhat.com) +- remove unused private static log (tlestach(a)redhat.com) +- remove unused private static log (tlestach(a)redhat.com) +- remove unused private final attributes (tlestach(a)redhat.com) +- remove unused private static final attribute (tlestach(a)redhat.com) +- remove unused private static final attributes (tlestach(a)redhat.com) +- remove unused test part (tlestach(a)redhat.com) +- remove unused private static sttribute (tlestach(a)redhat.com) +- remove unused private logger (tlestach(a)redhat.com) +- remove unused private logger (tlestach(a)redhat.com) +- remove unused private logger (tlestach(a)redhat.com) +- remove unused private logger (tlestach(a)redhat.com) +- remove unused private logger (tlestach(a)redhat.com) +- remove unused private static final attribute (tlestach(a)redhat.com) +- remove unused private attribute (tlestach(a)redhat.com) +- remove unused logger (tlestach(a)redhat.com) +- remove unused private static final attribute (tlestach(a)redhat.com) +- remove unused private static attribute (tlestach(a)redhat.com) +- remove unused private static attributes (tlestach(a)redhat.com) +- remove unused method (tlestach(a)redhat.com) +- remove unused method (tlestach(a)redhat.com) +- remove unused private methods (tlestach(a)redhat.com) +- remove unused private method (tlestach(a)redhat.com) +- removing unused private method from SystemEntitlementsSubmitAction + (tlestach(a)redhat.com) + * Mon Feb 27 2012 Simon Lukasik <slukasik(a)redhat.com> 1.7.45-1 - OpenSCAP integration -- Frontend API for scan schedule. (slukasik(a)redhat.com) - checkstyle: allow Copyright 2012. (slukasik(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 2c8cb9c..ad20ea0 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.7.45-1 java/ +1.7.46-1 java/

12 years, 2 months

1
0
0 / 0

50 commits - java/code

by Tomas Lestach

java/code/internal/src/com/redhat/rhn/internal/doclet/SinglePageWriter.java | 3 java/code/src/com/redhat/rhn/common/hibernate/NestedTransactionFactory.java | 175 ---------- java/code/src/com/redhat/rhn/common/security/acl/PackageAclHandler.java | 5 java/code/src/com/redhat/rhn/common/translation/test/TestTranslations.java | 6 java/code/src/com/redhat/rhn/common/util/RecurringEventPicker.java | 7 java/code/src/com/redhat/rhn/domain/channel/ChannelVersion.java | 3 java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java | 1 java/code/src/com/redhat/rhn/domain/rhnpackage/Package.java | 1 java/code/src/com/redhat/rhn/domain/rhnpackage/PackageEvrFactory.java | 3 java/code/src/com/redhat/rhn/domain/session/WebSessionImpl.java | 4 java/code/src/com/redhat/rhn/frontend/action/audit/AuditAction.java | 3 java/code/src/com/redhat/rhn/frontend/action/kickstart/AdvancedModeDetailsAction.java | 6 java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteListSetupActionTest.java | 5 java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgSoftwareSubscriptionsAction.java | 3 java/code/src/com/redhat/rhn/frontend/action/multiorg/SystemEntitlementOrgsAction.java | 29 - java/code/src/com/redhat/rhn/frontend/action/multiorg/test/SoftwareEntitlementSubscriptionsActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/FlexGuestAction.java | 4 java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/SystemEntitlementsSubmitAction.java | 8 java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeGraphActionCsvTest.java | 88 ----- java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/kickstart/SessionStatusAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemMigrateAction.java | 31 - java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemNoteDeleteAction.java | 26 - java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemNoteEditAction.java | 30 - java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyChildChannelsAction.java | 4 java/code/src/com/redhat/rhn/frontend/action/user/test/CreateUserActionTest.java | 20 - java/code/src/com/redhat/rhn/frontend/dto/OrgSystemEntitlementDto.java | 4 java/code/src/com/redhat/rhn/frontend/security/PxtAuthenticationService.java | 3 java/code/src/com/redhat/rhn/frontend/taglibs/list/AlphaBarHelper.java | 5 java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/provider/PackagesProviderHandler.java | 4 java/code/src/com/redhat/rhn/manager/channel/repo/BaseRepoCommand.java | 5 java/code/src/com/redhat/rhn/manager/configuration/file/ConfigFileData.java | 1 java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java | 4 java/code/src/com/redhat/rhn/manager/kickstart/KickstartPartitionCommand.java | 3 java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCommand.java | 4 java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroEditCommand.java | 3 java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCreateCommand.java | 4 java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileEditCommand.java | 3 java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSnippetLister.java | 6 java/code/src/com/redhat/rhn/manager/org/UpdateOrgSoftwareEntitlementsCommand.java | 5 java/code/src/com/redhat/rhn/manager/org/UpdateOrgSystemEntitlementsCommand.java | 4 java/code/src/com/redhat/rhn/manager/ssm/SsmManager.java | 5 java/code/src/com/redhat/rhn/manager/ssm/SsmOperationManager.java | 5 java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java | 35 -- java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java | 26 - java/code/src/com/redhat/rhn/taskomatic/task/RhnQueueJob.java | 2 java/code/src/com/redhat/rhn/taskomatic/task/repomd/OtherXmlWriter.java | 3 java/code/src/com/redhat/rhn/taskomatic/task/repomd/PackageCapabilityIterator.java | 1 java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java | 3 java/code/src/com/redhat/rhn/taskomatic/task/test/ErrataQueueTest.java | 24 - 49 files changed, 53 insertions(+), 580 deletions(-) New commits: commit 704db334da58f2a88909a1c6a0baa29a484eb6bb Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 12:02:33 2012 +0100 remove unused class diff --git a/java/code/src/com/redhat/rhn/common/hibernate/NestedTransactionFactory.java b/java/code/src/com/redhat/rhn/common/hibernate/NestedTransactionFactory.java deleted file mode 100644 index e0787f3..0000000 --- a/java/code/src/com/redhat/rhn/common/hibernate/NestedTransactionFactory.java +++ /dev/null @@ -1,175 +0,0 @@ -/** - * Copyright (c) 2009--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 - * 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. - */ -package com.redhat.rhn.common.hibernate; - -import org.hibernate.ConnectionReleaseMode; -import org.hibernate.HibernateException; -import org.hibernate.Transaction; -import org.hibernate.TransactionException; -import org.hibernate.jdbc.JDBCContext; -import org.hibernate.transaction.JDBCTransactionFactory; -import org.hibernate.transaction.TransactionFactory; - -import java.util.Properties; - -import javax.transaction.Synchronization; - -/** - * A transaction factory that ignores transaction nesting. Only toplevel transactions - * are actually connected to the database, and calling <code>commit</code> and - * <code>rollback</code> on them will have an effect. A transaction is a toplevel - * transaction if it is the first transaction within a thread and a session. The scope - * of a toplevel transaction extends to the first call to <code>commit</code> or - * <code>rollback</code> on that transaction object, or to the end of the session, - * if the transaction is never committed or rolled back. The following code snippet - * illustrates this: - * <pre> - * Session session = getHibernateSession(); - * Transaction txn1 = session.beginTransaction(); // Toplevel txn - * Transaction txn2 = session.beginTransaction(); // Nested txn, ignored - * txn2.rollback(); // ignored - * txn1.commit(); // Actual commit to the DB - * Transaction txn3 = session.beginTransaction(); // Toplevel txn - * txn3.rollback(); // Actual rollback in DB - * </pre> - * - * @version $Rev$ - */ -public class NestedTransactionFactory implements TransactionFactory { - - private static final ThreadLocal TXN_TLS = new ThreadLocal(); - private final JDBCTransactionFactory jdbcTxnFactory = new JDBCTransactionFactory(); - - /** - * {@inheritDoc} - */ - public Transaction createTransaction(JDBCContext jdbcContext, Context context) - throws HibernateException { - ToplevelTransaction txn = getTransaction(); - if (txn == null || jdbcContext != txn.jdbcCtx) { - // Create new toplevel (JDBC) txn - Transaction realTxn = jdbcTxnFactory.createTransaction(jdbcContext, context); - txn = new ToplevelTransaction(realTxn, jdbcContext, context); - TXN_TLS.set(txn); - return txn; - } - else { - // An outermost transaction exists - throw new TransactionException("Nesting transactions is not allowed."); - } - } - - static Transaction threadTransaction() { - return getTransaction(); - } - - private static ToplevelTransaction getTransaction() { - return (ToplevelTransaction) TXN_TLS.get(); - } - - /** - * {@inheritDoc} - */ - public void configure(Properties props) throws HibernateException { - // noop - } - - /** {@inheritDoc} */ - public ConnectionReleaseMode getDefaultReleaseMode() { - // match the default 3.1 behavior, in our case - // this is at the end of the request. - return ConnectionReleaseMode.ON_CLOSE; - } - - /** - * {@inheritDoc} - */ - public boolean isTransactionManagerRequired() { - // we don't need access to the JTA txn mgr - return false; - } - - /** - * {@inheritDoc} - */ - public boolean areCallbacksLocalToHibernateTransactions() { - // sure why not - return true; - } - - private class ToplevelTransaction implements Transaction { - - private JDBCContext jdbcCtx; - private Context ctx; - private Transaction realTxn; - - public void begin() throws HibernateException { - //System.out.println("XXX begin"); - realTxn.begin(); - } - - public void setTimeout(int arg0) { - realTxn.setTimeout(arg0); - } - - public ToplevelTransaction(Transaction txn, JDBCContext jdbcContext, - Context context) { - - jdbcCtx = jdbcContext; - ctx = context; - realTxn = txn; - } - - public void commit() throws HibernateException { - realTxn.commit(); - //System.out.println("XXX commit: setting TXN_TLS to null"); - TXN_TLS.set(null); - } - - public void rollback() throws HibernateException { - realTxn.rollback(); - //System.out.println("XXX rollback: setting TXN_TLS to null"); - TXN_TLS.set(null); - } - - public boolean wasCommitted() throws HibernateException { - return realTxn.wasCommitted(); - } - - public boolean wasRolledBack() throws HibernateException { - return realTxn.wasRolledBack(); - } - - public boolean isActive() throws HibernateException { - return realTxn.isActive(); - } - - public void registerSynchronization(Synchronization synchronization) - throws HibernateException { - realTxn.registerSynchronization(synchronization); - - } - } - - /** - * - * {@inheritDoc} - */ - public boolean isTransactionInProgress(JDBCContext arg0, Context arg1, - Transaction arg2) { - // TODO Auto-generated method stub - return false; - } -} commit bf97795c6572fd062b59cfe8c529e07e78e2b726 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 11:33:37 2012 +0100 remove unused private attribute diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/SoftwareEntitlementSubscriptionsActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/SoftwareEntitlementSubscriptionsActionTest.java index 7690398..7bf424b 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/SoftwareEntitlementSubscriptionsActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/SoftwareEntitlementSubscriptionsActionTest.java @@ -16,7 +16,6 @@ package com.redhat.rhn.frontend.action.multiorg.test; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.channel.ChannelFamily; -import com.redhat.rhn.domain.org.Org; import com.redhat.rhn.domain.role.RoleFactory; import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.testing.RhnMockStrutsTestCase; @@ -28,7 +27,6 @@ import com.redhat.rhn.testing.TestUtils; * @version $Rev: 1 $ */ public class SoftwareEntitlementSubscriptionsActionTest extends RhnMockStrutsTestCase { - private Org testOrg; private ChannelFamily family; public void setUp() throws Exception { @@ -40,7 +38,7 @@ public class SoftwareEntitlementSubscriptionsActionTest extends RhnMockStrutsTes Server s = ServerTestUtils.createTestSystem(user); Channel chan = s.getChannels().iterator().next(); family = chan.getChannelFamily(); - testOrg = s.getOrg(); + s.getOrg(); setRequestPathInfo("/admin/multiorg/SoftwareEntitlementSubscriptions"); commit 85a310ac5e1c9df96c55415206836d1354499cf0 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 11:29:45 2012 +0100 removing unused method ErrataQueue does not implement findCandidates() the test cannot work anyway diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/test/ErrataQueueTest.java b/java/code/src/com/redhat/rhn/taskomatic/task/test/ErrataQueueTest.java index 4b89188..f1a4523 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/test/ErrataQueueTest.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/test/ErrataQueueTest.java @@ -14,7 +14,6 @@ */ package com.redhat.rhn.taskomatic.task.test; -import com.redhat.rhn.domain.errata.test.ErrataFactoryTest; import com.redhat.rhn.domain.task.TaskFactory; import com.redhat.rhn.taskomatic.TaskoBunch; import com.redhat.rhn.taskomatic.TaskoFactory; @@ -26,33 +25,12 @@ import com.redhat.rhn.testing.BaseTestCaseWithUser; import org.apache.commons.lang.RandomStringUtils; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - public class ErrataQueueTest extends BaseTestCaseWithUser { // We can run this now that mmccune made ErrataQueue perform OK. public void testErrataQueue() throws Exception { - ErrataQueue eq = new ErrataQueue() { - - // Override this so we only process one errata. - protected List findCandidates() throws Exception { - Long eid = ErrataFactoryTest. - createTestErrata(user.getOrg().getId()).getId(); - List retval = new LinkedList(); - Map row = new HashMap(); - row.put("errata_id", eid); - row.put("org_id", user.getOrg().getId()); - retval.add(row); - System.out.println("Returning one test errata."); - return retval; - } - - }; - + ErrataQueue eq = new ErrataQueue(); String suffix = RandomStringUtils.randomAlphanumeric(5); TaskoBunch bunch = new TaskoBunch(); TaskoTemplate template = new TaskoTemplate(); commit be14bfb80d42a0d955c313a1f3ad8cb711d0c11c Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 11:23:00 2012 +0100 remove unused private static log diff --git a/java/code/src/com/redhat/rhn/domain/session/WebSessionImpl.java b/java/code/src/com/redhat/rhn/domain/session/WebSessionImpl.java index 7fe72a7..2ecb2f4 100644 --- a/java/code/src/com/redhat/rhn/domain/session/WebSessionImpl.java +++ b/java/code/src/com/redhat/rhn/domain/session/WebSessionImpl.java @@ -18,15 +18,11 @@ import com.redhat.rhn.domain.user.User; import com.redhat.rhn.domain.user.UserFactory; import com.redhat.rhn.manager.session.SessionManager; -import org.apache.log4j.Logger; - /** * A web session * @version $Rev$ */ public class WebSessionImpl implements WebSession { - private static Logger log = Logger.getLogger(WebSessionImpl.class); - private Long id; private long expires; private Long webUserId; commit 16dc6c0270c6450b37778624386c3223df930b7e Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 11:22:39 2012 +0100 remove unused private static log diff --git a/java/code/src/com/redhat/rhn/manager/org/UpdateOrgSystemEntitlementsCommand.java b/java/code/src/com/redhat/rhn/manager/org/UpdateOrgSystemEntitlementsCommand.java index 4f9177c..c122764 100644 --- a/java/code/src/com/redhat/rhn/manager/org/UpdateOrgSystemEntitlementsCommand.java +++ b/java/code/src/com/redhat/rhn/manager/org/UpdateOrgSystemEntitlementsCommand.java @@ -26,8 +26,6 @@ import com.redhat.rhn.domain.server.EntitlementServerGroup; import com.redhat.rhn.domain.server.ServerGroupFactory; import com.redhat.rhn.manager.entitlement.EntitlementManager; -import org.apache.log4j.Logger; - import java.util.HashMap; import java.util.Map; @@ -40,8 +38,6 @@ import java.util.Map; */ public class UpdateOrgSystemEntitlementsCommand { - private static Logger log = Logger.getLogger(UpdateOrgSystemEntitlementsCommand.class); - private Org org; private long newTotal; private Entitlement entitlement; commit 36053c6007187e939dd6dc584a5ca448d8c4033f Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 11:15:57 2012 +0100 remove unused private static log diff --git a/java/code/src/com/redhat/rhn/manager/org/UpdateOrgSoftwareEntitlementsCommand.java b/java/code/src/com/redhat/rhn/manager/org/UpdateOrgSoftwareEntitlementsCommand.java index 68104d4..cc477a7 100644 --- a/java/code/src/com/redhat/rhn/manager/org/UpdateOrgSoftwareEntitlementsCommand.java +++ b/java/code/src/com/redhat/rhn/manager/org/UpdateOrgSoftwareEntitlementsCommand.java @@ -23,8 +23,6 @@ import com.redhat.rhn.domain.channel.ChannelFamilyFactory; import com.redhat.rhn.domain.org.Org; import com.redhat.rhn.domain.org.OrgFactory; -import org.apache.log4j.Logger; - import java.util.HashMap; import java.util.Map; @@ -37,9 +35,6 @@ import java.util.Map; */ public class UpdateOrgSoftwareEntitlementsCommand { - private static Logger log = - Logger.getLogger(UpdateOrgSoftwareEntitlementsCommand.class); - private Org org; private Long newTotal; private Long newFlexTotal; commit 693cc2f99143d910104e88520bec2d32629555ee Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 11:15:26 2012 +0100 remove unused private static log diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemNoteEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemNoteEditAction.java index e84dd90..0c8086c 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemNoteEditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemNoteEditAction.java @@ -14,13 +14,14 @@ */ package com.redhat.rhn.frontend.action.systems.sdc; -import java.util.HashMap; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.log4j.Logger; +import com.redhat.rhn.domain.server.Note; +import com.redhat.rhn.domain.server.Server; +import com.redhat.rhn.domain.server.ServerNoteFactory; +import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.frontend.struts.RhnAction; +import com.redhat.rhn.frontend.struts.StrutsDelegate; +import com.redhat.rhn.manager.system.SystemManager; import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; @@ -30,14 +31,11 @@ import org.apache.struts.action.ActionMessage; import org.apache.struts.action.ActionMessages; import org.apache.struts.action.DynaActionForm; -import com.redhat.rhn.domain.server.Note; -import com.redhat.rhn.domain.server.Server; -import com.redhat.rhn.domain.server.ServerNoteFactory; -import com.redhat.rhn.domain.user.User; -import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.frontend.struts.RhnAction; -import com.redhat.rhn.frontend.struts.StrutsDelegate; -import com.redhat.rhn.manager.system.SystemManager; +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; /** * SystemNoteEditAction @@ -45,8 +43,6 @@ import com.redhat.rhn.manager.system.SystemManager; */ public class SystemNoteEditAction extends RhnAction { - private static Logger log = Logger.getLogger(SystemNoteEditAction.class); - /** {@inheritDoc} */ public ActionForward execute(ActionMapping mapping, ActionForm form, commit b5d144c27eefe1a4ebb8b9b3d94fa777b02aa4f7 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 11:15:03 2012 +0100 remove unused private static log diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemNoteDeleteAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemNoteDeleteAction.java index dc8120e..b0c268c 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemNoteDeleteAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemNoteDeleteAction.java @@ -14,19 +14,6 @@ */ package com.redhat.rhn.frontend.action.systems.sdc; -import java.util.HashMap; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.log4j.Logger; - -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.DynaActionForm; - import com.redhat.rhn.domain.server.Note; import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.user.User; @@ -35,14 +22,23 @@ import com.redhat.rhn.frontend.struts.RhnAction; import com.redhat.rhn.frontend.struts.StrutsDelegate; import com.redhat.rhn.manager.system.SystemManager; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.DynaActionForm; + +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * SystemNoteDeleteAction * @version $Rev: 1 $ */ public class SystemNoteDeleteAction extends RhnAction { - private static Logger log = Logger.getLogger(SystemNoteDeleteAction.class); - /** {@inheritDoc} */ public ActionForward execute(ActionMapping mapping, ActionForm form, commit ca8f897f3d87d491d47471b4b34a172ea5989590 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 11:14:43 2012 +0100 remove unused private static log diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemMigrateAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemMigrateAction.java index 2e28131..4590aba 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemMigrateAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemMigrateAction.java @@ -14,21 +14,6 @@ */ package com.redhat.rhn.frontend.action.systems.sdc; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Set; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.log4j.Logger; -import org.apache.struts.action.ActionErrors; -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.DynaActionForm; - import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.domain.org.Org; import com.redhat.rhn.domain.org.OrgFactory; @@ -41,14 +26,26 @@ import com.redhat.rhn.frontend.struts.RhnValidationHelper; import com.redhat.rhn.manager.org.MigrationManager; import com.redhat.rhn.manager.system.SystemManager; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.DynaActionForm; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Set; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * SystemDetailsEditAction * @version $Rev$ */ public class SystemMigrateAction extends RhnAction { - private static Logger log = Logger.getLogger(SystemMigrateAction.class); - public static final String SID = "sid"; public static final String ORG = "to_org"; commit ce36b157dd05c19fc0837d667bf29cef44fafde7 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 11:14:09 2012 +0100 remove unused private log diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/SystemEntitlementOrgsAction.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/SystemEntitlementOrgsAction.java index d1abaea..c2836bd 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/SystemEntitlementOrgsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/SystemEntitlementOrgsAction.java @@ -14,20 +14,6 @@ */ package com.redhat.rhn.frontend.action.multiorg; -import java.util.Iterator; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; -import org.apache.struts.action.ActionErrors; -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.DynaActionForm; - import com.redhat.rhn.common.db.datasource.DataList; import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.domain.entitlement.Entitlement; @@ -41,13 +27,24 @@ import com.redhat.rhn.manager.entitlement.EntitlementManager; import com.redhat.rhn.manager.org.OrgManager; import com.redhat.rhn.manager.org.UpdateOrgSystemEntitlementsCommand; +import org.apache.commons.lang.StringUtils; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.DynaActionForm; + +import java.util.Iterator; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * SystemEntitlementOrgsAction */ public class SystemEntitlementOrgsAction extends RhnAction { - private Logger log = Logger.getLogger(this.getClass()); - /** ${@inheritDoc} */ public ActionForward execute(ActionMapping mapping, ActionForm form, commit f345344dc7a9aa7a9eb731181bb27a202f25ec8c Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 11:13:11 2012 +0100 remove unused private final log diff --git a/java/code/src/com/redhat/rhn/manager/ssm/SsmOperationManager.java b/java/code/src/com/redhat/rhn/manager/ssm/SsmOperationManager.java index 9ab911b..4e90594 100644 --- a/java/code/src/com/redhat/rhn/manager/ssm/SsmOperationManager.java +++ b/java/code/src/com/redhat/rhn/manager/ssm/SsmOperationManager.java @@ -22,9 +22,6 @@ import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.dto.OperationDetailsDto; import com.redhat.rhn.manager.BaseManager; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import java.util.HashMap; import java.util.List; import java.util.Map; @@ -37,8 +34,6 @@ import java.util.Map; */ public class SsmOperationManager extends BaseManager { - private final Log log = LogFactory.getLog(this.getClass()); - /** * Private constructor to enforce static nature of the class. */ commit ac0001a6dd63aff2e551675ee4f2ebaa7c7eab3f Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 11:06:02 2012 +0100 remove unused private static log diff --git a/java/code/src/com/redhat/rhn/manager/ssm/SsmManager.java b/java/code/src/com/redhat/rhn/manager/ssm/SsmManager.java index 56cb53c..53e30ed 100644 --- a/java/code/src/com/redhat/rhn/manager/ssm/SsmManager.java +++ b/java/code/src/com/redhat/rhn/manager/ssm/SsmManager.java @@ -24,9 +24,6 @@ import com.redhat.rhn.manager.channel.ChannelManager; import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.rhnset.RhnSetManager; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -45,8 +42,6 @@ import java.util.Set; */ public class SsmManager { - private static Log log = LogFactory.getLog(SsmManager.class); - /** Private constructor to enforce the stateless nature of this class. */ private SsmManager() { } commit ac448541adabdc6101fbd8ce2117f0cf8ebe0a27 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 11:03:30 2012 +0100 remove unused private static array diff --git a/java/code/internal/src/com/redhat/rhn/internal/doclet/SinglePageWriter.java b/java/code/internal/src/com/redhat/rhn/internal/doclet/SinglePageWriter.java index e7d4250..862f6a5 100644 --- a/java/code/internal/src/com/redhat/rhn/internal/doclet/SinglePageWriter.java +++ b/java/code/internal/src/com/redhat/rhn/internal/doclet/SinglePageWriter.java @@ -28,9 +28,6 @@ public class SinglePageWriter extends DocWriter { private static final String JSP_OUTPUT = "./build/reports/apidocs/singlepage/"; private static final String JSP_TEMPLATES = "./buildconf/apidoc/singlepage/"; - - private static final String[] OTHER_FILES = {"faqs", "scripts"}; - /** * * {@inheritDoc} commit cbd870c568329d7036685780b0ba50e1023a00f3 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 11:02:37 2012 +0100 remove unused private static log diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/kickstart/SessionStatusAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/kickstart/SessionStatusAction.java index 8176bf3..e73772d 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/kickstart/SessionStatusAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/kickstart/SessionStatusAction.java @@ -27,7 +27,6 @@ import com.redhat.rhn.frontend.action.systems.sdc.SdcHelper; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.RhnAction; -import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; @@ -44,7 +43,6 @@ import javax.servlet.http.HttpServletResponse; */ public class SessionStatusAction extends RhnAction { - private static Logger log = Logger.getLogger(SessionStatusAction.class); private static final int GUEST_TIME_OUT_MINUTES = 15; /** {@inheritDoc} */ commit 6664168639773526372cec6fc65234d05620f542 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 11:02:03 2012 +0100 remove unused private attribute diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/RhnQueueJob.java b/java/code/src/com/redhat/rhn/taskomatic/task/RhnQueueJob.java index dca4566..55addf8 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/RhnQueueJob.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/RhnQueueJob.java @@ -40,8 +40,6 @@ import java.io.IOException; public abstract class RhnQueueJob implements RhnJob { private TaskoRun jobRun = null; - private boolean queueEmpty = true; - protected abstract Logger getLogger(); /** commit 7dd85913124fabbda20af4c2c716f1c688681eb4 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 11:01:22 2012 +0100 remove unused private static final attributes diff --git a/java/code/src/com/redhat/rhn/common/util/RecurringEventPicker.java b/java/code/src/com/redhat/rhn/common/util/RecurringEventPicker.java index ce2507b..9e9bc9c 100644 --- a/java/code/src/com/redhat/rhn/common/util/RecurringEventPicker.java +++ b/java/code/src/com/redhat/rhn/common/util/RecurringEventPicker.java @@ -53,13 +53,6 @@ public class RecurringEventPicker { */ public static final String USE_DATE = "use_date"; - - - private static final String MONTH = "month"; - private static final String DAY = "day"; - private static final String HOUR = "hour"; - private static final String MINUTE = "minute"; - private static final String STATUS_DISABLED = "disabled"; commit 40c09bb68a5867d83a47a4ea4bba6d7d42d223a8 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 11:00:28 2012 +0100 remove unused static final LOG diff --git a/java/code/src/com/redhat/rhn/frontend/security/PxtAuthenticationService.java b/java/code/src/com/redhat/rhn/frontend/security/PxtAuthenticationService.java index 380498e..d8c4bfe 100644 --- a/java/code/src/com/redhat/rhn/frontend/security/PxtAuthenticationService.java +++ b/java/code/src/com/redhat/rhn/frontend/security/PxtAuthenticationService.java @@ -21,7 +21,6 @@ import com.redhat.rhn.frontend.servlets.PxtSessionDelegate; import org.apache.commons.collections.set.UnmodifiableSet; import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; import java.io.IOException; import java.util.Set; @@ -40,8 +39,6 @@ public class PxtAuthenticationService extends BaseAuthenticationService { public static final long MAX_URL_LENGTH = 2048; - private static final Logger LOG = Logger.getLogger(PxtAuthenticationService.class); - private static final Set UNPROTECTED_URIS; static { commit fb358a1e4f71136c3aedc2c054212c9ba0714cb6 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 10:59:31 2012 +0100 remove unused private attribute diff --git a/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteListSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteListSetupActionTest.java index 920abe6..320b56e 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteListSetupActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteListSetupActionTest.java @@ -19,16 +19,11 @@ import com.redhat.rhn.domain.monitoring.suite.test.ProbeSuiteTest; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.testing.RhnMockStrutsTestCase; -import org.apache.struts.action.Action; - /** * ProbeSuiteListSetupActionTest * @version $Rev: 55327 $ */ public class ProbeSuiteListSetupActionTest extends RhnMockStrutsTestCase { - private Action action = null; - - public void testExecute() throws Exception { ProbeSuite suite = ProbeSuiteTest.createTestProbeSuite(user); String[] suites = new String[1]; commit 28fa1ff6586a7d8f89f113a5ece428e7a38c1da3 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 10:58:58 2012 +0100 remove empty test diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeGraphActionCsvTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeGraphActionCsvTest.java deleted file mode 100644 index 5a251a9..0000000 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeGraphActionCsvTest.java +++ /dev/null @@ -1,88 +0,0 @@ -/** - * Copyright (c) 2009--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 - * 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. - */ -package com.redhat.rhn.frontend.action.systems.monitoring.test; - -import com.redhat.rhn.domain.monitoring.Probe; -import com.redhat.rhn.domain.user.User; -import com.redhat.rhn.testing.RhnJmockBaseTestCase; - -import java.sql.Timestamp; - -/** - * ProbeGraphActionCsvTest - specific test to test output of CSV for a probe graph - * - * @version $Rev$ - */ -public class ProbeGraphActionCsvTest extends RhnJmockBaseTestCase { - - private User user; - private Probe probe; - private Timestamp testTime; - - - public void testExecuteCSV() throws Exception { - //TODO Fix broken test. The fix is coming with some changes in 415. - - /*if (!Config.get().isSatellite()) { - return; - } - ProbeGraphAction action = new ProbeGraphAction(); - Mock mreq = JMockTestUtils.createRequestWithSessionAndUser(); - Mock mresp = mock(HttpServletResponse.class); - HttpServletRequest request = (HttpServletRequest) mreq.proxy(); - HttpServletResponse response = (HttpServletResponse) mresp.proxy(); - RhnMockServletOutputStream out = new RhnMockServletOutputStream(); - - user = UserTestUtils.findNewUser("testUser", "testOrg"); - - Mock mockPxtSession = mock(WebSession.class); - mockPxtSession.stubs().method("getUser").will(returnValue(user)); - - Mock mockPxtDelegate = mock(PxtSessionDelegate.class); - mockPxtDelegate.stubs().method("getUser").with(isA(HttpServletRequest.class)).will( - returnValue(user)); - - PxtSessionDelegateFactory.setTestPxtSessionDelegate( - (PxtSessionDelegate)mockPxtDelegate.proxy()); - - // server = ServerFactoryTest.createTestServer(user, false); - probe = MonitoringFactoryTest.createTestProbe(user); - - testTime = MonitoringManagerTest.addTimeSeriesDataToProbe(user, probe, 20, - MonitoringManagerTest.TEST_METRIC); - testTime = MonitoringManagerTest.addTimeSeriesDataToProbe(user, probe, 20, - MonitoringManagerTest.TEST_METRIC2); - - String[] metrics = new String[2]; - metrics[0] = MonitoringManagerTest.TEST_METRIC; - metrics[1] = MonitoringManagerTest.TEST_METRIC2; - - addRequestParam(mreq, ProbeGraphAction.STARTTS, - new Long(testTime.getTime() - 60000000).toString()); - addRequestParam(mreq, ProbeGraphAction.ENDTS, - new Long(testTime.getTime()).toString()); - - addRequestParam(mreq, RequestContext.PROBEID, probe.getId().toString()); - mreq.expects(atLeastOnce()).method("getParameterValues"). - with(eq("metrics")).will(returnValue(metrics)); - addRequestParam(mreq, RequestContext.LIST_DISPLAY_EXPORT, "1"); - - JMockTestUtils.setupExportParameters(mresp, out); - action.execute(null, null, request, response); - assertTrue(out.getContents().startsWith("Id,Data,Time,Metric")); - assertTrue(out.getContents().endsWith("0,pctfree\n"));*/ - } - -} commit 7bd94e2cce0caa6d76ca29ee3933f9423f431002 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 10:57:49 2012 +0100 remove unused private static log diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java index 9dd3dbb..7aac59b 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java @@ -24,7 +24,6 @@ import com.redhat.rhn.manager.task.TaskManager; import com.redhat.rhn.taskomatic.task.TaskConstants; import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; import org.xml.sax.SAXException; import java.io.ByteArrayOutputStream; @@ -45,8 +44,6 @@ public class PrimaryXmlWriter extends RepomdWriter { private PackageCapabilityIterator recommendsIterator; private PackageCapabilityIterator suggestsIterator; private PackageCapabilityIterator supplementsIterator; - private static Logger log = Logger.getLogger(PrimaryXmlWriter.class); - /** * * @param writer The writer object for primary xml commit db96b64c6244f816ce288ac57f87d952d7b0be09 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 10:57:26 2012 +0100 remove unused private static log diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/provider/PackagesProviderHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/provider/PackagesProviderHandler.java index 3d1854c..1927841 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/provider/PackagesProviderHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/provider/PackagesProviderHandler.java @@ -26,7 +26,6 @@ import com.redhat.rhn.frontend.xmlrpc.InvalidPackageProviderException; import com.redhat.rhn.frontend.xmlrpc.PermissionCheckFailureException; import org.apache.commons.lang.StringEscapeUtils; -import org.apache.log4j.Logger; import java.util.List; import java.util.Set; @@ -40,9 +39,6 @@ import java.util.Set; */ public class PackagesProviderHandler extends BaseHandler { - private static Logger logger = Logger.getLogger(PackagesProviderHandler.class); - - /** * list the package providers * @param sessionKey the session key commit 060266554f684e00a14eae56a5446fdd3a828284 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 10:56:45 2012 +0100 remove unused private static log 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 9e0a2a3..d1a48c3 100644 --- a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageEvrFactory.java +++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageEvrFactory.java @@ -18,7 +18,6 @@ import com.redhat.rhn.common.db.datasource.CallableMode; import com.redhat.rhn.common.db.datasource.ModeFactory; import com.redhat.rhn.common.hibernate.HibernateFactory; -import org.apache.log4j.Logger; import org.hibernate.Session; import java.sql.Types; @@ -31,8 +30,6 @@ import java.util.Map; */ public class PackageEvrFactory { - private static Logger log = Logger.getLogger(PackageEvrFactory.class); - /** * Private Constructor */ commit c31a2b56499b42e2c620ffa0a9174764f9dbfa27 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 10:56:24 2012 +0100 remove unused private attribute diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PackageCapabilityIterator.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PackageCapabilityIterator.java index 624ec67..3e12a8d 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PackageCapabilityIterator.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PackageCapabilityIterator.java @@ -44,7 +44,6 @@ public class PackageCapabilityIterator { private static final String PACKAGE_ID = "package_id"; private String queryName; - private SelectMode mode; private ResultSet rs; private ResultSetMetaData rsmd; private Map row; commit 184f9074d122968acf9aacb48650ccb9ad1e0eae Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 10:55:24 2012 +0100 remove unused private final log diff --git a/java/code/src/com/redhat/rhn/common/security/acl/PackageAclHandler.java b/java/code/src/com/redhat/rhn/common/security/acl/PackageAclHandler.java index 0b6d3d8..3471d6c 100644 --- a/java/code/src/com/redhat/rhn/common/security/acl/PackageAclHandler.java +++ b/java/code/src/com/redhat/rhn/common/security/acl/PackageAclHandler.java @@ -24,9 +24,6 @@ import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.manager.rhnpackage.PackageManager; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import java.util.Map; import java.util.Set; @@ -36,8 +33,6 @@ import java.util.Set; */ public class PackageAclHandler extends BaseHandler { - private final Log log = LogFactory.getLog(this.getClass()); - /** * Returns true if the Token whose id matches the given tid, * has the requested entitlement given by entitlement label in param 0 commit bcca83b16e5dae71a4dc225b5220232a6183407d Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 10:54:27 2012 +0100 remove unused private attribute diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/Package.java b/java/code/src/com/redhat/rhn/domain/rhnpackage/Package.java index 4fb1b56..01ef259 100644 --- a/java/code/src/com/redhat/rhn/domain/rhnpackage/Package.java +++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/Package.java @@ -55,7 +55,6 @@ public class Package extends BaseDomainHelper { private String copyright; private String cookie; private Date lastModified; - private String sourcePath; private Set<PublishedErrata> publishedErrata = new HashSet<PublishedErrata>(); private Set<UnpublishedErrata> unpublishedErrata = new HashSet<UnpublishedErrata>(); private Set<Channel> channels = new HashSet<Channel>(); commit 58e703606a20f31e89e6e62b80e8378259f32ac0 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 10:51:28 2012 +0100 remove unused private log diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/OtherXmlWriter.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/OtherXmlWriter.java index 1dffa84..908c288 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/OtherXmlWriter.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/OtherXmlWriter.java @@ -22,7 +22,6 @@ import com.redhat.rhn.manager.task.TaskManager; import com.redhat.rhn.taskomatic.task.TaskConstants; import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; import org.xml.sax.SAXException; import java.io.ByteArrayOutputStream; @@ -37,8 +36,6 @@ import java.io.Writer; public class OtherXmlWriter extends RepomdWriter { private PackageCapabilityIterator changeLogIterator; - private Logger log = Logger.getLogger(OtherXmlWriter.class); - /** * * @param writer The writer object for other.xml commit ec0c567dbbee50d4f5bc52259ee4bc895f2a0e70 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 10:50:47 2012 +0100 remove unused private attributes diff --git a/java/code/src/com/redhat/rhn/frontend/dto/OrgSystemEntitlementDto.java b/java/code/src/com/redhat/rhn/frontend/dto/OrgSystemEntitlementDto.java index d0c29f0..7a0cfb4 100644 --- a/java/code/src/com/redhat/rhn/frontend/dto/OrgSystemEntitlementDto.java +++ b/java/code/src/com/redhat/rhn/frontend/dto/OrgSystemEntitlementDto.java @@ -28,10 +28,6 @@ public class OrgSystemEntitlementDto { private String orgname; private OrgEntitlementDto orgEntDto; private String entname; - private Long availableEntitlements; - private Long currentEntitlements; - private Long satelliteTotal; - /** * Constructor .. */ commit 9e052cddc171b6ce6b8748541cb2af5e0ba0ec7d Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 10:48:46 2012 +0100 remove unused private static log diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgSoftwareSubscriptionsAction.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgSoftwareSubscriptionsAction.java index 61b2fbf..89afdc8 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgSoftwareSubscriptionsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgSoftwareSubscriptionsAction.java @@ -30,7 +30,6 @@ import com.redhat.rhn.manager.channel.ChannelManager; import com.redhat.rhn.manager.org.UpdateOrgSoftwareEntitlementsCommand; import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; @@ -50,8 +49,6 @@ import javax.servlet.http.HttpServletResponse; */ public class OrgSoftwareSubscriptionsAction extends RhnAction implements Listable { private static final String SUBSCRIPTIONS = "subscriptions"; - private static Logger log = Logger.getLogger(OrgSoftwareSubscriptionsAction.class); - private static String makeLabel(HttpServletRequest request) { RequestContext ctx = new RequestContext(request); Long oid = ctx.getParamAsLong(RequestContext.ORG_ID); commit 908e5328de2773f0016102585b72004a76b64184 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 10:47:54 2012 +0100 remove unused private static log diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartPartitionCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartPartitionCommand.java index 821197b..720ee07 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartPartitionCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartPartitionCommand.java @@ -17,15 +17,12 @@ package com.redhat.rhn.manager.kickstart; import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.domain.user.User; -import org.apache.log4j.Logger; - /** * KickstartPrePostCommand - for editing the pre and post steps * in a kickstart. * @version $Rev$ */ public class KickstartPartitionCommand extends BaseKickstartCommand { - private static Logger log = Logger.getLogger(KickstartPartitionCommand.class); /** * Constructor * @param ksidIn id of the Kickstart to lookup commit c26920130c0f93d76e47bfad844bf44e5a31dcce Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 10:31:19 2012 +0100 remove unused private final attributes diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java index 5c6ed99..b5188c4 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java @@ -107,8 +107,6 @@ public class KickstartFormatter { private static final String UPDATE_OPT_PATH = "/tmp/rhn_rpms/optional/"; private static final String UPDATE_CMD = "rpm -Uvh --replacepkgs --replacefiles "; private static final String FRESH_CMD = "rpm -Fvh /tmp/rhn_rpms/*rpm"; - private static final String IMPORT_RHN_KEY5 = - "rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release"; private static final String IMPORT_RHN_KEY34 = "rpm --import /usr/share/rhn/RPM-GPG-KEY"; private static final String IMPORT_RHN_KEY2 = @@ -125,7 +123,6 @@ public class KickstartFormatter { "mkdir -p /etc/sysconfig/rhn/allowed-actions/configfiles" + NEWLINE + "touch /etc/sysconfig/rhn/allowed-actions/configfiles/all"; private static final String RHNCHECK = "rhn_check"; - private static final String ACT_KEY_CMD = "rhnreg_ks --activationkey="; private static final String RHN_NOCHROOT = "mkdir /mnt/sysimage/tmp/ks-tree-copy" + NEWLINE + "if [ -d /oldtmp/ks-tree-shadow ]; then" + NEWLINE + @@ -168,7 +165,6 @@ public class KickstartFormatter { "%s" + NEWLINE + "#end if" + NEWLINE; - private final boolean seenNoChroot = false; private final KickstartData ksdata; private final String ksHost; private final User user; commit 4089732f56e2e451e77533aad9d0a34ecb36c9bc Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 10:22:54 2012 +0100 remove unused private static final attribute diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java index 52c4d78..df62d12 100644 --- a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java +++ b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java @@ -83,7 +83,6 @@ import java.util.TreeSet; */ public class KickstartDataTest extends BaseTestCaseWithUser { - private static final String STATIC_DEV = "dhcp:eth0"; private static final String KERNEL_PARAMS = "ide0=ata66"; commit c3e654e6e016faa4770eb2a7d9106621a3b60054 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 10:22:19 2012 +0100 remove unused private static final attributes diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/FlexGuestAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/FlexGuestAction.java index cfbde52..17def37 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/FlexGuestAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/FlexGuestAction.java @@ -36,10 +36,6 @@ import javax.servlet.http.HttpServletResponse; */ public class FlexGuestAction extends EligibleFlexGuestAction { - private static final String SELECTABLE = "selectable"; - private static final String SELECTED_FAMILY = "channel_family"; - private static final String ALL = "all"; - /** * * {@inheritDoc} commit bae7c59c9248a13dae3e942e8944e3e5d85e441a Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 10:18:39 2012 +0100 remove unused test part diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/test/CreateUserActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/user/test/CreateUserActionTest.java index 38f1165..c8d3cc4 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/user/test/CreateUserActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/user/test/CreateUserActionTest.java @@ -15,17 +15,13 @@ package com.redhat.rhn.frontend.action.user.test; import com.redhat.rhn.common.messaging.MessageQueue; -import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.action.user.CreateUserAction; import com.redhat.rhn.frontend.action.user.UserActionHelper; -import com.redhat.rhn.manager.user.CreateUserCommand; import com.redhat.rhn.testing.RhnMockDynaActionForm; import com.redhat.rhn.testing.RhnMockStrutsTestCase; import com.redhat.rhn.testing.TestUtils; import com.redhat.rhn.webapp.RhnServletListener; -import java.util.List; - /** * CreateUserActionTest - Test the CreateUserAction * @@ -106,20 +102,4 @@ public class CreateUserActionTest extends RhnMockStrutsTestCase { f.set("preferredLocale", "en_US"); return f; } - - private TestCreateUserCommand cmd = new TestCreateUserCommand(); - - public class TestCreateUserCommand extends CreateUserCommand { - - private int publishCount = 0; - - /** - * {@inheritDoc} - */ - public void publishNewUserEvent(User accountCreator, List admins, - String domain, String password) { - publishCount++; - } - - } } commit 2d4c10492ac6d01a255ea2458a69dcf3bbc0c650 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 10:14:51 2012 +0100 remove unused private static sttribute diff --git a/java/code/src/com/redhat/rhn/manager/configuration/file/ConfigFileData.java b/java/code/src/com/redhat/rhn/manager/configuration/file/ConfigFileData.java index 1171668..5fcd7ca 100644 --- a/java/code/src/com/redhat/rhn/manager/configuration/file/ConfigFileData.java +++ b/java/code/src/com/redhat/rhn/manager/configuration/file/ConfigFileData.java @@ -42,7 +42,6 @@ import java.util.Map; * @version $Rev$ */ public abstract class ConfigFileData { - private static long serialVersionUID = -2162768922109257186L; private static final String VALIDATION_XSD = "/com/redhat/rhn/frontend/action/configuration/validation/configFileForm.xsd"; commit e15746591264a9d40d2e270afbfea3d9134c1b7f Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 10:14:24 2012 +0100 remove unused private logger diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSnippetLister.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSnippetLister.java index 9468057..e5a3ccb 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSnippetLister.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSnippetLister.java @@ -20,8 +20,6 @@ import com.redhat.rhn.domain.role.RoleFactory; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.manager.BaseManager; -import org.apache.log4j.Logger; - import java.io.File; import java.util.Arrays; import java.util.LinkedList; @@ -33,10 +31,6 @@ import java.util.List; */ public class CobblerSnippetLister extends BaseManager { - /** - * Logger for this class - */ - private static final Logger LOG = Logger.getLogger(CobblerSnippetLister.class); private static final CobblerSnippetLister INSTANCE = new CobblerSnippetLister(); /** * Default constructor commit b795e4ab393096415b4d24f41a4ed551c8b1bd8c Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 10:14:08 2012 +0100 remove unused private logger diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileEditCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileEditCommand.java index a7fc05e..c86ad86 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileEditCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileEditCommand.java @@ -20,7 +20,6 @@ import com.redhat.rhn.domain.kickstart.KickstartFactory; import com.redhat.rhn.domain.user.User; import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; import org.cobbler.Profile; /** @@ -28,8 +27,6 @@ import org.cobbler.Profile; * @version $Rev$ */ public class CobblerProfileEditCommand extends CobblerProfileCommand { - private static Logger log = Logger.getLogger(CobblerProfileEditCommand.class); - /** * Constructor * @param ksDataIn to sync commit ad6fa60cb8bba7e99a39c5a7c3feb6ad72509bd4 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 10:13:52 2012 +0100 remove unused private logger diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCreateCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCreateCommand.java index 261d16e..7af0738 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCreateCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCreateCommand.java @@ -20,7 +20,6 @@ import com.redhat.rhn.domain.kickstart.KickstartData; import com.redhat.rhn.domain.kickstart.KickstartFactory; import com.redhat.rhn.domain.user.User; -import org.apache.log4j.Logger; import org.cobbler.CobblerConnection; import org.cobbler.Distro; import org.cobbler.Profile; @@ -34,9 +33,6 @@ import java.util.Map; */ public class CobblerProfileCreateCommand extends CobblerProfileCommand { - private static Logger log = Logger.getLogger(CobblerProfileCreateCommand.class); - - /** * Constructor * @param ksDataIn to sync commit 9968374ff4f70bad6815a5002805d7c5457b0f3e Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 10:13:29 2012 +0100 remove unused private logger diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroEditCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroEditCommand.java index 4e74656..1816744 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroEditCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroEditCommand.java @@ -18,7 +18,6 @@ import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.domain.kickstart.KickstartableTree; import com.redhat.rhn.domain.user.User; -import org.apache.log4j.Logger; import org.cobbler.Distro; /** @@ -38,8 +37,6 @@ public class CobblerDistroEditCommand extends CobblerDistroCommand { super(ksTreeIn, userIn); } - private static Logger log = Logger.getLogger(CobblerDistroEditCommand.class); - /** * {@inheritDoc} */ commit 1ff4573d42a10f4114e4a652d57959c73df903bd Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 10:13:10 2012 +0100 remove unused private logger diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCommand.java index 7b1bfc2..96623db 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCommand.java @@ -19,7 +19,6 @@ import com.redhat.rhn.domain.kickstart.KickstartableTree; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.manager.kickstart.KickstartUrlHelper; -import org.apache.log4j.Logger; import org.cobbler.CobblerConnection; import org.cobbler.Distro; @@ -27,15 +26,12 @@ import java.util.HashMap; import java.util.Map; - /** * CobblerProfileComand - class to contain logic to communicate with cobbler * @version $Rev$ */ public class CobblerDistroCommand extends CobblerCommand { - private static Logger log = Logger.getLogger(CobblerDistroCommand.class); - protected KickstartableTree tree; /** commit bda5d086eda67bd4d045eae5a289329947b615d5 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 10:12:04 2012 +0100 remove unused private static final attribute diff --git a/java/code/src/com/redhat/rhn/domain/channel/ChannelVersion.java b/java/code/src/com/redhat/rhn/domain/channel/ChannelVersion.java index 122fbba..97f0629 100644 --- a/java/code/src/com/redhat/rhn/domain/channel/ChannelVersion.java +++ b/java/code/src/com/redhat/rhn/domain/channel/ChannelVersion.java @@ -40,9 +40,6 @@ public class ChannelVersion { public static final ChannelVersion RHEL6 = new ChannelVersion( "Red Hat Enterprise Linux 6", "6"); - // Map kickstart install type labels to channel version constants. - private static final Map KICKSTART_INSTALL_TYPE_TO_CHANNEL_VERSION = new HashMap(); - // Map releases to channel version constants. Anything not in this map // will be assumed to be legacy. public static final Map DIST_CHANNEL_MAP_TO_CHANNEL_VERSION = new HashMap(); commit 97676633eff73a541792589fb31826f2b82ba047 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 10:05:39 2012 +0100 remove unused private attribute diff --git a/java/code/src/com/redhat/rhn/manager/channel/repo/BaseRepoCommand.java b/java/code/src/com/redhat/rhn/manager/channel/repo/BaseRepoCommand.java index a11dc9a..83bf475 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/repo/BaseRepoCommand.java +++ b/java/code/src/com/redhat/rhn/manager/channel/repo/BaseRepoCommand.java @@ -14,9 +14,6 @@ */ package com.redhat.rhn.manager.channel.repo; -import java.util.List; - -import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.domain.channel.ChannelFactory; import com.redhat.rhn.domain.channel.ContentSource; import com.redhat.rhn.domain.org.Org; @@ -34,8 +31,6 @@ public class BaseRepoCommand { private String label; private String url; private Org org; - private List<ValidatorError> errors; - /** * Constructor */ commit 88fb8eeae9e750d39385f749c6a91c18e7ffcb58 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 10:01:41 2012 +0100 remove unused logger diff --git a/java/code/src/com/redhat/rhn/frontend/action/audit/AuditAction.java b/java/code/src/com/redhat/rhn/frontend/action/audit/AuditAction.java index d2037ac..a42ff69 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/audit/AuditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/audit/AuditAction.java @@ -22,7 +22,6 @@ import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper; import com.redhat.rhn.frontend.taglibs.list.helper.Listable; import com.redhat.rhn.manager.audit.AuditManager; -import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; @@ -39,8 +38,6 @@ import javax.servlet.http.HttpServletResponse; */ public class AuditAction extends RhnAction implements Listable { - private static Logger log = Logger.getLogger(AuditAction.class); - /** {@inheritDoc} */ public ActionForward execute(ActionMapping mapping, ActionForm form, commit e8022abe4a7d3602e5bce244cdc434e8750ef6f7 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 10:01:23 2012 +0100 remove unused private static final attribute diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/AlphaBarHelper.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/AlphaBarHelper.java index e9cf06f..17c8a11 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/AlphaBarHelper.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/AlphaBarHelper.java @@ -38,11 +38,6 @@ public class AlphaBarHelper { private static final AlphaBarHelper INSTANCE = new AlphaBarHelper(); /** - * Comment for <code>serialVersionUID</code> - */ - private static final long serialVersionUID = -4344327713489384983L; - - /** * provides the alpha bar key * @param listName the list name * @return the url key for the alpha bar commit 48cfaf1988e7b39b3ac0bbbbe6c816cbca65ea8a Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 09:59:16 2012 +0100 remove unused private static attribute diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/AdvancedModeDetailsAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/AdvancedModeDetailsAction.java index 99015c0..6781056 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/AdvancedModeDetailsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/AdvancedModeDetailsAction.java @@ -34,7 +34,6 @@ import com.redhat.rhn.manager.kickstart.KickstartFileDownloadCommand; import com.redhat.rhn.manager.kickstart.KickstartWizardHelper; import com.redhat.rhn.manager.kickstart.cobbler.CobblerProfileCommand; -import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; @@ -69,7 +68,6 @@ public class AdvancedModeDetailsAction extends RhnAction { private static final String CREATE_MODE = "create"; - private static Logger log = Logger.getLogger(AdvancedModeDetailsAction.class); private static final String UPLOAD_KEY = "manage.jsp.uploadbutton"; private static final String UPLOAD_KEY_LABEL = "uploadKey"; private static final String VALIDATION_XSD = commit 3b13d8d3e5822e1ddd0351080558418dd440b761 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 09:58:25 2012 +0100 remove unused private static attributes diff --git a/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyChildChannelsAction.java b/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyChildChannelsAction.java index e670776..0943512 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyChildChannelsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyChildChannelsAction.java @@ -47,10 +47,6 @@ import javax.servlet.http.HttpServletResponse; */ public class ActivationKeyChildChannelsAction extends RhnAction { private static final String CHANNELS = "channels"; - private static final Long DEFAULT_CHANNEL_ID = -1L; - private static final String POSSIBLE_CHANNELS = "possibleChannels"; - private static final String SELECTED_CHANNEL = "selectedChannel"; - /** * * {@inheritDoc} commit 7ea2ca51c9af24a4856c831e5a480cdf9a5cb8d0 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 09:53:42 2012 +0100 remove unused method 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 1a84190..29a349e 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 @@ -883,41 +883,6 @@ public class SystemManagerTest extends RhnBaseTestCase { assertEquals(1, nonCriticalCount); } - /** - * Creates two packages and errata agains the specified server. An installed package - * with the default EVR is created and installed to the server. The newer package - * is created with the given EVR and is the package associated with the errata. - * - * @param org - * @param server - * @param upgradedPackageEvr - * @param errataType - * @throws Exception - */ - private void populateServerErrataPackages(Org org, Server server, - PackageEvr upgradedPackageEvr, - String errataType) - throws Exception { - - Errata errata = ErrataFactoryTest.createTestErrata(org.getId()); - errata.setAdvisoryType(errataType); - TestUtils.saveAndFlush(errata); - - Package installedPackage = PackageTest.createTestPackage(org); - TestUtils.saveAndFlush(installedPackage); - - Session session = HibernateFactory.getSession(); - session.flush(); - - Package upgradedPackage = PackageTest.createTestPackage(org); - upgradedPackage.setPackageName(installedPackage.getPackageName()); - upgradedPackage.setPackageEvr(upgradedPackageEvr); - TestUtils.saveAndFlush(upgradedPackage); - - ErrataCacheManager.insertNeededPackageCache( - server.getId(), errata.getId(), installedPackage.getId()); - } - public void testSsmSystemPackagesToRemove() throws Exception { // Setup commit 34fbe6ca9b97b91bd2b6243e6a003534dd5a9f91 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 09:50:00 2012 +0100 remove unused method diff --git a/java/code/src/com/redhat/rhn/common/translation/test/TestTranslations.java b/java/code/src/com/redhat/rhn/common/translation/test/TestTranslations.java index dffc3cd..54054b0 100644 --- a/java/code/src/com/redhat/rhn/common/translation/test/TestTranslations.java +++ b/java/code/src/com/redhat/rhn/common/translation/test/TestTranslations.java @@ -37,12 +37,6 @@ public class TestTranslations extends Translations { return new Date(d.longValue()); } - // This is here to test that we can't access a private method and that - // when we try, we get a consistent error. - private static Long int2Long(Integer i) { - return new Long(i.intValue()); - } - public static String list2String(List l) { return l.toString(); } commit 10a5ac08b4950245e7d0c0c62a03e0d0364af840 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 09:23:09 2012 +0100 remove unused private methods diff --git a/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java b/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java index a4b41fd..6c25686 100644 --- a/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java +++ b/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java @@ -560,32 +560,6 @@ public class ActivationKeyManager { return !channels.isEmpty(); } - // called dynamically by subscribeToChildChannelWithPackageName - private Channel removeCloned(List<Channel> channels) { - Channel lastRemoved = null; - for (Iterator<Channel> i = channels.iterator(); i.hasNext();) { - Channel c = i.next(); - if (c.isCloned()) { - lastRemoved = c; - i.remove(); - } - } - return lastRemoved; - } - - // called dynamically by subscribeToChildChannelWithPackageName - private Channel removeCustom(List<Channel> channels) { - Channel lastRemoved = null; - for (Iterator<Channel> i = channels.iterator(); i.hasNext();) { - Channel c = i.next(); - if (c.isCustom()) { - lastRemoved = c; - i.remove(); - } - } - return lastRemoved; - } - private void addConfigMgmtPackages(ActivationKey key) { String [] names = { PackageManager.RHNCFG, PackageManager.RHNCFG_CLIENT, commit 6a724fefba90718217d05e311cbf787a99d2f980 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 09:21:42 2012 +0100 remove unused private method diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/AdvancedModeDetailsAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/AdvancedModeDetailsAction.java index 6e8555a..99015c0 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/AdvancedModeDetailsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/AdvancedModeDetailsAction.java @@ -316,8 +316,4 @@ public class AdvancedModeDetailsAction extends RhnAction { map.put(KICKSTART_LABEL_PARAM, form.get(KICKSTART_LABEL_PARAM)); return map; } - - private String getSuccessKey() { - return "kickstart.details.success"; - } } commit a2f194b34af48041827dc885110a600eb8b9745d Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Feb 28 08:09:23 2012 +0100 removing unused private method from SystemEntitlementsSubmitAction diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/SystemEntitlementsSubmitAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/SystemEntitlementsSubmitAction.java index 51882fe..6b2d0ce 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/SystemEntitlementsSubmitAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/SystemEntitlementsSubmitAction.java @@ -537,12 +537,4 @@ public class SystemEntitlementsSubmitAction extends protected ActionMessage getEmptySelectionMessage() { return new ActionMessage("system_entitlements.emptyselectionerror"); } - - private void addToMessage(ActionMessages msgs, String key, Object[] args) { - ActionMessage temp = new ActionMessage(key, args); - msgs.add(ActionMessages.GLOBAL_MESSAGE, temp); - } - - - }

12 years, 2 months

1
0
0 / 0

schema/spacewalk

by Milan Zazrivec

schema/spacewalk/oracle/procs/lookup_erratafile_type.sql | 1 schema/spacewalk/postgres/procs/lookup_erratafile_type.sql | 2 - schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/095-lookup_erratafile_type.sql.oracle | 18 ++++++++++ schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/095-lookup_erratafile_type.sql.postgresql | 2 + 4 files changed, 21 insertions(+), 2 deletions(-) New commits: commit 807f0f1fddb0cf9c4c4d1d1a0e826f850a4ff67a Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Tue Feb 28 11:56:27 2012 +0100 no need for autonomous_transaction in lookup_erratafile_type diff --git a/schema/spacewalk/oracle/procs/lookup_erratafile_type.sql b/schema/spacewalk/oracle/procs/lookup_erratafile_type.sql index d654322..4f9e42f 100644 --- a/schema/spacewalk/oracle/procs/lookup_erratafile_type.sql +++ b/schema/spacewalk/oracle/procs/lookup_erratafile_type.sql @@ -20,7 +20,6 @@ create or replace function lookup_erratafile_type ( label_in in varchar2 ) return number deterministic is - pragma autonomous_transaction; erratafile_type_id number; begin select id diff --git a/schema/spacewalk/postgres/procs/lookup_erratafile_type.sql b/schema/spacewalk/postgres/procs/lookup_erratafile_type.sql index 5508a15..a155791 100644 --- a/schema/spacewalk/postgres/procs/lookup_erratafile_type.sql +++ b/schema/spacewalk/postgres/procs/lookup_erratafile_type.sql @@ -1,4 +1,4 @@ --- oracle equivalent source sha1 f4a1877eeefcbdfd668fc2863fddedc7ae727fbb +-- oracle equivalent source sha1 c37ec2fbd380eb992f2064563a80abb3a0d8f9ce -- retrieved from ./1241042199/53fa26df463811901487b608eecc3f77ca7783a1/schema/spacewalk/oracle/procs/lookup_erratafile_type.sql -- -- Copyright (c) 2008--2010 Red Hat, Inc. diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/095-lookup_erratafile_type.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/095-lookup_erratafile_type.sql.oracle new file mode 100644 index 0000000..3ad9ec1 --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/095-lookup_erratafile_type.sql.oracle @@ -0,0 +1,18 @@ +create or replace function +lookup_erratafile_type ( + label_in in varchar2 +) return number deterministic is + erratafile_type_id number; +begin + select id + into erratafile_type_id + from rhnErrataFileType + where label = label_in; + + return erratafile_type_id; +exception + when no_data_found then + rhn_exception.raise_exception('erratafile_type_not_found'); +end; +/ +show errors diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/095-lookup_erratafile_type.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/095-lookup_erratafile_type.sql.postgresql new file mode 100644 index 0000000..03797a9 --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/095-lookup_erratafile_type.sql.postgresql @@ -0,0 +1,2 @@ +-- oracle equivalent source sha1 d8619ed90fe5a61425ec2e61bbb46a0cbb99ead3 +-- This file is intentionally left empty.

12 years, 2 months

1
0
0 / 0

4 commits - schema/spacewalk

by Milan Zazrivec

schema/spacewalk/oracle/procs/insert_cve.sql | 26 ++++ schema/spacewalk/oracle/procs/lookup_cve.sql | 62 +++------- schema/spacewalk/oracle/procs/procs.deps | 2 schema/spacewalk/postgres/procs/insert_cve.sql | 2 schema/spacewalk/postgres/procs/lookup_cve.sql | 54 ++++---- schema/spacewalk/postgres/procs/procs.deps | 2 schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/094-lookup_cve.sql.oracle | 39 ++++++ schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/094-lookup_cve.sql.postgresql | 43 ++++++ 8 files changed, 164 insertions(+), 66 deletions(-) New commits: commit 4f12e3db660dfb3d5de83d82e6e8bdb7414d170e Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Tue Feb 28 11:43:21 2012 +0100 lookup_cve: postgresql schema upgrade diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/094-lookup_cve.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/094-lookup_cve.sql.postgresql new file mode 100644 index 0000000..d7391a9 --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/094-lookup_cve.sql.postgresql @@ -0,0 +1,43 @@ +-- oracle equivalent source sha1 5f3ad99fd4ed1558cfa5e3d64eb1c2cf452b59cf +-- +-- 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_cve(name_in in varchar) +returns numeric +as $$ +declare + name_id numeric; +begin + select id + into name_id + from rhnCVE + where name = name_in; + + if not found then + name_id := nextval('rhn_cve_id_seq'); + begin + perform pg_dblink_exec( + 'insert into rhnCVE (id, name) values (' || name_id || ', ' || + coalesce(quote_literal(name_in), 'NULL') || ')'); + exception when unique_violation then + select id + into strict name_id + from rhnCVE + where name = name_in; + end; + end if; + + return name_id; +end; $$ language plpgsql immutable; commit b0c2c7000bd8529586072f84a4458de53c8d4ef1 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Tue Feb 28 11:42:05 2012 +0100 use pg_dblink_exec to execute insert inside lookup_cve diff --git a/schema/spacewalk/postgres/procs/insert_cve.sql b/schema/spacewalk/postgres/procs/insert_cve.sql new file mode 100644 index 0000000..ca1172a --- /dev/null +++ b/schema/spacewalk/postgres/procs/insert_cve.sql @@ -0,0 +1,2 @@ +-- oracle equivalent source sha1 503d7fcd3467f712f378d98bb0a6195315ff4d5f +-- This file is intentionally left empty. diff --git a/schema/spacewalk/postgres/procs/lookup_cve.sql b/schema/spacewalk/postgres/procs/lookup_cve.sql index b45ea94..d209693 100644 --- a/schema/spacewalk/postgres/procs/lookup_cve.sql +++ b/schema/spacewalk/postgres/procs/lookup_cve.sql @@ -1,7 +1,6 @@ --- oracle equivalent source sha1 f8ec6c07d6f4276d821e52bcacf61f2e930a8ba9 --- retrieved from ./1241042199/53fa26df463811901487b608eecc3f77ca7783a1/schema/spacewalk/oracle/procs/lookup_cve.sql +-- oracle equivalent source sha1 bd0ee90dd89cf387d15632b5c37158ddcdbc3817 -- --- 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 @@ -13,29 +12,32 @@ -- 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_CVE(name_in IN VARCHAR) -RETURNS NUMERIC -AS $$ -DECLARE - name_id NUMERIC; -BEGIN - SELECT id - INTO name_id - FROM rhnCve - WHERE name = name_in; - - IF NOT FOUND THEN - INSERT INTO rhnCve (id, name) VALUES (nextval('rhn_cve_id_seq'), name_in); - name_id := currval('rhn_cve_id_seq'); - END IF; +create or replace function +lookup_cve(name_in in varchar) +returns numeric +as $$ +declare + name_id numeric; +begin + select id + into name_id + from rhnCVE + where name = name_in; - RETURN name_id; -END; $$ language plpgsql; + if not found then + name_id := nextval('rhn_cve_id_seq'); + begin + perform pg_dblink_exec( + 'insert into rhnCVE (id, name) values (' || name_id || ', ' || + coalesce(quote_literal(name_in), 'NULL') || ')'); + exception when unique_violation then + select id + into strict name_id + from rhnCVE + where name = name_in; + end; + end if; + return name_id; +end; $$ language plpgsql immutable; diff --git a/schema/spacewalk/postgres/procs/procs.deps b/schema/spacewalk/postgres/procs/procs.deps index 6abde3a..49a446e 100644 --- a/schema/spacewalk/postgres/procs/procs.deps +++ b/schema/spacewalk/postgres/procs/procs.deps @@ -67,7 +67,7 @@ lookup_client_capability :: rhnClientCapabilityName pg_dblink_exec lookup_cf_state :: rhnConfigFileState lookup_config_filename :: pg_dblink_exec lookup_config_info :: pg_dblink_exec -lookup_cve :: rhnCVE +lookup_cve :: rhnCVE pg_dblink_exec lookup_erratafile_type :: rhnErrataFileType data/rhnErrataFileType lookup_evr :: rhnPackageEVR lookup_feature_type :: rhnFeature commit 28bc0301d8ffe60f568657f41237aa73e34f9092 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Tue Feb 28 11:30:08 2012 +0100 lookup_cve: oracle schema upgrade diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/094-lookup_cve.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/094-lookup_cve.sql.oracle new file mode 100644 index 0000000..17ed0f0 --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/094-lookup_cve.sql.oracle @@ -0,0 +1,39 @@ +create or replace function insert_cve(name_in in varchar2) +return number +is + pragma autonomous_transaction; + name_id number; +begin + insert into rhnCVE (id, name) + values (rhn_cve_id_seq.nextval, name_in) returning id into name_id; + commit; + return name_id; +end; +/ +show errors + +create or replace function +lookup_cve(name_in in varchar2) +return number +is + name_id number; +begin + select id + into name_id + from rhnCVE + where name = name_in; + + return name_id; +exception when no_data_found then + begin + name_id := insert_cve(name_in); + exception when dup_val_on_index then + select id + into name_id + from rhnCVE + where name = name_in; + end; + return name_id; +end; +/ +show errors commit 5527f6626ad2ae8ea4d6071180df2391f23571e0 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Tue Feb 28 11:28:24 2012 +0100 use autonomous_transaction for insert only diff --git a/schema/spacewalk/oracle/procs/insert_cve.sql b/schema/spacewalk/oracle/procs/insert_cve.sql new file mode 100644 index 0000000..03cca9f --- /dev/null +++ b/schema/spacewalk/oracle/procs/insert_cve.sql @@ -0,0 +1,26 @@ +-- Copyright (c) 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 insert_cve(name_in in varchar2) +return number +is + pragma autonomous_transaction; + name_id number; +begin + insert into rhnCVE (id, name) + values (rhn_cve_id_seq.nextval, name_in) returning id into name_id; + commit; + return name_id; +end; +/ +show errors diff --git a/schema/spacewalk/oracle/procs/lookup_cve.sql b/schema/spacewalk/oracle/procs/lookup_cve.sql index d446bd8..14329f9 100644 --- a/schema/spacewalk/oracle/procs/lookup_cve.sql +++ b/schema/spacewalk/oracle/procs/lookup_cve.sql @@ -1,5 +1,4 @@ --- --- Copyright (c) 2008 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 @@ -11,42 +10,29 @@ -- 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_CVE(name_in IN VARCHAR2) -RETURN NUMBER -IS - PRAGMA AUTONOMOUS_TRANSACTION; - name_id NUMBER; -BEGIN - SELECT id - INTO name_id - FROM rhnCve - WHERE name = name_in; +create or replace function +lookup_cve(name_in in varchar2) +return number +is + name_id number; +begin + select id + into name_id + from rhnCVE + where name = name_in; - RETURN name_id; -EXCEPTION - WHEN NO_DATA_FOUND THEN - INSERT INTO rhnCve (id, name) - VALUES (rhn_cve_id_seq.nextval, name_in) - RETURNING id INTO name_id; - COMMIT; - RETURN name_id; -END LOOKUP_CVE; + return name_id; +exception when no_data_found then + begin + name_id := insert_cve(name_in); + exception when dup_val_on_index then + select id + into name_id + from rhnCVE + where name = name_in; + end; + return name_id; +end; / -SHOW ERRORS - --- --- Revision 1.2 2004/07/07 21:48:25 pjones --- bugzilla: 123370 -- "end lookup_cve", to be consistent with the dbchange way --- --- Revision 1.1 2004/07/07 17:27:36 bretm --- bugzilla: 123370 --- --- lookup_cve utility function --- --- +show errors diff --git a/schema/spacewalk/oracle/procs/procs.deps b/schema/spacewalk/oracle/procs/procs.deps index 8e4c3e1..1e72734 100644 --- a/schema/spacewalk/oracle/procs/procs.deps +++ b/schema/spacewalk/oracle/procs/procs.deps @@ -72,7 +72,7 @@ lookup_client_capability :: insert_client_capability rhnClientCapabilityN lookup_cf_state :: rhnConfigFileState lookup_config_filename :: insert_config_filename lookup_config_info :: insert_config_info -lookup_cve :: rhnCVE +lookup_cve :: rhnCVE insert_cve lookup_erratafile_type :: rhnErrataFileType data/rhnErrataFileType lookup_evr :: rhnPackageEVR lookup_feature_type :: rhnFeature

12 years, 2 months

1
0
0 / 0

schema/spacewalk

by Milan Zazrivec

schema/spacewalk/oracle/procs/lookup_config_info.sql | 1 - schema/spacewalk/postgres/procs/insert_config_info.sql | 2 +- schema/spacewalk/postgres/procs/lookup_config_info.sql | 2 +- schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/093-lookup_config_info.sql.oracle | 1 - schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/093-lookup_config_info.sql.postgresql | 2 +- 5 files changed, 3 insertions(+), 5 deletions(-) New commits: commit 63c160544134a7d32cbb4bc1489cd775ab8fd6a8 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Tue Feb 28 11:13:10 2012 +0100 we don't need the autonomous_transaction pragma in lookup_config_info anymore diff --git a/schema/spacewalk/oracle/procs/lookup_config_info.sql b/schema/spacewalk/oracle/procs/lookup_config_info.sql index 8769931..2525507 100644 --- a/schema/spacewalk/oracle/procs/lookup_config_info.sql +++ b/schema/spacewalk/oracle/procs/lookup_config_info.sql @@ -21,7 +21,6 @@ lookup_config_info ( ) return number deterministic is - pragma autonomous_transaction; v_id number; cursor lookup_cursor is select id diff --git a/schema/spacewalk/postgres/procs/insert_config_info.sql b/schema/spacewalk/postgres/procs/insert_config_info.sql index a43dd9b..18667b7 100644 --- a/schema/spacewalk/postgres/procs/insert_config_info.sql +++ b/schema/spacewalk/postgres/procs/insert_config_info.sql @@ -1,2 +1,2 @@ --- oracle equivalent source sha1 927ed17ae7b2c43d40e5a397f793ad986f7ba410 +-- oracle equivalent source sha1 ac28a1215137bf44831e56f3592afb2ef71a7042 -- This file is intentionally left empty. diff --git a/schema/spacewalk/postgres/procs/lookup_config_info.sql b/schema/spacewalk/postgres/procs/lookup_config_info.sql index 980be5a..7e729bd 100644 --- a/schema/spacewalk/postgres/procs/lookup_config_info.sql +++ b/schema/spacewalk/postgres/procs/lookup_config_info.sql @@ -1,4 +1,4 @@ --- oracle equivalent source sha1 d6f51503a2c3261083fa31ce1bb1343c718292c1 +-- oracle equivalent source sha1 3f919d54835de5605f895ca1c76f90e6deb80bfb -- -- Copyright (c) 2008--2010 Red Hat, Inc. -- diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/093-lookup_config_info.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/093-lookup_config_info.sql.oracle index 048d825..3218dfa 100644 --- a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/093-lookup_config_info.sql.oracle +++ b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/093-lookup_config_info.sql.oracle @@ -29,7 +29,6 @@ lookup_config_info ( ) return number deterministic is - pragma autonomous_transaction; v_id number; cursor lookup_cursor is select id diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/093-lookup_config_info.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/093-lookup_config_info.sql.postgresql index 1ba81f8..5929d14 100644 --- a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/093-lookup_config_info.sql.postgresql +++ b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/093-lookup_config_info.sql.postgresql @@ -1,4 +1,4 @@ --- oracle equivalent source sha1 972edb1a123761b8e7d7e239455bff1bae2307b1 +-- oracle equivalent source sha1 c342d6d7cd96eb4c99b64d8d8449aea4c89ad10a -- -- Copyright (c) 2008--2010 Red Hat, Inc. --

12 years, 2 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits February 2012